From 3c1c67a46f8f3611a7f4bca4700b508cbc54b9d8 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Mon, 19 Aug 2024 02:47:45 -0300
Subject: [PATCH] refactor(aws): Make datasource names consistent (#30865)
---
lib/modules/datasource/api.ts | 8 ++++----
.../datasource/aws-machine-image/index.spec.ts | 12 ++++++------
lib/modules/datasource/aws-machine-image/index.ts | 10 +++++-----
lib/modules/datasource/aws-rds/index.spec.ts | 8 ++++----
lib/modules/datasource/aws-rds/index.ts | 6 +++---
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/lib/modules/datasource/api.ts b/lib/modules/datasource/api.ts
index e336c3eacb..9321d416b9 100644
--- a/lib/modules/datasource/api.ts
+++ b/lib/modules/datasource/api.ts
@@ -1,6 +1,6 @@
import { ArtifactoryDatasource } from './artifactory';
-import { AwsMachineImageDataSource } from './aws-machine-image';
-import { AwsRdsDataSource } from './aws-rds';
+import { AwsMachineImageDatasource } from './aws-machine-image';
+import { AwsRdsDatasource } from './aws-rds';
import { AzureBicepResourceDatasource } from './azure-bicep-resource';
import { AzurePipelinesTasksDatasource } from './azure-pipelines-tasks';
import { BazelDatasource } from './bazel';
@@ -68,8 +68,8 @@ const api = new Map<string, DatasourceApi>();
export default api;
api.set(ArtifactoryDatasource.id, new ArtifactoryDatasource());
-api.set(AwsMachineImageDataSource.id, new AwsMachineImageDataSource());
-api.set(AwsRdsDataSource.id, new AwsRdsDataSource());
+api.set(AwsMachineImageDatasource.id, new AwsMachineImageDatasource());
+api.set(AwsRdsDatasource.id, new AwsRdsDatasource());
api.set(AzureBicepResourceDatasource.id, new AzureBicepResourceDatasource());
api.set(AzurePipelinesTasksDatasource.id, new AzurePipelinesTasksDatasource());
api.set(BazelDatasource.id, new BazelDatasource());
diff --git a/lib/modules/datasource/aws-machine-image/index.spec.ts b/lib/modules/datasource/aws-machine-image/index.spec.ts
index c966a7b857..f0c600befd 100644
--- a/lib/modules/datasource/aws-machine-image/index.spec.ts
+++ b/lib/modules/datasource/aws-machine-image/index.spec.ts
@@ -6,9 +6,9 @@ import {
} from '@aws-sdk/client-ec2';
import { mockClient } from 'aws-sdk-client-mock';
import { getDigest, getPkgReleases } from '..';
-import { AwsMachineImageDataSource } from '.';
+import { AwsMachineImageDatasource } from '.';
-const datasource = AwsMachineImageDataSource.id;
+const datasource = AwsMachineImageDatasource.id;
const ec2Mock = mockClient(EC2Client);
/**
@@ -140,7 +140,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
describe('getSortedAwsMachineImages()', () => {
it('with 3 returned images', async () => {
mockDescribeImagesCommand(mock3Images);
- const ec2DataSource = new AwsMachineImageDataSource();
+ const ec2DataSource = new AwsMachineImageDatasource();
const res = await ec2DataSource.getSortedAwsMachineImages(
'[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["3images"]}]',
);
@@ -151,7 +151,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
it('with 1 returned image', async () => {
mockDescribeImagesCommand(mock1Image);
- const ec2DataSource = new AwsMachineImageDataSource();
+ const ec2DataSource = new AwsMachineImageDatasource();
const res = await ec2DataSource.getSortedAwsMachineImages(
'[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["1image"]}]',
);
@@ -162,7 +162,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
it('without returned images', async () => {
mockDescribeImagesCommand(mockEmpty);
- const ec2DataSource = new AwsMachineImageDataSource();
+ const ec2DataSource = new AwsMachineImageDatasource();
const res = await ec2DataSource.getSortedAwsMachineImages(
'[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["noiamge"]}]',
);
@@ -300,7 +300,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
});
describe('loadConfig()', () => {
- const ec2DataSource = new AwsMachineImageDataSource();
+ const ec2DataSource = new AwsMachineImageDatasource();
it('loads filters without aws config', () => {
const res = ec2DataSource.loadConfig(
diff --git a/lib/modules/datasource/aws-machine-image/index.ts b/lib/modules/datasource/aws-machine-image/index.ts
index 455e1d33ba..0867781afc 100644
--- a/lib/modules/datasource/aws-machine-image/index.ts
+++ b/lib/modules/datasource/aws-machine-image/index.ts
@@ -11,7 +11,7 @@ import { Datasource } from '../datasource';
import type { GetReleasesConfig, ReleaseResult } from '../types';
import type { AwsClientConfig, ParsedConfig } from './types';
-export class AwsMachineImageDataSource extends Datasource {
+export class AwsMachineImageDatasource extends Datasource {
static readonly id = 'aws-machine-image';
override readonly defaultVersioning = amazonMachineImageVersioning.id;
@@ -42,7 +42,7 @@ export class AwsMachineImageDataSource extends Datasource {
private readonly now: number;
constructor() {
- super(AwsMachineImageDataSource.id);
+ super(AwsMachineImageDatasource.id);
this.now = Date.now();
}
@@ -81,7 +81,7 @@ export class AwsMachineImageDataSource extends Datasource {
}
@cache({
- namespace: `datasource-${AwsMachineImageDataSource.id}`,
+ namespace: `datasource-${AwsMachineImageDatasource.id}`,
key: (serializedAmiFilter: string) =>
`getSortedAwsMachineImages:${serializedAmiFilter}`,
})
@@ -106,7 +106,7 @@ export class AwsMachineImageDataSource extends Datasource {
}
@cache({
- namespace: `datasource-${AwsMachineImageDataSource.id}`,
+ namespace: `datasource-${AwsMachineImageDatasource.id}`,
key: ({ packageName }: GetReleasesConfig, newValue: string) =>
`getDigest:${packageName}:${newValue ?? ''}`,
})
@@ -136,7 +136,7 @@ export class AwsMachineImageDataSource extends Datasource {
}
@cache({
- namespace: `datasource-${AwsMachineImageDataSource.id}`,
+ namespace: `datasource-${AwsMachineImageDatasource.id}`,
key: ({ packageName }: GetReleasesConfig) => `getReleases:${packageName}`,
})
async getReleases({
diff --git a/lib/modules/datasource/aws-rds/index.spec.ts b/lib/modules/datasource/aws-rds/index.spec.ts
index c6602fc4de..1f263ba8e0 100644
--- a/lib/modules/datasource/aws-rds/index.spec.ts
+++ b/lib/modules/datasource/aws-rds/index.spec.ts
@@ -6,7 +6,7 @@ import {
} from '@aws-sdk/client-rds';
import { mockClient } from 'aws-sdk-client-mock';
import { getPkgReleases } from '..';
-import { AwsRdsDataSource } from '.';
+import { AwsRdsDatasource } from '.';
const rdsMock = mockClient(RDSClient);
@@ -104,7 +104,7 @@ describe('modules/datasource/aws-rds/index', () => {
$metadata: {},
});
const res = await getPkgReleases({
- datasource: AwsRdsDataSource.id,
+ datasource: AwsRdsDatasource.id,
packageName: '[{"Name":"engine","Values":["mysql"]}]',
});
expect(res).toBeNull();
@@ -116,7 +116,7 @@ describe('modules/datasource/aws-rds/index', () => {
DBEngineVersions: [version2],
});
const res = await getPkgReleases({
- datasource: AwsRdsDataSource.id,
+ datasource: AwsRdsDatasource.id,
packageName: '[{"Name":"engine","Values":["mysql"]}]',
});
expect(res).toEqual({
@@ -135,7 +135,7 @@ describe('modules/datasource/aws-rds/index', () => {
DBEngineVersions: [version1, version2, version3],
});
const res = await getPkgReleases({
- datasource: AwsRdsDataSource.id,
+ datasource: AwsRdsDatasource.id,
packageName: '[{"Name":"engine","Values":["mysql"]}]',
});
expect(res).toEqual({
diff --git a/lib/modules/datasource/aws-rds/index.ts b/lib/modules/datasource/aws-rds/index.ts
index 1ad325f5e3..95a10bc562 100644
--- a/lib/modules/datasource/aws-rds/index.ts
+++ b/lib/modules/datasource/aws-rds/index.ts
@@ -7,7 +7,7 @@ import { Lazy } from '../../../util/lazy';
import { Datasource } from '../datasource';
import type { GetReleasesConfig, ReleaseResult } from '../types';
-export class AwsRdsDataSource extends Datasource {
+export class AwsRdsDatasource extends Datasource {
static readonly id = 'aws-rds';
override readonly caching = true;
@@ -15,12 +15,12 @@ export class AwsRdsDataSource extends Datasource {
private readonly rds: Lazy<RDSClient>;
constructor() {
- super(AwsRdsDataSource.id);
+ super(AwsRdsDatasource.id);
this.rds = new Lazy(() => new RDSClient({}));
}
@cache({
- namespace: `datasource-${AwsRdsDataSource.id}`,
+ namespace: `datasource-${AwsRdsDatasource.id}`,
key: ({ packageName }: GetReleasesConfig) => `getReleases:${packageName}`,
})
async getReleases({
--
GitLab