From 143c9a67516180e364e7a0881b1d9ac4d3fb1b17 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Thu, 3 Mar 2022 16:08:43 +0100 Subject: [PATCH] refactor: rename lookupName -> packageName (#14494) Renames `lookupName` to be `packageName`. BREAKING CHANGE: Use `packageName` instead of `lookupName` if interacting with Renovate datasources directly. --- docs/usage/configuration-options.md | 4 +- .../__snapshots__/migration.spec.ts.snap | 28 ++++++- lib/config/migration.spec.ts | 28 ++++++- lib/config/migration.ts | 13 ++++ lib/config/migrations/migrations-service.ts | 1 + lib/config/options/index.ts | 4 +- lib/config/presets/internal/regex-managers.ts | 2 +- lib/config/types.ts | 2 +- lib/config/validation.ts | 2 +- .../datasource/adoptium-java/common.ts | 4 +- lib/modules/datasource/adoptium-java/index.ts | 10 +-- .../datasource/adoptium-java/readme.md | 4 +- .../datasource/artifactory/index.spec.ts | 20 ++--- lib/modules/datasource/artifactory/index.ts | 16 ++-- lib/modules/datasource/artifactory/readme.md | 2 +- .../datasource/aws-machine-image/index.ts | 12 +-- .../datasource/aws-machine-image/readme.md | 6 +- .../datasource/bitbucket-tags/index.ts | 16 ++-- lib/modules/datasource/cdnjs/index.ts | 6 +- lib/modules/datasource/conan/index.spec.ts | 22 +++--- lib/modules/datasource/conan/index.ts | 10 +-- lib/modules/datasource/conda/index.ts | 10 +-- lib/modules/datasource/crate/index.ts | 44 +++++------ lib/modules/datasource/dart/index.ts | 4 +- lib/modules/datasource/docker/index.ts | 18 ++--- .../__snapshots__/index.spec.ts.snap | 2 +- .../galaxy-collection/index.spec.ts | 2 +- .../datasource/galaxy-collection/index.ts | 10 +-- lib/modules/datasource/galaxy/index.ts | 13 ++-- lib/modules/datasource/git-refs/base.ts | 6 +- lib/modules/datasource/git-refs/index.spec.ts | 8 +- lib/modules/datasource/git-refs/index.ts | 12 +-- lib/modules/datasource/git-tags/index.spec.ts | 6 +- lib/modules/datasource/git-tags/index.ts | 12 +-- .../datasource/github-releases/common.ts | 7 +- .../datasource/github-releases/digest.spec.ts | 6 +- .../datasource/github-releases/index.spec.ts | 6 +- .../datasource/github-releases/index.ts | 8 +- .../datasource/github-releases/test/index.ts | 6 +- .../datasource/github-tags/index.spec.ts | 36 ++++----- lib/modules/datasource/github-tags/index.ts | 6 +- .../datasource/gitlab-packages/index.ts | 14 ++-- .../datasource/gitlab-releases/index.ts | 10 +-- lib/modules/datasource/gitlab-tags/index.ts | 12 +-- lib/modules/datasource/gitlab-tags/util.ts | 7 +- lib/modules/datasource/go/base.spec.ts | 24 +++--- lib/modules/datasource/go/base.ts | 28 +++---- lib/modules/datasource/go/common.ts | 8 +- lib/modules/datasource/go/index.spec.ts | 16 ++-- lib/modules/datasource/go/index.ts | 8 +- .../datasource/go/releases-direct.spec.ts | 64 ++++++++-------- lib/modules/datasource/go/releases-direct.ts | 12 +-- .../datasource/go/releases-goproxy.spec.ts | 22 +++--- lib/modules/datasource/go/releases-goproxy.ts | 26 +++---- lib/modules/datasource/go/types.ts | 2 +- .../helm/__snapshots__/index.spec.ts.snap | 2 +- lib/modules/datasource/helm/index.spec.ts | 4 +- lib/modules/datasource/helm/index.ts | 8 +- lib/modules/datasource/hex/index.ts | 12 +-- lib/modules/datasource/index.ts | 34 ++++----- .../datasource/jenkins-plugins/index.ts | 6 +- lib/modules/datasource/maven/index.ts | 4 +- lib/modules/datasource/maven/util.ts | 6 +- lib/modules/datasource/metadata.spec.ts | 44 +++++------ lib/modules/datasource/metadata.ts | 8 +- lib/modules/datasource/npm/index.ts | 4 +- lib/modules/datasource/nuget/index.ts | 8 +- .../orb/__snapshots__/index.spec.ts.snap | 48 ++++++------ lib/modules/datasource/orb/index.ts | 14 ++-- lib/modules/datasource/packagist/index.ts | 6 +- lib/modules/datasource/pod/index.ts | 62 +++++++-------- lib/modules/datasource/pypi/index.ts | 10 +-- lib/modules/datasource/readme.md | 2 +- lib/modules/datasource/repology/index.ts | 8 +- lib/modules/datasource/repology/readme.md | 2 +- .../datasource/rubygems/get-rubygems-org.ts | 8 +- lib/modules/datasource/rubygems/get.ts | 6 +- lib/modules/datasource/rubygems/index.spec.ts | 4 +- lib/modules/datasource/rubygems/index.ts | 10 +-- lib/modules/datasource/sbt-package/index.ts | 6 +- lib/modules/datasource/sbt-plugin/index.ts | 6 +- .../datasource/terraform-module/index.ts | 12 +-- .../__snapshots__/index.spec.ts.snap | 4 +- .../terraform-provider/index.spec.ts | 4 +- .../datasource/terraform-provider/index.ts | 22 +++--- lib/modules/datasource/types.ts | 10 +-- .../__snapshots__/extract.spec.ts.snap | 46 +++++------ .../ansible-galaxy/collections-metadata.ts | 2 +- .../manager/ansible-galaxy/collections.ts | 2 +- lib/modules/manager/ansible-galaxy/roles.ts | 6 +- lib/modules/manager/ansible-galaxy/util.ts | 2 +- .../__snapshots__/extract.spec.ts.snap | 4 +- .../manager/azure-pipelines/extract.spec.ts | 2 +- .../manager/azure-pipelines/extract.ts | 2 +- .../bazel/__snapshots__/extract.spec.ts.snap | 44 +++++------ lib/modules/manager/bazel/extract.spec.ts | 22 +++--- lib/modules/manager/bazel/extract.ts | 10 +-- .../__snapshots__/extract.spec.ts.snap | 14 ++-- lib/modules/manager/buildkite/extract.ts | 2 +- .../__snapshots__/artifacts.spec.ts.snap | 2 +- .../cargo/__snapshots__/extract.spec.ts.snap | 2 +- lib/modules/manager/cargo/artifacts.spec.ts | 4 +- lib/modules/manager/cargo/extract.spec.ts | 2 +- lib/modules/manager/cargo/extract.ts | 8 +- .../cdnurl/__snapshots__/extract.spec.ts.snap | 20 ++--- lib/modules/manager/cdnurl/extract.spec.ts | 2 +- lib/modules/manager/cdnurl/extract.ts | 2 +- .../__snapshots__/extract.spec.ts.snap | 6 +- lib/modules/manager/circleci/extract.ts | 2 +- .../__snapshots__/extract.spec.ts.snap | 14 ++-- lib/modules/manager/cocoapods/extract.spec.ts | 10 +-- lib/modules/manager/cocoapods/extract.ts | 4 +- .../__snapshots__/extract.spec.ts.snap | 8 +- lib/modules/manager/composer/extract.ts | 10 +-- lib/modules/manager/conan/extract.spec.ts | 52 ++++++------- lib/modules/manager/conan/extract.ts | 4 +- .../manager/dockerfile/extract.spec.ts | 8 +- lib/modules/manager/dockerfile/extract.ts | 8 +- .../__snapshots__/extract.spec.ts.snap | 4 +- lib/modules/manager/fvm/extract.spec.ts | 4 +- lib/modules/manager/fvm/extract.ts | 2 +- .../manager/git-submodules/extract.spec.ts | 2 +- lib/modules/manager/git-submodules/extract.ts | 2 +- .../manager/gradle/shallow/extract.spec.ts | 10 +-- .../manager/gradle/shallow/extract/catalog.ts | 2 +- .../manager/gradle/shallow/parser.spec.ts | 16 ++-- lib/modules/manager/gradle/shallow/parser.ts | 4 +- .../__snapshots__/extract.spec.ts.snap | 12 +-- lib/modules/manager/helmsman/extract.ts | 6 +- .../helmv3/__snapshots__/extract.spec.ts.snap | 4 +- lib/modules/manager/helmv3/utils.ts | 2 +- .../html/__snapshots__/extract.spec.ts.snap | 20 ++--- lib/modules/manager/html/extract.ts | 2 +- .../__snapshots__/extract.spec.ts.snap | 6 +- .../manager/jsonnet-bundler/artifacts.spec.ts | 4 +- .../manager/jsonnet-bundler/artifacts.ts | 2 +- .../manager/jsonnet-bundler/extract.spec.ts | 6 +- .../manager/jsonnet-bundler/extract.ts | 2 +- .../__snapshots__/extract.spec.ts.snap | 4 +- lib/modules/manager/kustomize/extract.spec.ts | 6 +- lib/modules/manager/kustomize/extract.ts | 2 +- .../mix/__snapshots__/extract.spec.ts.snap | 12 +-- lib/modules/manager/mix/artifacts.spec.ts | 4 +- lib/modules/manager/mix/artifacts.ts | 6 +- lib/modules/manager/mix/extract.spec.ts | 2 +- lib/modules/manager/mix/extract.ts | 4 +- lib/modules/manager/nodenv/extract.spec.ts | 6 +- lib/modules/manager/nodenv/extract.ts | 2 +- .../extract/__snapshots__/index.spec.ts.snap | 34 ++++----- lib/modules/manager/npm/extract/index.spec.ts | 8 +- lib/modules/manager/npm/extract/index.ts | 16 ++-- .../npm/extract/locked-versions.spec.ts | 12 +-- .../manager/npm/extract/locked-versions.ts | 2 +- .../npm/update/dependency/index.spec.ts | 2 +- .../manager/npm/update/dependency/index.ts | 2 +- lib/modules/manager/nvm/extract.spec.ts | 6 +- lib/modules/manager/nvm/extract.ts | 2 +- .../manager/pip_requirements/extract.spec.ts | 8 +- .../manager/pip_requirements/extract.ts | 6 +- .../__snapshots__/extract.spec.ts.snap | 14 ++-- .../manager/pre-commit/extract.spec.ts | 10 +-- lib/modules/manager/pre-commit/extract.ts | 6 +- lib/modules/manager/regex/readme.md | 2 +- lib/modules/manager/regex/utils.ts | 2 +- .../sbt/__snapshots__/extract.spec.ts.snap | 72 +++++++++--------- lib/modules/manager/sbt/extract.spec.ts | 76 +++++++++---------- lib/modules/manager/sbt/extract.ts | 6 +- .../swift/__snapshots__/index.spec.ts.snap | 28 +++---- lib/modules/manager/swift/extract.ts | 12 +-- .../__snapshots__/extract.spec.ts.snap | 68 ++++++++--------- lib/modules/manager/terraform/extract.ts | 6 +- .../lockfile/__snapshots__/util.spec.ts.snap | 6 +- .../manager/terraform/lockfile/index.spec.ts | 20 ++--- .../manager/terraform/lockfile/index.ts | 10 +-- .../manager/terraform/lockfile/types.ts | 2 +- .../manager/terraform/lockfile/util.ts | 6 +- lib/modules/manager/terraform/modules.ts | 13 ++-- lib/modules/manager/terraform/providers.ts | 4 +- lib/modules/manager/terraform/util.ts | 13 ++-- .../__snapshots__/extract.spec.ts.snap | 30 ++++---- lib/modules/manager/terragrunt/modules.ts | 11 ++- .../travis/__snapshots__/extract.spec.ts.snap | 4 +- lib/modules/manager/travis/extract.spec.ts | 12 +-- lib/modules/manager/travis/extract.ts | 6 +- lib/modules/manager/types.ts | 4 +- lib/types/errors/external-host-error.ts | 2 +- lib/util/cache/repository/index.ts | 2 +- lib/util/cache/repository/types.ts | 2 +- lib/util/template/index.ts | 2 +- lib/workers/repository/cache.ts | 4 +- lib/workers/repository/error.ts | 2 +- .../update/branch/auto-replace.spec.ts | 12 +-- .../repository/update/branch/auto-replace.ts | 2 +- lib/workers/repository/updates/generate.ts | 6 +- 194 files changed, 1109 insertions(+), 1023 deletions(-) diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md index ec9023d4682464..5d81cfe42c2d1e 100644 --- a/docs/usage/configuration-options.md +++ b/docs/usage/configuration-options.md @@ -2329,9 +2329,9 @@ It will be compiled using Handlebars and the regex `groups` result. If `extractVersion` cannot be captured with a named capture group in `matchString` then it can be defined manually using this field. It will be compiled using Handlebars and the regex `groups` result. -### lookupNameTemplate +### packageNameTemplate -`lookupName` is used for looking up dependency versions. +`packageName` is used for looking up dependency versions. It will be compiled using Handlebars and the regex `groups` result. It will default to the value of `depName` if left unconfigured/undefined. diff --git a/lib/config/__snapshots__/migration.spec.ts.snap b/lib/config/__snapshots__/migration.spec.ts.snap index 9bcf41779611bb..c56f50000332ad 100644 --- a/lib/config/__snapshots__/migration.spec.ts.snap +++ b/lib/config/__snapshots__/migration.spec.ts.snap @@ -51,6 +51,32 @@ Object { } `; +exports[`config/migration it migrates regexManagers 1`] = ` +Object { + "regexManagers": Array [ + Object { + "fileMatch": Array [ + "(^|/|\\\\.)Dockerfile$", + "(^|/)Dockerfile\\\\.[^/]*$", + ], + "matchStrings": Array [ + "# renovate: datasource=(?[a-z-]+?) depName=(?[^\\\\s]+?)(?: lookupName=(?[^\\\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\\\s(?:ENV|ARG) .+?_VERSION=\\"?(?.+?)\\"?\\\\s", + ], + }, + Object { + "fileMatch": Array [ + "(^|/|\\\\.)Dockerfile$", + "(^|/)Dockerfile\\\\.[^/]*$", + ], + "matchStrings": Array [ + "# renovate: datasource=(?[a-z-]+?) depName=(?[^\\\\s]+?)(?: lookupName=(?[^\\\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\\\s(?:ENV|ARG) .+?_VERSION=\\"?(?.+?)\\"?\\\\s", + ], + "packageNameTemplate": "{{{holder}}}", + }, + ], +} +`; + exports[`config/migration migrateConfig(config, parentConfig) does not migrate multi days 1`] = ` Object { "schedule": "after 5:00pm on wednesday and thursday", @@ -95,7 +121,7 @@ Object { "binarySource": "global", "branchName": "{{{branchPrefix}}}{{{additionalBranchPrefix}}}{{{branchTopic}}}{{{packageFileDir}}}", "branchPrefix": "renovate/", - "commitMessage": "{{#if semanticCommitType}}{{semanticCommitType}}{{#if semanticCommitScope}}({{semanticCommitScope}}){{/if}}: {{/if}}some commit message {{depName}}", + "commitMessage": "{{#if semanticCommitType}}{{semanticCommitType}}{{#if semanticCommitScope}}({{semanticCommitScope}}){{/if}}: {{/if}}some commit message {{depName}} {{packageName}}", "constraints": Object { "python": "3.7", }, diff --git a/lib/config/migration.spec.ts b/lib/config/migration.spec.ts index 4dfccb1142e746..7a9d69145a8443 100644 --- a/lib/config/migration.spec.ts +++ b/lib/config/migration.spec.ts @@ -85,7 +85,8 @@ describe('config/migration', () => { meteor: true, autodiscover: 'true' as never, schedule: 'on the last day of the month' as never, - commitMessage: '{{semanticPrefix}}some commit message {{depNameShort}}', + commitMessage: + '{{semanticPrefix}}some commit message {{depNameShort}} {{lookupName}}', prTitle: '{{semanticPrefix}}some pr title', semanticPrefix: 'fix(deps): ', pathRules: [ @@ -669,6 +670,31 @@ describe('config/migration', () => { expect(isMigrated).toBeTrue(); expect(migratedConfig).toEqual({ extends: ['local>org/renovate-config'] }); }); + it('it migrates regexManagers', () => { + const config: RenovateConfig = { + regexManagers: [ + { + fileMatch: ['(^|/|\\.)Dockerfile$', '(^|/)Dockerfile\\.[^/]*$'], + matchStrings: [ + '# renovate: datasource=(?[a-z-]+?) depName=(?[^\\s]+?)(?: lookupName=(?[^\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\s(?:ENV|ARG) .+?_VERSION="?(?.+?)"?\\s', + ], + }, + { + fileMatch: ['(^|/|\\.)Dockerfile$', '(^|/)Dockerfile\\.[^/]*$'], + matchStrings: [ + '# renovate: datasource=(?[a-z-]+?) depName=(?[^\\s]+?)(?: lookupName=(?[^\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\s(?:ENV|ARG) .+?_VERSION="?(?.+?)"?\\s', + ], + lookupNameTemplate: '{{{holder}}}', + } as any, + ], + }; + const { isMigrated, migratedConfig } = configMigration.migrateConfig( + config, + defaultConfig + ); + expect(isMigrated).toBeTrue(); + expect(migratedConfig).toMatchSnapshot(); + }); it('it migrates gradle-lite', () => { const config: RenovateConfig = { diff --git a/lib/config/migration.ts b/lib/config/migration.ts index d2b7ff357ffba7..f99e2c7656f9bb 100644 --- a/lib/config/migration.ts +++ b/lib/config/migration.ts @@ -53,6 +53,14 @@ export function migrateConfig( (item) => item !== 'prEditNotification' ); } + } else if (key === 'matchStrings' && is.array(val)) { + migratedConfig.matchStrings = val + .map( + (matchString) => + is.string(matchString) && + matchString.replace(regEx(/\(\?/g), '(?') + ) + .filter(Boolean); } else if (key.startsWith('masterIssue')) { const newKey = key.replace('masterIssue', 'dependencyDashboard'); migratedConfig[newKey] = val; @@ -116,6 +124,11 @@ export function migrateConfig( regEx(/{{baseDir}}/g), '{{packageFileDir}}' ); + } else if (is.string(val) && val.includes('{{lookupName}}')) { + migratedConfig[key] = val.replace( + regEx(/{{lookupName}}/g), + '{{packageName}}' + ); } else if (is.string(val) && val.includes('{{depNameShort}}')) { migratedConfig[key] = val.replace( regEx(/{{depNameShort}}/g), diff --git a/lib/config/migrations/migrations-service.ts b/lib/config/migrations/migrations-service.ts index accd7d5b56daeb..40a4e20c3af22d 100644 --- a/lib/config/migrations/migrations-service.ts +++ b/lib/config/migrations/migrations-service.ts @@ -47,6 +47,7 @@ export class MigrationsService { ['multipleMajorPrs', 'separateMultipleMajor'], ['separatePatchReleases', 'separateMinorPatch'], ['versionScheme', 'versioning'], + ['lookupNameTemplate', 'packageNameTemplate'], ]); static readonly customMigrations: ReadonlyArray = [ diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts index b7ac6886c44066..51fddda4d5b22d 100644 --- a/lib/config/options/index.ts +++ b/lib/config/options/index.ts @@ -2093,9 +2093,9 @@ const options: RenovateOptions[] = [ env: false, }, { - name: 'lookupNameTemplate', + name: 'packageNameTemplate', description: - 'Optional lookupName for extracted dependencies, else defaults to depName value. Valid only within a `regexManagers` object.', + 'Optional packageName for extracted dependencies, else defaults to depName value. Valid only within a `regexManagers` object.', type: 'string', parent: 'regexManagers', cli: false, diff --git a/lib/config/presets/internal/regex-managers.ts b/lib/config/presets/internal/regex-managers.ts index 277254519719bd..4549d522248b41 100644 --- a/lib/config/presets/internal/regex-managers.ts +++ b/lib/config/presets/internal/regex-managers.ts @@ -7,7 +7,7 @@ export const presets: Record = { { fileMatch: ['(^|/|\\.)Dockerfile$', '(^|/)Dockerfile\\.[^/]*$'], matchStrings: [ - '# renovate: datasource=(?[a-z-]+?) depName=(?[^\\s]+?)(?: lookupName=(?[^\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\s(?:ENV|ARG) .+?_VERSION="?(?.+?)"?\\s', + '# renovate: datasource=(?[a-z-]+?) depName=(?[^\\s]+?)(?: (lookupName|packageName)=(?[^\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\s(?:ENV|ARG) .+?_VERSION="?(?.+?)"?\\s', ], }, ], diff --git a/lib/config/types.ts b/lib/config/types.ts index 6fe7a9452a69b7..3bf10bab7ef118 100644 --- a/lib/config/types.ts +++ b/lib/config/types.ts @@ -156,7 +156,7 @@ export interface CustomManager { matchStringsStrategy?: string; depNameTemplate?: string; datasourceTemplate?: string; - lookupNameTemplate?: string; + packageNameTemplate?: string; versioningTemplate?: string; autoReplaceStringTemplate?: string; } diff --git a/lib/config/validation.ts b/lib/config/validation.ts index c2089a82e4ba03..40e40ab33f6565 100644 --- a/lib/config/validation.ts +++ b/lib/config/validation.ts @@ -385,7 +385,7 @@ export async function validateConfig( 'matchStrings', 'matchStringsStrategy', 'depNameTemplate', - 'lookupNameTemplate', + 'packageNameTemplate', 'datasourceTemplate', 'versioningTemplate', 'registryUrlTemplate', diff --git a/lib/modules/datasource/adoptium-java/common.ts b/lib/modules/datasource/adoptium-java/common.ts index 6c1bfc19ffeb3d..d65c51704fea27 100644 --- a/lib/modules/datasource/adoptium-java/common.ts +++ b/lib/modules/datasource/adoptium-java/common.ts @@ -5,8 +5,8 @@ export const defaultRegistryUrl = 'https://api.adoptium.net/'; export const datasource = 'adoptium-java'; -export function getImageType(lookupName: string): string { - switch (lookupName) { +export function getImageType(packageName: string): string { + switch (packageName) { case 'java-jre': return 'jre'; default: diff --git a/lib/modules/datasource/adoptium-java/index.ts b/lib/modules/datasource/adoptium-java/index.ts index 1e9da6740545d9..a92f8963c12401 100644 --- a/lib/modules/datasource/adoptium-java/index.ts +++ b/lib/modules/datasource/adoptium-java/index.ts @@ -53,16 +53,16 @@ export class AdoptiumJavaDatasource extends Datasource { @cache({ namespace: `datasource-${datasource}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${registryUrl}:${getImageType(lookupName)}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${registryUrl}:${getImageType(packageName)}`, }) async getReleases({ registryUrl, - lookupName, + packageName, }: GetReleasesConfig): Promise { - const imageType = getImageType(lookupName); + const imageType = getImageType(packageName); logger.trace( - { registryUrl, lookupName, imageType }, + { registryUrl, packageName, imageType }, 'fetching java release' ); const url = `${registryUrl}v3/info/release_versions?page_size=${pageSize}&image_type=${imageType}&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium`; diff --git a/lib/modules/datasource/adoptium-java/readme.md b/lib/modules/datasource/adoptium-java/readme.md index f556714c32840d..79600d0ab2e992 100644 --- a/lib/modules/datasource/adoptium-java/readme.md +++ b/lib/modules/datasource/adoptium-java/readme.md @@ -4,7 +4,7 @@ It uses `image_type=&project=jdk&release_type=ga&sort_method=DATE&sort_ It only uses the first 50 pages with 50 items per page. -Use `java-jdk` or `java` as `lookupName` to get releases which come with the Java Development Kit. +Use `java-jdk` or `java` as `packageName` to get releases which come with the Java Development Kit. -Use `java-jre` as `lookupName` if you only want releases which come with the Java Runtime Environment. +Use `java-jre` as `packageName` if you only want releases which come with the Java Runtime Environment. Currently only the LTS releases of Java come with the JRE. diff --git a/lib/modules/datasource/artifactory/index.spec.ts b/lib/modules/datasource/artifactory/index.spec.ts index b06ba1001ac663..014cd1036b32da 100644 --- a/lib/modules/datasource/artifactory/index.spec.ts +++ b/lib/modules/datasource/artifactory/index.spec.ts @@ -35,7 +35,7 @@ describe('modules/datasource/artifactory/index', () => { const res = await getPkgReleases({ ...testConfig, datasource, - lookupName: testLookupName, + packageName: testLookupName, }); expect(res?.releases).toHaveLength(4); expect(res).toMatchSnapshot({ @@ -51,7 +51,7 @@ describe('modules/datasource/artifactory/index', () => { const res = await getPkgReleases({ ...testConfig, datasource, - lookupName: testLookupName, + packageName: testLookupName, }); expect(res?.releases).toHaveLength(4); expect(res).toMatchSnapshot({ @@ -76,7 +76,7 @@ describe('modules/datasource/artifactory/index', () => { registryUrls: [testRegistryUrl, secondRegistryUrl], depName: testLookupName, datasource, - lookupName: testLookupName, + packageName: testLookupName, }); expect(res?.releases).toHaveLength(5); expect(res).toMatchSnapshot(); @@ -86,11 +86,11 @@ describe('modules/datasource/artifactory/index', () => { const res = await getPkgReleases({ datasource, depName: testLookupName, - lookupName: testLookupName, + packageName: testLookupName, }); expect(logger.warn).toHaveBeenCalledTimes(1); expect(logger.warn).toHaveBeenCalledWith( - { lookupName: 'project' }, + { packageName: 'project' }, 'artifactory datasource requires custom registryUrl. Skipping datasource' ); expect(res).toBeNull(); @@ -105,7 +105,7 @@ describe('modules/datasource/artifactory/index', () => { await getPkgReleases({ ...testConfig, datasource, - lookupName: testLookupName, + packageName: testLookupName, }) ).toBeNull(); }); @@ -116,13 +116,13 @@ describe('modules/datasource/artifactory/index', () => { await getPkgReleases({ ...testConfig, datasource, - lookupName: testLookupName, + packageName: testLookupName, }) ).toBeNull(); expect(logger.warn).toHaveBeenCalledTimes(1); expect(logger.warn).toHaveBeenCalledWith( { - lookupName: 'project', + packageName: 'project', registryUrl: 'https://jfrog.company.com/artifactory', }, 'artifactory: `Not Found` error' @@ -135,7 +135,7 @@ describe('modules/datasource/artifactory/index', () => { getPkgReleases({ ...testConfig, datasource, - lookupName: testLookupName, + packageName: testLookupName, }) ).rejects.toThrow(EXTERNAL_HOST_ERROR); }); @@ -148,7 +148,7 @@ describe('modules/datasource/artifactory/index', () => { const res = await getPkgReleases({ ...testConfig, datasource, - lookupName: testLookupName, + packageName: testLookupName, }); expect(res).toBeNull(); }); diff --git a/lib/modules/datasource/artifactory/index.ts b/lib/modules/datasource/artifactory/index.ts index 1243e9330b0a8f..e6669adaa714ea 100644 --- a/lib/modules/datasource/artifactory/index.ts +++ b/lib/modules/datasource/artifactory/index.ts @@ -23,22 +23,22 @@ export class ArtifactoryDatasource extends Datasource { @cache({ namespace: `datasource-${datasource}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${registryUrl}:${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${registryUrl}:${packageName}`, }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { if (!registryUrl) { logger.warn( - { lookupName }, + { packageName }, 'artifactory datasource requires custom registryUrl. Skipping datasource' ); return null; } - const url = joinUrlParts(registryUrl, lookupName); + const url = joinUrlParts(registryUrl, packageName); const result: ReleaseResult = { releases: [], @@ -82,12 +82,12 @@ export class ArtifactoryDatasource extends Datasource { if (result.releases.length) { logger.trace( - { registryUrl, lookupName, versions: result.releases.length }, + { registryUrl, packageName, versions: result.releases.length }, 'artifactory: Found versions' ); } else { logger.trace( - { registryUrl, lookupName }, + { registryUrl, packageName }, 'artifactory: No versions found' ); } @@ -96,7 +96,7 @@ export class ArtifactoryDatasource extends Datasource { if (err instanceof HttpError) { if (err.response?.statusCode === 404) { logger.warn( - { registryUrl, lookupName }, + { registryUrl, packageName }, 'artifactory: `Not Found` error' ); return null; diff --git a/lib/modules/datasource/artifactory/readme.md b/lib/modules/datasource/artifactory/readme.md index c1c49534bbe1b3..87b5342d66e82e 100644 --- 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 `lookupName`, which defaults to `depName` when `lookupName` is not defined. +The target URL is composed by the `registryUrl` and the `packageName`, which defaults to `depName` when `packageName` is not defined. 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.ts b/lib/modules/datasource/aws-machine-image/index.ts index 39645dcfd31283..5a2b1abc85445d 100644 --- a/lib/modules/datasource/aws-machine-image/index.ts +++ b/lib/modules/datasource/aws-machine-image/index.ts @@ -66,11 +66,11 @@ export class AwsMachineImageDataSource extends Datasource { @cache({ namespace: `datasource-${AwsMachineImageDataSource.id}`, - key: ({ lookupName }: GetReleasesConfig, newValue: string) => - `getDigest:${lookupName}:${newValue ?? ''}`, + key: ({ packageName }: GetReleasesConfig, newValue: string) => + `getDigest:${packageName}:${newValue ?? ''}`, }) override async getDigest( - { lookupName: serializedAmiFilter }: GetReleasesConfig, + { packageName: serializedAmiFilter }: GetReleasesConfig, newValue?: string ): Promise { const images = await this.getSortedAwsMachineImages(serializedAmiFilter); @@ -90,16 +90,16 @@ export class AwsMachineImageDataSource extends Datasource { return null; } - const res = await this.getReleases({ lookupName: serializedAmiFilter }); + const res = await this.getReleases({ packageName: serializedAmiFilter }); return res?.releases?.[0]?.newDigest ?? /* istanbul ignore next */ null; } @cache({ namespace: `datasource-${AwsMachineImageDataSource.id}`, - key: ({ lookupName }: GetReleasesConfig) => `getReleases:${lookupName}`, + key: ({ packageName }: GetReleasesConfig) => `getReleases:${packageName}`, }) async getReleases({ - lookupName: serializedAmiFilter, + packageName: serializedAmiFilter, }: GetReleasesConfig): Promise { const images = await this.getSortedAwsMachineImages(serializedAmiFilter); const latestImage = images[images.length - 1]; diff --git a/lib/modules/datasource/aws-machine-image/readme.md b/lib/modules/datasource/aws-machine-image/readme.md index e877248bb256e6..de1efe71fb3587 100644 --- a/lib/modules/datasource/aws-machine-image/readme.md +++ b/lib/modules/datasource/aws-machine-image/readme.md @@ -2,7 +2,7 @@ This datasource returns the latest [Amazon Machine Image](https://docs.aws.amazon.com/en_en/AWSEC2/latest/UserGuide/AMIs.html) via the AWS API (valid credentials required). -Because there is no general `lookupName`, you have to use the [describe images filter](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-ec2/interfaces/describeimagescommandinput.html#filters) as minified JSON as a `lookupName`. +Because there is no general `packageName`, you have to use the [describe images filter](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-ec2/interfaces/describeimagescommandinput.html#filters) as minified JSON as a `packageName`. Example: @@ -38,7 +38,7 @@ module.exports = { { fileMatch: ['.*'], matchStrings: [ - '.*amiFilter=(?.*?)\\n(.*currentImageName=(?.*?)\\n)?(.*\\n)?.*?(?[a-zA-Z0-9-_:]*)[ ]*?[:|=][ ]*?["|\']?(?ami-[a-z0-9]{17})["|\']?.*', + '.*amiFilter=(?.*?)\\n(.*currentImageName=(?.*?)\\n)?(.*\\n)?.*?(?[a-zA-Z0-9-_:]*)[ ]*?[:|=][ ]*?["|\']?(?ami-[a-z0-9]{17})["|\']?.*', ], datasourceTemplate: 'aws-machine-image', versioningTemplate: 'aws-machine-image', @@ -57,7 +57,7 @@ Or as JSON: 'fileMatch': ['.*'], 'matchStrings': [ - ".*amiFilter=(?.*?)\\n(.*currentImageName=(?.*?)\\n)?(.*\\n)?.*?(?[a-zA-Z0-9-_:]*)[ ]*?[:|=][ ]*?[\"|']?(?ami-[a-z0-9]{17})[\"|']?.*", + ".*amiFilter=(?.*?)\\n(.*currentImageName=(?.*?)\\n)?(.*\\n)?.*?(?[a-zA-Z0-9-_:]*)[ ]*?[:|=][ ]*?[\"|']?(?ami-[a-z0-9]{17})[\"|']?.*", ], 'datasourceTemplate': 'aws-machine-image', 'versioningTemplate': 'aws-machine-image', diff --git a/lib/modules/datasource/bitbucket-tags/index.ts b/lib/modules/datasource/bitbucket-tags/index.ts index e4237ba5bd9ca4..1ceec61646fa05 100644 --- a/lib/modules/datasource/bitbucket-tags/index.ts +++ b/lib/modules/datasource/bitbucket-tags/index.ts @@ -38,21 +38,21 @@ export class BitBucketTagsDatasource extends Datasource { )}:${repo}:${type}`; } - static getSourceUrl(lookupName: string, registryUrl?: string): string { + static getSourceUrl(packageName: string, registryUrl?: string): string { const url = BitBucketTagsDatasource.getRegistryURL(registryUrl); const normalizedUrl = ensureTrailingSlash(url); - return `${normalizedUrl}${lookupName}`; + return `${normalizedUrl}${packageName}`; } // getReleases fetches list of tags for the repository @cache({ namespace: BitBucketTagsDatasource.cacheNamespace, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - BitBucketTagsDatasource.getCacheKey(registryUrl, lookupName, 'tags'), + key: ({ registryUrl, packageName }: GetReleasesConfig) => + BitBucketTagsDatasource.getCacheKey(registryUrl, packageName, 'tags'), }) async getReleases({ registryUrl, - lookupName: repo, + packageName: repo, }: GetReleasesConfig): Promise { const url = `/2.0/repositories/${repo}/refs/tags`; @@ -110,11 +110,11 @@ export class BitBucketTagsDatasource extends Datasource { // however, if newValue is provided, then getTagCommit is called @cache({ namespace: BitBucketTagsDatasource.cacheNamespace, - key: ({ registryUrl, lookupName }: DigestConfig) => - BitBucketTagsDatasource.getCacheKey(registryUrl, lookupName, 'digest'), + key: ({ registryUrl, packageName }: DigestConfig) => + BitBucketTagsDatasource.getCacheKey(registryUrl, packageName, 'digest'), }) override async getDigest( - { lookupName: repo, registryUrl }: DigestConfig, + { packageName: repo, registryUrl }: DigestConfig, newValue?: string ): Promise { if (newValue?.length) { diff --git a/lib/modules/datasource/cdnjs/index.ts b/lib/modules/datasource/cdnjs/index.ts index 3dfc06f8c385fd..4960375561a706 100644 --- a/lib/modules/datasource/cdnjs/index.ts +++ b/lib/modules/datasource/cdnjs/index.ts @@ -19,11 +19,11 @@ export class CdnJsDatasource extends Datasource { // this.handleErrors will always throw async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // Each library contains multiple assets, so we cache at the library level instead of per-asset - const library = lookupName.split('/')[0]; + const library = packageName.split('/')[0]; const url = `${registryUrl}libraries/${library}?fields=homepage,repository,assets`; let result: ReleaseResult | null = null; try { @@ -33,7 +33,7 @@ export class CdnJsDatasource extends Datasource { if (!assets) { return null; } - const assetName = lookupName.replace(`${library}/`, ''); + const assetName = packageName.replace(`${library}/`, ''); const releases = assets .filter(({ files }) => files.includes(assetName)) .map(({ version, sri }) => ({ version, newDigest: sri?.[assetName] })); diff --git a/lib/modules/datasource/conan/index.spec.ts b/lib/modules/datasource/conan/index.spec.ts index 74a054057558ab..04cd190cee154f 100644 --- a/lib/modules/datasource/conan/index.spec.ts +++ b/lib/modules/datasource/conan/index.spec.ts @@ -36,7 +36,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'fakepackage/1.2@_/_', + packageName: 'fakepackage/1.2@_/_', }) ).toBeNull(); }); @@ -50,7 +50,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'fakepackage/1.2@_/_', + packageName: 'fakepackage/1.2@_/_', }) ).toBeNull(); }); @@ -65,7 +65,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'poco/1.2@_/_', + packageName: 'poco/1.2@_/_', }) ).toBeNull(); }); @@ -79,7 +79,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'fakepackage/1.2@_/_', + packageName: 'fakepackage/1.2@_/_', }) ).toBeNull(); }); @@ -93,7 +93,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'poco/1.2@_/_', + packageName: 'poco/1.2@_/_', }) ).toEqual({ registryUrl: 'https://not.conan.io', @@ -129,7 +129,7 @@ describe('modules/datasource/conan/index', () => { ...config, registryUrls: [defaultRegistryUrl], depName: 'poco', - lookupName: 'poco/1.2@_/_', + packageName: 'poco/1.2@_/_', }) ).toEqual({ registryUrl: 'https://center.conan.io', @@ -164,7 +164,7 @@ describe('modules/datasource/conan/index', () => { ...config, registryUrls: [defaultRegistryUrl], depName: 'poco', - lookupName: 'poco/1.2@foo/bar', + packageName: 'poco/1.2@foo/bar', }) ).toBeNull(); }); @@ -178,7 +178,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'poco/1.2@un/matched', + packageName: 'poco/1.2@un/matched', }) ).toBeNull(); }); @@ -192,7 +192,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'bad/1.2@_/_', + packageName: 'bad/1.2@_/_', }) ).toEqual({ registryUrl: 'https://not.conan.io', @@ -214,7 +214,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'poco/1.2@_/_', + packageName: 'poco/1.2@_/_', }) ).toBeNull(); }); @@ -229,7 +229,7 @@ describe('modules/datasource/conan/index', () => { expect( await getPkgReleases({ ...config, - lookupName: 'poco/1.2@_/_', + packageName: 'poco/1.2@_/_', }) ).toBeNull(); }); diff --git a/lib/modules/datasource/conan/index.ts b/lib/modules/datasource/conan/index.ts index 7baf9d929b4e7d..ac22536453e572 100644 --- a/lib/modules/datasource/conan/index.ts +++ b/lib/modules/datasource/conan/index.ts @@ -52,15 +52,15 @@ export class ConanDatasource extends Datasource { @cache({ namespace: `datasource-${datasource}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${registryUrl}:${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${registryUrl}:${packageName}`, }) async getReleases({ registryUrl, - lookupName, + packageName, }: GetReleasesConfig): Promise { - const depName = lookupName.split('/')[0]; - const userAndChannel = '@' + lookupName.split('@')[1]; + const depName = packageName.split('/')[0]; + const userAndChannel = '@' + packageName.split('@')[1]; if ( is.string(registryUrl) && ensureTrailingSlash(registryUrl) === defaultRegistryUrl diff --git a/lib/modules/datasource/conda/index.ts b/lib/modules/datasource/conda/index.ts index af5f4efccf72d8..18b82986ba5205 100644 --- a/lib/modules/datasource/conda/index.ts +++ b/lib/modules/datasource/conda/index.ts @@ -22,16 +22,16 @@ export class CondaDatasource extends Datasource { @cache({ namespace: `datasource-${datasource}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${registryUrl}:${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${registryUrl}:${packageName}`, }) async getReleases({ registryUrl, - lookupName, + packageName, }: GetReleasesConfig): Promise { - logger.trace({ registryUrl, lookupName }, 'fetching conda package'); + logger.trace({ registryUrl, packageName }, 'fetching conda package'); - const url = `${registryUrl}${lookupName}`; + const url = `${registryUrl}${packageName}`; const result: ReleaseResult = { releases: [], diff --git a/lib/modules/datasource/crate/index.ts b/lib/modules/datasource/crate/index.ts index 4bb83ed8139e70..4bd3b4bca445ed 100644 --- a/lib/modules/datasource/crate/index.ts +++ b/lib/modules/datasource/crate/index.ts @@ -30,13 +30,13 @@ export class CrateDatasource extends Datasource { @cache({ namespace: `datasource-${CrateDatasource.id}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${registryUrl}/${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${registryUrl}/${packageName}`, cacheable: ({ registryUrl }: GetReleasesConfig) => CrateDatasource.areReleasesCacheable(registryUrl), }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -48,7 +48,7 @@ export class CrateDatasource extends Datasource { } const registryInfo = await CrateDatasource.fetchRegistryInfo({ - lookupName, + packageName, registryUrl, }); if (!registryInfo) { @@ -58,12 +58,12 @@ export class CrateDatasource extends Datasource { const dependencyUrl = CrateDatasource.getDependencyUrl( registryInfo, - lookupName + packageName ); const payload = await this.fetchCrateRecordsPayload( registryInfo, - lookupName + packageName ); const lines = payload .split(newlineRegex) // break into lines @@ -94,12 +94,12 @@ export class CrateDatasource extends Datasource { public async fetchCrateRecordsPayload( info: RegistryInfo, - lookupName: string + packageName: string ): Promise { if (info.clonePath) { const path = upath.join( info.clonePath, - ...CrateDatasource.getIndexSuffix(lookupName) + ...CrateDatasource.getIndexSuffix(packageName) ); return readFile(path, 'utf8'); } @@ -107,7 +107,7 @@ export class CrateDatasource extends Datasource { if (info.flavor === RegistryFlavor.CratesIo) { const crateUrl = CrateDatasource.CRATES_IO_BASE_URL + - CrateDatasource.getIndexSuffix(lookupName).join('/'); + CrateDatasource.getIndexSuffix(packageName).join('/'); try { return (await this.http.get(crateUrl)).body; } catch (err) { @@ -123,20 +123,20 @@ export class CrateDatasource extends Datasource { */ private static getDependencyUrl( info: RegistryInfo, - lookupName: string + packageName: string ): string { switch (info.flavor) { case RegistryFlavor.CratesIo: - return `https://crates.io/crates/${lookupName}`; + return `https://crates.io/crates/${packageName}`; case RegistryFlavor.Cloudsmith: { // input: https://dl.cloudsmith.io/basic/$org/$repo/cargo/index.git const tokens = info.url.pathname.split('/'); const org = tokens[2]; const repo = tokens[3]; - return `https://cloudsmith.io/~${org}/repos/${repo}/packages/detail/cargo/${lookupName}`; + return `https://cloudsmith.io/~${org}/repos/${repo}/packages/detail/cargo/${packageName}`; } default: - return `${info.rawUrl}/${lookupName}`; + return `${info.rawUrl}/${packageName}`; } } @@ -161,7 +161,7 @@ export class CrateDatasource extends Datasource { * url and clones it to cache. */ private static async fetchRegistryInfo({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -235,7 +235,7 @@ export class CrateDatasource extends Datasource { await clonePromise; } catch (err) { logger.warn( - { err, lookupName, registryUrl }, + { err, packageName, registryUrl }, 'failed cloning git registry' ); memCache.set(cacheKeyForError, err); @@ -247,7 +247,7 @@ export class CrateDatasource extends Datasource { if (!clonePath) { const err = memCache.get(cacheKeyForError); logger.warn( - { err, lookupName, registryUrl }, + { err, packageName, registryUrl }, 'Previous git clone failed, bailing out.' ); @@ -268,19 +268,19 @@ export class CrateDatasource extends Datasource { return registryUrl === 'https://crates.io'; } - public static getIndexSuffix(lookupName: string): string[] { - const len = lookupName.length; + public static getIndexSuffix(packageName: string): string[] { + const len = packageName.length; if (len === 1) { - return ['1', lookupName]; + return ['1', packageName]; } if (len === 2) { - return ['2', lookupName]; + return ['2', packageName]; } if (len === 3) { - return ['3', lookupName[0], lookupName]; + return ['3', packageName[0], packageName]; } - return [lookupName.slice(0, 2), lookupName.slice(2, 4), lookupName]; + return [packageName.slice(0, 2), packageName.slice(2, 4), packageName]; } } diff --git a/lib/modules/datasource/dart/index.ts b/lib/modules/datasource/dart/index.ts index 718d2a0dc6f0c1..f3069a9382ad0c 100644 --- a/lib/modules/datasource/dart/index.ts +++ b/lib/modules/datasource/dart/index.ts @@ -15,7 +15,7 @@ export class DartDatasource extends Datasource { override readonly defaultRegistryUrls = ['https://pub.dartlang.org/']; async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -23,7 +23,7 @@ export class DartDatasource extends Datasource { return null; } let result: ReleaseResult | null = null; - const pkgUrl = `${registryUrl}api/packages/${lookupName}`; + const pkgUrl = `${registryUrl}api/packages/${packageName}`; let raw: HttpResponse | null = null; try { diff --git a/lib/modules/datasource/docker/index.ts b/lib/modules/datasource/docker/index.ts index 25a35deca5fd3e..10ae3572b99f20 100644 --- a/lib/modules/datasource/docker/index.ts +++ b/lib/modules/datasource/docker/index.ts @@ -223,19 +223,19 @@ async function getECRAuthToken( } export function getRegistryRepository( - lookupName: string, + packageName: string, registryUrl: string ): RegistryRepository { if (registryUrl !== DOCKER_HUB) { const registryEndingWithSlash = ensureTrailingSlash( registryUrl.replace(regEx(/^https?:\/\//), '') ); - if (lookupName.startsWith(registryEndingWithSlash)) { + if (packageName.startsWith(registryEndingWithSlash)) { let registryHost = trimTrailingSlash(registryUrl); if (!regEx(/^https?:\/\//).test(registryHost)) { registryHost = `https://${registryHost}`; } - let dockerRepository = lookupName.replace(registryEndingWithSlash, ''); + let dockerRepository = packageName.replace(registryEndingWithSlash, ''); const fullUrl = `${registryHost}/${dockerRepository}`; const { origin, pathname } = parseUrl(fullUrl); registryHost = origin; @@ -247,7 +247,7 @@ export function getRegistryRepository( } } let registryHost: string; - const split = lookupName.split('/'); + const split = packageName.split('/'); if (split.length > 1 && (split[0].includes('.') || split[0].includes(':'))) { [registryHost] = split; split.shift(); @@ -744,11 +744,11 @@ export class DockerDatasource extends Datasource { * - Return the digest as a string */ override async getDigest( - { registryUrl, lookupName }: GetReleasesConfig, + { registryUrl, packageName }: GetReleasesConfig, newValue?: string ): Promise { const { registryHost, dockerRepository } = getRegistryRepository( - lookupName, + packageName, registryUrl ); logger.debug( @@ -799,7 +799,7 @@ export class DockerDatasource extends Datasource { logger.debug( { err, - lookupName, + packageName, newTag, }, 'Unknown Error looking up docker image digest' @@ -822,11 +822,11 @@ export class DockerDatasource extends Datasource { * This function will filter only tags that contain a semver version */ async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { const { registryHost, dockerRepository } = getRegistryRepository( - lookupName, + packageName, registryUrl ); const tags = await this.getTags(registryHost, dockerRepository); diff --git a/lib/modules/datasource/galaxy-collection/__snapshots__/index.spec.ts.snap b/lib/modules/datasource/galaxy-collection/__snapshots__/index.spec.ts.snap index 406dc51e570bff..7b8cf2e74bb370 100644 --- a/lib/modules/datasource/galaxy-collection/__snapshots__/index.spec.ts.snap +++ b/lib/modules/datasource/galaxy-collection/__snapshots__/index.spec.ts.snap @@ -111,7 +111,7 @@ Array [ exports[`modules/datasource/galaxy-collection/index getReleases returns null for empty lookup 1`] = `Array []`; -exports[`modules/datasource/galaxy-collection/index getReleases returns null for null lookupName 1`] = `Array []`; +exports[`modules/datasource/galaxy-collection/index getReleases returns null for null packageName 1`] = `Array []`; exports[`modules/datasource/galaxy-collection/index getReleases returns null for unexpected data at base 1`] = ` Array [ diff --git a/lib/modules/datasource/galaxy-collection/index.spec.ts b/lib/modules/datasource/galaxy-collection/index.spec.ts index ae33d3b418a92c..82f2ceba435a64 100644 --- a/lib/modules/datasource/galaxy-collection/index.spec.ts +++ b/lib/modules/datasource/galaxy-collection/index.spec.ts @@ -127,7 +127,7 @@ describe('modules/datasource/galaxy-collection/index', () => { expect(httpMock.getTrace()).toMatchSnapshot(); }); - it('returns null for null lookupName ', async () => { + it('returns null for null packageName ', async () => { expect( await getPkgReleases({ datasource, diff --git a/lib/modules/datasource/galaxy-collection/index.ts b/lib/modules/datasource/galaxy-collection/index.ts index 65ac5cf2578a52..e01008cac00733 100644 --- a/lib/modules/datasource/galaxy-collection/index.ts +++ b/lib/modules/datasource/galaxy-collection/index.ts @@ -23,13 +23,13 @@ export class GalaxyCollectionDatasource extends Datasource { @cache({ namespace: `datasource-${GalaxyCollectionDatasource.id}`, - key: ({ lookupName }: GetReleasesConfig) => lookupName, + key: ({ packageName }: GetReleasesConfig) => packageName, }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { - const [namespace, projectName] = lookupName.split('.'); + const [namespace, projectName] = packageName.split('.'); const baseUrl = `${registryUrl}api/v2/collections/${namespace}/${projectName}/`; @@ -42,7 +42,7 @@ export class GalaxyCollectionDatasource extends Datasource { if (!baseUrlResponse || !baseUrlResponse.body) { logger.warn( - { dependency: lookupName }, + { dependency: packageName }, `Received invalid data from ${baseUrl}` ); return null; @@ -100,7 +100,7 @@ export class GalaxyCollectionDatasource extends Datasource { return release; } catch (err) { logger.warn( - { dependency: lookupName, err }, + { dependency: packageName, err }, `Received invalid data from ${versionsUrl}${basicRelease.version}/` ); return null; diff --git a/lib/modules/datasource/galaxy/index.ts b/lib/modules/datasource/galaxy/index.ts index 64cb34f61db86c..a70e452f64e1cd 100644 --- a/lib/modules/datasource/galaxy/index.ts +++ b/lib/modules/datasource/galaxy/index.ts @@ -18,13 +18,14 @@ export class GalaxyDatasource extends Datasource { @cache({ namespace: 'datasource-galaxy', - key: (getReleasesConfig: GetReleasesConfig) => getReleasesConfig.lookupName, + key: (getReleasesConfig: GetReleasesConfig) => + getReleasesConfig.packageName, }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { - const lookUp = lookupName.split('.'); + const lookUp = packageName.split('.'); const userName = lookUp[0]; const projectName = lookUp[1]; @@ -47,7 +48,7 @@ export class GalaxyDatasource extends Datasource { if (!body) { logger.warn( - { dependency: lookupName }, + { dependency: packageName }, `Received invalid data from ${galaxyAPIUrl}` ); return null; @@ -56,14 +57,14 @@ export class GalaxyDatasource extends Datasource { // istanbul ignore if if (body.results.length > 1) { logger.warn( - { dependency: lookupName }, + { dependency: packageName }, `Received multiple results from ${galaxyAPIUrl}` ); return null; } if (body.results.length === 0) { logger.info( - { dependency: lookupName }, + { dependency: packageName }, `Received no results from ${galaxyAPIUrl}` ); return null; diff --git a/lib/modules/datasource/git-refs/base.ts b/lib/modules/datasource/git-refs/base.ts index 0e29398f96e2b1..952f6515bd6455 100644 --- a/lib/modules/datasource/git-refs/base.ts +++ b/lib/modules/datasource/git-refs/base.ts @@ -16,17 +16,17 @@ export class GitDatasource { @cache({ namespace: `datasource-${GitDatasource.id}`, - key: ({ lookupName }: GetReleasesConfig) => lookupName, + key: ({ packageName }: GetReleasesConfig) => packageName, }) static async getRawRefs( - { lookupName }: GetReleasesConfig, + { packageName }: GetReleasesConfig, hostType: string ): Promise { const git = simpleGit(simpleGitConfig()); // fetch remote tags const lsRemote = await git.listRemote([ - getRemoteUrlWithToken(lookupName, hostType), + getRemoteUrlWithToken(packageName, hostType), ]); if (!lsRemote) { return null; diff --git a/lib/modules/datasource/git-refs/index.spec.ts b/lib/modules/datasource/git-refs/index.spec.ts index 41cb9210e73550..4154c5d02ed25e 100644 --- a/lib/modules/datasource/git-refs/index.spec.ts +++ b/lib/modules/datasource/git-refs/index.spec.ts @@ -74,7 +74,7 @@ describe('modules/datasource/git-refs/index', () => { }, }); const digest = await new GitRefsDatasource().getDigest( - { lookupName: 'a tag to look up' }, + { packageName: 'a tag to look up' }, 'v2.0.0' ); expect(digest).toBeNull(); @@ -86,7 +86,7 @@ describe('modules/datasource/git-refs/index', () => { }, }); const digest = await new GitRefsDatasource().getDigest( - { lookupName: 'a tag to look up' }, + { packageName: 'a tag to look up' }, 'v1.0.4' ); expect(digest).toMatchSnapshot(); @@ -98,7 +98,7 @@ describe('modules/datasource/git-refs/index', () => { }, }); const digest = await new GitRefsDatasource().getDigest( - { lookupName: 'a tag to look up' }, + { packageName: 'a tag to look up' }, 'master' ); expect(digest).toBe('a9920c014aebc28dc1b23e7efcc006d0455cc710'); @@ -110,7 +110,7 @@ describe('modules/datasource/git-refs/index', () => { }, }); const digest = await new GitRefsDatasource().getDigest( - { lookupName: 'another tag to look up' }, + { packageName: 'another tag to look up' }, undefined ); expect(digest).toMatchSnapshot(); diff --git a/lib/modules/datasource/git-refs/index.ts b/lib/modules/datasource/git-refs/index.ts index 5f3531743e4217..a2aaaceb6f4228 100644 --- a/lib/modules/datasource/git-refs/index.ts +++ b/lib/modules/datasource/git-refs/index.ts @@ -19,13 +19,13 @@ export class GitRefsDatasource extends Datasource { @cache({ namespace: `datasource-${GitRefsDatasource.id}`, - key: ({ lookupName }: GetReleasesConfig) => lookupName, + key: ({ packageName }: GetReleasesConfig) => packageName, }) override async getReleases({ - lookupName, + packageName, }: GetReleasesConfig): Promise { const rawRefs: RawRefs[] = await GitDatasource.getRawRefs( - { lookupName }, + { packageName }, this.id ); @@ -35,7 +35,7 @@ export class GitRefsDatasource extends Datasource { const uniqueRefs = [...new Set(refs)]; - const sourceUrl = lookupName + const sourceUrl = packageName .replace(regEx(/\.git$/), '') .replace(regEx(/\/$/), ''); @@ -52,11 +52,11 @@ export class GitRefsDatasource extends Datasource { } override async getDigest( - { lookupName }: DigestConfig, + { packageName }: DigestConfig, newValue?: string ): Promise { const rawRefs: RawRefs[] = await GitDatasource.getRawRefs( - { lookupName }, + { packageName }, this.id ); let ref: RawRefs; diff --git a/lib/modules/datasource/git-tags/index.spec.ts b/lib/modules/datasource/git-tags/index.spec.ts index 1a38d77743e081..c7c9f6d8978fd1 100644 --- a/lib/modules/datasource/git-tags/index.spec.ts +++ b/lib/modules/datasource/git-tags/index.spec.ts @@ -55,7 +55,7 @@ describe('modules/datasource/git-tags/index', () => { }, }); const digest = await datasourceInstance.getDigest( - { lookupName: 'a tag to look up' }, + { packageName: 'a tag to look up' }, 'notfound' ); expect(digest).toBeNull(); @@ -67,7 +67,7 @@ describe('modules/datasource/git-tags/index', () => { }, }); const digest = await datasourceInstance.getDigest( - { lookupName: 'a tag to look up' }, + { packageName: 'a tag to look up' }, 'v1.0.2' ); expect(digest).toMatchSnapshot(); @@ -79,7 +79,7 @@ describe('modules/datasource/git-tags/index', () => { }, }); const digest = await datasourceInstance.getDigest( - { lookupName: 'another tag to look up' }, + { packageName: 'another tag to look up' }, undefined ); expect(digest).toMatchSnapshot(); diff --git a/lib/modules/datasource/git-tags/index.ts b/lib/modules/datasource/git-tags/index.ts index 2f2be00b300db4..6b2e1e669ba30e 100644 --- a/lib/modules/datasource/git-tags/index.ts +++ b/lib/modules/datasource/git-tags/index.ts @@ -15,12 +15,12 @@ export class GitTagsDatasource extends Datasource { @cache({ namespace: `datasource-${GitTagsDatasource.id}`, - key: ({ lookupName }: GetReleasesConfig) => lookupName, + key: ({ packageName }: GetReleasesConfig) => packageName, }) async getReleases({ - lookupName, + packageName, }: GetReleasesConfig): Promise { - const rawRefs = await GitDatasource.getRawRefs({ lookupName }, this.id); + const rawRefs = await GitDatasource.getRawRefs({ packageName }, this.id); if (rawRefs === null) { return null; @@ -33,7 +33,7 @@ export class GitTagsDatasource extends Datasource { newDigest: ref.hash, })); - const sourceUrl = lookupName + const sourceUrl = packageName .replace(regEx(/\.git$/), '') .replace(regEx(/\/$/), ''); @@ -46,10 +46,10 @@ export class GitTagsDatasource extends Datasource { } override async getDigest( - { lookupName }: DigestConfig, + { packageName }: DigestConfig, newValue?: string ): Promise { - const rawRefs = await GitDatasource.getRawRefs({ lookupName }, this.id); + const rawRefs = await GitDatasource.getRawRefs({ packageName }, this.id); const findValue = newValue || 'HEAD'; const ref = rawRefs.find((rawRef) => rawRef.value === findValue); if (ref) { diff --git a/lib/modules/datasource/github-releases/common.ts b/lib/modules/datasource/github-releases/common.ts index 4475fe57e149f7..991392ebcb42bc 100644 --- a/lib/modules/datasource/github-releases/common.ts +++ b/lib/modules/datasource/github-releases/common.ts @@ -14,7 +14,10 @@ export function getApiBaseUrl(registryUrl: string): string { : `${sourceUrlBase}api/v3/`; } -export function getSourceUrl(lookupName: string, registryUrl?: string): string { +export function getSourceUrl( + packageName: string, + registryUrl?: string +): string { const sourceUrlBase = getSourceUrlBase(registryUrl); - return `${sourceUrlBase}${lookupName}`; + return `${sourceUrlBase}${packageName}`; } diff --git a/lib/modules/datasource/github-releases/digest.spec.ts b/lib/modules/datasource/github-releases/digest.spec.ts index 9e24b576731c45..cd09db7a90d921 100644 --- a/lib/modules/datasource/github-releases/digest.spec.ts +++ b/lib/modules/datasource/github-releases/digest.spec.ts @@ -6,10 +6,10 @@ import type { DigestAsset } from './types'; import { GithubReleasesDatasource } from '.'; describe('modules/datasource/github-releases/digest', () => { - const lookupName = 'some/dep'; + const packageName = 'some/dep'; const releaseMock = new GitHubReleaseMocker( 'https://api.github.com', - lookupName + packageName ); const githubReleases = new GithubReleasesDatasource(); @@ -37,7 +37,7 @@ describe('modules/datasource/github-releases/digest', () => { // Small assets like this digest file may be downloaded twice httpMock .scope('https://api.github.com') - .get(`/repos/${lookupName}/releases/download/v1.0.0/SHASUMS.txt`) + .get(`/repos/${packageName}/releases/download/v1.0.0/SHASUMS.txt`) .reply(200, ''); const digestAsset = await githubReleases.findDigestAsset( diff --git a/lib/modules/datasource/github-releases/index.spec.ts b/lib/modules/datasource/github-releases/index.spec.ts index 5c0e859b1f4296..34941033b8afbe 100644 --- a/lib/modules/datasource/github-releases/index.spec.ts +++ b/lib/modules/datasource/github-releases/index.spec.ts @@ -58,14 +58,14 @@ describe('modules/datasource/github-releases/index', () => { expect(httpMock.getTrace()).toMatchSnapshot(); }); it('supports ghe', async () => { - const lookupName = 'some/dep'; + const packageName = 'some/dep'; httpMock .scope(githubEnterpriseApiHost) - .get(`/api/v3/repos/${lookupName}/releases?per_page=100`) + .get(`/api/v3/repos/${packageName}/releases?per_page=100`) .reply(200, responseBody); const res = await githubReleases.getReleases({ registryUrl: 'https://git.enterprise.com', - lookupName, + packageName, }); httpMock.getTrace(); expect(res).toMatchSnapshot(); diff --git a/lib/modules/datasource/github-releases/index.ts b/lib/modules/datasource/github-releases/index.ts index 494b1258078744..cb1812b6e519f4 100644 --- a/lib/modules/datasource/github-releases/index.ts +++ b/lib/modules/datasource/github-releases/index.ts @@ -157,7 +157,7 @@ export class GithubReleasesDatasource extends Datasource { namespace: 'datasource-github-releases', key: ( { - lookupName: repo, + packageName: repo, currentValue, currentDigest, registryUrl, @@ -180,7 +180,7 @@ export class GithubReleasesDatasource extends Datasource { */ override async getDigest( { - lookupName: repo, + packageName: repo, currentValue, currentDigest, registryUrl, @@ -220,7 +220,7 @@ export class GithubReleasesDatasource extends Datasource { @cache({ namespace: 'datasource-github-releases', - key: ({ lookupName: repo, registryUrl }: GetReleasesConfig) => + key: ({ packageName: repo, registryUrl }: GetReleasesConfig) => `${registryUrl}:${repo}:tags`, }) /** @@ -234,7 +234,7 @@ export class GithubReleasesDatasource extends Datasource { * - Return a dependency object containing sourceUrl string and releases array */ async getReleases({ - lookupName: repo, + packageName: repo, registryUrl, }: GetReleasesConfig): Promise { const apiBaseUrl = getApiBaseUrl(registryUrl); diff --git a/lib/modules/datasource/github-releases/test/index.ts b/lib/modules/datasource/github-releases/test/index.ts index 8c2789afedf3b0..ee59f5769c43ef 100644 --- a/lib/modules/datasource/github-releases/test/index.ts +++ b/lib/modules/datasource/github-releases/test/index.ts @@ -4,7 +4,7 @@ import type { GithubRelease } from '../types'; export class GitHubReleaseMocker { constructor( private readonly githubApiHost: string, - private readonly lookupName: string + private readonly packageName: string ) {} release(version: string): GithubRelease { @@ -22,7 +22,7 @@ export class GitHubReleaseMocker { assets: [], } as GithubRelease; for (const assetFn of Object.keys(assets)) { - const assetPath = `/repos/${this.lookupName}/releases/download/${version}/${assetFn}`; + const assetPath = `/repos/${this.packageName}/releases/download/${version}/${assetFn}`; const assetData = assets[assetFn]; releaseData.assets.push({ name: assetFn, @@ -37,7 +37,7 @@ export class GitHubReleaseMocker { } httpMock .scope(this.githubApiHost) - .get(`/repos/${this.lookupName}/releases/tags/${version}`) + .get(`/repos/${this.packageName}/releases/tags/${version}`) .optionally() .reply(200, releaseData); return releaseData; diff --git a/lib/modules/datasource/github-tags/index.spec.ts b/lib/modules/datasource/github-tags/index.spec.ts index 74f5f951178c87..eb2197e2772d84 100644 --- a/lib/modules/datasource/github-tags/index.spec.ts +++ b/lib/modules/datasource/github-tags/index.spec.ts @@ -21,64 +21,64 @@ describe('modules/datasource/github-tags/index', () => { }); describe('getDigest', () => { - const lookupName = 'some/dep'; + const packageName = 'some/dep'; const tag = 'v1.2.0'; it('returns null if no token', async () => { httpMock .scope(githubApiHost) - .get(`/repos/${lookupName}/commits?per_page=1`) + .get(`/repos/${packageName}/commits?per_page=1`) .reply(200, []); - const res = await github.getDigest({ lookupName }, null); + const res = await github.getDigest({ packageName }, null); expect(res).toBeNull(); expect(httpMock.getTrace()).toMatchSnapshot(); }); it('returns digest', async () => { httpMock .scope(githubApiHost) - .get(`/repos/${lookupName}/commits?per_page=1`) + .get(`/repos/${packageName}/commits?per_page=1`) .reply(200, [{ sha: 'abcdef' }]); - const res = await github.getDigest({ lookupName }, null); + const res = await github.getDigest({ packageName }, null); expect(res).toBe('abcdef'); expect(httpMock.getTrace()).toMatchSnapshot(); }); it('returns commit digest', async () => { httpMock .scope(githubApiHost) - .get(`/repos/${lookupName}/git/refs/tags/${tag}`) + .get(`/repos/${packageName}/git/refs/tags/${tag}`) .reply(200, { object: { type: 'commit', sha: 'ddd111' } }); - const res = await github.getDigest({ lookupName }, tag); + const res = await github.getDigest({ packageName }, tag); expect(res).toBe('ddd111'); expect(httpMock.getTrace()).toMatchSnapshot(); }); it('returns tagged commit digest', async () => { httpMock .scope(githubApiHost) - .get(`/repos/${lookupName}/git/refs/tags/${tag}`) + .get(`/repos/${packageName}/git/refs/tags/${tag}`) .reply(200, { object: { type: 'tag', url: `${githubApiHost}/some-url` }, }) .get('/some-url') .reply(200, { object: { type: 'commit', sha: 'ddd111' } }); - const res = await github.getDigest({ lookupName }, tag); + const res = await github.getDigest({ packageName }, tag); expect(res).toBe('ddd111'); expect(httpMock.getTrace()).toMatchSnapshot(); }); it('warns if unknown ref', async () => { httpMock .scope(githubApiHost) - .get(`/repos/${lookupName}/git/refs/tags/${tag}`) + .get(`/repos/${packageName}/git/refs/tags/${tag}`) .reply(200, { object: { sha: 'ddd111' } }); - const res = await github.getDigest({ lookupName }, tag); + const res = await github.getDigest({ packageName }, tag); expect(res).toBeNull(); expect(httpMock.getTrace()).toMatchSnapshot(); }); it('returns null for missed tagged digest', async () => { httpMock .scope(githubApiHost) - .get(`/repos/${lookupName}/git/refs/tags/${tag}`) + .get(`/repos/${packageName}/git/refs/tags/${tag}`) .reply(200, {}); - const res = await github.getDigest({ lookupName: 'some/dep' }, 'v1.2.0'); + const res = await github.getDigest({ packageName: 'some/dep' }, 'v1.2.0'); expect(res).toBeNull(); expect(httpMock.getTrace()).toMatchSnapshot(); }); @@ -86,17 +86,17 @@ describe('modules/datasource/github-tags/index', () => { it('supports ghe', async () => { httpMock .scope(githubEnterpriseApiHost) - .get(`/api/v3/repos/${lookupName}/git/refs/tags/${tag}`) + .get(`/api/v3/repos/${packageName}/git/refs/tags/${tag}`) .reply(200, { object: { type: 'commit', sha: 'ddd111' } }) - .get(`/api/v3/repos/${lookupName}/commits?per_page=1`) + .get(`/api/v3/repos/${packageName}/commits?per_page=1`) .reply(200, [{ sha: 'abcdef' }]); const sha1 = await github.getDigest( - { lookupName, registryUrl: githubEnterpriseApiHost }, + { packageName, registryUrl: githubEnterpriseApiHost }, null ); const sha2 = await github.getDigest( - { lookupName: 'some/dep', registryUrl: githubEnterpriseApiHost }, + { packageName: 'some/dep', registryUrl: githubEnterpriseApiHost }, 'v1.2.0' ); expect(httpMock.getTrace()).toMatchSnapshot(); @@ -145,7 +145,7 @@ describe('modules/datasource/github-tags/index', () => { const res = await github.getReleases({ registryUrl: 'https://git.enterprise.com', - lookupName: depName, + packageName: depName, }); expect(res).toMatchSnapshot(); expect(httpMock.getTrace()).toMatchSnapshot(); diff --git a/lib/modules/datasource/github-tags/index.ts b/lib/modules/datasource/github-tags/index.ts index 89a6cfe5ae80fd..b0e6662ceba3f8 100644 --- a/lib/modules/datasource/github-tags/index.ts +++ b/lib/modules/datasource/github-tags/index.ts @@ -78,7 +78,7 @@ export class GithubTagsDatasource extends GithubReleasesDatasource { * Returns the latest commit hash for the repository. */ override getDigest( - { lookupName: repo, registryUrl }: Partial, + { packageName: repo, registryUrl }: Partial, newValue?: string ): Promise { return newValue @@ -89,12 +89,12 @@ export class GithubTagsDatasource extends GithubReleasesDatasource { @cache({ ttlMinutes: 10, namespace: `datasource-${GithubTagsDatasource.id}`, - key: ({ registryUrl, lookupName: repo }: GetReleasesConfig) => + key: ({ registryUrl, packageName: repo }: GetReleasesConfig) => `${registryUrl}:${repo}:tags`, }) async getTags({ registryUrl, - lookupName: repo, + packageName: repo, }: GetReleasesConfig): Promise { const apiBaseUrl = getApiBaseUrl(registryUrl); // tag diff --git a/lib/modules/datasource/gitlab-packages/index.ts b/lib/modules/datasource/gitlab-packages/index.ts index 1fb8aa79b06d4a..e7fd124a9a3bb9 100644 --- a/lib/modules/datasource/gitlab-packages/index.ts +++ b/lib/modules/datasource/gitlab-packages/index.ts @@ -42,19 +42,19 @@ export class GitlabPackagesDatasource extends Datasource { @cache({ namespace: `datasource-${datasource}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${registryUrl}-${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${registryUrl}-${packageName}`, }) async getReleases({ registryUrl, - lookupName, + packageName, }: GetReleasesConfig): Promise { - const [projectName, packageName] = lookupName.split(':', 2); + const [projectPart, packagePart] = packageName.split(':', 2); const apiUrl = GitlabPackagesDatasource.getGitlabPackageApiUrl( registryUrl, - projectName, - packageName + projectPart, + packagePart ); const result: ReleaseResult = { @@ -70,7 +70,7 @@ export class GitlabPackagesDatasource extends Datasource { result.releases = response // Setting the package_name option when calling the GitLab API isn't enough to filter information about other packages // because this option is only implemented on GitLab > 12.9 and it only does a fuzzy search. - .filter((r) => r.name === packageName) + .filter((r) => r.name === packagePart) .map(({ version, created_at }) => ({ version, releaseTimestamp: created_at, diff --git a/lib/modules/datasource/gitlab-releases/index.ts b/lib/modules/datasource/gitlab-releases/index.ts index 05976a1d67b026..afe1843add646a 100644 --- a/lib/modules/datasource/gitlab-releases/index.ts +++ b/lib/modules/datasource/gitlab-releases/index.ts @@ -18,14 +18,14 @@ export class GitlabReleasesDatasource extends Datasource { @cache({ namespace: `datasource-${GitlabReleasesDatasource.id}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${registryUrl}/${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${registryUrl}/${packageName}`, }) async getReleases({ registryUrl, - lookupName, + packageName, }: GetReleasesConfig): Promise { - const urlEncodedRepo = encodeURIComponent(lookupName); + const urlEncodedRepo = encodeURIComponent(packageName); const apiUrl = `${registryUrl}/api/v4/projects/${urlEncodedRepo}/releases`; try { @@ -34,7 +34,7 @@ export class GitlabReleasesDatasource extends Datasource { ).body; return { - sourceUrl: `${registryUrl}/${lookupName}`, + sourceUrl: `${registryUrl}/${packageName}`, releases: gitlabReleasesResponse.map(({ tag_name, released_at }) => { const release: Release = { registryUrl, diff --git a/lib/modules/datasource/gitlab-tags/index.ts b/lib/modules/datasource/gitlab-tags/index.ts index f9663482817fb3..d04583ab01a47e 100644 --- a/lib/modules/datasource/gitlab-tags/index.ts +++ b/lib/modules/datasource/gitlab-tags/index.ts @@ -21,12 +21,12 @@ export class GitlabTagsDatasource extends Datasource { @cache({ namespace: `datasource-${GitlabTagsDatasource.id}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${getDepHost(registryUrl)}:${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${getDepHost(registryUrl)}:${packageName}`, }) async getReleases({ registryUrl, - lookupName: repo, + packageName: repo, }: GetReleasesConfig): Promise { const depHost = getDepHost(registryUrl); @@ -66,11 +66,11 @@ export class GitlabTagsDatasource extends Datasource { */ @cache({ namespace: `datasource-${GitlabTagsDatasource.id}-commit`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${getDepHost(registryUrl)}:${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${getDepHost(registryUrl)}:${packageName}`, }) override async getDigest( - { lookupName: repo, registryUrl }: Partial, + { packageName: repo, registryUrl }: Partial, newValue?: string ): Promise { const depHost = getDepHost(registryUrl); diff --git a/lib/modules/datasource/gitlab-tags/util.ts b/lib/modules/datasource/gitlab-tags/util.ts index de21765fea9a4a..bb0a6e439dc4f9 100644 --- a/lib/modules/datasource/gitlab-tags/util.ts +++ b/lib/modules/datasource/gitlab-tags/util.ts @@ -7,7 +7,10 @@ export function getDepHost(registryUrl: string = defaultRegistryUrl): string { return registryUrl.replace(regEx(/\/api\/v4$/), ''); } -export function getSourceUrl(lookupName: string, registryUrl?: string): string { +export function getSourceUrl( + packageName: string, + registryUrl?: string +): string { const depHost = getDepHost(registryUrl); - return joinUrlParts(depHost, lookupName); + return joinUrlParts(depHost, packageName); } diff --git a/lib/modules/datasource/go/base.spec.ts b/lib/modules/datasource/go/base.spec.ts index 0d40b1e1a59c7c..3acf75baa931f5 100644 --- a/lib/modules/datasource/go/base.spec.ts +++ b/lib/modules/datasource/go/base.spec.ts @@ -12,16 +12,16 @@ const hostRules = mocked(_hostRules); describe('modules/datasource/go/base', () => { describe('simple cases', () => { test.each` - module | datasource | lookupName + module | datasource | packageName ${'gopkg.in/foo'} | ${'github-tags'} | ${'go-foo/foo'} ${'gopkg.in/foo/bar'} | ${'github-tags'} | ${'foo/bar'} ${'github.com/foo/bar'} | ${'github-tags'} | ${'foo/bar'} ${'bitbucket.org/foo/bar'} | ${'bitbucket-tags'} | ${'foo/bar'} `( - '$module -> $datasource: $lookupName', - async ({ module, datasource, lookupName }) => { + '$module -> $datasource: $packageName', + async ({ module, datasource, packageName }) => { const res = await BaseGoDatasource.getDatasource(module); - expect(res).toMatchObject({ datasource, lookupName }); + expect(res).toMatchObject({ datasource, packageName }); } ); }); @@ -91,7 +91,7 @@ describe('modules/datasource/go/base', () => { expect(res).toEqual({ datasource: GithubTagsDatasource.id, - lookupName: 'golang/text', + packageName: 'golang/text', registryUrl: 'https://github.com', }); }); @@ -108,7 +108,7 @@ describe('modules/datasource/go/base', () => { expect(res).toEqual({ datasource: GithubTagsDatasource.id, - lookupName: 'example/module', + packageName: 'example/module', registryUrl: 'https://git.enterprise.com', }); }); @@ -125,7 +125,7 @@ describe('modules/datasource/go/base', () => { expect(res).toEqual({ datasource: GitlabTagsDatasource.id, - lookupName: 'group/subgroup', + packageName: 'group/subgroup', registryUrl: 'https://gitlab.com', }); }); @@ -142,7 +142,7 @@ describe('modules/datasource/go/base', () => { expect(res).toEqual({ datasource: GitlabTagsDatasource.id, - lookupName: 'group/subgroup/private', + packageName: 'group/subgroup/private', registryUrl: 'https://gitlab.com', }); }); @@ -161,7 +161,7 @@ describe('modules/datasource/go/base', () => { expect(res).toEqual({ datasource: GitlabTagsDatasource.id, - lookupName: 'golang/text', + packageName: 'golang/text', registryUrl: 'https://gitlab.com', }); }); @@ -178,7 +178,7 @@ describe('modules/datasource/go/base', () => { expect(res).toEqual({ datasource: GitlabTagsDatasource.id, - lookupName: 'group/subgroup', + packageName: 'group/subgroup', registryUrl: 'https://gitlab.com', }); }); @@ -196,7 +196,7 @@ describe('modules/datasource/go/base', () => { expect(res).toEqual({ datasource: GitlabTagsDatasource.id, - lookupName: 'golang/myrepo', + packageName: 'golang/myrepo', registryUrl: 'https://my.custom.domain', }); }); @@ -214,7 +214,7 @@ describe('modules/datasource/go/base', () => { expect(res).toEqual({ datasource: 'github-tags', registryUrl: 'https://github.com', - lookupName: 'fyne-io/fyne', + packageName: 'fyne-io/fyne', }); }); }); diff --git a/lib/modules/datasource/go/base.ts b/lib/modules/datasource/go/base.ts index 3018f7c8b27c11..d6f562019f0a43 100644 --- a/lib/modules/datasource/go/base.ts +++ b/lib/modules/datasource/go/base.ts @@ -25,30 +25,30 @@ export class BaseGoDatasource { static async getDatasource(goModule: string): Promise { if (goModule.startsWith('gopkg.in/')) { const [pkg] = goModule.replace('gopkg.in/', '').split('.'); - const lookupName = pkg.includes('/') ? pkg : `go-${pkg}/${pkg}`; + const packageName = pkg.includes('/') ? pkg : `go-${pkg}/${pkg}`; return { datasource: GithubTagsDatasource.id, - lookupName, + packageName, registryUrl: 'https://github.com', }; } if (goModule.startsWith('github.com/')) { const split = goModule.split('/'); - const lookupName = split[1] + '/' + split[2]; + const packageName = split[1] + '/' + split[2]; return { datasource: GithubTagsDatasource.id, - lookupName, + packageName, registryUrl: 'https://github.com', }; } if (goModule.startsWith('bitbucket.org/')) { const split = goModule.split('/'); - const lookupName = split[1] + '/' + split[2]; + const packageName = split[1] + '/' + split[2]; return { datasource: BitBucketTagsDatasource.id, - lookupName, + packageName, registryUrl: 'https://bitbucket.org', }; } @@ -75,7 +75,7 @@ export class BaseGoDatasource { if (goSourceUrl?.startsWith('https://github.com/')) { return { datasource: GithubTagsDatasource.id, - lookupName: goSourceUrl + packageName: goSourceUrl .replace('https://github.com/', '') .replace(regEx(/\/$/), ''), registryUrl: 'https://github.com', @@ -95,7 +95,7 @@ export class BaseGoDatasource { return { datasource: GitlabTagsDatasource.id, registryUrl: gitlabUrl, - lookupName: gitlabModuleName.substring( + packageName: gitlabModuleName.substring( 0, gitlabModuleName.indexOf('.git') ), @@ -104,14 +104,14 @@ export class BaseGoDatasource { return { datasource: GitlabTagsDatasource.id, registryUrl: gitlabUrl, - lookupName: gitlabModuleName, + packageName: gitlabModuleName, }; } return { datasource: GitlabTagsDatasource.id, registryUrl: gitlabUrl, - lookupName: gitlabUrlName, + packageName: gitlabUrlName, }; } @@ -125,14 +125,14 @@ export class BaseGoDatasource { // split the go module from the URL: host/go/module -> go/module const split = goModule.split('/'); - const lookupName = split[1] + '/' + split[2]; + const packageName = split[1] + '/' + split[2]; const registryUrl = `${parsedUrl.protocol}//${parsedUrl.host}`; return { datasource: GitlabTagsDatasource.id, registryUrl, - lookupName, + packageName, }; } } else { @@ -152,7 +152,7 @@ export class BaseGoDatasource { const parsedUrl = URL.parse(goImportURL); // split the go module from the URL: host/go/module -> go/module - const lookupName = trimTrailingSlash(parsedUrl.pathname) + const packageName = trimTrailingSlash(parsedUrl.pathname) .replace(regEx(/\.git$/), '') .split('/') .slice(-2) @@ -161,7 +161,7 @@ export class BaseGoDatasource { return { datasource: GithubTagsDatasource.id, registryUrl: `${parsedUrl.protocol}//${parsedUrl.host}`, - lookupName, + packageName, }; } diff --git a/lib/modules/datasource/go/common.ts b/lib/modules/datasource/go/common.ts index 4b928d29fdaba2..44c838870690f4 100644 --- a/lib/modules/datasource/go/common.ts +++ b/lib/modules/datasource/go/common.ts @@ -14,18 +14,18 @@ export enum GoproxyFallback { export function getSourceUrl(dataSource?: DataSource): string | undefined { if (dataSource) { - const { datasource, registryUrl, lookupName } = dataSource; + const { datasource, registryUrl, packageName } = dataSource; if (datasource === GithubTagsDatasource.id) { - return githubSourceUrl(lookupName, registryUrl); + return githubSourceUrl(packageName, registryUrl); } if (datasource === GitlabTagsDatasource.id) { - return gitlabSourceUrl(lookupName, registryUrl); + return gitlabSourceUrl(packageName, registryUrl); } if (datasource === BitBucketTagsDatasource.id) { - return BitBucketTagsDatasource.getSourceUrl(lookupName, registryUrl); + return BitBucketTagsDatasource.getSourceUrl(packageName, registryUrl); } } diff --git a/lib/modules/datasource/go/index.spec.ts b/lib/modules/datasource/go/index.spec.ts index ef3b7a4d7bd996..895be93f6910e8 100644 --- a/lib/modules/datasource/go/index.spec.ts +++ b/lib/modules/datasource/go/index.spec.ts @@ -56,7 +56,7 @@ describe('modules/datasource/go/index', () => { getReleasesDirectMock.mockResolvedValue(expected); const res = await datasource.getReleases({ - lookupName: 'golang.org/foo/bar', + packageName: 'golang.org/foo/bar', }); expect(res).toBe(expected); @@ -71,7 +71,7 @@ describe('modules/datasource/go/index', () => { process.env.GOPROXY = 'https://proxy.golang.org,direct'; const res = await datasource.getReleases({ - lookupName: 'golang.org/foo/bar', + packageName: 'golang.org/foo/bar', }); expect(res).toBe(expected); @@ -97,7 +97,7 @@ describe('modules/datasource/go/index', () => { .get('/y/text?go-get=1') .reply(200, ''); const res = await datasource.getDigest( - { lookupName: 'golang.org/y/text' }, + { packageName: 'golang.org/y/text' }, null ); expect(res).toBeNull(); @@ -109,7 +109,7 @@ describe('modules/datasource/go/index', () => { .get('/y/text?go-get=1') .reply(200, loadFixture('go-get-github.html')); const res = await datasource.getDigest( - { lookupName: 'golang.org/y/text' }, + { packageName: 'golang.org/y/text' }, null ); expect(res).toBeNull(); @@ -122,7 +122,7 @@ describe('modules/datasource/go/index', () => { .reply(200, loadFixture('go-get-gitlab.html')); getDigestGitlabMock.mockResolvedValue('abcdefabcdefabcdefabcdef'); const res = await datasource.getDigest( - { lookupName: 'gitlab.com/group/subgroup' }, + { packageName: 'gitlab.com/group/subgroup' }, null ); expect(res).toBe('abcdefabcdefabcdefabcdef'); @@ -135,7 +135,7 @@ describe('modules/datasource/go/index', () => { .reply(200, loadFixture('go-get-gitlab.html')); getDigestGitlabMock.mockResolvedValue('abcdefabcdefabcdefabcdef'); const res = await datasource.getDigest( - { lookupName: 'gitlab.com/group/subgroup' }, + { packageName: 'gitlab.com/group/subgroup' }, branch ); expect(res).toBe('abcdefabcdefabcdefabcdef'); @@ -147,7 +147,7 @@ describe('modules/datasource/go/index', () => { .reply(200, loadFixture('go-get-github.html')); getDigestGithubMock.mockResolvedValueOnce('abcdefabcdefabcdefabcdef'); const res = await datasource.getDigest( - { lookupName: 'golang.org/x/text' }, + { packageName: 'golang.org/x/text' }, null ); expect(res).toBe('abcdefabcdefabcdefabcdef'); @@ -157,7 +157,7 @@ describe('modules/datasource/go/index', () => { getDigestBitbucketMock.mockResolvedValueOnce('123'); const res = await datasource.getDigest( { - lookupName: 'bitbucket.org/golang/text', + packageName: 'bitbucket.org/golang/text', }, null ); diff --git a/lib/modules/datasource/go/index.ts b/lib/modules/datasource/go/index.ts index 651b9fc8b714be..d8b07ef02caea0 100644 --- a/lib/modules/datasource/go/index.ts +++ b/lib/modules/datasource/go/index.ts @@ -22,7 +22,7 @@ export class GoDatasource extends Datasource { @cache({ namespace: `datasource-${GoDatasource.id}`, - key: ({ lookupName }: Partial) => `${lookupName}-digest`, + key: ({ packageName }: Partial) => `${packageName}-digest`, }) getReleases(config: GetReleasesConfig): Promise { return process.env.GOPROXY @@ -42,13 +42,13 @@ export class GoDatasource extends Datasource { */ @cache({ namespace: GoDatasource.id, - key: ({ lookupName }: Partial) => `${lookupName}-digest`, + key: ({ packageName }: Partial) => `${packageName}-digest`, }) override async getDigest( - { lookupName }: Partial, + { packageName }: Partial, value?: string ): Promise { - const source = await BaseGoDatasource.getDatasource(lookupName); + const source = await BaseGoDatasource.getDatasource(packageName); if (!source) { return null; } diff --git a/lib/modules/datasource/go/releases-direct.spec.ts b/lib/modules/datasource/go/releases-direct.spec.ts index 5d27ec49b50303..b5e0bbdb7752bb 100644 --- a/lib/modules/datasource/go/releases-direct.spec.ts +++ b/lib/modules/datasource/go/releases-direct.spec.ts @@ -26,7 +26,7 @@ describe('modules/datasource/go/releases-direct', () => { it('returns null for null getDatasource result', async () => { getDatasourceSpy.mockResolvedValueOnce(null); const res = await datasource.getReleases({ - lookupName: 'golang.org/foo/something', + packageName: 'golang.org/foo/something', }); expect(res).toBeNull(); }); @@ -34,14 +34,14 @@ describe('modules/datasource/go/releases-direct', () => { getDatasourceSpy.mockRejectedValueOnce(new Error('unknown')); await expect( datasource.getReleases({ - lookupName: 'golang.org/foo/something', + packageName: 'golang.org/foo/something', }) ).rejects.toThrow(); }); it('processes real data', async () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'golang/text', + packageName: 'golang/text', registryUrl: 'https://github.com', }); httpMock @@ -51,7 +51,7 @@ describe('modules/datasource/go/releases-direct', () => { .get('/repos/golang/text/releases?per_page=100') .reply(200, []); const res = await datasource.getReleases({ - lookupName: 'golang.org/x/text', + packageName: 'golang.org/x/text', }); expect(res).toMatchSnapshot(); expect(res).not.toBeNull(); @@ -62,14 +62,14 @@ describe('modules/datasource/go/releases-direct', () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'gitlab-tags', registryUrl: 'https://gitlab.com', - lookupName: 'golang/text', + packageName: 'golang/text', }); httpMock .scope('https://gitlab.com/') .get('/api/v4/projects/golang%2Ftext/repository/tags?per_page=100') .reply(200, [{ name: 'v1.0.0' }, { name: 'v2.0.0' }]); const res = await datasource.getReleases({ - lookupName: 'golang.org/x/text', + packageName: 'golang.org/x/text', }); expect(res).toMatchSnapshot(); expect(res).not.toBeNull(); @@ -80,7 +80,7 @@ describe('modules/datasource/go/releases-direct', () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'gitlab-tags', registryUrl: 'https://my.custom.domain', - lookupName: 'golang/myrepo', + packageName: 'golang/myrepo', }); hostRules.find.mockReturnValue({ token: 'some-token' }); httpMock @@ -88,7 +88,7 @@ describe('modules/datasource/go/releases-direct', () => { .get('/api/v4/projects/golang%2Fmyrepo/repository/tags?per_page=100') .reply(200, [{ name: 'v1.0.0' }, { name: 'v2.0.0' }]); const res = await datasource.getReleases({ - lookupName: 'my.custom.domain/golang/myrepo', + packageName: 'my.custom.domain/golang/myrepo', }); expect(res).toMatchSnapshot(); expect(res).not.toBeNull(); @@ -98,7 +98,7 @@ describe('modules/datasource/go/releases-direct', () => { it('support bitbucket tags', async () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'bitbucket-tags', - lookupName: 'golang/text', + packageName: 'golang/text', registryUrl: 'https://bitbucket.org', }); httpMock @@ -110,7 +110,7 @@ describe('modules/datasource/go/releases-direct', () => { values: [{ name: 'v1.0.0' }, { name: 'v2.0.0' }], }); const res = await datasource.getReleases({ - lookupName: 'bitbucket.org/golang/text', + packageName: 'bitbucket.org/golang/text', }); expect(res).toMatchSnapshot(); expect(res).not.toBeNull(); @@ -121,7 +121,7 @@ describe('modules/datasource/go/releases-direct', () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', registryUrl: 'https://git.enterprise.com', - lookupName: 'example/module', + packageName: 'example/module', }); httpMock .scope('https://git.enterprise.com/') @@ -130,7 +130,7 @@ describe('modules/datasource/go/releases-direct', () => { .get('/api/v3/repos/example/module/releases?per_page=100') .reply(200, []); const res = await datasource.getReleases({ - lookupName: 'git.enterprise.com/example/module', + packageName: 'git.enterprise.com/example/module', }); expect(res).toMatchSnapshot(); expect(res).not.toBeNull(); @@ -140,17 +140,17 @@ describe('modules/datasource/go/releases-direct', () => { it('works for known servers', async () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'x/text', + packageName: 'x/text', registryUrl: 'https://github.com', }); getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'x/text', + packageName: 'x/text', registryUrl: 'https://github.com', }); getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'go-x/x', + packageName: 'go-x/x', registryUrl: 'https://github.com', }); httpMock @@ -168,9 +168,9 @@ describe('modules/datasource/go/releases-direct', () => { .get('/repos/go-x/x/releases?per_page=100') .reply(200, []); const packages = [ - { lookupName: 'github.com/x/text' }, - { lookupName: 'gopkg.in/x/text' }, - { lookupName: 'gopkg.in/x' }, + { packageName: 'github.com/x/text' }, + { packageName: 'gopkg.in/x/text' }, + { packageName: 'gopkg.in/x' }, ]; for (const pkg of packages) { const res = await datasource.getReleases(pkg); @@ -184,7 +184,7 @@ describe('modules/datasource/go/releases-direct', () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'gitlab-tags', registryUrl: 'https://gitlab.com', - lookupName: 'group/subgroup/repo', + packageName: 'group/subgroup/repo', }); httpMock .scope('https://gitlab.com/') @@ -193,7 +193,7 @@ describe('modules/datasource/go/releases-direct', () => { ) .reply(200, [{ name: 'v1.0.0' }, { name: 'v2.0.0' }]); const res = await datasource.getReleases({ - lookupName: 'gitlab.com/group/subgroup/repo', + packageName: 'gitlab.com/group/subgroup/repo', }); expect(res).toMatchSnapshot(); expect(res).not.toBeNull(); @@ -203,22 +203,22 @@ describe('modules/datasource/go/releases-direct', () => { it('works for nested modules on github', async () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'x/text', + packageName: 'x/text', registryUrl: 'https://github.com', }); getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'x/text', + packageName: 'x/text', registryUrl: 'https://github.com', }); getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'x/text', + packageName: 'x/text', registryUrl: 'https://github.com', }); const packages = [ - { lookupName: 'github.com/x/text/a' }, - { lookupName: 'github.com/x/text/b' }, + { packageName: 'github.com/x/text/a' }, + { packageName: 'github.com/x/text/b' }, ]; const tags = [{ name: 'a/v1.0.0' }, { name: 'b/v2.0.0' }]; @@ -230,7 +230,7 @@ describe('modules/datasource/go/releases-direct', () => { .get('/repos/x/text/releases?per_page=100') .reply(200, []); - const prefix = pkg.lookupName.split('/')[3]; + const prefix = pkg.packageName.split('/')[3]; const result = await datasource.getReleases(pkg); expect(result.releases).toHaveLength(1); expect(result.releases[0].version.startsWith(prefix)).toBeFalse(); @@ -243,17 +243,17 @@ describe('modules/datasource/go/releases-direct', () => { it('returns none if no tags match submodules', async () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'x/text', + packageName: 'x/text', registryUrl: 'https://github.com', }); getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'x/text', + packageName: 'x/text', registryUrl: 'https://github.com', }); const packages = [ - { lookupName: 'github.com/x/text/a' }, - { lookupName: 'github.com/x/text/b' }, + { packageName: 'github.com/x/text/a' }, + { packageName: 'github.com/x/text/b' }, ]; const tags = [{ name: 'v1.0.0' }, { name: 'v2.0.0' }]; @@ -276,10 +276,10 @@ describe('modules/datasource/go/releases-direct', () => { it('works for nested modules on github v2+ major upgrades', async () => { getDatasourceSpy.mockResolvedValueOnce({ datasource: 'github-tags', - lookupName: 'x/text', + packageName: 'x/text', registryUrl: 'https://github.com', }); - const pkg = { lookupName: 'github.com/x/text/b/v2' }; + const pkg = { packageName: 'github.com/x/text/b/v2' }; const tags = [ { name: 'a/v1.0.0' }, { name: 'v5.0.0' }, diff --git a/lib/modules/datasource/go/releases-direct.ts b/lib/modules/datasource/go/releases-direct.ts index 6ead672fa028ec..62c159c86da1fc 100644 --- a/lib/modules/datasource/go/releases-direct.ts +++ b/lib/modules/datasource/go/releases-direct.ts @@ -36,19 +36,19 @@ export class GoDirectDatasource extends Datasource { */ @cache({ namespace: `datasource-${GoDirectDatasource.id}`, - key: ({ lookupName }: GetReleasesConfig) => lookupName, + key: ({ packageName }: GetReleasesConfig) => packageName, }) async getReleases(config: GetReleasesConfig): Promise { - const { lookupName } = config; + const { packageName } = config; let res: ReleaseResult = null; - logger.trace(`go.getReleases(${lookupName})`); - const source = await BaseGoDatasource.getDatasource(lookupName); + logger.trace(`go.getReleases(${packageName})`); + const source = await BaseGoDatasource.getDatasource(packageName); if (!source) { logger.info( - { lookupName }, + { packageName }, 'Unsupported go host - cannot look up versions' ); return null; @@ -85,7 +85,7 @@ export class GoDirectDatasource extends Datasource { * and that tag should be used instead of just va.b.c, although for compatibility * the old behaviour stays the same. */ - const nameParts = lookupName.replace(regEx(/\/v\d+$/), '').split('/'); + const nameParts = packageName.replace(regEx(/\/v\d+$/), '').split('/'); logger.trace({ nameParts, releases: res.releases }, 'go.getReleases'); // If it has more than 3 parts it's a submodule or subgroup (gitlab only) diff --git a/lib/modules/datasource/go/releases-goproxy.spec.ts b/lib/modules/datasource/go/releases-goproxy.spec.ts index 0b1f5659b5076e..e3c5655fc64881 100644 --- a/lib/modules/datasource/go/releases-goproxy.spec.ts +++ b/lib/modules/datasource/go/releases-goproxy.spec.ts @@ -13,7 +13,7 @@ describe('modules/datasource/go/releases-goproxy', () => { describe('requests', () => { const baseUrl = 'https://proxy.golang.org'; - const lookupName = 'github.com/go-kit/kit'; + const packageName = 'github.com/go-kit/kit'; it('listVersions', async () => { httpMock @@ -21,7 +21,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .get('/github.com/go-kit/kit/@v/list') .reply(200, loadFixture('go-kit.list.txt')); - const versions = await datasource.listVersions(baseUrl, lookupName); + const versions = await datasource.listVersions(baseUrl, packageName); expect(versions).not.toBeEmpty(); expect(versions).toHaveLength(10); @@ -36,7 +36,7 @@ describe('modules/datasource/go/releases-goproxy', () => { const release = await datasource.versionInfo( baseUrl, - lookupName, + packageName, 'v0.5.0' ); @@ -286,7 +286,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .reply(200, []); const res = await datasource.getReleases({ - lookupName: 'github.com/google/btree', + packageName: 'github.com/google/btree', }); expect(httpMock.getTrace()).toMatchSnapshot(); expect(res).toEqual({ @@ -311,7 +311,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .reply(200, { Version: 'v1.0.1', Time: '2019-10-16T16:15:28Z' }); const res = await datasource.getReleases({ - lookupName: 'github.com/google/btree', + packageName: 'github.com/google/btree', }); expect(httpMock.getTrace()).toMatchSnapshot(); expect(res).toEqual({ @@ -336,7 +336,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .reply(410); const res = await datasource.getReleases({ - lookupName: 'github.com/google/btree', + packageName: 'github.com/google/btree', }); expect(httpMock.getTrace()).toMatchSnapshot(); expect(res).toEqual({ @@ -363,7 +363,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .reply(200, { Version: 'v1.0.1', Time: '2019-10-16T16:15:28Z' }); const res = await datasource.getReleases({ - lookupName: 'github.com/google/btree', + packageName: 'github.com/google/btree', }); expect(httpMock.getTrace()).toMatchSnapshot(); expect(res).toEqual({ @@ -402,7 +402,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .reply(200, { Version: 'v1.0.1', Time: '2019-10-16T16:15:28Z' }); const res = await datasource.getReleases({ - lookupName: 'github.com/google/btree', + packageName: 'github.com/google/btree', }); expect(httpMock.getTrace()).toMatchSnapshot(); expect(res).toEqual({ @@ -438,7 +438,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .replyWithError('unknown'); const res = await datasource.getReleases({ - lookupName: 'github.com/foo/bar', + packageName: 'github.com/foo/bar', }); expect(httpMock.getTrace()).toMatchSnapshot([ @@ -474,7 +474,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .reply(200, []); const res = await datasource.getReleases({ - lookupName: 'github.com/foo/bar', + packageName: 'github.com/foo/bar', }); expect(httpMock.getTrace()).toMatchSnapshot(); @@ -503,7 +503,7 @@ describe('modules/datasource/go/releases-goproxy', () => { .reply(410); const res = await datasource.getReleases({ - lookupName: 'github.com/foo/bar', + packageName: 'github.com/foo/bar', }); expect(httpMock.getTrace()).toMatchSnapshot([ diff --git a/lib/modules/datasource/go/releases-goproxy.ts b/lib/modules/datasource/go/releases-goproxy.ts index bd5cea475ba88d..814b2baabc59bf 100644 --- a/lib/modules/datasource/go/releases-goproxy.ts +++ b/lib/modules/datasource/go/releases-goproxy.ts @@ -27,8 +27,8 @@ export class GoProxyDatasource extends Datasource { key: (config: GetReleasesConfig) => GoProxyDatasource.getCacheKey(config), }) async getReleases(config: GetReleasesConfig): Promise { - const { lookupName } = config; - logger.trace(`goproxy.getReleases(${lookupName})`); + const { packageName } = config; + logger.trace(`goproxy.getReleases(${packageName})`); const goproxy = process.env.GOPROXY; const proxyList = this.parseGoproxy(goproxy); @@ -36,8 +36,8 @@ export class GoProxyDatasource extends Datasource { let result: ReleaseResult | null = null; - if (noproxy?.test(lookupName)) { - logger.debug(`Fetching ${lookupName} via GONOPROXY match`); + if (noproxy?.test(packageName)) { + logger.debug(`Fetching ${packageName} via GONOPROXY match`); result = await this.direct.getReleases(config); return result; } @@ -51,10 +51,10 @@ export class GoProxyDatasource extends Datasource { break; } - const versions = await this.listVersions(url, lookupName); + const versions = await this.listVersions(url, packageName); const queue = versions.map((version) => async (): Promise => { try { - return await this.versionInfo(url, lookupName, version); + return await this.versionInfo(url, packageName, version); } catch (err) { logger.trace({ err }, `Can't obtain data from ${url}`); return { version }; @@ -62,7 +62,7 @@ export class GoProxyDatasource extends Datasource { }); const releases = await pAll(queue, { concurrency: 5 }); if (releases.length) { - const datasource = await BaseGoDatasource.getDatasource(lookupName); + const datasource = await BaseGoDatasource.getDatasource(packageName); const sourceUrl = getSourceUrl(datasource); result = { releases, sourceUrl }; break; @@ -198,8 +198,8 @@ export class GoProxyDatasource extends Datasource { return input.replace(regEx(/([A-Z])/g), (x) => `!${x.toLowerCase()}`); } - async listVersions(baseUrl: string, lookupName: string): Promise { - const url = `${baseUrl}/${this.encodeCase(lookupName)}/@v/list`; + async listVersions(baseUrl: string, packageName: string): Promise { + const url = `${baseUrl}/${this.encodeCase(packageName)}/@v/list`; const { body } = await this.http.get(url); return body .split(regEx(/\s+/)) @@ -209,10 +209,10 @@ export class GoProxyDatasource extends Datasource { async versionInfo( baseUrl: string, - lookupName: string, + packageName: string, version: string ): Promise { - const url = `${baseUrl}/${this.encodeCase(lookupName)}/@v/${version}.info`; + const url = `${baseUrl}/${this.encodeCase(packageName)}/@v/${version}.info`; const res = await this.http.getJson(url); const result: Release = { @@ -226,9 +226,9 @@ export class GoProxyDatasource extends Datasource { return result; } - static getCacheKey({ lookupName }: GetReleasesConfig): string { + static getCacheKey({ packageName }: GetReleasesConfig): string { const goproxy = process.env.GOPROXY; const noproxy = GoProxyDatasource.parseNoproxy(); - return `${lookupName}@@${goproxy}@@${noproxy?.toString()}`; + return `${packageName}@@${goproxy}@@${noproxy?.toString()}`; } } diff --git a/lib/modules/datasource/go/types.ts b/lib/modules/datasource/go/types.ts index 329e09493b5d8f..2f5bac903378df 100644 --- a/lib/modules/datasource/go/types.ts +++ b/lib/modules/datasource/go/types.ts @@ -3,7 +3,7 @@ import type { GoproxyFallback } from './common'; export interface DataSource { datasource: string; registryUrl: string; - lookupName: string; + packageName: string; } export interface VersionInfo { diff --git a/lib/modules/datasource/helm/__snapshots__/index.spec.ts.snap b/lib/modules/datasource/helm/__snapshots__/index.spec.ts.snap index 89b07bafde7074..70a2e5be144c22 100644 --- a/lib/modules/datasource/helm/__snapshots__/index.spec.ts.snap +++ b/lib/modules/datasource/helm/__snapshots__/index.spec.ts.snap @@ -229,7 +229,7 @@ Array [ ] `; -exports[`modules/datasource/helm/index getReleases returns null if lookupName is not in index.yaml 1`] = ` +exports[`modules/datasource/helm/index getReleases returns null if packageName is not in index.yaml 1`] = ` Array [ Object { "headers": Object { diff --git a/lib/modules/datasource/helm/index.spec.ts b/lib/modules/datasource/helm/index.spec.ts index 50647ff4fa5150..9fe55aef104cd7 100644 --- a/lib/modules/datasource/helm/index.spec.ts +++ b/lib/modules/datasource/helm/index.spec.ts @@ -12,7 +12,7 @@ describe('modules/datasource/helm/index', () => { jest.resetAllMocks(); }); - it('returns null if lookupName was not provided', async () => { + it('returns null if packageName was not provided', async () => { expect( await getPkgReleases({ datasource: HelmDatasource.id, @@ -142,7 +142,7 @@ describe('modules/datasource/helm/index', () => { expect(releases).toBeNull(); expect(httpMock.getTrace()).toMatchSnapshot(); }); - it('returns null if lookupName is not in index.yaml', async () => { + it('returns null if packageName is not in index.yaml', async () => { httpMock .scope('https://example-repository.com') .get('/index.yaml') diff --git a/lib/modules/datasource/helm/index.ts b/lib/modules/datasource/helm/index.ts index a435f2aa76dad5..6b0018f698bd88 100644 --- a/lib/modules/datasource/helm/index.ts +++ b/lib/modules/datasource/helm/index.ts @@ -86,7 +86,7 @@ export class HelmDatasource extends Datasource { } async getReleases({ - lookupName, + packageName, registryUrl: helmRepository, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -99,11 +99,11 @@ export class HelmDatasource extends Datasource { logger.debug(`Couldn't get index.yaml file from ${helmRepository}`); return null; } - const releases = repositoryData[lookupName]; + const releases = repositoryData[packageName]; if (!releases) { logger.debug( - { dependency: lookupName }, - `Entry ${lookupName} doesn't exist in index.yaml from ${helmRepository}` + { dependency: packageName }, + `Entry ${packageName} doesn't exist in index.yaml from ${helmRepository}` ); return null; } diff --git a/lib/modules/datasource/hex/index.ts b/lib/modules/datasource/hex/index.ts index 1015c245bff947..a76ec9367cb59f 100644 --- a/lib/modules/datasource/hex/index.ts +++ b/lib/modules/datasource/hex/index.ts @@ -21,10 +21,10 @@ export class HexDatasource extends Datasource { @cache({ namespace: `datasource-${HexDatasource.id}`, - key: ({ lookupName }: GetReleasesConfig) => lookupName, + key: ({ packageName }: GetReleasesConfig) => packageName, }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -32,12 +32,12 @@ export class HexDatasource extends Datasource { return null; } - // Get dependency name from lookupName. - // If the dependency is private lookupName contains organization name as following: + // Get dependency name from packageName. + // If the dependency is private packageName contains organization name as following: // hexPackageName:organizationName // hexPackageName is used to pass it in hex dep url // organizationName is used for accessing to private deps - const [hexPackageName, organizationName] = lookupName.split(':'); + const [hexPackageName, organizationName] = packageName.split(':'); const organizationUrlPrefix = organizationName ? `repos/${organizationName}/` : ''; @@ -53,7 +53,7 @@ export class HexDatasource extends Datasource { const hexRelease: HexRelease = response.body; if (!hexRelease) { - logger.warn({ datasource: 'hex', lookupName }, `Invalid response body`); + logger.warn({ datasource: 'hex', packageName }, `Invalid response body`); return null; } diff --git a/lib/modules/datasource/index.ts b/lib/modules/datasource/index.ts index cf225eb5ca2f29..e2fd5fa40db8a7 100644 --- a/lib/modules/datasource/index.ts +++ b/lib/modules/datasource/index.ts @@ -35,19 +35,19 @@ function getDatasourceFor(datasource: string): DatasourceApi { type GetReleasesInternalConfig = GetReleasesConfig & GetPkgReleasesConfig; // TODO: fix error Type -function logError(datasource: string, lookupName: string, err: any): void { +function logError(datasource: string, packageName: string, err: any): void { const { statusCode, code: errCode, url } = err; if (statusCode === 404) { - logger.debug({ datasource, lookupName, url }, 'Datasource 404'); + logger.debug({ datasource, packageName, url }, 'Datasource 404'); } else if (statusCode === 401 || statusCode === 403) { - logger.debug({ datasource, lookupName, url }, 'Datasource unauthorized'); + logger.debug({ datasource, packageName, url }, 'Datasource unauthorized'); } else if (errCode) { logger.debug( - { datasource, lookupName, url, errCode }, + { datasource, packageName, url, errCode }, 'Datasource connection error' ); } else { - logger.debug({ datasource, lookupName, err }, 'Datasource unknown error'); + logger.debug({ datasource, packageName, err }, 'Datasource unknown error'); } } @@ -56,7 +56,7 @@ async function getRegistryReleases( config: GetReleasesConfig, registryUrl: string ): Promise { - const cacheKey = `${datasource.id} ${registryUrl} ${config.lookupName}`; + const cacheKey = `${datasource.id} ${registryUrl} ${config.packageName}`; if (datasource.caching) { const cachedResult = await packageCache.get( cacheNamespace, @@ -270,12 +270,12 @@ async function fetchReleases( if (err instanceof ExternalHostError) { throw err; } - logError(datasource.id, config.lookupName, err); + logError(datasource.id, config.packageName, err); } if (!dep || dequal(dep, { releases: [] })) { return null; } - addMetaData(dep, datasourceName, config.lookupName); + addMetaData(dep, datasourceName, config.packageName); dep = { ...dep, ...applyReplacements(config) }; return dep; } @@ -283,8 +283,8 @@ async function fetchReleases( function getRawReleases( config: GetReleasesInternalConfig ): Promise { - const { datasource, lookupName, registryUrls } = config; - const cacheKey = `${cacheNamespace}${datasource}${lookupName}${String( + const { datasource, packageName, registryUrls } = config; + const cacheKey = `${cacheNamespace}${datasource}${packageName}${String( registryUrls )}`; // By returning a Promise and reusing it, we should only fetch each package at most once @@ -305,9 +305,9 @@ export async function getPkgReleases( logger.warn('No datasource found'); return null; } - const lookupName = config.lookupName || config.depName; - if (!lookupName) { - logger.error({ config }, 'Datasource getReleases without lookupName'); + const packageName = config.packageName || config.depName; + if (!packageName) { + logger.error({ config }, 'Datasource getReleases without packageName'); return null; } let res: ReleaseResult; @@ -315,13 +315,13 @@ export async function getPkgReleases( res = clone( await getRawReleases({ ...config, - lookupName, + packageName, }) ); } catch (e) /* istanbul ignore next */ { if (e instanceof ExternalHostError) { e.hostType = config.datasource; - e.lookupName = lookupName; + e.packageName = packageName; } throw e; } @@ -395,13 +395,13 @@ function getDigestConfig( config: GetDigestInputConfig ): DigestConfig { const { currentValue, currentDigest } = config; - const lookupName = config.lookupName ?? config.depName; + const packageName = config.packageName ?? config.depName; const [registryUrl] = resolveRegistryUrls( datasource, config.defaultRegistryUrls, config.registryUrls ); - return { lookupName, registryUrl, currentValue, currentDigest }; + return { packageName, registryUrl, currentValue, currentDigest }; } export function getDigest( diff --git a/lib/modules/datasource/jenkins-plugins/index.ts b/lib/modules/datasource/jenkins-plugins/index.ts index 9325f0c941931b..85048c5da3821a 100644 --- a/lib/modules/datasource/jenkins-plugins/index.ts +++ b/lib/modules/datasource/jenkins-plugins/index.ts @@ -25,17 +25,17 @@ export class JenkinsPluginsDatasource extends Datasource { 'https://updates.jenkins.io/current/plugin-versions.json'; async getReleases({ - lookupName, + packageName, }: GetReleasesConfig): Promise { const plugins = await this.getJenkinsPluginInfo(); - const plugin = plugins[lookupName]; + const plugin = plugins[packageName]; if (!plugin) { return null; } const result = clone(plugin); const versions = await this.getJenkinsPluginVersions(); - const releases = versions[lookupName]; + const releases = versions[packageName]; result.releases = releases ? clone(releases) : []; return result; } diff --git a/lib/modules/datasource/maven/index.ts b/lib/modules/datasource/maven/index.ts index 5d806c23dbc2d8..15a7851fb8cad6 100644 --- a/lib/modules/datasource/maven/index.ts +++ b/lib/modules/datasource/maven/index.ts @@ -317,7 +317,7 @@ export class MavenDatasource extends Datasource { } async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -325,7 +325,7 @@ export class MavenDatasource extends Datasource { return null; } - const dependency = getDependencyParts(lookupName); + const dependency = getDependencyParts(packageName); const repoUrl = ensureTrailingSlash(registryUrl); logger.debug(`Looking up ${dependency.display} in repository ${repoUrl}`); diff --git a/lib/modules/datasource/maven/util.ts b/lib/modules/datasource/maven/util.ts index 9120646377132c..4b7728fee50492 100644 --- a/lib/modules/datasource/maven/util.ts +++ b/lib/modules/datasource/maven/util.ts @@ -179,11 +179,11 @@ export async function downloadMavenXml( return { authorization, xml: new XmlDocument(rawContent) }; } -export function getDependencyParts(lookupName: string): MavenDependency { - const [group, name] = lookupName.split(':'); +export function getDependencyParts(packageName: string): MavenDependency { + const [group, name] = packageName.split(':'); const dependencyUrl = `${group.replace(regEx(/\./g), '/')}/${name}`; return { - display: lookupName, + display: packageName, group, name, dependencyUrl, diff --git a/lib/modules/datasource/metadata.spec.ts b/lib/modules/datasource/metadata.spec.ts index 8509ddd85f0708..e227bda05d7197 100644 --- a/lib/modules/datasource/metadata.spec.ts +++ b/lib/modules/datasource/metadata.spec.ts @@ -19,9 +19,9 @@ describe('modules/datasource/metadata', () => { }; const datasource = PypiDatasource.id; - const lookupName = 'django'; + const packageName = 'django'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ changelogUrl: 'https://github.com/django/django/tree/master/docs/releases', @@ -42,9 +42,9 @@ describe('modules/datasource/metadata', () => { }; const datasource = PypiDatasource.id; - const lookupName = 'mkdocs'; + const packageName = 'mkdocs'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ sourceUrl: 'https://github.com/mkdocs/mkdocs', }); @@ -64,9 +64,9 @@ describe('modules/datasource/metadata', () => { ], }; const datasource = PypiDatasource.id; - const lookupName = 'django-filter'; + const packageName = 'django-filter'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ sourceUrl: 'https://github.com/carltongibson/django-filter', }); @@ -86,9 +86,9 @@ describe('modules/datasource/metadata', () => { ], }; const datasource = PypiDatasource.id; - const lookupName = 'django-filter'; + const packageName = 'django-filter'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ sourceUrl: 'https://github.com/some/repo', }); @@ -106,9 +106,9 @@ describe('modules/datasource/metadata', () => { ], }; const datasource = NpmDatasource.id; - const lookupName = 'dropzone'; + const packageName = 'dropzone'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ sourceUrl: 'https://gitlab.com/meno/dropzone', }); @@ -125,9 +125,9 @@ describe('modules/datasource/metadata', () => { ], }; const datasource = NpmDatasource.id; - const lookupName = 'dropzone'; + const packageName = 'dropzone'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ sourceUrl: 'https://gitlab-nope', }); @@ -144,9 +144,9 @@ describe('modules/datasource/metadata', () => { ], }; const datasource = NpmDatasource.id; - const lookupName = 'dropzone'; + const packageName = 'dropzone'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ sourceUrl: 'https://nope-nope-nope', }); @@ -163,9 +163,9 @@ describe('modules/datasource/metadata', () => { ], }; const datasource = NpmDatasource.id; - const lookupName = 'dropzone'; + const packageName = 'dropzone'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep).not.toContainKey('sourceUrl'); expect(dep).toMatchSnapshot(); }); @@ -176,9 +176,9 @@ describe('modules/datasource/metadata', () => { releases: [{ version: '1.9.3' }], }; const datasource = MavenDatasource.id; - const lookupName = 'io.mockk:mockk'; + const packageName = 'io.mockk:mockk'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep.sourceUrl).toBe('https://github.com/mockk/mockk'); }); @@ -189,9 +189,9 @@ describe('modules/datasource/metadata', () => { sourceUrl: undefined, }; const datasource = MavenDatasource.id; - const lookupName = 'io.mockk:mockk'; + const packageName = 'io.mockk:mockk'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep.sourceUrl).toBe('https://github.com/mockk/mockk'); expect(dep.homepage).toBeUndefined(); }); @@ -202,9 +202,9 @@ describe('modules/datasource/metadata', () => { releases: [{ version: '5.7.0' }], }; const datasource = MavenDatasource.id; - const lookupName = 'dropzone'; + const packageName = 'dropzone'; - addMetaData(dep, datasource, lookupName); + addMetaData(dep, datasource, packageName); expect(dep.sourceUrl).toBe('https://gitlab.com/meno/dropzone'); }); diff --git a/lib/modules/datasource/metadata.ts b/lib/modules/datasource/metadata.ts index 98e8f411ef17b5..68806fe2e9c286 100644 --- a/lib/modules/datasource/metadata.ts +++ b/lib/modules/datasource/metadata.ts @@ -92,18 +92,18 @@ function massageTimestamps(dep: ReleaseResult): void { export function addMetaData( dep: ReleaseResult, datasource: string, - lookupName: string + packageName: string ): void { massageTimestamps(dep); - const lookupNameLowercase = lookupName.toLowerCase(); + const packageNameLowercase = packageName.toLowerCase(); const manualChangelogUrl = - manualChangelogUrls[datasource]?.[lookupNameLowercase]; + manualChangelogUrls[datasource]?.[packageNameLowercase]; if (manualChangelogUrl) { dep.changelogUrl = manualChangelogUrl; } - const manualSourceUrl = manualSourceUrls[datasource]?.[lookupNameLowercase]; + const manualSourceUrl = manualSourceUrls[datasource]?.[packageNameLowercase]; if (manualSourceUrl) { dep.sourceUrl = manualSourceUrl; } diff --git a/lib/modules/datasource/npm/index.ts b/lib/modules/datasource/npm/index.ts index b66c17597c44a5..1e22feecc51238 100644 --- a/lib/modules/datasource/npm/index.ts +++ b/lib/modules/datasource/npm/index.ts @@ -23,13 +23,13 @@ export class NpmDatasource extends Datasource { } async getReleases({ - lookupName, + packageName, npmrc, }: GetReleasesConfig): Promise { if (is.string(npmrc)) { setNpmrc(npmrc); } - const res = await getDependency(this.http, lookupName); + const res = await getDependency(this.http, packageName); if (res) { res.tags = res['dist-tags']; delete res['dist-tags']; diff --git a/lib/modules/datasource/nuget/index.ts b/lib/modules/datasource/nuget/index.ts index 12abc52324104c..94ebe16134d809 100644 --- a/lib/modules/datasource/nuget/index.ts +++ b/lib/modules/datasource/nuget/index.ts @@ -23,18 +23,18 @@ export class NugetDatasource extends Datasource { } async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { - logger.trace(`nuget.getReleases(${lookupName})`); + logger.trace(`nuget.getReleases(${packageName})`); const { feedUrl, protocolVersion } = parseRegistryUrl(registryUrl); if (protocolVersion === 2) { - return v2.getReleases(this.http, feedUrl, lookupName); + return v2.getReleases(this.http, feedUrl, packageName); } if (protocolVersion === 3) { const queryUrl = await v3.getResourceUrl(this.http, feedUrl); if (queryUrl) { - return v3.getReleases(this.http, feedUrl, queryUrl, lookupName); + return v3.getReleases(this.http, feedUrl, queryUrl, packageName); } } return null; diff --git a/lib/modules/datasource/orb/__snapshots__/index.spec.ts.snap b/lib/modules/datasource/orb/__snapshots__/index.spec.ts.snap index c28b7425f18885..0170a238c2a79b 100644 --- a/lib/modules/datasource/orb/__snapshots__/index.spec.ts.snap +++ b/lib/modules/datasource/orb/__snapshots__/index.spec.ts.snap @@ -54,11 +54,11 @@ Array [ "graphql": Object { "query": Object { "__vars": Object { - "$lookupName": "String!", + "$packageName": "String!", }, "orb": Object { "__args": Object { - "name": "$lookupName", + "name": "$packageName", }, "homeUrl": null, "name": null, @@ -69,13 +69,13 @@ Array [ }, }, "variables": Object { - "lookupName": "hyper-expanse/library-release-workflows", + "packageName": "hyper-expanse/library-release-workflows", }, }, "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate, br", - "content-length": "231", + "content-length": "234", "content-type": "application/json", "host": "circleci.com", "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", @@ -140,11 +140,11 @@ Array [ "graphql": Object { "query": Object { "__vars": Object { - "$lookupName": "String!", + "$packageName": "String!", }, "orb": Object { "__args": Object { - "name": "$lookupName", + "name": "$packageName", }, "homeUrl": null, "name": null, @@ -155,13 +155,13 @@ Array [ }, }, "variables": Object { - "lookupName": "hyper-expanse/library-release-workflows", + "packageName": "hyper-expanse/library-release-workflows", }, }, "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate, br", - "content-length": "231", + "content-length": "234", "content-type": "application/json", "host": "circleci.com", "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", @@ -178,11 +178,11 @@ Array [ "graphql": Object { "query": Object { "__vars": Object { - "$lookupName": "String!", + "$packageName": "String!", }, "orb": Object { "__args": Object { - "name": "$lookupName", + "name": "$packageName", }, "homeUrl": null, "name": null, @@ -193,13 +193,13 @@ Array [ }, }, "variables": Object { - "lookupName": "hyper-expanse/library-release-workflows", + "packageName": "hyper-expanse/library-release-workflows", }, }, "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate, br", - "content-length": "231", + "content-length": "234", "content-type": "application/json", "host": "circleci.com", "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", @@ -216,11 +216,11 @@ Array [ "graphql": Object { "query": Object { "__vars": Object { - "$lookupName": "String!", + "$packageName": "String!", }, "orb": Object { "__args": Object { - "name": "$lookupName", + "name": "$packageName", }, "homeUrl": null, "name": null, @@ -231,13 +231,13 @@ Array [ }, }, "variables": Object { - "lookupName": "hyper-expanse/library-release-workflows", + "packageName": "hyper-expanse/library-release-workflows", }, }, "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate, br", - "content-length": "231", + "content-length": "234", "content-type": "application/json", "host": "circleci.com", "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", @@ -254,11 +254,11 @@ Array [ "graphql": Object { "query": Object { "__vars": Object { - "$lookupName": "String!", + "$packageName": "String!", }, "orb": Object { "__args": Object { - "name": "$lookupName", + "name": "$packageName", }, "homeUrl": null, "name": null, @@ -269,13 +269,13 @@ Array [ }, }, "variables": Object { - "lookupName": "hyper-expanse/library-release-wonkflows", + "packageName": "hyper-expanse/library-release-wonkflows", }, }, "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate, br", - "content-length": "231", + "content-length": "234", "content-type": "application/json", "host": "circleci.com", "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", @@ -292,11 +292,11 @@ Array [ "graphql": Object { "query": Object { "__vars": Object { - "$lookupName": "String!", + "$packageName": "String!", }, "orb": Object { "__args": Object { - "name": "$lookupName", + "name": "$packageName", }, "homeUrl": null, "name": null, @@ -307,13 +307,13 @@ Array [ }, }, "variables": Object { - "lookupName": "hyper-expanse/library-release-workflows", + "packageName": "hyper-expanse/library-release-workflows", }, }, "headers": Object { "accept": "application/json", "accept-encoding": "gzip, deflate, br", - "content-length": "231", + "content-length": "234", "content-type": "application/json", "host": "circleci.com", "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", diff --git a/lib/modules/datasource/orb/index.ts b/lib/modules/datasource/orb/index.ts index 9cd2d2ab287779..8692ae7f67f8d7 100644 --- a/lib/modules/datasource/orb/index.ts +++ b/lib/modules/datasource/orb/index.ts @@ -5,8 +5,8 @@ import type { GetReleasesConfig, ReleaseResult } from '../types'; import type { OrbRelease } from './types'; const query = ` -query($lookupName: String!) { - orb(name: $lookupName) { +query($packageName: String!) { + orb(name: $packageName) { name, homeUrl, versions { @@ -30,10 +30,10 @@ export class OrbDatasource extends Datasource { @cache({ namespace: `datasource-${OrbDatasource.id}`, - key: ({ lookupName }: GetReleasesConfig) => lookupName, + key: ({ packageName }: GetReleasesConfig) => packageName, }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -43,7 +43,7 @@ export class OrbDatasource extends Datasource { const url = `${registryUrl}graphql-unstable`; const body = { query, - variables: { lookupName }, + variables: { packageName }, }; const res: OrbRelease = ( await this.http.postJson<{ data: { orb: OrbRelease } }>(url, { @@ -51,13 +51,13 @@ export class OrbDatasource extends Datasource { }) ).body.data.orb; if (!res) { - logger.debug({ lookupName }, 'Failed to look up orb'); + logger.debug({ packageName }, 'Failed to look up orb'); return null; } // Simplify response before caching and returning const homepage = res.homeUrl?.length ? res.homeUrl - : `https://circleci.com/developer/orbs/orb/${lookupName}`; + : `https://circleci.com/developer/orbs/orb/${packageName}`; const releases = res.versions.map(({ version, createdAt }) => ({ version, releaseTimestamp: createdAt ?? null, diff --git a/lib/modules/datasource/packagist/index.ts b/lib/modules/datasource/packagist/index.ts index a09a7862ed6f50..6ccbf40d9d81e6 100644 --- a/lib/modules/datasource/packagist/index.ts +++ b/lib/modules/datasource/packagist/index.ts @@ -33,11 +33,11 @@ export class PackagistDatasource extends Datasource { override readonly registryStrategy = 'hunt'; public override getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { - logger.trace(`getReleases(${lookupName})`); - return this.packageLookup(registryUrl, lookupName); + logger.trace(`getReleases(${packageName})`); + return this.packageLookup(registryUrl, packageName); } // We calculate auth at this datasource layer so that we can know whether it's safe to cache or not diff --git a/lib/modules/datasource/pod/index.ts b/lib/modules/datasource/pod/index.ts index 268d2c6cef7519..7fd676b237982d 100644 --- a/lib/modules/datasource/pod/index.ts +++ b/lib/modules/datasource/pod/index.ts @@ -18,10 +18,10 @@ const enum URLFormatOptions { WithoutSpecsWithoutShard, } -function shardParts(lookupName: string): string[] { +function shardParts(packageName: string): string[] { return crypto .createHash('md5') - .update(lookupName) + .update(packageName) .digest('hex') .slice(0, 3) .split(''); @@ -32,7 +32,7 @@ const githubRegex = regEx( ); function releasesGithubUrl( - lookupName: string, + packageName: string, opts: { hostURL: string; account: string; @@ -46,22 +46,22 @@ function releasesGithubUrl( hostURL && hostURL !== 'https://github.com' ? `${hostURL}/api/v3/repos` : 'https://api.github.com/repos'; - const shard = shardParts(lookupName).join('/'); + const shard = shardParts(packageName).join('/'); // `Specs` in the pods repo URL is a new requirement for legacy support also allow pod repo URL without `Specs` - const lookupNamePath = useSpecs ? `Specs/${lookupName}` : lookupName; + const packageNamePath = useSpecs ? `Specs/${packageName}` : packageName; const shardPath = useSpecs - ? `Specs/${shard}/${lookupName}` - : `${shard}/${lookupName}`; - const suffix = useShard ? shardPath : lookupNamePath; + ? `Specs/${shard}/${packageName}` + : `${shard}/${packageName}`; + const suffix = useShard ? shardPath : packageNamePath; return `${prefix}/${account}/${repo}/contents/${suffix}`; } -function handleError(lookupName: string, err: HttpError): void { - const errorData = { lookupName, err }; +function handleError(packageName: string, err: HttpError): void { + const errorData = { packageName, err }; const statusCode = err.response?.statusCode; if (statusCode === 429 || (statusCode >= 500 && statusCode < 600)) { - logger.warn({ lookupName, err }, `CocoaPods registry failure`); + logger.warn({ packageName, err }, `CocoaPods registry failure`); throw new ExternalHostError(err); } @@ -88,8 +88,8 @@ function isDefaultRepo(url: string): boolean { return false; } -function releasesCDNUrl(lookupName: string, registryUrl: string): string { - const shard = shardParts(lookupName).join('_'); +function releasesCDNUrl(packageName: string, registryUrl: string): string { + const shard = shardParts(packageName).join('_'); return `${registryUrl}/all_pods_versions_${shard}.txt`; } @@ -109,7 +109,7 @@ export class PodDatasource extends Datasource { private async requestCDN( url: string, - lookupName: string + packageName: string ): Promise { try { const resp = await this.http.get(url); @@ -117,7 +117,7 @@ export class PodDatasource extends Datasource { return resp.body; } } catch (err) { - handleError(lookupName, err); + handleError(packageName, err); } return null; @@ -125,7 +125,7 @@ export class PodDatasource extends Datasource { private async requestGithub( url: string, - lookupName: string + packageName: string ): Promise { try { const resp = await this.githubHttp.getJson(url); @@ -133,21 +133,21 @@ export class PodDatasource extends Datasource { return resp.body; } } catch (err) { - handleError(lookupName, err); + handleError(packageName, err); } return null; } private async getReleasesFromGithub( - lookupName: string, + packageName: string, opts: { hostURL: string; account: string; repo: string }, useShard = true, useSpecs = true, urlFormatOptions = URLFormatOptions.WithShardWithSpec ): Promise { - const url = releasesGithubUrl(lookupName, { ...opts, useShard, useSpecs }); - const resp = await this.requestGithub<{ name: string }[]>(url, lookupName); + const url = releasesGithubUrl(packageName, { ...opts, useShard, useSpecs }); + const resp = await this.requestGithub<{ name: string }[]>(url, packageName); if (resp) { const releases = resp.map(({ name }) => ({ version: name })); return { releases }; @@ -157,7 +157,7 @@ export class PodDatasource extends Datasource { switch (urlFormatOptions) { case URLFormatOptions.WithShardWithSpec: return this.getReleasesFromGithub( - lookupName, + packageName, opts, true, false, @@ -165,7 +165,7 @@ export class PodDatasource extends Datasource { ); case URLFormatOptions.WithShardWithoutSpec: return this.getReleasesFromGithub( - lookupName, + packageName, opts, false, true, @@ -173,7 +173,7 @@ export class PodDatasource extends Datasource { ); case URLFormatOptions.WithSpecsWithoutShard: return this.getReleasesFromGithub( - lookupName, + packageName, opts, false, false, @@ -186,17 +186,17 @@ export class PodDatasource extends Datasource { } private async getReleasesFromCDN( - lookupName: string, + packageName: string, registryUrl: string ): Promise { - const url = releasesCDNUrl(lookupName, registryUrl); - const resp = await this.requestCDN(url, lookupName); + const url = releasesCDNUrl(packageName, registryUrl); + const resp = await this.requestCDN(url, packageName); if (resp) { const lines = resp.split(newlineRegex); for (let idx = 0; idx < lines.length; idx += 1) { const line = lines[idx]; const [name, ...versions] = line.split('/'); - if (name === lookupName.replace(regEx(/\/.*$/), '')) { + if (name === packageName.replace(regEx(/\/.*$/), '')) { const releases = versions.map((version) => ({ version })); return { releases }; } @@ -208,14 +208,14 @@ export class PodDatasource extends Datasource { @cache({ ttlMinutes: 30, namespace: `datasource-${PodDatasource.id}`, - key: ({ lookupName, registryUrl }: GetReleasesConfig) => - `${registryUrl}:${lookupName}`, + key: ({ packageName, registryUrl }: GetReleasesConfig) => + `${registryUrl}:${packageName}`, }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { - const podName = lookupName.replace(regEx(/\/.*$/), ''); + const podName = packageName.replace(regEx(/\/.*$/), ''); let baseUrl = registryUrl.replace(regEx(/\/+$/), ''); baseUrl = massageGithubUrl(baseUrl); // In order to not abuse github API limits, query CDN instead diff --git a/lib/modules/datasource/pypi/index.ts b/lib/modules/datasource/pypi/index.ts index 62e1d8456e5365..1dbd1baea077bb 100644 --- a/lib/modules/datasource/pypi/index.ts +++ b/lib/modules/datasource/pypi/index.ts @@ -31,17 +31,17 @@ export class PypiDatasource extends Datasource { override readonly registryStrategy = 'merge'; async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { let dependency: ReleaseResult = null; const hostUrl = ensureTrailingSlash(registryUrl); - const normalizedLookupName = PypiDatasource.normalizeName(lookupName); + const normalizedLookupName = PypiDatasource.normalizeName(packageName); // not all simple indexes use this identifier, but most do if (hostUrl.endsWith('/simple/') || hostUrl.endsWith('/+simple/')) { logger.trace( - { lookupName, hostUrl }, + { packageName, hostUrl }, 'Looking up pypi simple dependency' ); dependency = await this.getSimpleDependency( @@ -49,7 +49,7 @@ export class PypiDatasource extends Datasource { hostUrl ); } else { - logger.trace({ lookupName, hostUrl }, 'Looking up pypi api dependency'); + logger.trace({ packageName, hostUrl }, 'Looking up pypi api dependency'); try { // we need to resolve early here so we can catch any 404s and fallback to a simple lookup dependency = await this.getDependency(normalizedLookupName, hostUrl); @@ -60,7 +60,7 @@ export class PypiDatasource extends Datasource { // error contacting json-style api -- attempt to fallback to a simple-style api logger.trace( - { lookupName, hostUrl }, + { packageName, hostUrl }, 'Looking up pypi simple dependency via fallback' ); dependency = await this.getSimpleDependency( diff --git a/lib/modules/datasource/readme.md b/lib/modules/datasource/readme.md index 7a80ce47b5d10f..a89dc6214c2ec7 100644 --- a/lib/modules/datasource/readme.md +++ b/lib/modules/datasource/readme.md @@ -15,7 +15,7 @@ The minimum exported interface for a datasource is a function called `getRelease The config contains: -- `lookupName`: the package's full name including scope if present (e.g. `@foo/bar`) +- `packageName`: the package's full name including scope if present (e.g. `@foo/bar`) - `registryUrls`: an array of registry Urls to try `getReleases` should return an object containing: diff --git a/lib/modules/datasource/repology/index.ts b/lib/modules/datasource/repology/index.ts index 4880e8f9629fe0..46a0403dc560f7 100644 --- a/lib/modules/datasource/repology/index.ts +++ b/lib/modules/datasource/repology/index.ts @@ -186,11 +186,11 @@ export class RepologyDatasource extends Datasource { } async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // Ensure lookup name contains both repository and package - const [repoName, pkgName] = lookupName.split('/', 2); + const [repoName, pkgName] = packageName.split('/', 2); if (!repoName || !pkgName) { throw new ExternalHostError( new Error( @@ -216,10 +216,10 @@ export class RepologyDatasource extends Datasource { } catch (err) { if (err.message === HOST_DISABLED) { // istanbul ignore next - logger.trace({ lookupName, err }, 'Host disabled'); + logger.trace({ packageName, err }, 'Host disabled'); } else { logger.warn( - { lookupName, err }, + { packageName, err }, 'Repology lookup failed with unexpected error' ); } diff --git a/lib/modules/datasource/repology/readme.md b/lib/modules/datasource/repology/readme.md index 5a1f555b0f8593..ddedb6dd869cfd 100644 --- a/lib/modules/datasource/repology/readme.md +++ b/lib/modules/datasource/repology/readme.md @@ -1,6 +1,6 @@ [Repology](https://repology.org/) supports looking up package versions from a wide variety of package repositories and can be used in combination with [regex managers](https://docs.renovatebot.com/modules/manager/regex/) to keep dependencies up-to-date which are not specifically supported by Renovate. -To specify which specific repository should be queried when looking up a package, the `lookupName` has to contain the repository identifier and the package name itself, separated by a slash. As an example, `alpine_3_12/gcc` would look for a binary or source package called `gcc` within the `alpine_3_12` repository. +To specify which specific repository should be queried when looking up a package, the `packageName` has to contain the repository identifier and the package name itself, separated by a slash. As an example, `alpine_3_12/gcc` would look for a binary or source package called `gcc` within the `alpine_3_12` repository. A [list of all supported repositories](https://repology.org/repositories/statistics) can be found on the Repology homepage. To determine the correct identifier, click on a repository of your choice and make note of the identifier in the URL: `https://repology.org/repository/` diff --git a/lib/modules/datasource/rubygems/get-rubygems-org.ts b/lib/modules/datasource/rubygems/get-rubygems-org.ts index d8c5f3e932f807..3758bcb394e5b9 100644 --- a/lib/modules/datasource/rubygems/get-rubygems-org.ts +++ b/lib/modules/datasource/rubygems/get-rubygems-org.ts @@ -22,15 +22,15 @@ export class RubyGemsOrgDatasource extends Datasource { } async getReleases({ - lookupName, + packageName, }: GetReleasesConfig): Promise { - logger.debug(`getRubygemsOrgDependency(${lookupName})`); + logger.debug(`getRubygemsOrgDependency(${packageName})`); await this.syncVersions(); - if (!packageReleases[lookupName]) { + if (!packageReleases[packageName]) { return null; } const dep: ReleaseResult = { - releases: packageReleases[lookupName].map((version) => ({ + releases: packageReleases[packageName].map((version) => ({ version, })), }; diff --git a/lib/modules/datasource/rubygems/get.ts b/lib/modules/datasource/rubygems/get.ts index cd27c1cefd8a63..e98d7e7ec5288e 100644 --- a/lib/modules/datasource/rubygems/get.ts +++ b/lib/modules/datasource/rubygems/get.ts @@ -22,13 +22,13 @@ export class InternalRubyGemsDatasource extends Datasource { private knownFallbackHosts = ['rubygems.pkg.github.com', 'gitlab.com']; override getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { if (this.knownFallbackHosts.includes(parseUrl(registryUrl)?.hostname)) { - return this.getDependencyFallback(lookupName, registryUrl); + return this.getDependencyFallback(packageName, registryUrl); } - return this.getDependency(lookupName, registryUrl); + return this.getDependency(packageName, registryUrl); } async getDependencyFallback( diff --git a/lib/modules/datasource/rubygems/index.spec.ts b/lib/modules/datasource/rubygems/index.spec.ts index d92264f3240772..ed15dd4f0db5e0 100644 --- a/lib/modules/datasource/rubygems/index.spec.ts +++ b/lib/modules/datasource/rubygems/index.spec.ts @@ -67,7 +67,7 @@ describe('modules/datasource/rubygems/index', () => { it('returns a dep for rubygems.org package hit', async () => { const newparams = { ...params, - lookupName: '1pass', + packageName: '1pass', registryUrls: [], }; httpMock @@ -102,7 +102,7 @@ describe('modules/datasource/rubygems/index', () => { const res = await getPkgReleases({ ...params, - lookupName: '1pass', + packageName: '1pass', registryUrls: [], }); expect(res).not.toBeNull(); diff --git a/lib/modules/datasource/rubygems/index.ts b/lib/modules/datasource/rubygems/index.ts index 7a2badea65e061..4eab67ef7b8121 100644 --- a/lib/modules/datasource/rubygems/index.ts +++ b/lib/modules/datasource/rubygems/index.ts @@ -31,18 +31,18 @@ export class RubyGemsDatasource extends Datasource { @cache({ namespace: `datasource-${RubyGemsDatasource.id}`, - key: ({ registryUrl, lookupName }: GetReleasesConfig) => - `${registryUrl}/${lookupName}`, + key: ({ registryUrl, packageName }: GetReleasesConfig) => + `${registryUrl}/${packageName}`, }) getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { if (parseUrl(registryUrl)?.hostname === 'rubygems.org') { - return this.rubyGemsOrgDatasource.getReleases({ lookupName }); + return this.rubyGemsOrgDatasource.getReleases({ packageName }); } return this.internalRubyGemsDatasource.getReleases({ - lookupName, + packageName, registryUrl, }); } diff --git a/lib/modules/datasource/sbt-package/index.ts b/lib/modules/datasource/sbt-package/index.ts index 96e0bc257c4945..c1b0fbe19ea4cb 100644 --- a/lib/modules/datasource/sbt-package/index.ts +++ b/lib/modules/datasource/sbt-package/index.ts @@ -144,7 +144,7 @@ export class SbtPackageDatasource extends Datasource { } async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -152,7 +152,7 @@ export class SbtPackageDatasource extends Datasource { return null; } - const [groupId, artifactId] = lookupName.split(':'); + const [groupId, artifactId] = packageName.split(':'); const groupIdSplit = groupId.split('.'); const artifactIdSplit = artifactId.split('_'); const [artifact, scalaVersion] = artifactIdSplit; @@ -193,7 +193,7 @@ export class SbtPackageDatasource extends Datasource { } logger.debug( - `No versions found for ${lookupName} in ${searchRoots.length} repositories` + `No versions found for ${packageName} in ${searchRoots.length} repositories` ); return null; } diff --git a/lib/modules/datasource/sbt-plugin/index.ts b/lib/modules/datasource/sbt-plugin/index.ts index cb86509a36f288..d23dfbe03ddbe1 100644 --- a/lib/modules/datasource/sbt-plugin/index.ts +++ b/lib/modules/datasource/sbt-plugin/index.ts @@ -78,7 +78,7 @@ export class SbtPluginDatasource extends SbtPackageDatasource { } override async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -86,7 +86,7 @@ export class SbtPluginDatasource extends SbtPackageDatasource { return null; } - const [groupId, artifactId] = lookupName.split(':'); + const [groupId, artifactId] = packageName.split(':'); const groupIdSplit = groupId.split('.'); const artifactIdSplit = artifactId.split('_'); const [artifact, scalaVersion] = artifactIdSplit; @@ -129,7 +129,7 @@ export class SbtPluginDatasource extends SbtPackageDatasource { } logger.debug( - `No versions found for ${lookupName} in ${searchRoots.length} repositories` + `No versions found for ${packageName} in ${searchRoots.length} repositories` ); return null; } diff --git a/lib/modules/datasource/terraform-module/index.ts b/lib/modules/datasource/terraform-module/index.ts index b88ebd31467a16..0a5ac1f5f18aa6 100644 --- a/lib/modules/datasource/terraform-module/index.ts +++ b/lib/modules/datasource/terraform-module/index.ts @@ -28,7 +28,7 @@ export class TerraformModuleDatasource extends TerraformDatasource { TerraformModuleDatasource.getCacheKey(getReleasesConfig), }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if @@ -37,7 +37,7 @@ export class TerraformModuleDatasource extends TerraformDatasource { } const { registry, repository } = - TerraformModuleDatasource.getRegistryRepository(lookupName, registryUrl); + TerraformModuleDatasource.getRegistryRepository(packageName, registryUrl); logger.trace( { registry, terraformRepository: repository }, 'terraform-module.getReleases()' @@ -86,11 +86,11 @@ export class TerraformModuleDatasource extends TerraformDatasource { } private static getRegistryRepository( - lookupName: string, + packageName: string, registryUrl = '' ): RegistryRepository { let registry: string; - const split = lookupName.split('/'); + const split = packageName.split('/'); if (split.length > 3 && split[0].includes('.')) { [registry] = split; split.shift(); @@ -108,11 +108,11 @@ export class TerraformModuleDatasource extends TerraformDatasource { } private static getCacheKey({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): string { const { registry, repository } = - TerraformModuleDatasource.getRegistryRepository(lookupName, registryUrl); + TerraformModuleDatasource.getRegistryRepository(packageName, registryUrl); return `${registry}/${repository}`; } } diff --git a/lib/modules/datasource/terraform-provider/__snapshots__/index.spec.ts.snap b/lib/modules/datasource/terraform-provider/__snapshots__/index.spec.ts.snap index 851b1c14329004..efd6dec151f8df 100644 --- a/lib/modules/datasource/terraform-provider/__snapshots__/index.spec.ts.snap +++ b/lib/modules/datasource/terraform-provider/__snapshots__/index.spec.ts.snap @@ -316,7 +316,7 @@ Array [ ] `; -exports[`modules/datasource/terraform-provider/index getReleases processes real data from lookupName 1`] = ` +exports[`modules/datasource/terraform-provider/index getReleases processes real data from packageName 1`] = ` Object { "homepage": "https://registry.company.com/providers/hashicorp/azurerm", "registryUrl": "https://registry.company.com", @@ -333,7 +333,7 @@ Object { } `; -exports[`modules/datasource/terraform-provider/index getReleases processes real data from lookupName 2`] = ` +exports[`modules/datasource/terraform-provider/index getReleases processes real data from packageName 2`] = ` Array [ Object { "headers": Object { diff --git a/lib/modules/datasource/terraform-provider/index.spec.ts b/lib/modules/datasource/terraform-provider/index.spec.ts index 2dca97c785acb9..b996964864766d 100644 --- a/lib/modules/datasource/terraform-provider/index.spec.ts +++ b/lib/modules/datasource/terraform-provider/index.spec.ts @@ -80,7 +80,7 @@ describe('modules/datasource/terraform-provider/index', () => { expect(httpMock.getTrace()).toMatchSnapshot(); }); - it('processes real data from lookupName', async () => { + it('processes real data from packageName', async () => { httpMock .scope('https://registry.company.com') .get('/v1/providers/hashicorp/azurerm') @@ -90,7 +90,7 @@ describe('modules/datasource/terraform-provider/index', () => { const res = await getPkgReleases({ datasource: TerraformProviderDatasource.id, depName: 'azure', - lookupName: 'hashicorp/azurerm', + packageName: 'hashicorp/azurerm', registryUrls: ['https://registry.company.com'], }); expect(res).toMatchSnapshot(); diff --git a/lib/modules/datasource/terraform-provider/index.ts b/lib/modules/datasource/terraform-provider/index.ts index c73825db1a347e..bfcde7fd43ba5a 100644 --- a/lib/modules/datasource/terraform-provider/index.ts +++ b/lib/modules/datasource/terraform-provider/index.ts @@ -25,7 +25,7 @@ export class TerraformProviderDatasource extends TerraformDatasource { 'https://releases.hashicorp.com', ]; - static repositoryRegex = regEx(/^hashicorp\/(?\S+)$/); + static repositoryRegex = regEx(/^hashicorp\/(?\S+)$/); constructor() { super(TerraformProviderDatasource.id); @@ -46,21 +46,21 @@ export class TerraformProviderDatasource extends TerraformDatasource { }/${TerraformProviderDatasource.getRepository(getReleasesConfig)}`, }) async getReleases({ - lookupName, + packageName, registryUrl, }: GetReleasesConfig): Promise { // istanbul ignore if if (!registryUrl) { return null; } - logger.debug({ lookupName }, 'terraform-provider.getDependencies()'); + logger.debug({ packageName }, 'terraform-provider.getDependencies()'); let dep: ReleaseResult | null = null; const registryHost = parseUrl(registryUrl)?.host; if (registryHost === 'releases.hashicorp.com') { - dep = await this.queryReleaseBackend(lookupName, registryUrl); + dep = await this.queryReleaseBackend(packageName, registryUrl); } else { const repository = TerraformProviderDatasource.getRepository({ - lookupName, + packageName, }); dep = await this.queryRegistry(registryUrl, repository); } @@ -68,8 +68,8 @@ export class TerraformProviderDatasource extends TerraformDatasource { return dep; } - private static getRepository({ lookupName }: GetReleasesConfig): string { - return lookupName.includes('/') ? lookupName : `hashicorp/${lookupName}`; + private static getRepository({ packageName }: GetReleasesConfig): string { + return packageName.includes('/') ? packageName : `hashicorp/${packageName}`; } private async queryRegistry( @@ -104,10 +104,10 @@ export class TerraformProviderDatasource extends TerraformDatasource { // TODO: add long term cache (#9590) private async queryReleaseBackend( - lookupName: string, + packageName: string, registryURL: string ): Promise { - const backendLookUpName = `terraform-provider-${lookupName}`; + const backendLookUpName = `terraform-provider-${packageName}`; const backendURL = registryURL + `/index.json`; const res = ( await this.http.getJson(backendURL) @@ -145,8 +145,8 @@ export class TerraformProviderDatasource extends TerraformDatasource { // non hashicorp builds are not supported with releases.hashicorp.com return null; } - const lookupName = repositoryRegexResult.lookupName; - const backendLookUpName = `terraform-provider-${lookupName}`; + const packageName = repositoryRegexResult.packageName; + const backendLookUpName = `terraform-provider-${packageName}`; let versionReleaseBackend: VersionDetailResponse; try { versionReleaseBackend = await this.getReleaseBackendIndex( diff --git a/lib/modules/datasource/types.ts b/lib/modules/datasource/types.ts index 8106c3b82a6ea8..98362b3ec7059f 100644 --- a/lib/modules/datasource/types.ts +++ b/lib/modules/datasource/types.ts @@ -2,7 +2,7 @@ import type { ModuleApi } from '../../types'; export interface GetDigestInputConfig { datasource?: string; - lookupName?: string; + packageName?: string; depName: string; defaultRegistryUrls?: string[]; registryUrls?: string[]; @@ -11,7 +11,7 @@ export interface GetDigestInputConfig { } export interface DigestConfig { - lookupName: string; + packageName: string; registryUrl?: string; currentValue?: string; currentDigest?: string; @@ -19,7 +19,7 @@ export interface DigestConfig { export interface GetReleasesConfig { npmrc?: string; - lookupName: string; + packageName: string; registryUrl?: string; } @@ -29,7 +29,7 @@ export interface GetPkgReleasesConfig { registryUrls?: string[]; datasource: string; depName: string; - lookupName?: string; + packageName?: string; versioning?: string; extractVersion?: string; constraints?: Record; @@ -94,7 +94,7 @@ export interface DatasourceApi extends ModuleApi { /** * Whether to perform caching in the datasource index/wrapper or not. - * true: datasoure index wrapper should cache all results (based on registryUrl/lookupName) + * true: datasoure index wrapper should cache all results (based on registryUrl/packageName) * false: caching is not performed, or performed within the datasource implementation */ caching?: boolean; diff --git a/lib/modules/manager/ansible-galaxy/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/ansible-galaxy/__snapshots__/extract.spec.ts.snap index f558b0d9d08319..8984250244b726 100644 --- a/lib/modules/manager/ansible-galaxy/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/ansible-galaxy/__snapshots__/extract.spec.ts.snap @@ -23,21 +23,21 @@ Array [ "datasource": "github-tags", "depName": "github.com/organization/repo_name", "depType": "galaxy-collection", - "lookupName": "https://github.com/organization/repo_name.git", + "packageName": "https://github.com/organization/repo_name.git", }, Object { "currentValue": "1.2.2", "datasource": "git-tags", "depName": "example.com/organization/repo_name", "depType": "galaxy-collection", - "lookupName": "https://example.com/organization/repo_name.git", + "packageName": "https://example.com/organization/repo_name.git", }, Object { "currentValue": "1.2.2", "datasource": "git-tags", "depName": "example.com/organization/repo_name", "depType": "galaxy-collection", - "lookupName": "https://example.com/organization/repo_name.git", + "packageName": "https://example.com/organization/repo_name.git", }, Object { "datasource": "galaxy-collection", @@ -53,7 +53,7 @@ Array [ "datasource": "git-tags", "depName": "foo.bar/organization/repo_name", "depType": "galaxy-collection", - "lookupName": "https://foo.bar/organization/repo_name.git", + "packageName": "https://foo.bar/organization/repo_name.git", "skipReason": "no-version", }, Object { @@ -77,7 +77,7 @@ Array [ "datasource": "git-tags", "depName": "example.com/organization/repo_name", "depType": "galaxy-collection", - "lookupName": "https://example.com/organization/repo_name.git", + "packageName": "https://example.com/organization/repo_name.git", "skipReason": "unsupported", }, Object { @@ -85,14 +85,14 @@ Array [ "datasource": "galaxy", "depName": "geerlingguy.java", "depType": "role", - "lookupName": "geerlingguy.java", + "packageName": "geerlingguy.java", }, Object { "currentValue": "2.9.0", "datasource": "galaxy", "depName": "geerlingguy.docker", "depType": "role", - "lookupName": "geerlingguy.docker", + "packageName": "geerlingguy.docker", }, ] `; @@ -119,14 +119,14 @@ Array [ "datasource": "galaxy", "depName": "geerlingguy.java", "depType": "role", - "lookupName": "geerlingguy.java", + "packageName": "geerlingguy.java", }, Object { "currentValue": "2.9.0", "datasource": "galaxy", "depName": "geerlingguy.docker", "depType": "role", - "lookupName": "geerlingguy.docker", + "packageName": "geerlingguy.docker", }, ] `; @@ -155,14 +155,14 @@ Array [ "datasource": "galaxy", "depName": "yatesr.timezone", "depType": "role", - "lookupName": "yatesr.timezone", + "packageName": "yatesr.timezone", }, Object { "currentValue": "0.1", "datasource": "git-tags", "depName": "mygroup/ansible-base", "depType": "role", - "lookupName": "git@gitlab.company.com:mygroup/ansible-base.git", + "packageName": "git@gitlab.company.com:mygroup/ansible-base.git", }, ] `; @@ -174,84 +174,84 @@ Array [ "datasource": "galaxy", "depName": "yatesr.timezone", "depType": "role", - "lookupName": "yatesr.timezone", + "packageName": "yatesr.timezone", }, Object { "currentValue": "0.19.0", "datasource": "galaxy", "depName": "cloudalchemy.node-exporter", "depType": "role", - "lookupName": "cloudalchemy.node-exporter", + "packageName": "cloudalchemy.node-exporter", }, Object { "currentValue": "master", "datasource": "git-tags", "depName": "nginx_role", "depType": "role", - "lookupName": "https://github.com/bennojoy/nginx", + "packageName": "https://github.com/bennojoy/nginx", }, Object { "currentValue": "v1.4", "datasource": "git-tags", "depName": "willthames/git-ansible-galaxy", "depType": "role", - "lookupName": "http://bitbucket.org/willthames/git-ansible-galaxy", + "packageName": "http://bitbucket.org/willthames/git-ansible-galaxy", }, Object { "currentValue": "0.1", "datasource": "git-tags", "depName": "mygroup/ansible-base", "depType": "role", - "lookupName": "git@gitlab.company.com:mygroup/ansible-base.git", + "packageName": "git@gitlab.company.com:mygroup/ansible-base.git", }, Object { "currentValue": "0.1", "datasource": "git-tags", "depName": "testGroup/testProject", "depType": "role", - "lookupName": "ssh://git@gitlab.company.com/testGroup/testProject.git", + "packageName": "ssh://git@gitlab.company.com/testGroup/testProject.git", }, Object { "currentValue": "0.1", "datasource": "git-tags", "depName": "testGroup/testProject2", "depType": "role", - "lookupName": "ssh://gitlab.company.com/testGroup/testProject2.git", + "packageName": "ssh://gitlab.company.com/testGroup/testProject2.git", }, Object { "currentValue": "3.1", "datasource": "git-tags", "depName": "testGroup/testProject3", "depType": "role", - "lookupName": "ssh://git@gitlab.company.com:23/testGroup/testProject3.git", + "packageName": "ssh://git@gitlab.company.com:23/testGroup/testProject3.git", }, Object { "currentValue": "0.14", "datasource": "git-tags", "depName": "mygroup/ansible-base", "depType": "role", - "lookupName": "git@gitlab.company.com:mygroup/ansible-base.git", + "packageName": "git@gitlab.company.com:mygroup/ansible-base.git", }, Object { "currentValue": "0.14", "datasource": "git-tags", "depName": "mygroup/ansible-base", "depType": "role", - "lookupName": "company.com:mygroup/ansible-base.git", + "packageName": "company.com:mygroup/ansible-base.git", }, Object { "currentValue": "47.11", "datasource": "git-tags", "depName": "org/repo", "depType": "role", - "lookupName": "git://github.com/org/repo.git", + "packageName": "git://github.com/org/repo.git", }, Object { "currentValue": "47.11", "datasource": "git-tags", "depName": "org/re.po", "depType": "role", - "lookupName": "git://github.com/org/re.po.git", + "packageName": "git://github.com/org/re.po.git", }, ] `; diff --git a/lib/modules/manager/ansible-galaxy/collections-metadata.ts b/lib/modules/manager/ansible-galaxy/collections-metadata.ts index e91b21523f74fe..0808afe99d0dbf 100644 --- a/lib/modules/manager/ansible-galaxy/collections-metadata.ts +++ b/lib/modules/manager/ansible-galaxy/collections-metadata.ts @@ -20,7 +20,7 @@ export function extractCollectionsMetaDataFile( const dep: PackageDependency = { depType: 'galaxy-collection', datasource: GalaxyCollectionDatasource.id, - depName: galaxyRegExResult.groups.lookupName, + depName: galaxyRegExResult.groups.packageName, currentValue: galaxyRegExResult.groups.version, }; deps.push(dep); diff --git a/lib/modules/manager/ansible-galaxy/collections.ts b/lib/modules/manager/ansible-galaxy/collections.ts index e3ac4b7b6a1573..e5c729e6ab3e5d 100644 --- a/lib/modules/manager/ansible-galaxy/collections.ts +++ b/lib/modules/manager/ansible-galaxy/collections.ts @@ -65,7 +65,7 @@ function handleGitDep( ); dep.depName = `${nameMatch.groups.hostname}/${massagedDepName}`; // remove leading `git+` from URLs like `git+https://...` - dep.lookupName = source.replace(regEx(/git\+/), ''); + dep.packageName = source.replace(regEx(/git\+/), ''); // if version is declared using version appendix `,v1.2.0`, use it if (nameMatch.groups.version) { diff --git a/lib/modules/manager/ansible-galaxy/roles.ts b/lib/modules/manager/ansible-galaxy/roles.ts index 294bdff8f315e2..39454cfc69d4c1 100644 --- a/lib/modules/manager/ansible-galaxy/roles.ts +++ b/lib/modules/manager/ansible-galaxy/roles.ts @@ -56,15 +56,15 @@ function finalize(dependency: PackageDependency): boolean { dep.datasource = GitTagsDatasource.id; dep.depName = sourceMatch.groups.depName.replace(regEx(/.git$/), ''); // remove leading `git+` from URLs like `git+https://...` - dep.lookupName = source.replace(regEx(/git\+/), ''); + dep.packageName = source.replace(regEx(/git\+/), ''); } else if (galaxyDepRegex.exec(source)) { dep.datasource = GalaxyDatasource.id; dep.depName = dep.managerData.src; - dep.lookupName = dep.managerData.src; + dep.packageName = dep.managerData.src; } else if (galaxyDepRegex.exec(dep.managerData.name)) { dep.datasource = GalaxyDatasource.id; dep.depName = dep.managerData.name; - dep.lookupName = dep.managerData.name; + dep.packageName = dep.managerData.name; } else { dep.skipReason = 'no-source-match'; return false; diff --git a/lib/modules/manager/ansible-galaxy/util.ts b/lib/modules/manager/ansible-galaxy/util.ts index d0fb6b8a220f40..a6e127688ce43d 100644 --- a/lib/modules/manager/ansible-galaxy/util.ts +++ b/lib/modules/manager/ansible-galaxy/util.ts @@ -5,7 +5,7 @@ export const blockLineRegEx = /^\s*((\w+):\s*(.*))$/; export const galaxyDepRegex = /[\w-]+\.[\w-]+/; export const dependencyRegex = /^dependencies:/; export const galaxyRegEx = regEx( - /^\s+(?[\w.]+):\s*["'](?.+)["']\s*/ + /^\s+(?[\w.]+):\s*["'](?.+)["']\s*/ ); export const nameMatchRegex = regEx( /(?((git\+)?(?:(git|ssh|https?):\/\/)?(.*@)?(?[\w.-]+)(?:(:\d+)?\/|:))(?[\w./-]+)(?:\.git)?)(,(?[\w.]*))?/ diff --git a/lib/modules/manager/azure-pipelines/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/azure-pipelines/__snapshots__/extract.spec.ts.snap index 6d12c74daab23c..b6699c5fae3a75 100644 --- a/lib/modules/manager/azure-pipelines/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/azure-pipelines/__snapshots__/extract.spec.ts.snap @@ -21,7 +21,7 @@ Array [ "datasource": "git-tags", "depName": "user/repo", "depType": "gitTags", - "lookupName": "https://github.com/user/repo.git", + "packageName": "https://github.com/user/repo.git", "replaceString": "refs/tags/v0.5.1", }, Object { @@ -53,7 +53,7 @@ Object { "datasource": "git-tags", "depName": "user/repo", "depType": "gitTags", - "lookupName": "https://github.com/user/repo.git", + "packageName": "https://github.com/user/repo.git", "replaceString": "refs/tags/v1.0.0", } `; diff --git a/lib/modules/manager/azure-pipelines/extract.spec.ts b/lib/modules/manager/azure-pipelines/extract.spec.ts index 1114be0aeb264a..d84ebbf0098115 100644 --- a/lib/modules/manager/azure-pipelines/extract.spec.ts +++ b/lib/modules/manager/azure-pipelines/extract.spec.ts @@ -35,7 +35,7 @@ describe('modules/manager/azure-pipelines/extract', () => { }) ).toMatchSnapshot({ depName: 'user/repo', - lookupName: 'https://github.com/user/repo.git', + packageName: 'https://github.com/user/repo.git', }); }); diff --git a/lib/modules/manager/azure-pipelines/extract.ts b/lib/modules/manager/azure-pipelines/extract.ts index 1a11a40e8d66c5..fb146c4b573332 100644 --- a/lib/modules/manager/azure-pipelines/extract.ts +++ b/lib/modules/manager/azure-pipelines/extract.ts @@ -22,7 +22,7 @@ export function extractRepository( datasource: GitTagsDatasource.id, depName: repository.name, depType: 'gitTags', - lookupName: `https://github.com/${repository.name}.git`, + packageName: `https://github.com/${repository.name}.git`, replaceString: repository.ref, }; } diff --git a/lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap index 52a1a1ab0b9b85..6c1d2bc9a1cebd 100644 --- a/lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap @@ -8,7 +8,6 @@ Array [ "datasource": "docker", "depName": "hasura", "depType": "container_pull", - "lookupName": "hasura/graphql-engine", "managerData": Object { "def": "container_pull( name=\\"hasura\\", @@ -19,6 +18,7 @@ Array [ tag=\\"v1.0.0-alpha31.cli-migrations\\" )", }, + "packageName": "hasura/graphql-engine", "registryUrls": Array [ "index.docker.io", ], @@ -34,7 +34,6 @@ Array [ "datasource": "github-tags", "depName": "subpar", "depType": "http_archive", - "lookupName": "google/subpar", "managerData": Object { "def": "http_archive( name = \\"subpar\\", @@ -44,6 +43,7 @@ Array [ urls = [\\"https://github.com/google/subpar/archive/0356bef3fbbabec5f0e196ecfacdeb6db62d48c0.tar.gz\\"], )", }, + "packageName": "google/subpar", "repo": "google/subpar", }, Object { @@ -51,7 +51,6 @@ Array [ "datasource": "github-tags", "depName": "bazel_skylib", "depType": "http_archive", - "lookupName": "bazelbuild/bazel-skylib", "managerData": Object { "def": "http_archive( name = \\"bazel_skylib\\", @@ -60,6 +59,7 @@ Array [ urls = [\\"https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz\\"], )", }, + "packageName": "bazelbuild/bazel-skylib", "repo": "bazelbuild/bazel-skylib", }, ] @@ -72,7 +72,6 @@ Array [ "datasource": "github-tags", "depName": "GBDeviceInfo", "depType": "http_archive", - "lookupName": "lmirosevic/GBDeviceInfo", "managerData": Object { "def": "http_archive( name = \\"GBDeviceInfo\\", @@ -81,6 +80,7 @@ Array [ strip_prefix = \\"GBDeviceInfo-6.3.0/GBDeviceInfo\\" )", }, + "packageName": "lmirosevic/GBDeviceInfo", "repo": "lmirosevic/GBDeviceInfo", }, Object { @@ -88,7 +88,6 @@ Array [ "datasource": "github-tags", "depName": "com_github_nelhage_rules_boost", "depType": "http_archive", - "lookupName": "nelhage/rules_boost", "managerData": Object { "def": "http_archive( name = \\"com_github_nelhage_rules_boost\\", @@ -97,6 +96,7 @@ Array [ strip_prefix = \\"rules_boost-135d46b4c9423ee7d494c78a21ff621bc73c12f3\\", )", }, + "packageName": "nelhage/rules_boost", "repo": "nelhage/rules_boost", }, Object { @@ -104,7 +104,6 @@ Array [ "datasource": "github-tags", "depName": "GBDeviceInfo-zip", "depType": "http_archive", - "lookupName": "lmirosevic/GBDeviceInfo", "managerData": Object { "def": "http_archive( name = \\"GBDeviceInfo-zip\\", @@ -113,6 +112,7 @@ Array [ strip_prefix = \\"GBDeviceInfo-6.3.0/GBDeviceInfo\\" )", }, + "packageName": "lmirosevic/GBDeviceInfo", "repo": "lmirosevic/GBDeviceInfo", }, Object { @@ -120,7 +120,6 @@ Array [ "datasource": "github-tags", "depName": "com_github_nelhage_rules_boost-zip", "depType": "http_archive", - "lookupName": "nelhage/rules_boost", "managerData": Object { "def": "http_archive( name = \\"com_github_nelhage_rules_boost-zip\\", @@ -129,6 +128,7 @@ Array [ strip_prefix = \\"rules_boost-135d46b4c9423ee7d494c78a21ff621bc73c12f3\\", )", }, + "packageName": "nelhage/rules_boost", "repo": "nelhage/rules_boost", }, ] @@ -141,7 +141,6 @@ Array [ "datasource": "go", "depName": "com_github_bitly_go-nsq", "depType": "go_repository", - "lookupName": "github.com/bitly/go-nsq", "managerData": Object { "def": "go_repository( name = \\"com_github_bitly_go-nsq\\", @@ -149,6 +148,7 @@ Array [ tag = \\"v1.0.5\\" )", }, + "packageName": "github.com/bitly/go-nsq", }, Object { "currentDigest": "dec09d789f3dba190787f8b4454c7d3c936fed9e", @@ -158,7 +158,6 @@ Array [ "depName": "com_github_google_uuid", "depType": "go_repository", "digestOneAndOnly": true, - "lookupName": "github.com/google/uuid", "managerData": Object { "def": "go_repository( name = \\"com_github_google_uuid\\", @@ -166,13 +165,13 @@ Array [ commit = \\"dec09d789f3dba190787f8b4454c7d3c936fed9e\\" )", }, + "packageName": "github.com/google/uuid", }, Object { "currentValue": "v2", "datasource": "go", "depName": "com_gopkgin_mgo_v2", "depType": "go_repository", - "lookupName": "gopkg.in/mgo.v2", "managerData": Object { "def": "go_repository( name = \\"com_gopkgin_mgo_v2\\", @@ -180,13 +179,13 @@ Array [ tag = \\"v2\\" )", }, + "packageName": "gopkg.in/mgo.v2", }, Object { "currentValue": "0.3.1", "datasource": "github-releases", "depName": "build_bazel_rules_nodejs", "depType": "git_repository", - "lookupName": "bazelbuild/rules_nodejs", "managerData": Object { "def": "git_repository( name = \\"build_bazel_rules_nodejs\\", @@ -194,13 +193,13 @@ Array [ tag = \\"0.3.1\\", )", }, + "packageName": "bazelbuild/rules_nodejs", }, Object { "currentValue": "0.6.1", "datasource": "github-releases", "depName": "build_bazel_rules_typescript", "depType": "git_repository", - "lookupName": "bazelbuild/rules_typescript", "managerData": Object { "def": "git_repository( name = \\"build_bazel_rules_typescript\\", @@ -208,13 +207,13 @@ Array [ tag = \\"0.6.1\\", )", }, + "packageName": "bazelbuild/rules_typescript", }, Object { "currentDigest": "446923c3756ceeaa75888f52fcbdd48bb314fbf8", "datasource": "github-tags", "depName": "distroless", "depType": "http_archive", - "lookupName": "GoogleContainerTools/distroless", "managerData": Object { "def": "http_archive( name=\\"distroless\\", @@ -223,6 +222,7 @@ Array [ urls=[\\"https://github.com/GoogleContainerTools/distroless/archive/446923c3756ceeaa75888f52fcbdd48bb314fbf8.tar.gz\\"] )", }, + "packageName": "GoogleContainerTools/distroless", "repo": "GoogleContainerTools/distroless", }, Object { @@ -230,7 +230,6 @@ Array [ "datasource": "github-tags", "depName": "bazel_toolchains", "depType": "http_archive", - "lookupName": "bazelbuild/bazel-toolchains", "managerData": Object { "def": "http_archive( name = \\"bazel_toolchains\\", @@ -242,6 +241,7 @@ Array [ ], )", }, + "packageName": "bazelbuild/bazel-toolchains", "repo": "bazelbuild/bazel-toolchains", }, Object { @@ -249,7 +249,6 @@ Array [ "datasource": "github-releases", "depName": "io_bazel_rules_sass", "depType": "git_repository", - "lookupName": "bazelbuild/rules_sass", "managerData": Object { "def": "git_repository( name = \\"io_bazel_rules_sass\\", @@ -257,13 +256,13 @@ Array [ tag = \\"0.0.3\\", )", }, + "packageName": "bazelbuild/rules_sass", }, Object { "currentDigest": "b3b620e8bcff18ed3378cd3f35ebeb7016d71f71", "datasource": "github-releases", "depName": "com_github_bazelbuild_buildtools", "depType": "git_repository", - "lookupName": "bazelbuild/buildtools", "managerData": Object { "def": "git_repository( name = \\"com_github_bazelbuild_buildtools\\", @@ -272,13 +271,13 @@ Array [ commit = \\"b3b620e8bcff18ed3378cd3f35ebeb7016d71f71\\", )", }, + "packageName": "bazelbuild/buildtools", }, Object { "currentValue": "0.7.1", "datasource": "github-releases", "depName": "io_bazel_rules_go", "depType": "http_archive", - "lookupName": "bazelbuild/rules_go", "managerData": Object { "def": "http_archive( name = \\"io_bazel_rules_go\\", @@ -286,6 +285,7 @@ Array [ sha256 = \\"341d5eacef704415386974bc82a1783a8b7ffbff2ab6ba02375e1ca20d9b031c\\", )", }, + "packageName": "bazelbuild/rules_go", "repo": "bazelbuild/rules_go", }, Object { @@ -293,7 +293,6 @@ Array [ "datasource": "github-tags", "depName": "bazel_skylib", "depType": "http_archive", - "lookupName": "bazelbuild/bazel-skylib", "managerData": Object { "def": "http_archive( name = \\"bazel_skylib\\", @@ -305,6 +304,7 @@ Array [ ], )", }, + "packageName": "bazelbuild/bazel-skylib", "repo": "bazelbuild/bazel-skylib", }, Object { @@ -312,7 +312,6 @@ Array [ "datasource": "github-tags", "depName": "distroless", "depType": "http_archive", - "lookupName": "GoogleContainerTools/distroless", "managerData": Object { "def": "http_archive( name=\\"distroless\\", @@ -321,6 +320,7 @@ Array [ urls=[\\"https://github.com/GoogleContainerTools/distroless/archive/446923c3756ceeaa75888f52fcbdd48bb314fbf8.tar.gz\\"] )", }, + "packageName": "GoogleContainerTools/distroless", "repo": "GoogleContainerTools/distroless", }, Object { @@ -329,7 +329,6 @@ Array [ "datasource": "docker", "depName": "py3_image_base", "depType": "container_pull", - "lookupName": "distroless/python3-debian10", "managerData": Object { "def": "container_pull( name = \\"py3_image_base\\", @@ -339,6 +338,7 @@ Array [ tag = \\"latest\\", )", }, + "packageName": "distroless/python3-debian10", "registryUrls": Array [ "gcr.io", ], @@ -349,7 +349,6 @@ Array [ "datasource": "github-tags", "depName": "distroless", "depType": "http_file", - "lookupName": "GoogleContainerTools/distroless", "managerData": Object { "def": "http_file( name=\\"distroless\\", @@ -358,6 +357,7 @@ Array [ urls=[\\"https://github.com/GoogleContainerTools/distroless/archive/446923c3756ceeaa75888f52fcbdd48bb314fbf8.tar.gz\\"] )", }, + "packageName": "GoogleContainerTools/distroless", "repo": "GoogleContainerTools/distroless", }, ] @@ -370,7 +370,6 @@ Array [ "datasource": "github-tags", "depName": "com_github_nelhage_rules_boost", "depType": "http_archive", - "lookupName": "nelhage/rules_boost", "managerData": Object { "def": "http_archive( name = \\"com_github_nelhage_rules_boost\\", @@ -379,6 +378,7 @@ Array [ strip_prefix = \\"rules_boost-98495a618246683c9058dd87c2c78a2c06087999\\", )", }, + "packageName": "nelhage/rules_boost", "repo": "nelhage/rules_boost", }, ] diff --git a/lib/modules/manager/bazel/extract.spec.ts b/lib/modules/manager/bazel/extract.spec.ts index de86c94f666b3b..9f685e3be992cd 100644 --- a/lib/modules/manager/bazel/extract.spec.ts +++ b/lib/modules/manager/bazel/extract.spec.ts @@ -19,26 +19,28 @@ describe('modules/manager/bazel/extract', () => { it('extracts github tags', () => { const res = extractPackageFile(Fixtures.get('WORKSPACE2')); expect(res.deps).toMatchSnapshot([ - { lookupName: 'lmirosevic/GBDeviceInfo' }, - { lookupName: 'nelhage/rules_boost' }, - { lookupName: 'lmirosevic/GBDeviceInfo' }, - { lookupName: 'nelhage/rules_boost' }, + { packageName: 'lmirosevic/GBDeviceInfo' }, + { packageName: 'nelhage/rules_boost' }, + { packageName: 'lmirosevic/GBDeviceInfo' }, + { packageName: 'nelhage/rules_boost' }, ]); }); it('handle comments and strings', () => { const res = extractPackageFile(Fixtures.get('WORKSPACE3')); - expect(res.deps).toMatchSnapshot([{ lookupName: 'nelhage/rules_boost' }]); + expect(res.deps).toMatchSnapshot([ + { packageName: 'nelhage/rules_boost' }, + ]); }); it('extracts dependencies from *.bzl files', () => { const res = extractPackageFile(Fixtures.get('repositories.bzl')); expect(res.deps).toMatchSnapshot([ { currentDigest: '0356bef3fbbabec5f0e196ecfacdeb6db62d48c0', - lookupName: 'google/subpar', + packageName: 'google/subpar', }, { currentValue: '0.6.0', - lookupName: 'bazelbuild/bazel-skylib', + packageName: 'bazelbuild/bazel-skylib', }, ]); }); @@ -61,7 +63,7 @@ describe('modules/manager/bazel/extract', () => { 'sha256:a4e8d8c444ca04fe706649e82263c9f4c2a4229bc30d2a64561b5e1d20cc8548', currentValue: 'v1.0.0-alpha31.cli-migrations', depType: 'container_pull', - lookupName: 'hasura/graphql-engine', + packageName: 'hasura/graphql-engine', registryUrls: ['index.docker.io'], }, ]); @@ -79,7 +81,9 @@ go_repository( ` ); expect(successStory.deps[0].datasource).toBe('go'); - expect(successStory.deps[0].lookupName).toBe('github.com/test/uuid-fork'); + expect(successStory.deps[0].packageName).toBe( + 'github.com/test/uuid-fork' + ); const badStory = extractPackageFile( ` diff --git a/lib/modules/manager/bazel/extract.ts b/lib/modules/manager/bazel/extract.ts index 2ece66951f8c2d..6ef1c4e0175f08 100644 --- a/lib/modules/manager/bazel/extract.ts +++ b/lib/modules/manager/bazel/extract.ts @@ -242,7 +242,7 @@ export function extractPackageFile( if (githubURL) { const repo = githubURL.substring('https://github.com/'.length); dep.datasource = GithubReleasesDatasource.id; - dep.lookupName = repo; + dep.packageName = repo; deps.push(dep); } } else if ( @@ -254,13 +254,13 @@ export function extractPackageFile( dep.depName = depName; dep.currentValue = currentValue || commit.substr(0, 7); dep.datasource = GoDatasource.id; - dep.lookupName = importpath; + dep.packageName = importpath; if (remote) { const remoteMatch = regEx( /https:\/\/github\.com(?:.*\/)(([a-zA-Z]+)([-])?([a-zA-Z]+))/ ).exec(remote); if (remoteMatch && remoteMatch[0].length === remote.length) { - dep.lookupName = remote.replace('https://', ''); + dep.packageName = remote.replace('https://', ''); } else { dep.skipReason = 'unsupported-remote'; } @@ -287,7 +287,7 @@ export function extractPackageFile( dep.currentValue = parsedUrl.currentValue; } dep.datasource = parsedUrl.datasource; - dep.lookupName = dep.repo; + dep.packageName = dep.repo; deps.push(dep); } else if ( depType === 'container_pull' && @@ -301,7 +301,7 @@ export function extractPackageFile( dep.depName = depName; dep.versioning = dockerVersioning.id; dep.datasource = DockerDatasource.id; - dep.lookupName = repository; + dep.packageName = repository; dep.registryUrls = [registry]; deps.push(dep); } else { diff --git a/lib/modules/manager/buildkite/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/buildkite/__snapshots__/extract.spec.ts.snap index 9c4c92af18f7c2..96c3b1fe68e78f 100644 --- a/lib/modules/manager/buildkite/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/buildkite/__snapshots__/extract.spec.ts.snap @@ -21,28 +21,28 @@ Array [ "currentValue": "v2.0.1", "datasource": "github-tags", "depName": "docker-login", - "lookupName": "buildkite-plugins/docker-login-buildkite-plugin", + "packageName": "buildkite-plugins/docker-login-buildkite-plugin", "skipReason": undefined, }, Object { "currentValue": "v2.5.1", "datasource": "github-tags", "depName": "docker-compose", - "lookupName": "buildkite-plugins/docker-compose-buildkite-plugin", + "packageName": "buildkite-plugins/docker-compose-buildkite-plugin", "skipReason": undefined, }, Object { "currentValue": "v2.0.1", "datasource": "github-tags", "depName": "docker-login", - "lookupName": "buildkite-plugins/docker-login-buildkite-plugin", + "packageName": "buildkite-plugins/docker-login-buildkite-plugin", "skipReason": undefined, }, Object { "currentValue": "v2.5.1", "datasource": "github-tags", "depName": "docker-compose", - "lookupName": "buildkite-plugins/docker-compose-buildkite-plugin", + "packageName": "buildkite-plugins/docker-compose-buildkite-plugin", "skipReason": undefined, }, ] @@ -75,14 +75,14 @@ Array [ "currentValue": "v1.3.2", "datasource": "github-tags", "depName": "docker-compose", - "lookupName": "buildkite-plugins/docker-compose-buildkite-plugin", + "packageName": "buildkite-plugins/docker-compose-buildkite-plugin", "skipReason": undefined, }, Object { "currentValue": "v1.3.2", "datasource": "github-tags", "depName": "docker-compose", - "lookupName": "buildkite-plugins/docker-compose-buildkite-plugin", + "packageName": "buildkite-plugins/docker-compose-buildkite-plugin", "skipReason": undefined, }, ] @@ -94,7 +94,7 @@ Array [ "currentValue": "v2.0.0", "datasource": "github-tags", "depName": "abc/detect-clowns", - "lookupName": "abc/detect-clowns-buildkite-plugin", + "packageName": "abc/detect-clowns-buildkite-plugin", "skipReason": undefined, }, ] diff --git a/lib/modules/manager/buildkite/extract.ts b/lib/modules/manager/buildkite/extract.ts index 46f76ebf0e83d1..5e3d7ec14f356b 100644 --- a/lib/modules/manager/buildkite/extract.ts +++ b/lib/modules/manager/buildkite/extract.ts @@ -79,7 +79,7 @@ export function extractPackageFile(content: string): PackageFile | null { }; if (repo) { dep.datasource = GithubTagsDatasource.id; - dep.lookupName = repo; + dep.packageName = repo; } deps.push(dep); } diff --git a/lib/modules/manager/cargo/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/cargo/__snapshots__/artifacts.spec.ts.snap index a1c864517d816c..0050250b9204a8 100644 --- a/lib/modules/manager/cargo/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/cargo/__snapshots__/artifacts.spec.ts.snap @@ -127,7 +127,7 @@ Array [ ] `; -exports[`modules/manager/cargo/artifacts updates Cargo.lock based on the lookupName, when given 1`] = ` +exports[`modules/manager/cargo/artifacts updates Cargo.lock based on the packageName, when given 1`] = ` Array [ Object { "cmd": "cargo update --manifest-path Cargo.toml --workspace", diff --git a/lib/modules/manager/cargo/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/cargo/__snapshots__/extract.spec.ts.snap index 13bbde27d34168..200a1d195580ea 100644 --- a/lib/modules/manager/cargo/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/cargo/__snapshots__/extract.spec.ts.snap @@ -398,10 +398,10 @@ Array [ "datasource": "crate", "depName": "boolector-solver", "depType": "dependencies", - "lookupName": "boolector", "managerData": Object { "nestedVersion": true, }, + "packageName": "boolector", }, ] `; diff --git a/lib/modules/manager/cargo/artifacts.spec.ts b/lib/modules/manager/cargo/artifacts.spec.ts index c2e522317fd9f1..97777ca6a82540 100644 --- a/lib/modules/manager/cargo/artifacts.spec.ts +++ b/lib/modules/manager/cargo/artifacts.spec.ts @@ -108,7 +108,7 @@ describe('modules/manager/cargo/artifacts', () => { expect(execSnapshots).toMatchSnapshot(); }); - it('updates Cargo.lock based on the lookupName, when given', async () => { + it('updates Cargo.lock based on the packageName, when given', async () => { fs.stat.mockResolvedValueOnce({ name: 'Cargo.lock' } as any); git.getFile.mockResolvedValueOnce('Old Cargo.lock'); const execSnapshots = mockExecAll(exec); @@ -117,7 +117,7 @@ describe('modules/manager/cargo/artifacts', () => { const updatedDeps = [ { depName: 'renamedDep1', - lookupName: 'dep1', + packageName: 'dep1', }, ]; expect( diff --git a/lib/modules/manager/cargo/extract.spec.ts b/lib/modules/manager/cargo/extract.spec.ts index 9f690739624b06..42723d2ccba6d8 100644 --- a/lib/modules/manager/cargo/extract.spec.ts +++ b/lib/modules/manager/cargo/extract.spec.ts @@ -131,7 +131,7 @@ describe('modules/manager/cargo/extract', () => { expect(res.deps).toMatchSnapshot(); expect(res.deps).toHaveLength(1); - expect(res.deps[0].lookupName).toBe('boolector'); + expect(res.deps[0].packageName).toBe('boolector'); }); }); }); diff --git a/lib/modules/manager/cargo/extract.ts b/lib/modules/manager/cargo/extract.ts index f3d0b1e5f89d9f..5839e5f37b3484 100644 --- a/lib/modules/manager/cargo/extract.ts +++ b/lib/modules/manager/cargo/extract.ts @@ -27,7 +27,7 @@ function extractFromSection( let currentValue = sectionContent[depName]; let nestedVersion = false; let registryUrls: string[] | undefined; - let lookupName: string | undefined; + let packageName: string | undefined; if (typeof currentValue !== 'string') { const version = currentValue.version; @@ -35,7 +35,7 @@ function extractFromSection( const git = currentValue.git; const registryName = currentValue.registry; - lookupName = currentValue.package; + packageName = currentValue.package; if (version) { currentValue = version; @@ -81,8 +81,8 @@ function extractFromSection( if (target) { dep.target = target; } - if (lookupName) { - dep.lookupName = lookupName; + if (packageName) { + dep.packageName = packageName; } deps.push(dep); }); diff --git a/lib/modules/manager/cdnurl/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/cdnurl/__snapshots__/extract.spec.ts.snap index 7b940e9d7a7b8a..80a8630c7bde9f 100644 --- a/lib/modules/manager/cdnurl/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/cdnurl/__snapshots__/extract.spec.ts.snap @@ -7,61 +7,61 @@ Object { "currentValue": "15.6.1", "datasource": "cdnjs", "depName": "prop-types", - "lookupName": "prop-types/prop-types.min.js", + "packageName": "prop-types/prop-types.min.js", }, Object { "currentValue": "16.3.2", "datasource": "cdnjs", "depName": "react", - "lookupName": "react/umd/react.production.min.js", + "packageName": "react/umd/react.production.min.js", }, Object { "currentValue": "16.3.2", "datasource": "cdnjs", "depName": "react-dom", - "lookupName": "react-dom/umd/react-dom.production.min.js", + "packageName": "react-dom/umd/react-dom.production.min.js", }, Object { "currentValue": "2.2.1", "datasource": "cdnjs", "depName": "react-transition-group", - "lookupName": "react-transition-group/react-transition-group.min.js", + "packageName": "react-transition-group/react-transition-group.min.js", }, Object { "currentValue": "1.14.3", "datasource": "cdnjs", "depName": "popper.js", - "lookupName": "popper.js/umd/popper.min.js", + "packageName": "popper.js/umd/popper.min.js", }, Object { "currentValue": "0.10.4", "datasource": "cdnjs", "depName": "react-popper", - "lookupName": "react-popper/umd/react-popper.min.js", + "packageName": "react-popper/umd/react-popper.min.js", }, Object { "currentValue": "7.1.0", "datasource": "cdnjs", "depName": "reactstrap", - "lookupName": "reactstrap/reactstrap.min.js", + "packageName": "reactstrap/reactstrap.min.js", }, Object { "currentValue": "4.3.1", "datasource": "cdnjs", "depName": "react-router", - "lookupName": "react-router/react-router.min.js", + "packageName": "react-router/react-router.min.js", }, Object { "currentValue": "4.0.6", "datasource": "cdnjs", "depName": "react-markdown", - "lookupName": "react-markdown/react-markdown.js", + "packageName": "react-markdown/react-markdown.js", }, Object { "currentValue": "0.18.0", "datasource": "cdnjs", "depName": "axios", - "lookupName": "axios/axios.min.js", + "packageName": "axios/axios.min.js", }, ], } diff --git a/lib/modules/manager/cdnurl/extract.spec.ts b/lib/modules/manager/cdnurl/extract.spec.ts index e6d69dada12bc7..c2b27b3fc34b63 100644 --- a/lib/modules/manager/cdnurl/extract.spec.ts +++ b/lib/modules/manager/cdnurl/extract.spec.ts @@ -8,7 +8,7 @@ describe('modules/manager/cdnurl/extract', () => { { depName: 'prop-types', currentValue: '15.6.1', - lookupName: 'prop-types/prop-types.min.js', + packageName: 'prop-types/prop-types.min.js', }, { depName: 'react', currentValue: '16.3.2' }, { depName: 'react-dom', currentValue: '16.3.2' }, diff --git a/lib/modules/manager/cdnurl/extract.ts b/lib/modules/manager/cdnurl/extract.ts index 7c787a35788fd5..0bfb2b9cf58f13 100644 --- a/lib/modules/manager/cdnurl/extract.ts +++ b/lib/modules/manager/cdnurl/extract.ts @@ -22,7 +22,7 @@ export function extractPackageFile(content: string): PackageFile { deps.push({ datasource: CdnJsDatasource.id, depName, - lookupName: `${depName}/${asset}`, + packageName: `${depName}/${asset}`, currentValue, }); } diff --git a/lib/modules/manager/circleci/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/circleci/__snapshots__/extract.spec.ts.snap index a8640c3a57392f..104447312676c3 100644 --- a/lib/modules/manager/circleci/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/circleci/__snapshots__/extract.spec.ts.snap @@ -68,7 +68,7 @@ Array [ "datasource": "orb", "depName": "release-workflows", "depType": "orb", - "lookupName": "hutson/library-release-workflows", + "packageName": "hutson/library-release-workflows", "rangeStrategy": "pin", "versioning": "npm", }, @@ -78,7 +78,7 @@ Array [ "datasource": "orb", "depName": "no-version", "depType": "orb", - "lookupName": "abc/def", + "packageName": "abc/def", "rangeStrategy": "pin", "versioning": "npm", }, @@ -88,7 +88,7 @@ Array [ "datasource": "orb", "depName": "volatile", "depType": "orb", - "lookupName": "zzz/zzz", + "packageName": "zzz/zzz", "rangeStrategy": "pin", "versioning": "npm", }, diff --git a/lib/modules/manager/circleci/extract.ts b/lib/modules/manager/circleci/extract.ts index a7c6594a8a290e..f3e85dd84406a6 100644 --- a/lib/modules/manager/circleci/extract.ts +++ b/lib/modules/manager/circleci/extract.ts @@ -38,7 +38,7 @@ export function extractPackageFile(content: string): PackageFile | null { depName, currentValue, datasource: OrbDatasource.id, - lookupName: orbName, + packageName: orbName, commitMessageTopic: '{{{depName}}} orb', versioning: npmVersioning.id, rangeStrategy: 'pin', diff --git a/lib/modules/manager/cocoapods/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/cocoapods/__snapshots__/extract.spec.ts.snap index c59556ed1625bd..980635d0c05aa2 100644 --- a/lib/modules/manager/cocoapods/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/cocoapods/__snapshots__/extract.spec.ts.snap @@ -380,64 +380,64 @@ Array [ "currentValue": "3.2.1", "datasource": "git-tags", "depName": "g", - "lookupName": "g.git", "managerData": Object { "lineNumber": 9, }, + "packageName": "g.git", }, Object { "currentValue": "0.0.1", "datasource": "github-tags", "depName": "h", - "lookupName": "foo/foo", "managerData": Object { "lineNumber": 10, }, + "packageName": "foo/foo", }, Object { "currentValue": "0.0.1", "datasource": "github-tags", "depName": "i", - "lookupName": "foo/foo", "managerData": Object { "lineNumber": 11, }, + "packageName": "foo/foo", }, Object { "currentValue": "0.1.0", "datasource": "gitlab-tags", "depName": "j", - "lookupName": "bar/bar", "managerData": Object { "lineNumber": 12, }, + "packageName": "bar/bar", }, Object { "currentValue": "0.1.0", "datasource": "gitlab-tags", "depName": "k", - "lookupName": "bar/bar", "managerData": Object { "lineNumber": 13, }, + "packageName": "bar/bar", }, Object { "currentValue": "1.0.0", "datasource": "git-tags", "depName": "l", - "lookupName": "https://example.com/baz/baz.git", "managerData": Object { "lineNumber": 14, }, + "packageName": "https://example.com/baz/baz.git", }, Object { "currentValue": "1.0.0", "datasource": "git-tags", "depName": "m", - "lookupName": "git@example.com:baz/baz.git", "managerData": Object { "lineNumber": 15, }, + "packageName": "git@example.com:baz/baz.git", }, ] `; diff --git a/lib/modules/manager/cocoapods/extract.spec.ts b/lib/modules/manager/cocoapods/extract.spec.ts index 0186bd2677c9c9..c420a14d3ff0ea 100644 --- a/lib/modules/manager/cocoapods/extract.spec.ts +++ b/lib/modules/manager/cocoapods/extract.spec.ts @@ -23,17 +23,17 @@ describe('modules/manager/cocoapods/extract', () => { { depName: 'f', skipReason: 'git-dependency' }, { depName: 'g', datasource: 'git-tags', currentValue: '3.2.1' }, { depName: 'h', currentValue: '0.0.1', datasource: 'github-tags' }, - { depName: 'i', lookupName: 'foo/foo', datasource: 'github-tags' }, - { depName: 'j', lookupName: 'bar/bar', datasource: 'gitlab-tags' }, - { depName: 'k', lookupName: 'bar/bar', datasource: 'gitlab-tags' }, + { depName: 'i', packageName: 'foo/foo', datasource: 'github-tags' }, + { depName: 'j', packageName: 'bar/bar', datasource: 'gitlab-tags' }, + { depName: 'k', packageName: 'bar/bar', datasource: 'gitlab-tags' }, { depName: 'l', - lookupName: 'https://example.com/baz/baz.git', + packageName: 'https://example.com/baz/baz.git', datasource: 'git-tags', }, { depName: 'm', - lookupName: 'git@example.com:baz/baz.git', + packageName: 'git@example.com:baz/baz.git', datasource: 'git-tags', }, ]); diff --git a/lib/modules/manager/cocoapods/extract.ts b/lib/modules/manager/cocoapods/extract.ts index 96f843a9408d52..eed1fb52ba8776 100644 --- a/lib/modules/manager/cocoapods/extract.ts +++ b/lib/modules/manager/cocoapods/extract.ts @@ -66,7 +66,7 @@ export function gitDep(parsedLine: ParsedLine): PackageDependency | null { return { datasource, depName, - lookupName: `${account}/${repo.replace(regEx(/\.git$/), '')}`, + packageName: `${account}/${repo.replace(regEx(/\.git$/), '')}`, currentValue: tag, }; } @@ -75,7 +75,7 @@ export function gitDep(parsedLine: ParsedLine): PackageDependency | null { return { datasource: GitTagsDatasource.id, depName, - lookupName: git, + packageName: git, currentValue: tag, }; } diff --git a/lib/modules/manager/composer/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/composer/__snapshots__/extract.spec.ts.snap index 5281f7d81b84ad..8ad45a7713e183 100644 --- a/lib/modules/manager/composer/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/composer/__snapshots__/extract.spec.ts.snap @@ -510,7 +510,7 @@ Object { "depName": "awesome/vcs", "depType": "require", "lockedVersion": "1.1.0", - "lookupName": "https://my-vcs.example/my-vcs-repo", + "packageName": "https://my-vcs.example/my-vcs-repo", }, Object { "currentValue": ">=7.0.2", @@ -518,7 +518,7 @@ Object { "depName": "awesome/git", "depType": "require", "lockedVersion": "1.2.0", - "lookupName": "git@my-git.example:my-git-repo", + "packageName": "git@my-git.example:my-git-repo", }, ], "lockFiles": Array [ @@ -585,14 +585,14 @@ Object { "datasource": "git-tags", "depName": "awesome/vcs", "depType": "require", - "lookupName": "https://my-vcs.example/my-vcs-repo", + "packageName": "https://my-vcs.example/my-vcs-repo", }, Object { "currentValue": ">=7.0.2", "datasource": "git-tags", "depName": "awesome/git", "depType": "require", - "lookupName": "https://my-git.example/my-git-repo", + "packageName": "https://my-git.example/my-git-repo", }, ], "registryUrls": Array [ diff --git a/lib/modules/manager/composer/extract.ts b/lib/modules/manager/composer/extract.ts index 2906cb9665544c..e39a83b169ce33 100644 --- a/lib/modules/manager/composer/extract.ts +++ b/lib/modules/manager/composer/extract.ts @@ -123,9 +123,9 @@ export async function extractPackageFile( composerJson[depType] as Record )) { const currentValue = version.trim(); - // Default datasource and lookupName + // Default datasource and packageName let datasource = PackagistDatasource.id; - let lookupName = depName; + let packageName = depName; // Check custom repositories by type if (repositories[depName]) { @@ -133,7 +133,7 @@ export async function extractPackageFile( case 'vcs': case 'git': datasource = GitTagsDatasource.id; - lookupName = repositories[depName].url; + packageName = repositories[depName].url; break; } } @@ -143,8 +143,8 @@ export async function extractPackageFile( currentValue, datasource, }; - if (depName !== lookupName) { - dep.lookupName = lookupName; + if (depName !== packageName) { + dep.packageName = packageName; } if (!depName.includes('/')) { dep.skipReason = 'unsupported'; diff --git a/lib/modules/manager/conan/extract.spec.ts b/lib/modules/manager/conan/extract.spec.ts index 81d74b0518f143..b24ae08cf51412 100644 --- a/lib/modules/manager/conan/extract.spec.ts +++ b/lib/modules/manager/conan/extract.spec.ts @@ -17,35 +17,35 @@ describe('modules/manager/conan/extract', () => { currentValue: '1.9.4', depName: 'poco', depType: 'requires', - lookupName: 'poco/1.9.4@_/_', + packageName: 'poco/1.9.4@_/_', replaceString: 'poco/1.9.4', }, { currentValue: '[~1.2.3, loose=False]', depName: 'zlib', depType: 'requires', - lookupName: 'zlib/[~1.2.3, loose=False]@_/_', + packageName: 'zlib/[~1.2.3, loose=False]@_/_', replaceString: 'zlib/[~1.2.3, loose=False]', }, { currentValue: '8.62.134', depName: 'fake', depType: 'requires', - lookupName: 'fake/8.62.134@test/dev', + packageName: 'fake/8.62.134@test/dev', replaceString: 'fake/8.62.134@test/dev', }, { currentValue: '[>1.1 <2.1, include_prerelease=True]', depName: '7zip', depType: 'build_requires', - lookupName: '7zip/[>1.1 <2.1, include_prerelease=True]@_/_', + packageName: '7zip/[>1.1 <2.1, include_prerelease=True]@_/_', replaceString: '7zip/[>1.1 <2.1, include_prerelease=True]', }, { currentValue: '[~1.2.3, loose=False, include_prerelease=True]', depName: 'curl', depType: 'build_requires', - lookupName: + packageName: 'curl/[~1.2.3, loose=False, include_prerelease=True]@test/dev', replaceString: 'curl/[~1.2.3, loose=False, include_prerelease=True]@test/dev', @@ -54,35 +54,35 @@ describe('modules/manager/conan/extract', () => { currentValue: '[>1.1 <2.1]', depName: 'boost', depType: 'build_requires', - lookupName: 'boost/[>1.1 <2.1]@_/_', + packageName: 'boost/[>1.1 <2.1]@_/_', replaceString: 'boost/[>1.1 <2.1]', }, { currentValue: '[2.8]', depName: 'catch2', depType: 'build_requires', - lookupName: 'catch2/[2.8]@_/_', + packageName: 'catch2/[2.8]@_/_', replaceString: 'catch2/[2.8]', }, { currentValue: '[~=3.0]', depName: 'openssl', depType: 'build_requires', - lookupName: 'openssl/[~=3.0]@test/prod', + packageName: 'openssl/[~=3.0]@test/prod', replaceString: 'openssl/[~=3.0]@test/prod', }, { currentValue: '[>1.1 || 0.8]', depName: 'cmake', depType: 'build_requires', - lookupName: 'cmake/[>1.1 || 0.8]@_/_', + packageName: 'cmake/[>1.1 || 0.8]@_/_', replaceString: 'cmake/[>1.1 || 0.8]', }, { currentValue: '[1.2.7 || >=1.2.9 <2.0.0]', depName: 'cryptopp', depType: 'build_requires', - lookupName: 'cryptopp/[1.2.7 || >=1.2.9 <2.0.0]@test/local', + packageName: 'cryptopp/[1.2.7 || >=1.2.9 <2.0.0]@test/local', replaceString: 'cryptopp/[1.2.7 || >=1.2.9 <2.0.0]@test/local', }, ]); @@ -98,112 +98,112 @@ describe('modules/manager/conan/extract', () => { currentValue: '0.1', depName: 'pyreq', depType: 'python_requires', - lookupName: 'pyreq/0.1@user/channel', + packageName: 'pyreq/0.1@user/channel', replaceString: 'pyreq/0.1@user/channel', }, { currentValue: '0.2', depName: 'tool_a', depType: 'build_requires', - lookupName: 'tool_a/0.2@user/testing', + packageName: 'tool_a/0.2@user/testing', replaceString: 'tool_a/0.2@user/testing', }, { currentValue: '0.2', depName: 'tool_b', depType: 'build_requires', - lookupName: 'tool_b/0.2@user/testing', + packageName: 'tool_b/0.2@user/testing', replaceString: 'tool_b/0.2@user/testing', }, { currentValue: '1.0', depName: 'req_a', depType: 'requires', - lookupName: 'req_a/1.0@_/_', + packageName: 'req_a/1.0@_/_', replaceString: 'req_a/1.0', }, { currentValue: '2.1', depName: 'req_l', depType: 'requires', - lookupName: 'req_l/2.1@otheruser/testing', + packageName: 'req_l/2.1@otheruser/testing', replaceString: 'req_l/2.1@otheruser/testing', }, { currentValue: '0.1', depName: 'req_b', depType: 'requires', - lookupName: 'req_b/0.1@user/testing', + packageName: 'req_b/0.1@user/testing', replaceString: 'req_b/0.1@user/testing', }, { currentValue: '0.2', depName: 'req_d', depType: 'requires', - lookupName: 'req_d/0.2@dummy/stable', + packageName: 'req_d/0.2@dummy/stable', replaceString: 'req_d/0.2@dummy/stable', }, { currentValue: '2.1', depName: 'req_e', depType: 'requires', - lookupName: 'req_e/2.1@coder/beta', + packageName: 'req_e/2.1@coder/beta', replaceString: 'req_e/2.1@coder/beta', }, { currentValue: '1.0', depName: 'req_c', depType: 'requires', - lookupName: 'req_c/1.0@user/stable', + packageName: 'req_c/1.0@user/stable', replaceString: 'req_c/1.0@user/stable', }, { currentValue: '1.0', depName: 'req_f', depType: 'requires', - lookupName: 'req_f/1.0@user/stable', + packageName: 'req_f/1.0@user/stable', replaceString: 'req_f/1.0@user/stable', }, { currentValue: '3.0', depName: 'req_h', depType: 'requires', - lookupName: 'req_h/3.0@other/beta', + packageName: 'req_h/3.0@other/beta', replaceString: 'req_h/3.0@other/beta', }, { currentValue: '[>1.0 <1.8]', depName: 'req_g', depType: 'requires', - lookupName: 'req_g/[>1.0 <1.8]@user/stable', + packageName: 'req_g/[>1.0 <1.8]@user/stable', replaceString: 'req_g/[>1.0 <1.8]@user/stable', }, { currentValue: '1.2', depName: 'req_i', depType: 'requires', - lookupName: 'req_i/1.2@drl/testing', + packageName: 'req_i/1.2@drl/testing', replaceString: 'req_i/1.2@drl/testing', }, { currentValue: '2.2', depName: 'req_i', depType: 'requires', - lookupName: 'req_i/2.2@drl/stable', + packageName: 'req_i/2.2@drl/stable', replaceString: 'req_i/2.2@drl/stable', }, { currentValue: '1.2', depName: 'req_k', depType: 'requires', - lookupName: 'req_k/1.2@drl/testing', + packageName: 'req_k/1.2@drl/testing', replaceString: 'req_k/1.2@drl/testing', }, { currentValue: '0.1', depName: 'tool_win', depType: 'build_requires', - lookupName: 'tool_win/0.1@user/stable', + packageName: 'tool_win/0.1@user/stable', replaceString: 'tool_win/0.1@user/stable', }, ]); diff --git a/lib/modules/manager/conan/extract.ts b/lib/modules/manager/conan/extract.ts index 47462326076d53..40c178dec007e4 100644 --- a/lib/modules/manager/conan/extract.ts +++ b/lib/modules/manager/conan/extract.ts @@ -54,12 +54,12 @@ export function extractPackageFile(content: string): PackageFile | null { userAndChannel = matches.groups.userChannel; replaceString = `${depName}/${currentValue}${userAndChannel}`; } - const lookupName = `${depName}/${currentValue}${userAndChannel}`; + const packageName = `${depName}/${currentValue}${userAndChannel}`; dep = { ...dep, depName, - lookupName, + packageName, currentValue, replaceString, depType, diff --git a/lib/modules/manager/dockerfile/extract.spec.ts b/lib/modules/manager/dockerfile/extract.spec.ts index ae649171b52611..37a6514ee44793 100644 --- a/lib/modules/manager/dockerfile/extract.spec.ts +++ b/lib/modules/manager/dockerfile/extract.spec.ts @@ -219,13 +219,13 @@ describe('modules/manager/dockerfile/extract', () => { const res = extractPackageFile('FROM quay.io:1234/node\n').deps; expect(res[0]).toMatchInlineSnapshot(` Object { - "autoReplaceStringTemplate": "{{lookupName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}", + "autoReplaceStringTemplate": "{{packageName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}", "currentDigest": undefined, "currentValue": undefined, "datasource": "docker", "depName": "quay.io/node", "depType": "final", - "lookupName": "quay.io:1234/node", + "packageName": "quay.io:1234/node", "replaceString": "quay.io:1234/node", } `); @@ -599,13 +599,13 @@ describe('modules/manager/dockerfile/extract', () => { expect(res).toMatchInlineSnapshot(` Array [ Object { - "autoReplaceStringTemplate": "{{lookupName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}", + "autoReplaceStringTemplate": "{{packageName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}", "currentDigest": undefined, "currentValue": "18.04", "datasource": "docker", "depName": "ubuntu", "depType": "final", - "lookupName": "amd64/ubuntu", + "packageName": "amd64/ubuntu", "replaceString": "amd64/ubuntu:18.04", "versioning": "ubuntu", }, diff --git a/lib/modules/manager/dockerfile/extract.ts b/lib/modules/manager/dockerfile/extract.ts index 998f1e714a35dc..d5ef6480e74db4 100644 --- a/lib/modules/manager/dockerfile/extract.ts +++ b/lib/modules/manager/dockerfile/extract.ts @@ -126,11 +126,11 @@ export function getDep( const specialPrefixes = ['amd64', 'arm64', 'library']; for (const prefix of specialPrefixes) { if (dep.depName.startsWith(`${prefix}/`)) { - dep.lookupName = dep.depName; + dep.packageName = dep.depName; dep.depName = dep.depName.replace(`${prefix}/`, ''); if (specifyReplaceString) { dep.autoReplaceStringTemplate = - '{{lookupName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}'; + '{{packageName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}'; } } } @@ -144,10 +144,10 @@ export function getDep( if (quayRegex.test(dep.depName)) { const depName = dep.depName.replace(quayRegex, 'quay.io'); if (depName !== dep.depName) { - dep.lookupName = dep.depName; + dep.packageName = dep.depName; dep.depName = depName; dep.autoReplaceStringTemplate = - '{{lookupName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}'; + '{{packageName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}'; } } diff --git a/lib/modules/manager/droneci/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/droneci/__snapshots__/extract.spec.ts.snap index bdef36286bc3b6..91019979b1d809 100644 --- a/lib/modules/manager/droneci/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/droneci/__snapshots__/extract.spec.ts.snap @@ -12,13 +12,13 @@ Array [ "replaceString": "elixir:1.8.1-alpine", }, Object { - "autoReplaceStringTemplate": "{{lookupName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}", + "autoReplaceStringTemplate": "{{packageName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}", "currentDigest": "sha256:36adc17e9cceab32179d3314da9cb9c737ffb11f0de4e688f407ad6d9ca32201", "currentValue": "10.0.0", "datasource": "docker", "depName": "node", "depType": "docker", - "lookupName": "amd64/node", + "packageName": "amd64/node", "replaceString": "amd64/node:10.0.0@sha256:36adc17e9cceab32179d3314da9cb9c737ffb11f0de4e688f407ad6d9ca32201", }, Object { diff --git a/lib/modules/manager/fvm/extract.spec.ts b/lib/modules/manager/fvm/extract.spec.ts index d72c63c5c1c374..4565acc4474ffc 100644 --- a/lib/modules/manager/fvm/extract.spec.ts +++ b/lib/modules/manager/fvm/extract.spec.ts @@ -30,7 +30,7 @@ describe('modules/manager/fvm/extract', () => { currentValue: '2.10.1', datasource: 'github-tags', depName: 'flutter', - lookupName: 'flutter/flutter', + packageName: 'flutter/flutter', }, ]); }); @@ -44,7 +44,7 @@ describe('modules/manager/fvm/extract', () => { currentValue: 'stable', datasource: 'github-tags', depName: 'flutter', - lookupName: 'flutter/flutter', + packageName: 'flutter/flutter', }, ]); }); diff --git a/lib/modules/manager/fvm/extract.ts b/lib/modules/manager/fvm/extract.ts index 0dac5fd8533a3b..c945e57ad4b08c 100644 --- a/lib/modules/manager/fvm/extract.ts +++ b/lib/modules/manager/fvm/extract.ts @@ -34,7 +34,7 @@ export function extractPackageFile( depName: 'flutter', currentValue: fvmConfig.flutterSdkVersion, datasource: GithubTagsDatasource.id, - lookupName: 'flutter/flutter', + packageName: 'flutter/flutter', }; return { deps: [dep] }; } diff --git a/lib/modules/manager/git-submodules/extract.spec.ts b/lib/modules/manager/git-submodules/extract.spec.ts index 64a9c734ba8d87..f105bf257fd915 100644 --- a/lib/modules/manager/git-submodules/extract.spec.ts +++ b/lib/modules/manager/git-submodules/extract.spec.ts @@ -57,7 +57,7 @@ describe('modules/manager/git-submodules/extract', () => { expect(res.deps).toHaveLength(1); res = await extractPackageFile('', '.gitmodules.5', {}); expect(res.deps).toHaveLength(3); - expect(res.deps[2].lookupName).toBe( + expect(res.deps[2].packageName).toBe( 'https://github.com/renovatebot/renovate-config.git' ); }); diff --git a/lib/modules/manager/git-submodules/extract.ts b/lib/modules/manager/git-submodules/extract.ts index 3c08f67f228d4d..2429fcd2a286b4 100644 --- a/lib/modules/manager/git-submodules/extract.ts +++ b/lib/modules/manager/git-submodules/extract.ts @@ -119,7 +119,7 @@ export default async function extractPackageFile( ); deps.push({ depName: path, - lookupName: getHttpUrl(subModuleUrl), + packageName: getHttpUrl(subModuleUrl), currentValue, currentDigest, }); diff --git a/lib/modules/manager/gradle/shallow/extract.spec.ts b/lib/modules/manager/gradle/shallow/extract.spec.ts index c68c9600488f27..546f8fc37174a7 100644 --- a/lib/modules/manager/gradle/shallow/extract.spec.ts +++ b/lib/modules/manager/gradle/shallow/extract.spec.ts @@ -246,7 +246,7 @@ describe('modules/manager/gradle/shallow/extract', () => { depType: 'plugin', currentValue: '1.17.0', commitMessageTopic: 'plugin detekt', - lookupName: + packageName: 'io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin', managerData: { fileReplacePosition: 21, @@ -262,7 +262,7 @@ describe('modules/manager/gradle/shallow/extract', () => { depType: 'plugin', currentValue: '0.5.0', commitMessageTopic: 'plugin publish-on-central', - lookupName: + packageName: 'org.danilopianini.publish-on-central:org.danilopianini.publish-on-central.gradle.plugin', managerData: { fileReplacePosition: 68, @@ -354,7 +354,7 @@ describe('modules/manager/gradle/shallow/extract', () => { depType: 'plugin', currentValue: '1.5.21', commitMessageTopic: 'plugin kotlinJvm', - lookupName: + packageName: 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin', managerData: { fileReplacePosition: 661, @@ -370,7 +370,7 @@ describe('modules/manager/gradle/shallow/extract', () => { depType: 'plugin', currentValue: '1.5.21', commitMessageTopic: 'plugin kotlinSerialization', - lookupName: + packageName: 'org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin', managerData: { fileReplacePosition: 21, @@ -386,7 +386,7 @@ describe('modules/manager/gradle/shallow/extract', () => { depType: 'plugin', currentValue: '0.3.0', commitMessageTopic: 'plugin multiJvm', - lookupName: + packageName: 'org.danilopianini.multi-jvm-test-plugin:org.danilopianini.multi-jvm-test-plugin.gradle.plugin', managerData: { fileReplacePosition: 822, diff --git a/lib/modules/manager/gradle/shallow/extract/catalog.ts b/lib/modules/manager/gradle/shallow/extract/catalog.ts index 9df92999501e3c..2729da5f06b53d 100644 --- a/lib/modules/manager/gradle/shallow/extract/catalog.ts +++ b/lib/modules/manager/gradle/shallow/extract/catalog.ts @@ -184,7 +184,7 @@ export function parseCatalog( const dependency = { depType: 'plugin', depName, - lookupName: `${depName}:${depName}.gradle.plugin`, + packageName: `${depName}:${depName}.gradle.plugin`, registryUrls: ['https://plugins.gradle.org/m2/'], currentValue, commitMessageTopic: `plugin ${pluginName}`, diff --git a/lib/modules/manager/gradle/shallow/parser.spec.ts b/lib/modules/manager/gradle/shallow/parser.spec.ts index 9dc8d3c4f35cc6..b5c04fdd473b6f 100644 --- a/lib/modules/manager/gradle/shallow/parser.spec.ts +++ b/lib/modules/manager/gradle/shallow/parser.spec.ts @@ -63,17 +63,17 @@ describe('modules/manager/gradle/shallow/parser', () => { describe('plugins', () => { test.each` def | input | output - ${''} | ${'id "foo.bar" version "1.2.3"'} | ${{ depName: 'foo.bar', lookupName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} - ${''} | ${'id("foo.bar") version "1.2.3"'} | ${{ depName: 'foo.bar', lookupName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} - ${''} | ${'kotlin("jvm") version "1.3.71"'} | ${{ depName: 'org.jetbrains.kotlin.jvm', lookupName: 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin', currentValue: '1.3.71' }} + ${''} | ${'id "foo.bar" version "1.2.3"'} | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} + ${''} | ${'id("foo.bar") version "1.2.3"'} | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} + ${''} | ${'kotlin("jvm") version "1.3.71"'} | ${{ depName: 'org.jetbrains.kotlin.jvm', packageName: 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin', currentValue: '1.3.71' }} ${''} | ${'id "foo.bar" version something'} | ${{ depName: 'foo.bar', currentValue: 'something', skipReason: 'unknown-version' }} - ${'baz = "1.2.3"'} | ${'id "foo.bar" version baz'} | ${{ depName: 'foo.bar', lookupName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} - ${'baz = "1.2.3"'} | ${'id("foo.bar") version baz'} | ${{ depName: 'foo.bar', lookupName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} - ${'baz = "1.3.71"'} | ${'kotlin("jvm") version baz'} | ${{ depName: 'org.jetbrains.kotlin.jvm', lookupName: 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin', currentValue: '1.3.71' }} - ${'z = "1.2.3"'} | ${'id "x.y" version "$z"'} | ${{ depName: 'x.y', lookupName: 'x.y:x.y.gradle.plugin', currentValue: '1.2.3' }} + ${'baz = "1.2.3"'} | ${'id "foo.bar" version baz'} | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} + ${'baz = "1.2.3"'} | ${'id("foo.bar") version baz'} | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} + ${'baz = "1.3.71"'} | ${'kotlin("jvm") version baz'} | ${{ depName: 'org.jetbrains.kotlin.jvm', packageName: 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin', currentValue: '1.3.71' }} + ${'z = "1.2.3"'} | ${'id "x.y" version "$z"'} | ${{ depName: 'x.y', packageName: 'x.y:x.y.gradle.plugin', currentValue: '1.2.3' }} ${''} | ${'id "x.y" version "$z"'} | ${{ depName: 'x.y', skipReason: 'unknown-version', currentValue: 'z' }} ${''} | ${'id "x.y" version "x${y}z"'} | ${{ depName: 'x.y', skipReason: 'unknown-version' }} - ${'z = "1.2.3"'} | ${'id("x.y") version "$z"'} | ${{ depName: 'x.y', lookupName: 'x.y:x.y.gradle.plugin', currentValue: '1.2.3' }} + ${'z = "1.2.3"'} | ${'id("x.y") version "$z"'} | ${{ depName: 'x.y', packageName: 'x.y:x.y.gradle.plugin', currentValue: '1.2.3' }} ${''} | ${'id("x.y") version "$z"'} | ${{ depName: 'x.y', skipReason: 'unknown-version', currentValue: 'z' }} ${''} | ${'id("x.y") version "x${y}z"'} | ${{ depName: 'x.y', skipReason: 'unknown-version' }} `('$input', ({ def, input, output }) => { diff --git a/lib/modules/manager/gradle/shallow/parser.ts b/lib/modules/manager/gradle/shallow/parser.ts index b7d534d024b70b..509747e453d19d 100644 --- a/lib/modules/manager/gradle/shallow/parser.ts +++ b/lib/modules/manager/gradle/shallow/parser.ts @@ -208,7 +208,7 @@ function processPlugin({ const plugin = pluginName.value; const depName = methodName.value === 'kotlin' ? `org.jetbrains.kotlin.${plugin}` : plugin; - const lookupName = + const packageName = methodName.value === 'kotlin' ? `org.jetbrains.kotlin.${plugin}:org.jetbrains.kotlin.${plugin}.gradle.plugin` : `${plugin}:${plugin}.gradle.plugin`; @@ -216,7 +216,7 @@ function processPlugin({ const dep: PackageDependency = { depType: 'plugin', depName, - lookupName, + packageName, registryUrls: ['https://plugins.gradle.org/m2/'], commitMessageTopic: `plugin ${depName}`, }; diff --git a/lib/modules/manager/helmsman/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/helmsman/__snapshots__/extract.spec.ts.snap index eb6057f559b962..83bbd8e0cb7089 100644 --- a/lib/modules/manager/helmsman/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/helmsman/__snapshots__/extract.spec.ts.snap @@ -7,7 +7,7 @@ Object { "currentValue": "19.0.3", "datasource": "helm", "depName": "kube-prometheus", - "lookupName": "kube-prometheus-stack", + "packageName": "kube-prometheus-stack", "registryUrls": Array [ "https://prometheus-community.github.io/helm-charts", ], @@ -16,7 +16,7 @@ Object { "currentValue": "2.6.0", "datasource": "helm", "depName": "loki", - "lookupName": "loki", + "packageName": "loki", "registryUrls": Array [ "https://grafana.github.io/helm-charts", ], @@ -25,7 +25,7 @@ Object { "currentValue": "0.7.7", "datasource": "helm", "depName": "tempo", - "lookupName": "tempo", + "packageName": "tempo", "registryUrls": Array [ "https://grafana.github.io/helm-charts", ], @@ -34,7 +34,7 @@ Object { "currentValue": "0.6.0", "datasource": "helm", "depName": "otlp-collector", - "lookupName": "opentelemetry-collector", + "packageName": "opentelemetry-collector", "registryUrls": Array [ "https://open-telemetry.github.io/opentelemetry-helm-charts", ], @@ -43,7 +43,7 @@ Object { "currentValue": "0.25.0", "datasource": "helm", "depName": "strimzi-operator", - "lookupName": "strimzi-kafka-operator", + "packageName": "strimzi-kafka-operator", "registryUrls": Array [ "https://strimzi.io/charts/", ], @@ -57,7 +57,7 @@ Object { "currentValue": "2.6.0", "datasource": "helm", "depName": "loki-no-registry-ref", - "lookupName": "loki", + "packageName": "loki", "skipReason": "no-repository", }, Object { diff --git a/lib/modules/manager/helmsman/extract.ts b/lib/modules/manager/helmsman/extract.ts index b66b555dbb8c51..40e3df397e8980 100644 --- a/lib/modules/manager/helmsman/extract.ts +++ b/lib/modules/manager/helmsman/extract.ts @@ -6,7 +6,7 @@ import { HelmDatasource } from '../../datasource/helm'; import type { ExtractConfig, PackageDependency, PackageFile } from '../types'; import type { HelmsmanDocument } from './types'; -const chartRegex = regEx('^(?[^/]*)/(?[^/]*)$'); +const chartRegex = regEx('^(?[^/]*)/(?[^/]*)$'); function createDep(key: string, doc: HelmsmanDocument): PackageDependency { const dep: PackageDependency = { @@ -30,11 +30,11 @@ function createDep(key: string, doc: HelmsmanDocument): PackageDependency { return dep; } - if (!is.nonEmptyString(regexResult.groups.lookupName)) { + if (!is.nonEmptyString(regexResult.groups.packageName)) { dep.skipReason = 'invalid-name'; return dep; } - dep.lookupName = regexResult.groups.lookupName; + dep.packageName = regexResult.groups.packageName; const registryUrl = doc.helmRepos[regexResult.groups.registryRef]; if (!is.nonEmptyString(registryUrl)) { diff --git a/lib/modules/manager/helmv3/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/helmv3/__snapshots__/extract.spec.ts.snap index b2f5c7916eaf12..d9c15de9b1df64 100644 --- a/lib/modules/manager/helmv3/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/helmv3/__snapshots__/extract.spec.ts.snap @@ -8,7 +8,7 @@ Object { "currentValue": "0.1.0", "datasource": "docker", "depName": "library", - "lookupName": "ghcr.io/ankitabhopatkar13/library", + "packageName": "ghcr.io/ankitabhopatkar13/library", }, Object { "currentValue": "0.8.1", @@ -67,7 +67,7 @@ Object { "currentValue": "2.2.0", "datasource": "docker", "depName": "oci-example", - "lookupName": "quay.example.com/organization/oci-example", + "packageName": "quay.example.com/organization/oci-example", }, ], "packageFileVersion": "0.1.0", diff --git a/lib/modules/manager/helmv3/utils.ts b/lib/modules/manager/helmv3/utils.ts index 72b92e50dd2139..b6066b07f52b64 100644 --- a/lib/modules/manager/helmv3/utils.ts +++ b/lib/modules/manager/helmv3/utils.ts @@ -14,7 +14,7 @@ export function parseRepository( switch (url.protocol) { case 'oci:': res.datasource = DockerDatasource.id; - res.lookupName = `${repositoryURL.replace('oci://', '')}/${depName}`; + res.packageName = `${repositoryURL.replace('oci://', '')}/${depName}`; break; case 'file:': res.skipReason = 'local-dependency'; diff --git a/lib/modules/manager/html/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/html/__snapshots__/extract.spec.ts.snap index 0b9a68ee00a6c4..e815590ef0da7c 100644 --- a/lib/modules/manager/html/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/html/__snapshots__/extract.spec.ts.snap @@ -7,7 +7,7 @@ Object { "currentValue": "15.6.1", "datasource": "cdnjs", "depName": "prop-types", - "lookupName": "prop-types/prop-types.min.js", + "packageName": "prop-types/prop-types.min.js", "replaceString": "