From 0417c111ac555324d8e8421262da36fc69b855e7 Mon Sep 17 00:00:00 2001 From: Ryo Matsukawa <76232929+ryo-manba@users.noreply.github.com> Date: Thu, 25 May 2023 14:48:11 +0900 Subject: [PATCH] refactor: Merged multiple skipReasons into unspecified-version. (#22409) --- .../__snapshots__/extract.spec.ts.snap | 4 +-- .../manager/ansible-galaxy/collections.ts | 2 +- lib/modules/manager/ansible-galaxy/roles.ts | 2 +- lib/modules/manager/cocoapods/extract.spec.ts | 8 ++--- lib/modules/manager/cocoapods/extract.ts | 2 +- lib/modules/manager/cpanfile/extract.spec.ts | 12 +++---- lib/modules/manager/cpanfile/parser.ts | 2 +- lib/modules/manager/fleet/extract.spec.ts | 6 ++-- lib/modules/manager/fleet/extract.ts | 4 +-- .../__snapshots__/extract.spec.ts.snap | 2 +- .../manager/gitlabci-include/extract.ts | 2 +- lib/modules/manager/gradle/extract.spec.ts | 8 ++--- lib/modules/manager/gradle/extract/catalog.ts | 6 ++-- lib/modules/manager/gradle/parser.spec.ts | 32 +++++++++---------- lib/modules/manager/gradle/parser/handlers.ts | 10 +++--- .../__snapshots__/extract.spec.ts.snap | 2 +- lib/modules/manager/helmsman/extract.ts | 2 +- .../__snapshots__/extract.spec.ts.snap | 2 +- lib/modules/manager/jenkins/extract.ts | 2 +- lib/modules/manager/mint/extract.spec.ts | 8 ++--- lib/modules/manager/mint/extract.ts | 2 +- .../extract/__snapshots__/index.spec.ts.snap | 20 ++++++------ lib/modules/manager/npm/extract/index.spec.ts | 18 +++++------ lib/modules/manager/npm/extract/index.ts | 10 +++--- lib/modules/manager/pep621/extract.spec.ts | 14 ++++---- lib/modules/manager/pep621/utils.ts | 2 +- .../pipenv/__snapshots__/extract.spec.ts.snap | 6 ++-- lib/modules/manager/pipenv/extract.spec.ts | 8 ++--- lib/modules/manager/pipenv/extract.ts | 4 +-- .../poetry/__snapshots__/extract.spec.ts.snap | 2 +- lib/modules/manager/poetry/extract.ts | 2 +- lib/modules/manager/terraform/base.ts | 2 +- lib/modules/manager/terraform/extract.spec.ts | 4 +-- .../resources/terraform-workspace.ts | 2 +- lib/types/skip-reason.ts | 4 +-- 35 files changed, 108 insertions(+), 110 deletions(-) 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 cc107de1d1ada5..b748299fb75b84 100644 --- a/lib/modules/manager/ansible-galaxy/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/ansible-galaxy/__snapshots__/extract.spec.ts.snap @@ -46,7 +46,7 @@ exports[`modules/manager/ansible-galaxy/extract extractPackageFile() check colle "registryUrls": [ "https://cloud.redhat.com/api/automation-hub/", ], - "skipReason": "no-version", + "skipReason": "unspecified-version", }, { "currentValue": null, @@ -54,7 +54,7 @@ exports[`modules/manager/ansible-galaxy/extract extractPackageFile() check colle "depName": "foo.bar/organization/repo_name", "depType": "galaxy-collection", "packageName": "https://foo.bar/organization/repo_name.git", - "skipReason": "no-version", + "skipReason": "unspecified-version", }, { "currentValue": "1.0.0", diff --git a/lib/modules/manager/ansible-galaxy/collections.ts b/lib/modules/manager/ansible-galaxy/collections.ts index 83ba8e2d66ab2d..951618aace5da8 100644 --- a/lib/modules/manager/ansible-galaxy/collections.ts +++ b/lib/modules/manager/ansible-galaxy/collections.ts @@ -124,7 +124,7 @@ function finalize(dependency: AnsibleGalaxyPackageDependency): boolean { } if (!dependency.currentValue && !dep.skipReason) { - dep.skipReason = 'no-version'; + dep.skipReason = 'unspecified-version'; } return true; } diff --git a/lib/modules/manager/ansible-galaxy/roles.ts b/lib/modules/manager/ansible-galaxy/roles.ts index f4ada3b63e0829..0b3cb655f9c92b 100644 --- a/lib/modules/manager/ansible-galaxy/roles.ts +++ b/lib/modules/manager/ansible-galaxy/roles.ts @@ -47,7 +47,7 @@ function interpretLine( function finalize(dependency: AnsibleGalaxyPackageDependency): boolean { const dep = dependency; if (dependency.managerData.version === null) { - dep.skipReason = 'no-version'; + dep.skipReason = 'unspecified-version'; return false; } const source = dep.managerData.src ?? ''; diff --git a/lib/modules/manager/cocoapods/extract.spec.ts b/lib/modules/manager/cocoapods/extract.spec.ts index e5dcf9850c8ea7..ecef3e295e3e19 100644 --- a/lib/modules/manager/cocoapods/extract.spec.ts +++ b/lib/modules/manager/cocoapods/extract.spec.ts @@ -62,16 +62,16 @@ describe('modules/manager/cocoapods/extract', () => { { depName: 'TOCropViewController', currentValue: '~> 2.5.1' }, { depName: 'FMDB', currentValue: '~> 2.7.5' }, { depName: 'FDStackView', currentValue: '~> 1.0.1' }, - { depName: 'LYEmptyView', skipReason: 'unknown-version' }, + { depName: 'LYEmptyView', skipReason: 'unspecified-version' }, { depName: 'MMKV', currentValue: '~> 1.0.22' }, - { depName: 'fishhook', skipReason: 'unknown-version' }, + { depName: 'fishhook', skipReason: 'unspecified-version' }, { depName: 'CocoaLumberjack', currentValue: '~> 3.5.3' }, { depName: 'GZIP', currentValue: '~> 1.2' }, { depName: 'LBXScan/LBXNative', currentValue: '~> 2.3' }, { depName: 'LBXScan/LBXZXing', currentValue: '~> 2.3' }, { depName: 'LBXScan/UI', currentValue: '~> 2.3' }, - { depName: 'MLeaksFinder', skipReason: 'unknown-version' }, - { depName: 'FBMemoryProfiler', skipReason: 'unknown-version' }, + { depName: 'MLeaksFinder', skipReason: 'unspecified-version' }, + { depName: 'FBMemoryProfiler', skipReason: 'unspecified-version' }, ]); }); }); diff --git a/lib/modules/manager/cocoapods/extract.ts b/lib/modules/manager/cocoapods/extract.ts index ddb17826e75413..fb371633704a3c 100644 --- a/lib/modules/manager/cocoapods/extract.ts +++ b/lib/modules/manager/cocoapods/extract.ts @@ -112,7 +112,7 @@ export async function extractPackageFile( let dep: PackageDependency = { depName, groupName, - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }; if (currentValue) { diff --git a/lib/modules/manager/cpanfile/extract.spec.ts b/lib/modules/manager/cpanfile/extract.spec.ts index 29d0042c3bdcd5..f50caf78439057 100644 --- a/lib/modules/manager/cpanfile/extract.spec.ts +++ b/lib/modules/manager/cpanfile/extract.spec.ts @@ -59,7 +59,7 @@ describe('modules/manager/cpanfile/extract', () => { { datasource: 'cpan', depName: 'Try::Tiny', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { datasource: 'cpan', @@ -124,7 +124,7 @@ describe('modules/manager/cpanfile/extract', () => { { datasource: 'cpan', depName: 'Crypt::URandom', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { datasource: 'cpan', @@ -154,7 +154,7 @@ describe('modules/manager/cpanfile/extract', () => { { datasource: 'cpan', depName: 'Authen::Simple::Passwd', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, ], }); @@ -228,7 +228,7 @@ describe('modules/manager/cpanfile/extract', () => { datasource: 'cpan', depName: 'Test::Requires', depType: 'test', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, ], }); @@ -251,13 +251,13 @@ describe('modules/manager/cpanfile/extract', () => { datasource: 'cpan', depName: 'FCGI', depType: 'runtime', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { datasource: 'cpan', depName: 'FCGI::ProcManager', depType: 'runtime', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, ], }); diff --git a/lib/modules/manager/cpanfile/parser.ts b/lib/modules/manager/cpanfile/parser.ts index cf2286eaa79b82..a90275e8f77e5a 100644 --- a/lib/modules/manager/cpanfile/parser.ts +++ b/lib/modules/manager/cpanfile/parser.ts @@ -89,7 +89,7 @@ const moduleMatch = q if (currentValue) { dep.currentValue = currentValue; } else { - dep.skipReason = 'no-version'; + dep.skipReason = 'unspecified-version'; } if (phase) { dep.depType = phase; diff --git a/lib/modules/manager/fleet/extract.spec.ts b/lib/modules/manager/fleet/extract.spec.ts index e122cb41a3e658..6f25008456644b 100644 --- a/lib/modules/manager/fleet/extract.spec.ts +++ b/lib/modules/manager/fleet/extract.spec.ts @@ -118,7 +118,7 @@ kind: Fleet packageName: 'cert-manager', registryUrls: ['https://charts.jetstack.io'], depType: 'fleet', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, ]); }); @@ -129,7 +129,7 @@ kind: Fleet expect(result).not.toBeNull(); expect(result?.deps).toMatchObject([ { - skipReason: 'no-version', + skipReason: 'unspecified-version', datasource: 'helm', depName: 'cert-manager', registryUrls: ['https://charts.jetstack.io'], @@ -204,7 +204,7 @@ kind: Fleet datasource: 'git-tags', depName: 'https://github.com/rancher/rancher', depType: 'git_repo', - skipReason: 'no-version', + skipReason: 'unspecified-version', sourceUrl: 'https://github.com/rancher/rancher', }, ]); diff --git a/lib/modules/manager/fleet/extract.ts b/lib/modules/manager/fleet/extract.ts index b02f2669d8f264..1b196000fa4d0d 100644 --- a/lib/modules/manager/fleet/extract.ts +++ b/lib/modules/manager/fleet/extract.ts @@ -28,7 +28,7 @@ function extractGitRepo(doc: GitRepo): PackageDependency { if (!currentValue) { return { ...dep, - skipReason: 'no-version', + skipReason: 'unspecified-version', }; } @@ -71,7 +71,7 @@ function extractFleetHelmBlock(doc: FleetHelmBlock): PackageDependency { if (!doc.version) { return { ...dep, - skipReason: 'no-version', + skipReason: 'unspecified-version', }; } diff --git a/lib/modules/manager/gitlabci-include/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/gitlabci-include/__snapshots__/extract.spec.ts.snap index 1078afcb26dabe..986b82e20fb333 100644 --- a/lib/modules/manager/gitlabci-include/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/gitlabci-include/__snapshots__/extract.spec.ts.snap @@ -18,7 +18,7 @@ exports[`modules/manager/gitlabci-include/extract extractPackageFile() extracts "datasource": "gitlab-tags", "depName": "mikebryant/include-source-example3", "depType": "repository", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, ] `; diff --git a/lib/modules/manager/gitlabci-include/extract.ts b/lib/modules/manager/gitlabci-include/extract.ts index a677d8f5b70da7..a18c2d6ef0a2ad 100644 --- a/lib/modules/manager/gitlabci-include/extract.ts +++ b/lib/modules/manager/gitlabci-include/extract.ts @@ -26,7 +26,7 @@ function extractDepFromIncludeFile( depType: 'repository', }; if (!includeObj.ref) { - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; return dep; } dep.currentValue = includeObj.ref; diff --git a/lib/modules/manager/gradle/extract.spec.ts b/lib/modules/manager/gradle/extract.spec.ts index 94c9a4f1b18865..fd9f6f409e40d1 100644 --- a/lib/modules/manager/gradle/extract.spec.ts +++ b/lib/modules/manager/gradle/extract.spec.ts @@ -604,7 +604,7 @@ describe('modules/manager/gradle/extract', () => { packageFile: 'gradle/libs.versions.toml', }, registryUrls: ['https://plugins.gradle.org/m2/'], - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }, ], }, @@ -667,21 +667,21 @@ describe('modules/manager/gradle/extract', () => { managerData: { packageFile: 'gradle/libs.versions.toml', }, - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { depName: 'google-firebase-crashlytics', managerData: { packageFile: 'gradle/libs.versions.toml', }, - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { depName: 'google-firebase-messaging', managerData: { packageFile: 'gradle/libs.versions.toml', }, - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { depName: 'org.jetbrains.kotlin.jvm', diff --git a/lib/modules/manager/gradle/extract/catalog.ts b/lib/modules/manager/gradle/extract/catalog.ts index 16483dcb895d30..7061d8e8d4181c 100644 --- a/lib/modules/manager/gradle/extract/catalog.ts +++ b/lib/modules/manager/gradle/extract/catalog.ts @@ -113,7 +113,7 @@ function extractLiteralVersion({ sectionKey: string; }): VersionExtract { if (!version) { - return { skipReason: 'no-version' }; + return { skipReason: 'unspecified-version' }; } else if (is.string(version)) { const fileReplacePosition = depStartIndex + findVersionIndex(depSubContent, sectionKey, version); @@ -151,7 +151,7 @@ function extractLiteralVersion({ } } - return { skipReason: 'unknown-version' }; + return { skipReason: 'unspecified-version' }; } function extractDependency({ @@ -179,7 +179,7 @@ function extractDependency({ if (!currentValue) { return { depName, - skipReason: 'no-version', + skipReason: 'unspecified-version', }; } return { diff --git a/lib/modules/manager/gradle/parser.spec.ts b/lib/modules/manager/gradle/parser.spec.ts index fe948df16dd442..ec46915bf96469 100644 --- a/lib/modules/manager/gradle/parser.spec.ts +++ b/lib/modules/manager/gradle/parser.spec.ts @@ -435,8 +435,8 @@ describe('modules/manager/gradle/parser', () => { ${'baz = "1.2.3"'} | ${'kotlin("foo", baz)'} | ${{ ...output, groupName: 'baz' }} ${'baz = "1.2.3"'} | ${'kotlin("foo", version = baz)'} | ${output} ${'baz = "1.2.3"'} | ${'kotlin("foo", property("baz"))'} | ${output} - ${'baz = "1.2.3"'} | ${'kotlin("foo", "${baz}456")'} | ${{ skipReason: 'unknown-version' }} - ${'baz = "1.2.3"'} | ${'kotlin("foo", baz + "456")'} | ${{ skipReason: 'unknown-version' }} + ${'baz = "1.2.3"'} | ${'kotlin("foo", "${baz}456")'} | ${{ skipReason: 'unspecified-version' }} + ${'baz = "1.2.3"'} | ${'kotlin("foo", baz + "456")'} | ${{ skipReason: 'unspecified-version' }} ${''} | ${'kotlin("foo", some)'} | ${null} ${''} | ${'kotlin(["foo", "1.2.3"])'} | ${null} ${''} | ${'kotlin("foo", "1.2.3", "4.5.6")'} | ${null} @@ -458,7 +458,7 @@ describe('modules/manager/gradle/parser', () => { ${'some = "foo"'} | ${'group: some, name: some, version: "1.2.3"'} | ${{ depName: 'foo:foo', currentValue: '1.2.3' }} ${'some = "foo"'} | ${'group: "${some}", name: "${some}", version: "1.2.3"'} | ${{ depName: 'foo:foo', currentValue: '1.2.3' }} ${'baz = "1.2.3"'} | ${'group: "foo", name: "bar", version: "${baz}"'} | ${{ depName: 'foo:bar', currentValue: '1.2.3', groupName: 'baz' }} - ${'baz = "1.2.3"'} | ${'group: "foo", name: "bar", version: "${baz}456"'} | ${{ depName: 'foo:bar', skipReason: 'unknown-version' }} + ${'baz = "1.2.3"'} | ${'group: "foo", name: "bar", version: "${baz}456"'} | ${{ depName: 'foo:bar', skipReason: 'unspecified-version' }} ${''} | ${'(group: "foo", name: "bar", version: "1.2.3", classifier: "sources")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} ${''} | ${'(group: "foo", name: "bar", version: "1.2.3") {exclude module: "spring-jcl"}'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} ${''} | ${"implementation platform(group: 'foo', name: 'bar', version: '1.2.3')"} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} @@ -468,8 +468,8 @@ describe('modules/manager/gradle/parser', () => { ${'some = "foo"'} | ${'(group = "${some}", name = "${some}", version = "1.2.3")'} | ${{ depName: 'foo:foo', currentValue: '1.2.3' }} ${'some = "foo"'} | ${'(group = "${some}" + some, name = some + "bar" + some, version = "1.2.3")'} | ${{ depName: 'foofoo:foobarfoo', currentValue: '1.2.3' }} ${'baz = "1.2.3"'} | ${'(group = "foo", name = "bar", version = "${baz}")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3', groupName: 'baz' }} - ${'baz = "1.2.3"'} | ${'(group = "foo", name = "bar", version = "${baz}456")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3456', skipReason: 'unknown-version' }} - ${'baz = "1.2.3"'} | ${'(group = "foo", name = "bar", version = baz + "456")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3456', skipReason: 'unknown-version' }} + ${'baz = "1.2.3"'} | ${'(group = "foo", name = "bar", version = "${baz}456")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3456', skipReason: 'unspecified-version' }} + ${'baz = "1.2.3"'} | ${'(group = "foo", name = "bar", version = baz + "456")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3456', skipReason: 'unspecified-version' }} ${''} | ${'(group = "foo", name = "bar", version = "1.2.3", changing: true)'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} `('$def | $str', ({ def, str, output }) => { const { deps } = parseGradle([def, str].join('\n')); @@ -563,16 +563,16 @@ describe('modules/manager/gradle/parser', () => { ${''} | ${'id "foo".version("1.2.3")'} | ${null} ${''} | ${'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' }} - ${''} | ${'id "foo.bar" version "$baz"'} | ${{ depName: 'foo.bar', skipReason: 'unknown-version', currentValue: 'baz' }} + ${''} | ${'id "foo.bar" version "$baz"'} | ${{ depName: 'foo.bar', skipReason: 'unspecified-version', currentValue: 'baz' }} ${'baz = "1.2.3"'} | ${'id "foo.bar" version "$baz"'} | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3', groupName: 'baz' }} ${'baz = "1.2.3"'} | ${'id("foo.bar") version "$baz"'} | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} - ${''} | ${'id "foo.bar" version "x${ab}cd"'} | ${{ depName: 'foo.bar', skipReason: 'unknown-version' }} - ${''} | ${'id("foo.bar") version "$baz"'} | ${{ depName: 'foo.bar', skipReason: 'unknown-version', currentValue: 'baz' }} - ${''} | ${'id("foo.bar") version "x${ab}cd"'} | ${{ depName: 'foo.bar', skipReason: 'unknown-version' }} - ${''} | ${'id("foo.bar") version "1" + "2.3"'} | ${{ depName: 'foo.bar', skipReason: 'unknown-version' }} - ${''} | ${'id("foo.bar") version property("qux")'} | ${{ depName: 'foo.bar', skipReason: 'unknown-version' }} + ${''} | ${'id "foo.bar" version "x${ab}cd"'} | ${{ depName: 'foo.bar', skipReason: 'unspecified-version' }} + ${''} | ${'id("foo.bar") version "$baz"'} | ${{ depName: 'foo.bar', skipReason: 'unspecified-version', currentValue: 'baz' }} + ${''} | ${'id("foo.bar") version "x${ab}cd"'} | ${{ depName: 'foo.bar', skipReason: 'unspecified-version' }} + ${''} | ${'id("foo.bar") version "1" + "2.3"'} | ${{ depName: 'foo.bar', skipReason: 'unspecified-version' }} + ${''} | ${'id("foo.bar") version property("qux")'} | ${{ depName: 'foo.bar', skipReason: 'unspecified-version' }} ${'baz = "1.2.3"'} | ${'id("foo.bar") version property("baz")'} | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} - ${''} | ${'id "foo.bar" version baz'} | ${{ depName: 'foo.bar', currentValue: 'baz', skipReason: 'unknown-version' }} + ${''} | ${'id "foo.bar" version baz'} | ${{ depName: 'foo.bar', currentValue: 'baz', skipReason: 'unspecified-version' }} ${'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.2.3"'} | ${'id("foo.bar").version(baz)'} | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }} @@ -709,8 +709,8 @@ describe('modules/manager/gradle/parser', () => { ${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").version(baz)'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} ${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").version("${baz}")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} ${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").version(property("baz"))'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} - ${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").version("${baz}xy")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3xy', skipReason: 'unknown-version' }} - ${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").version(baz + ".45")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3.45', skipReason: 'unknown-version' }} + ${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").version("${baz}xy")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3xy', skipReason: 'unspecified-version' }} + ${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").version(baz + ".45")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3.45', skipReason: 'unspecified-version' }} ${'group = "foo"; artifact = "bar"'} | ${'library("foo.bar", group, artifact).version("1.2.3")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} ${'f = "foo"; b = "bar"'} | ${'library("foo.bar", "${f}", "${b}").version("1.2.3")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} ${'f = "foo"; b = "bar"; v = "1.2.3"'} | ${'library("foo.bar", property("f"), "${b}").version(v)'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} @@ -919,8 +919,8 @@ describe('modules/manager/gradle/parser', () => { ${''} | ${'spotbugs { toolVersion = "1.2.3" }'} | ${{ depName: 'spotbugs', packageName: GRADLE_PLUGINS['spotbugs'][1], currentValue: '1.2.3' }} ${''} | ${'pmd { toolVersion = "@@@" }'} | ${null} ${''} | ${'pmd { toolVersion = "${baz}" }'} | ${null} - ${'baz = "1.2.3"'} | ${'pmd { toolVersion = "${baz}.456" }'} | ${{ depName: 'pmd', currentValue: '1.2.3.456', skipReason: 'unknown-version' }} - ${'baz = "1.2.3"'} | ${'pmd { toolVersion = baz + ".456" }'} | ${{ depName: 'pmd', currentValue: '1.2.3.456', skipReason: 'unknown-version' }} + ${'baz = "1.2.3"'} | ${'pmd { toolVersion = "${baz}.456" }'} | ${{ depName: 'pmd', currentValue: '1.2.3.456', skipReason: 'unspecified-version' }} + ${'baz = "1.2.3"'} | ${'pmd { toolVersion = baz + ".456" }'} | ${{ depName: 'pmd', currentValue: '1.2.3.456', skipReason: 'unspecified-version' }} ${''} | ${'pmd { [toolVersion = "6.36.0"] }'} | ${null} ${''} | ${'unknown { toolVersion = "1.2.3" }'} | ${null} ${''} | ${'composeOptions { kotlinCompilerExtensionVersion = "1.2.3" }'} | ${{ depName: 'composeOptions', packageName: GRADLE_PLUGINS['composeOptions'][1], currentValue: '1.2.3' }} diff --git a/lib/modules/manager/gradle/parser/handlers.ts b/lib/modules/manager/gradle/parser/handlers.ts index 273ffeabbe09bc..15501cadbecdc0 100644 --- a/lib/modules/manager/gradle/parser/handlers.ts +++ b/lib/modules/manager/gradle/parser/handlers.ts @@ -139,7 +139,7 @@ export function handleKotlinShortNotationDep(ctx: Ctx): Ctx { if (versionTokens.length > 1) { // = template string with multiple variables - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; } else if (versionTokens[0].type === 'symbol') { const varData = findVariable(versionTokens[0].value, ctx); if (varData) { @@ -177,7 +177,7 @@ export function handleLongFormDep(ctx: Ctx): Ctx { const methodName = ctx.tokenMap.methodName ?? null; if (versionTokens.length > 1) { // = template string with multiple variables - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; } else if (versionTokens[0].type === 'symbol') { const varData = findVariable(versionTokens[0].value, ctx); if (varData) { @@ -227,7 +227,7 @@ export function handlePlugin(ctx: Ctx): Ctx { if (pluginVersion.length > 1) { // = template string with multiple variables - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; } else if (pluginVersion[0].type === 'symbol') { const varData = findVariable(pluginVersion[0].value, ctx); if (varData) { @@ -238,7 +238,7 @@ export function handlePlugin(ctx: Ctx): Ctx { packageFile: varData.packageFile, }; } else { - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; } } @@ -409,7 +409,7 @@ export function handleImplicitGradlePlugin(ctx: Ctx): Ctx { if (versionTokens.length > 1) { // = template string with multiple variables - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; } else if (versionTokens[0].type === 'symbol') { const varData = findVariable(versionTokens[0].value, ctx); if (varData) { diff --git a/lib/modules/manager/helmsman/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/helmsman/__snapshots__/extract.spec.ts.snap index 4fb0bbc1937b94..8fe89cff087513 100644 --- a/lib/modules/manager/helmsman/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/helmsman/__snapshots__/extract.spec.ts.snap @@ -51,7 +51,7 @@ exports[`modules/manager/helmsman/extract extractPackageFile() extract deps 1`] { "datasource": "helm", "depName": "strimzi-operator-missing-version", - "skipReason": "no-version", + "skipReason": "unspecified-version", }, { "currentValue": "2.6.0", diff --git a/lib/modules/manager/helmsman/extract.ts b/lib/modules/manager/helmsman/extract.ts index 9e0d1493b78e10..a539ce3a595c66 100644 --- a/lib/modules/manager/helmsman/extract.ts +++ b/lib/modules/manager/helmsman/extract.ts @@ -26,7 +26,7 @@ function createDep( } if (!anApp.version) { - dep.skipReason = 'no-version'; + dep.skipReason = 'unspecified-version'; return dep; } dep.currentValue = anApp.version; diff --git a/lib/modules/manager/jenkins/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/jenkins/__snapshots__/extract.spec.ts.snap index ccfc384f6cac21..ad756050bc18b8 100644 --- a/lib/modules/manager/jenkins/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/jenkins/__snapshots__/extract.spec.ts.snap @@ -75,7 +75,7 @@ exports[`modules/manager/jenkins/extract extractPackageFile() extracts multiple { "datasource": "jenkins-plugins", "depName": "docker", - "skipReason": "no-version", + "skipReason": "unspecified-version", "versioning": "maven", }, { diff --git a/lib/modules/manager/jenkins/extract.ts b/lib/modules/manager/jenkins/extract.ts index 7ae1983e6c3116..8f874cedba1ac2 100644 --- a/lib/modules/manager/jenkins/extract.ts +++ b/lib/modules/manager/jenkins/extract.ts @@ -27,7 +27,7 @@ function getDependency(plugin: JenkinsPlugin): PackageDependency { ); } } else { - dep.skipReason = 'no-version'; + dep.skipReason = 'unspecified-version'; } if ( diff --git a/lib/modules/manager/mint/extract.spec.ts b/lib/modules/manager/mint/extract.spec.ts index 66faefe37720f7..561159c3459c17 100644 --- a/lib/modules/manager/mint/extract.spec.ts +++ b/lib/modules/manager/mint/extract.spec.ts @@ -43,11 +43,11 @@ describe('modules/manager/mint/extract', () => { deps: [ { depName: 'yonaskolb/xcodegen', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { depName: 'realm/SwiftLint', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, ], }); @@ -69,7 +69,7 @@ describe('modules/manager/mint/extract', () => { }, { depName: 'yonaskolb/xcodegen', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { depName: 'realm/SwiftLint', @@ -99,7 +99,7 @@ describe('modules/manager/mint/extract', () => { }, { depName: 'yonaskolb/xcodegen', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { depName: 'realm/SwiftLint', diff --git a/lib/modules/manager/mint/extract.ts b/lib/modules/manager/mint/extract.ts index e2ecbc0c82fba9..47d177962ad177 100644 --- a/lib/modules/manager/mint/extract.ts +++ b/lib/modules/manager/mint/extract.ts @@ -31,7 +31,7 @@ function handleDepInMintfile(line: string): PackageDependency { if (!line.includes('@')) { return { depName: line, - skipReason: 'no-version', + skipReason: 'unspecified-version', }; } const [depName, currentVersion] = line.split('@').map((s) => s.trim()); diff --git a/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap b/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap index 06e92a81a48d4c..c73d244dfa945e 100644 --- a/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap +++ b/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap @@ -73,7 +73,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts engine "depName": "other", "depType": "devDependencies", "prettyDepType": "devDependency", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, { "currentValue": ">=1.7.0 <2.0.0", @@ -115,7 +115,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts engine "depName": "yarn", "depType": "engines", "prettyDepType": "engine", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, { "currentValue": ">=1.49.3", @@ -159,7 +159,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts non-np "depName": "a", "depType": "dependencies", "prettyDepType": "dependency", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, { "currentValue": "github:owner/b#master", @@ -216,28 +216,28 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts non-np "depName": "g", "depType": "dependencies", "prettyDepType": "dependency", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, { "currentValue": "github:-hello/world#v1.0.0", "depName": "h", "depType": "dependencies", "prettyDepType": "dependency", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, { "currentValue": "@foo/bar#v2.0.0", "depName": "i", "depType": "dependencies", "prettyDepType": "dependency", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, { "currentValue": "github:frank#v0.0.1", "depName": "j", "depType": "dependencies", "prettyDepType": "dependency", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, { "currentDigest": "49b5aca", @@ -358,7 +358,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts npm pa "depType": "dependencies", "npmPackageAlias": true, "prettyDepType": "dependency", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, ], "extractedConstraints": {}, @@ -481,7 +481,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta } `; -exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta yarn unknown-version 1`] = ` +exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta yarn unspecified-version 1`] = ` { "deps": [ { @@ -511,7 +511,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta "depName": "yarn", "depType": "volta", "prettyDepType": "volta", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, ], "extractedConstraints": { diff --git a/lib/modules/manager/npm/extract/index.spec.ts b/lib/modules/manager/npm/extract/index.spec.ts index 6013a242400032..d43e4702551c73 100644 --- a/lib/modules/manager/npm/extract/index.spec.ts +++ b/lib/modules/manager/npm/extract/index.spec.ts @@ -435,7 +435,7 @@ describe('modules/manager/npm/extract/index', () => { { depName: 'other', currentValue: 'latest', - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }, { depName: 'atom', @@ -467,7 +467,7 @@ describe('modules/manager/npm/extract/index', () => { currentValue: 'disabled', datasource: 'npm', depType: 'engines', - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }, { depName: 'vscode', @@ -512,7 +512,7 @@ describe('modules/manager/npm/extract/index', () => { }); }); - it('extracts volta yarn unknown-version', async () => { + it('extracts volta yarn unspecified-version', async () => { const pJson = { main: 'index.js', engines: { @@ -549,7 +549,7 @@ describe('modules/manager/npm/extract/index', () => { depName: 'yarn', depType: 'volta', prettyDepType: 'volta', - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }, ], }); @@ -628,7 +628,7 @@ describe('modules/manager/npm/extract/index', () => { ); expect(res).toMatchSnapshot({ deps: [ - { depName: 'a', skipReason: 'unknown-version' }, + { depName: 'a', skipReason: 'unspecified-version' }, { depName: 'b', skipReason: 'unversioned-reference' }, { depName: 'c', @@ -657,22 +657,22 @@ describe('modules/manager/npm/extract/index', () => { { depName: 'g', currentValue: 'gitlab:owner/g#v1.0.0', - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }, { depName: 'h', currentValue: 'github:-hello/world#v1.0.0', - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }, { depName: 'i', currentValue: '@foo/bar#v2.0.0', - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }, { depName: 'j', currentValue: 'github:frank#v0.0.1', - skipReason: 'unknown-version', + skipReason: 'unspecified-version', }, { depName: 'k', diff --git a/lib/modules/manager/npm/extract/index.ts b/lib/modules/manager/npm/extract/index.ts index 4af1aefdcaa7cb..beed99ef98d67d 100644 --- a/lib/modules/manager/npm/extract/index.ts +++ b/lib/modules/manager/npm/extract/index.ts @@ -242,7 +242,7 @@ export async function extractPackageFile( dep.skipReason = 'unknown-engines'; } if (!isValid(dep.currentValue)) { - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; } return dep; } @@ -267,7 +267,7 @@ export async function extractPackageFile( dep.skipReason = 'unknown-volta'; } if (!isValid(dep.currentValue)) { - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; } return dep; } @@ -306,7 +306,7 @@ export async function extractPackageFile( } const hashSplit = dep.currentValue.split('#'); if (hashSplit.length !== 2) { - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; return dep; } const [depNamePart, depRefPart] = hashSplit; @@ -323,7 +323,7 @@ export async function extractPackageFile( .replace(regEx(/\.git$/), ''); const githubRepoSplit = githubOwnerRepo.split('/'); if (githubRepoSplit.length !== 2) { - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; return dep; } [githubOwner, githubRepo] = githubRepoSplit; @@ -337,7 +337,7 @@ export async function extractPackageFile( !githubValidRegex.test(githubOwner) || !githubValidRegex.test(githubRepo) ) { - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; return dep; } if (isVersion(depRefPart)) { diff --git a/lib/modules/manager/pep621/extract.spec.ts b/lib/modules/manager/pep621/extract.spec.ts index 75e1ad6e2745bc..bc23878672d80c 100644 --- a/lib/modules/manager/pep621/extract.spec.ts +++ b/lib/modules/manager/pep621/extract.spec.ts @@ -35,7 +35,7 @@ describe('modules/manager/pep621/extract', () => { depName: 'blinker', datasource: 'pypi', depType: 'project.dependencies', - skipReason: 'any-version', + skipReason: 'unspecified-version', }, { packageName: 'packaging', @@ -63,7 +63,7 @@ describe('modules/manager/pep621/extract', () => { depName: 'pyproject-hooks', datasource: 'pypi', depType: 'project.dependencies', - skipReason: 'any-version', + skipReason: 'unspecified-version', }, { packageName: 'unearth', @@ -105,7 +105,7 @@ describe('modules/manager/pep621/extract', () => { depName: 'typing-extensions', datasource: 'pypi', depType: 'project.dependencies', - skipReason: 'any-version', + skipReason: 'unspecified-version', }, { packageName: 'importlib-metadata', @@ -131,7 +131,7 @@ describe('modules/manager/pep621/extract', () => { packageName: 'pytest-mock', datasource: 'pypi', depType: 'project.optional-dependencies', - skipReason: 'any-version', + skipReason: 'unspecified-version', depName: 'pytest/pytest-mock', }, ]); @@ -144,7 +144,7 @@ describe('modules/manager/pep621/extract', () => { packageName: 'pdm', datasource: 'pypi', depType: 'tool.pdm.dev-dependencies', - skipReason: 'any-version', + skipReason: 'unspecified-version', depName: 'test/pdm', }, { @@ -158,7 +158,7 @@ describe('modules/manager/pep621/extract', () => { packageName: 'tox', datasource: 'pypi', depType: 'tool.pdm.dev-dependencies', - skipReason: 'any-version', + skipReason: 'unspecified-version', depName: 'tox/tox', }, { @@ -180,7 +180,7 @@ describe('modules/manager/pep621/extract', () => { depName: 'blinker', datasource: 'pypi', depType: 'project.dependencies', - skipReason: 'any-version', + skipReason: 'unspecified-version', registryUrls: [ 'https://private-site.org/pypi/simple', 'https://private.pypi.org/simple', diff --git a/lib/modules/manager/pep621/utils.ts b/lib/modules/manager/pep621/utils.ts index 8741c28dd46a21..9c8149cfc7318f 100644 --- a/lib/modules/manager/pep621/utils.ts +++ b/lib/modules/manager/pep621/utils.ts @@ -58,7 +58,7 @@ export function pep508ToPackageDependency( }; if (is.nullOrUndefined(parsed.currentValue)) { - dep.skipReason = 'any-version'; + dep.skipReason = 'unspecified-version'; } else { dep.currentValue = parsed.currentValue; } diff --git a/lib/modules/manager/pipenv/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/pipenv/__snapshots__/extract.spec.ts.snap index dfdb126d1cec82..9d61568aa9fbb1 100644 --- a/lib/modules/manager/pipenv/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/pipenv/__snapshots__/extract.spec.ts.snap @@ -68,7 +68,7 @@ exports[`modules/manager/pipenv/extract extractPackageFile() extracts example pi "depName": "requests", "depType": "packages", "managerData": {}, - "skipReason": "any-version", + "skipReason": "unspecified-version", }, { "currentValue": ">0.5.0", @@ -105,14 +105,14 @@ exports[`modules/manager/pipenv/extract extractPackageFile() extracts example pi "registryUrls": [ "https://pypi.python.org/simple", ], - "skipReason": "any-version", + "skipReason": "unspecified-version", }, { "currentValue": "*", "depName": "nose", "depType": "dev-packages", "managerData": {}, - "skipReason": "any-version", + "skipReason": "unspecified-version", }, { "currentValue": ">=1.0,<3.0", diff --git a/lib/modules/manager/pipenv/extract.spec.ts b/lib/modules/manager/pipenv/extract.spec.ts index 7c7d2318a6a0ba..e9e32c190f1def 100644 --- a/lib/modules/manager/pipenv/extract.spec.ts +++ b/lib/modules/manager/pipenv/extract.spec.ts @@ -28,7 +28,7 @@ describe('modules/manager/pipenv/extract', () => { expect(res?.deps.filter((dep) => !dep.skipReason)).toHaveLength(4); }); - it('marks packages with "extras" as skipReason === any-version', async () => { + it('marks packages with "extras" as skipReason === unspecified-version', async () => { const res = await extractPackageFile(pipfile3, 'Pipfile'); expect(res?.deps.filter((r) => !r.skipReason)).toHaveLength(0); expect(res?.deps.filter((r) => r.skipReason)).toHaveLength(6); @@ -83,7 +83,7 @@ describe('modules/manager/pipenv/extract', () => { expect(res).toMatchSnapshot({ extractedConstraints: { python: '== 2.7.*' }, deps: [ - { depName: 'requests', skipReason: 'any-version' }, + { depName: 'requests', skipReason: 'unspecified-version' }, { currentValue: '>0.5.0', datasource: 'pypi', @@ -93,8 +93,8 @@ describe('modules/manager/pipenv/extract', () => { { depName: 'django', skipReason: 'git-dependency' }, { depName: 'e682b37', skipReason: 'file-dependency' }, { depName: 'e1839a8', skipReason: 'local-dependency' }, - { depName: 'pywinusb', skipReason: 'any-version' }, - { currentValue: '*', skipReason: 'any-version' }, + { depName: 'pywinusb', skipReason: 'unspecified-version' }, + { currentValue: '*', skipReason: 'unspecified-version' }, { currentValue: '>=1.0,<3.0', datasource: 'pypi', diff --git a/lib/modules/manager/pipenv/extract.ts b/lib/modules/manager/pipenv/extract.ts index 891622edd677dc..93791f4be53d1f 100644 --- a/lib/modules/manager/pipenv/extract.ts +++ b/lib/modules/manager/pipenv/extract.ts @@ -44,12 +44,12 @@ function extractFromSection( currentValue = requirements.version; nestedVersion = true; } else if (is.object(requirements)) { - skipReason = 'any-version'; + skipReason = 'unspecified-version'; } else { currentValue = requirements; } if (currentValue === '*') { - skipReason = 'any-version'; + skipReason = 'unspecified-version'; } if (!skipReason) { const packageMatches = packageRegex.exec(depName); diff --git a/lib/modules/manager/poetry/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/poetry/__snapshots__/extract.spec.ts.snap index b42a6a577429b6..4265b8669acacc 100644 --- a/lib/modules/manager/poetry/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/poetry/__snapshots__/extract.spec.ts.snap @@ -494,7 +494,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d "nestedVersion": false, }, "packageName": "dev-dep2", - "skipReason": "unknown-version", + "skipReason": "unspecified-version", }, { "currentValue": "^0.8.3", diff --git a/lib/modules/manager/poetry/extract.ts b/lib/modules/manager/poetry/extract.ts index 13daf4ace31a5f..a31a0f0a41c944 100644 --- a/lib/modules/manager/poetry/extract.ts +++ b/lib/modules/manager/poetry/extract.ts @@ -119,7 +119,7 @@ function extractFromSection( } else if (poetryVersioning.isValid(currentValue)) { dep.versioning = poetryVersioning.id; } else { - dep.skipReason = 'unknown-version'; + dep.skipReason = 'unspecified-version'; } deps.push(dep); } diff --git a/lib/modules/manager/terraform/base.ts b/lib/modules/manager/terraform/base.ts index 4947f14f8ddb8d..e9bb8a67dd01bd 100644 --- a/lib/modules/manager/terraform/base.ts +++ b/lib/modules/manager/terraform/base.ts @@ -62,7 +62,7 @@ export abstract class TerraformProviderExtractor extends DependencyExtractor { dep.lockedVersion = getLockedVersion(dep, locks); if (!dep.currentValue) { - dep.skipReason = 'no-version'; + dep.skipReason = 'unspecified-version'; } return dep; diff --git a/lib/modules/manager/terraform/extract.spec.ts b/lib/modules/manager/terraform/extract.spec.ts index c4e8246a9adc16..0cd851c567fbae 100644 --- a/lib/modules/manager/terraform/extract.spec.ts +++ b/lib/modules/manager/terraform/extract.spec.ts @@ -315,7 +315,7 @@ describe('modules/manager/terraform/extract', () => { depName: 'helm', depType: 'provider', packageName: 'hashicorp/helm', - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { currentValue: 'V1.9', @@ -729,7 +729,7 @@ describe('modules/manager/terraform/extract', () => { extractVersion: 'v(?.*)$', }, { - skipReason: 'no-version', + skipReason: 'unspecified-version', }, { currentValue: '1.1.9', diff --git a/lib/modules/manager/terraform/extractors/resources/terraform-workspace.ts b/lib/modules/manager/terraform/extractors/resources/terraform-workspace.ts index d85582a9fc1b89..79f4cff135e3fb 100644 --- a/lib/modules/manager/terraform/extractors/resources/terraform-workspace.ts +++ b/lib/modules/manager/terraform/extractors/resources/terraform-workspace.ts @@ -22,7 +22,7 @@ export class TerraformWorkspaceExtractor extends TerraformVersionExtractor { }); if (is.nullOrUndefined(workspace.terraform_version)) { - dep.skipReason = 'no-version'; + dep.skipReason = 'unspecified-version'; } dependencies.push({ ...dep, diff --git a/lib/types/skip-reason.ts b/lib/types/skip-reason.ts index 7164f169b044c5..5517d34c0c8563 100644 --- a/lib/types/skip-reason.ts +++ b/lib/types/skip-reason.ts @@ -1,5 +1,4 @@ export type SkipReason = - | 'any-version' | 'contains-variable' | 'disabled' | 'empty' @@ -25,15 +24,14 @@ export type SkipReason = | 'no-repository' | 'no-source-match' | 'no-source' - | 'no-version' | 'non-hex-dep-types' | 'not-a-version' | 'path-dependency' | 'placeholder-url' | 'unknown-engines' | 'unknown-registry' - | 'unknown-version' | 'unknown-volta' + | 'unspecified-version' | 'unsupported-chart-type' | 'unsupported-datasource' | 'unsupported-remote'