refactor!: use packageName and not depName for datasource lookups (#2…

…0474)
renovatebot · Feb 23, 2023 · 0592942 · 0592942
1 parent 9fbe4a2
commit 0592942
Show file tree

Hide file tree

Showing 73 changed files with 704 additions and 678 deletions.
diff --git a/lib/modules/datasource/artifactory/index.spec.ts b/lib/modules/datasource/artifactory/index.spec.ts
@@ -12,7 +12,7 @@ const testRegistryUrl = 'https://jfrog.company.com/artifactory';
 const testLookupName = 'project';
 const testConfig = {
   registryUrls: [testRegistryUrl],
-  depName: testLookupName,
+  packageName: testLookupName,
 };
 const fixtureReleasesAsFolders = Fixtures.get('releases-as-folders.html');
 const fixtureReleasesAsFiles = Fixtures.get('releases-as-files.html');
@@ -70,7 +70,6 @@ describe('modules/datasource/artifactory/index', () => {
         .reply(200, '<html>\n<h1>Header</h1>\n<a>1.3.0</a>\n<hmtl/>');
       const res = await getPkgReleases({
         registryUrls: [testRegistryUrl, secondRegistryUrl],
-        depName: testLookupName,
         datasource,
         packageName: testLookupName,
       });
@@ -81,7 +80,6 @@ describe('modules/datasource/artifactory/index', () => {
     it('returns null without registryUrl + warning', async () => {
       const res = await getPkgReleases({
         datasource,
-        depName: testLookupName,
         packageName: testLookupName,
       });
       expect(logger.warn).toHaveBeenCalledTimes(1);

diff --git a/lib/modules/datasource/artifactory/readme.md b/lib/modules/datasource/artifactory/readme.md
@@ -2,6 +2,6 @@ Artifactory is the recommended registry for Conan packages.
 
 This datasource returns releases from given custom `registryUrl`(s).
 
-The target URL is composed by the `registryUrl` and the `packageName`, which defaults to `depName` when `packageName` is not defined.
+The target URL is composed by the `registryUrl` and the `packageName`.
 
 The release timestamp is taken from the date in the directory listing, and is assumed to be in UTC time.
diff --git a/lib/modules/datasource/aws-machine-image/index.spec.ts b/lib/modules/datasource/aws-machine-image/index.spec.ts
@@ -276,7 +276,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mockEmpty);
       const res = await getDigest({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["without newValue, without returned images to be null"]}]',
       });
       expect(res).toBeNull();
@@ -286,7 +286,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mock1Image);
       const res = await getDigest({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["without newValue, with one matching image to return that image"]}]',
       });
       expect(res).toStrictEqual(image3.Name);
@@ -296,7 +296,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mock3Images);
       const res = await getDigest({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["without newValue, with 3 matching image to return the newest image"]}]',
       });
       expect(res).toStrictEqual(image3.Name);
@@ -307,7 +307,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       const res = await getDigest(
         {
           datasource,
-          depName:
+          packageName:
             '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with matching newValue, with 3 matching image to return the matching image"]}]',
         },
         image1.ImageId
@@ -320,7 +320,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       const res = await getDigest(
         {
           datasource,
-          depName:
+          packageName:
             '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with not matching newValue, with 3 matching images to return the matching image"]}]',
         },
         'will never match'
@@ -334,7 +334,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mockEmpty);
       const res = await getPkgReleases({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["without returned images to be null"]}]',
       });
       expect(res).toBeNull();
@@ -344,7 +344,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mock1Image);
       const res = await getPkgReleases({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with one matching image to return that image"]}]',
       });
       expect(res).toStrictEqual({
@@ -363,7 +363,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand({ Images: [image2] });
       const res = await getPkgReleases({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with one deprecated matching image to return that image"]}]',
       });
       expect(res).toStrictEqual({
@@ -382,7 +382,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mock3Images);
       const res = await getPkgReleases({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with 3 matching image to return the newest image"]}]',
       });
       expect(res).toStrictEqual({

diff --git a/lib/modules/datasource/aws-rds/index.spec.ts b/lib/modules/datasource/aws-rds/index.spec.ts
@@ -105,7 +105,7 @@ describe('modules/datasource/aws-rds/index', () => {
       });
       const res = await getPkgReleases({
         datasource: AwsRdsDataSource.id,
-        depName: '[{"Name":"engine","Values":["mysql"]}]',
+        packageName: '[{"Name":"engine","Values":["mysql"]}]',
       });
       expect(res).toBeNull();
     });
@@ -117,7 +117,7 @@ describe('modules/datasource/aws-rds/index', () => {
       });
       const res = await getPkgReleases({
         datasource: AwsRdsDataSource.id,
-        depName: '[{"Name":"engine","Values":["mysql"]}]',
+        packageName: '[{"Name":"engine","Values":["mysql"]}]',
       });
       expect(res).toStrictEqual({
         releases: [
@@ -136,7 +136,7 @@ describe('modules/datasource/aws-rds/index', () => {
       });
       const res = await getPkgReleases({
         datasource: AwsRdsDataSource.id,
-        depName: '[{"Name":"engine","Values":["mysql"]}]',
+        packageName: '[{"Name":"engine","Values":["mysql"]}]',
       });
       expect(res).toStrictEqual({
         releases: [

diff --git a/lib/modules/datasource/azure-pipelines-tasks/index.spec.ts b/lib/modules/datasource/azure-pipelines-tasks/index.spec.ts
@@ -6,7 +6,7 @@ describe('modules/datasource/azure-pipelines-tasks/index', () => {
     expect(
       await getPkgReleases({
         datasource: AzurePipelinesTasksDatasource.id,
-        depName: 'unknown',
+        packageName: 'unknown',
       })
     ).toBeNull();
   });
@@ -15,7 +15,7 @@ describe('modules/datasource/azure-pipelines-tasks/index', () => {
     expect(
       await getPkgReleases({
         datasource: AzurePipelinesTasksDatasource.id,
-        depName: 'AutomatedAnalysis',
+        packageName: 'AutomatedAnalysis',
       })
     ).toEqual({ releases: [{ version: '0.171.0' }, { version: '0.198.0' }] });
   });
@@ -24,7 +24,7 @@ describe('modules/datasource/azure-pipelines-tasks/index', () => {
     expect(
       await getPkgReleases({
         datasource: AzurePipelinesTasksDatasource.id,
-        depName: 'AutomatedAnalysis-Marketplace',
+        packageName: 'AutomatedAnalysis-Marketplace',
       })
     ).toEqual({ releases: [{ version: '0.171.0' }, { version: '0.198.0' }] });
   });
@@ -33,7 +33,7 @@ describe('modules/datasource/azure-pipelines-tasks/index', () => {
     expect(
       await getPkgReleases({
         datasource: AzurePipelinesTasksDatasource.id,
-        depName: 'automatedanalysis',
+        packageName: 'automatedanalysis',
       })
     ).toEqual({ releases: [{ version: '0.171.0' }, { version: '0.198.0' }] });
   });

diff --git a/lib/modules/datasource/bitbucket-tags/index.spec.ts b/lib/modules/datasource/bitbucket-tags/index.spec.ts
@@ -32,7 +32,7 @@ describe('modules/datasource/bitbucket-tags/index', () => {
         .reply(200, body);
       const res = await getPkgReleases({
         datasource,
-        depName: 'some/dep2',
+        packageName: 'some/dep2',
       });
       expect(res).toMatchSnapshot();
       expect(res?.releases).toHaveLength(3);
@@ -69,7 +69,7 @@ describe('modules/datasource/bitbucket-tags/index', () => {
         .reply(200, body);
       const res = await getDigest({
         datasource,
-        depName: 'some/dep2',
+        packageName: 'some/dep2',
       });
       expect(res).toMatchSnapshot();
       expect(res).toBeString();
@@ -94,7 +94,7 @@ describe('modules/datasource/bitbucket-tags/index', () => {
         .reply(200, body);
       const res = await getDigest({
         datasource,
-        depName: 'some/dep2',
+        packageName: 'some/dep2',
       });
       expect(res).toBeNull();
     });
@@ -116,7 +116,7 @@ describe('modules/datasource/bitbucket-tags/index', () => {
       const res = await getDigest(
         {
           datasource,
-          depName: 'some/dep2',
+          packageName: 'some/dep2',
         },
         'v1.0.0'
       );

diff --git a/lib/modules/datasource/cdnjs/index.spec.ts b/lib/modules/datasource/cdnjs/index.spec.ts
@@ -18,7 +18,7 @@ describe('modules/datasource/cdnjs/index', () => {
       await expect(
         getPkgReleases({
           datasource: CdnJsDatasource.id,
-          depName: 'foo/bar',
+          packageName: 'foo/bar',
         })
       ).rejects.toThrow(EXTERNAL_HOST_ERROR);
     });
@@ -28,7 +28,7 @@ describe('modules/datasource/cdnjs/index', () => {
       await expect(
         getPkgReleases({
           datasource: CdnJsDatasource.id,
-          depName: 'foo/bar',
+          packageName: 'foo/bar',
         })
       ).rejects.toThrow(EXTERNAL_HOST_ERROR);
     });
@@ -38,7 +38,7 @@ describe('modules/datasource/cdnjs/index', () => {
       expect(
         await getPkgReleases({
           datasource: CdnJsDatasource.id,
-          depName: 'foo/bar',
+          packageName: 'foo/bar',
         })
       ).toBeNull();
     });
@@ -51,7 +51,7 @@ describe('modules/datasource/cdnjs/index', () => {
       expect(
         await getPkgReleases({
           datasource: CdnJsDatasource.id,
-          depName: 'doesnotexist/doesnotexist',
+          packageName: 'doesnotexist/doesnotexist',
         })
       ).toBeNull();
     });
@@ -61,7 +61,7 @@ describe('modules/datasource/cdnjs/index', () => {
       await expect(
         getPkgReleases({
           datasource: CdnJsDatasource.id,
-          depName: 'foo/bar',
+          packageName: 'foo/bar',
         })
       ).rejects.toThrow(EXTERNAL_HOST_ERROR);
     });
@@ -71,7 +71,7 @@ describe('modules/datasource/cdnjs/index', () => {
       await expect(
         getPkgReleases({
           datasource: CdnJsDatasource.id,
-          depName: 'foo/bar',
+          packageName: 'foo/bar',
         })
       ).rejects.toThrow(EXTERNAL_HOST_ERROR);
     });
@@ -81,7 +81,7 @@ describe('modules/datasource/cdnjs/index', () => {
       await expect(
         getPkgReleases({
           datasource: CdnJsDatasource.id,
-          depName: 'foo/bar',
+          packageName: 'foo/bar',
         })
       ).rejects.toThrow(EXTERNAL_HOST_ERROR);
     });
@@ -91,7 +91,7 @@ describe('modules/datasource/cdnjs/index', () => {
       await expect(
         getPkgReleases({
           datasource: CdnJsDatasource.id,
-          depName: 'foo/bar',
+          packageName: 'foo/bar',
         })
       ).rejects.toThrow(EXTERNAL_HOST_ERROR);
     });
@@ -103,7 +103,7 @@ describe('modules/datasource/cdnjs/index', () => {
         .reply(200, Fixtures.get('d3-force.json'));
       const res = await getPkgReleases({
         datasource: CdnJsDatasource.id,
-        depName: 'd3-force/d3-force.js',
+        packageName: 'd3-force/d3-force.js',
       });
       expect(res).toMatchSnapshot();
     });
@@ -115,7 +115,7 @@ describe('modules/datasource/cdnjs/index', () => {
         .reply(200, Fixtures.get('bulma.json'));
       const res = await getPkgReleases({
         datasource: CdnJsDatasource.id,
-        depName: 'bulma/only/0.7.5/style.css',
+        packageName: 'bulma/only/0.7.5/style.css',
       });
       expect(res).toMatchSnapshot();
     });

diff --git a/lib/modules/datasource/clojure/index.spec.ts b/lib/modules/datasource/clojure/index.spec.ts
@@ -144,10 +144,10 @@ function mockGenericPackage(opts: MockOpts = {}) {
   }
 }
 function get(
-  depName = 'org.example:package',
+  packageName = 'org.example:package',
   ...registryUrls: string[]
 ): Promise<ReleaseResult | null> {
-  const conf = { versioning, datasource: ClojureDatasource.id, depName };
+  const conf = { versioning, datasource: ClojureDatasource.id, packageName };
   return getPkgReleases(registryUrls ? { ...conf, registryUrls } : conf);
 }
 

diff --git a/lib/modules/datasource/common.ts b/lib/modules/datasource/common.ts
@@ -5,6 +5,6 @@ export function isGetPkgReleasesConfig(
 ): input is GetPkgReleasesConfig {
   return (
     (input as GetPkgReleasesConfig).datasource !== undefined &&
-    (input as GetPkgReleasesConfig).depName !== undefined
+    (input as GetPkgReleasesConfig).packageName !== undefined
   );
 }
diff --git a/lib/modules/datasource/conan/common.ts b/lib/modules/datasource/conan/common.ts
@@ -11,7 +11,7 @@ export const conanDatasourceRegex = regEx(
 );
 
 export function getConanPackage(packageName: string): ConanPackage {
-  const depName = packageName.split('/')[0];
+  const conanName = packageName.split('/')[0];
   const userAndChannel = packageName.split('@')[1];
-  return { depName, userAndChannel };
+  return { conanName, userAndChannel };
 }