diff --git a/lib/modules/manager/ansible/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/ansible/__snapshots__/extract.spec.ts.snap index 27860f5b64f3c0c798ba3792c30531872e868eae..a2a2cc69d0f16096f0d5b8aee4747d17c0d79990 100644 --- a/lib/modules/manager/ansible/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/ansible/__snapshots__/extract.spec.ts.snap @@ -8,6 +8,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": undefined, "datasource": "docker", "depName": "busybox", + "packageName": "busybox", "replaceString": "busybox", "versioning": "docker", }, @@ -17,6 +18,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": undefined, "datasource": "docker", "depName": "redis", + "packageName": "redis", "replaceString": "redis", "versioning": "docker", }, @@ -26,6 +28,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": undefined, "datasource": "docker", "depName": "someuser/appimage", + "packageName": "someuser/appimage", "replaceString": "someuser/appimage", "versioning": "docker", }, @@ -35,6 +38,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": "14.04", "datasource": "docker", "depName": "ubuntu", + "packageName": "ubuntu", "replaceString": "ubuntu:14.04", "versioning": "docker", }, @@ -44,6 +48,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": undefined, "datasource": "docker", "depName": "someuser/anotherappimage", + "packageName": "someuser/anotherappimage", "replaceString": "someuser/anotherappimage", "versioning": "docker", }, @@ -53,6 +58,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": undefined, "datasource": "docker", "depName": "busybox", + "packageName": "busybox", "replaceString": "busybox", "versioning": "docker", }, @@ -62,6 +68,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": "latest", "datasource": "docker", "depName": "postgres", + "packageName": "postgres", "replaceString": "postgres:latest", "versioning": "docker", }, @@ -71,6 +78,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": "14.04", "datasource": "docker", "depName": "ubuntu", + "packageName": "ubuntu", "replaceString": "ubuntu:14.04", "versioning": "docker", }, @@ -80,6 +88,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": "14.04", "datasource": "docker", "depName": "ubuntu", + "packageName": "ubuntu", "replaceString": "ubuntu:14.04", "versioning": "docker", }, @@ -94,6 +103,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": "11.5.1", "datasource": "docker", "depName": "sameersbn/gitlab", + "packageName": "sameersbn/gitlab", "replaceString": "sameersbn/gitlab:11.5.1", "versioning": "docker", }, @@ -103,6 +113,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": "10", "datasource": "docker", "depName": "sameersbn/postgresql", + "packageName": "sameersbn/postgresql", "replaceString": "sameersbn/postgresql:10", "versioning": "docker", }, @@ -112,6 +123,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": "4.0.9-1", "datasource": "docker", "depName": "sameersbn/redis", + "packageName": "sameersbn/redis", "replaceString": "sameersbn/redis:4.0.9-1", "versioning": "docker", }, @@ -121,6 +133,7 @@ exports[`modules/manager/ansible/extract extractPackageFile() extracts multiple "currentValue": "2.6.2", "datasource": "docker", "depName": "registry", + "packageName": "registry", "replaceString": "registry:2.6.2", "versioning": "docker", }, diff --git a/lib/modules/manager/ansible/extract.spec.ts b/lib/modules/manager/ansible/extract.spec.ts index b807ce7eb5a2fe5d5b59cc75e333de5f24badce8..815a39bf9824f4a17f26e1188928d17e10adc8a0 100644 --- a/lib/modules/manager/ansible/extract.spec.ts +++ b/lib/modules/manager/ansible/extract.spec.ts @@ -42,6 +42,7 @@ describe('modules/manager/ansible/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'my-quay-mirror.registry.com/redis', + packageName: 'my-quay-mirror.registry.com/redis', replaceString: 'quay.io/redis:0.0.1', versioning: 'docker', }, @@ -72,6 +73,7 @@ describe('modules/manager/ansible/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'quay.io/redis', + packageName: 'quay.io/redis', replaceString: 'quay.io/redis:0.0.1', versioning: 'docker', }, @@ -103,6 +105,7 @@ describe('modules/manager/ansible/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'my-quay-mirror.registry.com/redis', + packageName: 'my-quay-mirror.registry.com/redis', replaceString: 'quay.io/redis:0.0.1', versioning: 'docker', }, diff --git a/lib/modules/manager/argocd/extract.spec.ts b/lib/modules/manager/argocd/extract.spec.ts index 3f8917dac6c04a34b9ba645cd5b931e9b43884e5..3438de673dd17640f144b97400eddc25909a92a5 100644 --- a/lib/modules/manager/argocd/extract.spec.ts +++ b/lib/modules/manager/argocd/extract.spec.ts @@ -114,6 +114,7 @@ spec: currentValue: 'v2.3.4', datasource: 'docker', depName: 'somecontainer.registry.io/someContainer', + packageName: 'somecontainer.registry.io/someContainer', replaceString: 'somecontainer.registry.io/someContainer:v2.3.4', }, { @@ -123,6 +124,7 @@ spec: 'sha256:8be5de38826b494a8ad1565b8d1eb49183d736d0277a89191bd1100d78479a42', datasource: 'docker', depName: 'othercontainer.registry.io/other/container', + packageName: 'othercontainer.registry.io/other/container', replaceString: 'othercontainer.registry.io/other/container@sha256:8be5de38826b494a8ad1565b8d1eb49183d736d0277a89191bd1100d78479a42', }, diff --git a/lib/modules/manager/bitbucket-pipelines/extract.spec.ts b/lib/modules/manager/bitbucket-pipelines/extract.spec.ts index 454c7673d46bf498427f7bf4204b4fce6b5cb957..9f5e280b08d8839a96ec04470c567e40238b59ac 100644 --- a/lib/modules/manager/bitbucket-pipelines/extract.spec.ts +++ b/lib/modules/manager/bitbucket-pipelines/extract.spec.ts @@ -131,6 +131,7 @@ describe('modules/manager/bitbucket-pipelines/extract', () => { currentValue: '2.0.2', datasource: 'docker', depName: 'some.jfrog.mirror/jfrog-setup-cli', + packageName: 'some.jfrog.mirror/jfrog-setup-cli', depType: 'docker', }, { diff --git a/lib/modules/manager/buildpacks/extract.spec.ts b/lib/modules/manager/buildpacks/extract.spec.ts index 2cc8b60ebe829b029ff2e8a1e2902db8f73b7716..5f70c39e0d1866d000545b536b4e3451c3b3e67e 100644 --- a/lib/modules/manager/buildpacks/extract.spec.ts +++ b/lib/modules/manager/buildpacks/extract.spec.ts @@ -76,6 +76,7 @@ id = "not/valid"`, currentValue: '1.1.1', datasource: 'docker', depName: 'registry.corp/builder/noble', + packageName: 'registry.corp/builder/noble', replaceString: 'registry.corp/builder/noble:1.1.1', }, { @@ -84,6 +85,7 @@ id = "not/valid"`, currentValue: '2.2.2', datasource: 'docker', depName: 'buildpacks/java', + packageName: 'buildpacks/java', replaceString: 'buildpacks/java:2.2.2', }, { @@ -92,6 +94,7 @@ id = "not/valid"`, currentValue: '3.3.3', datasource: 'docker', depName: 'buildpacks/nodejs', + packageName: 'buildpacks/nodejs', replaceString: 'buildpacks/nodejs:3.3.3', }, { @@ -115,6 +118,7 @@ id = "not/valid"`, 'sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef', datasource: 'docker', depName: 'cnbs/some-bp', + packageName: 'cnbs/some-bp', replaceString: 'cnbs/some-bp@sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef', }, @@ -126,6 +130,7 @@ id = "not/valid"`, currentValue: 'some-tag', datasource: 'docker', depName: 'cnbs/some-bp', + packageName: 'cnbs/some-bp', replaceString: 'cnbs/some-bp:some-tag@sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef', }, diff --git a/lib/modules/manager/circleci/extract.spec.ts b/lib/modules/manager/circleci/extract.spec.ts index 25915c53639f84235a9bed3ff1ac71af7006e14c..a8604782cb866fb4ade3ebc445323e53bc30954a 100644 --- a/lib/modules/manager/circleci/extract.spec.ts +++ b/lib/modules/manager/circleci/extract.spec.ts @@ -33,6 +33,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '0.6.2', datasource: 'docker', depName: 'my-quay-mirror.registry.com/myName/myPackage', + packageName: 'my-quay-mirror.registry.com/myName/myPackage', depType: 'docker', replaceString: 'quay.io/myName/myPackage:0.6.2', }, @@ -48,6 +49,7 @@ describe('modules/manager/circleci/extract', () => { '{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'docker', replaceString: 'node', }, @@ -57,6 +59,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '4', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'docker', replaceString: 'node:4', }, @@ -66,6 +69,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '6', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'docker', replaceString: 'node:6', }, @@ -75,6 +79,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '8.9.0', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'docker', replaceString: 'node:8.9.0', }, @@ -115,6 +120,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3.7', datasource: 'docker', depName: 'python', + packageName: 'python', depType: 'docker', replaceString: 'python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077', @@ -127,6 +133,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3.7', datasource: 'docker', depName: 'python', + packageName: 'python', depType: 'docker', replaceString: 'python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077', @@ -139,6 +146,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3.7', datasource: 'docker', depName: 'python', + packageName: 'python', depType: 'docker', replaceString: 'python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077', @@ -151,6 +159,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3.7', datasource: 'docker', depName: 'python', + packageName: 'python', depType: 'docker', replaceString: 'python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077', @@ -163,6 +172,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3-6', datasource: 'docker', depName: 'pypy', + packageName: 'pypy', depType: 'docker', replaceString: 'pypy:3-6@sha256:eb6325b75c1c70b4992eaa1bdd29e24e5f14d5324b4714a49f3e67783473214b', @@ -175,6 +185,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3.7', datasource: 'docker', depName: 'python', + packageName: 'python', depType: 'docker', replaceString: 'python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077', @@ -191,6 +202,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '14.8.0', datasource: 'docker', depName: 'cimg/node', + packageName: 'cimg/node', depType: 'docker', replaceString: 'cimg/node:14.8.0', }, @@ -200,6 +212,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '14.8.0', datasource: 'docker', depName: 'cimg/node', + packageName: 'cimg/node', depType: 'docker', replaceString: 'cimg/node:14.8.0', }, @@ -244,6 +257,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3.0.3-browsers', datasource: 'docker', depName: 'cimg/ruby', + packageName: 'cimg/ruby', depType: 'docker', replaceString: 'cimg/ruby:3.0.3-browsers', }, @@ -293,6 +307,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3.9', datasource: 'docker', depName: 'cimg/python', + packageName: 'cimg/python', depType: 'docker', replaceString: 'cimg/python:3.9', }, @@ -303,6 +318,7 @@ describe('modules/manager/circleci/extract', () => { currentValue: '3.7', datasource: 'docker', depName: 'cimg/python', + packageName: 'cimg/python', depType: 'docker', replaceString: 'cimg/python:3.7', }, diff --git a/lib/modules/manager/cloudbuild/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/cloudbuild/__snapshots__/extract.spec.ts.snap index 571bcea29b60e263eca27096d350b1c388cf5321..4b89bef9ad29dab30047e0274b6542d7dff93e0e 100644 --- a/lib/modules/manager/cloudbuild/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/cloudbuild/__snapshots__/extract.spec.ts.snap @@ -8,6 +8,7 @@ exports[`modules/manager/cloudbuild/extract extractPackageFile() extracts multip "currentValue": "19.03.8", "datasource": "docker", "depName": "gcr.io/cloud-builders/docker", + "packageName": "gcr.io/cloud-builders/docker", "replaceString": "gcr.io/cloud-builders/docker:19.03.8", }, { @@ -16,6 +17,7 @@ exports[`modules/manager/cloudbuild/extract extractPackageFile() extracts multip "currentValue": "12", "datasource": "docker", "depName": "node", + "packageName": "node", "replaceString": "node:12", }, { @@ -24,6 +26,7 @@ exports[`modules/manager/cloudbuild/extract extractPackageFile() extracts multip "currentValue": undefined, "datasource": "docker", "depName": "gcr.io/cloud-builders/kubectl", + "packageName": "gcr.io/cloud-builders/kubectl", "replaceString": "gcr.io/cloud-builders/kubectl", }, ] diff --git a/lib/modules/manager/crossplane/extract.spec.ts b/lib/modules/manager/crossplane/extract.spec.ts index dc16cb1962d4301efd6afd7b624e14c09eadcdab..d66c5baa9f7a678ab58dc38d6a18ddfb12e9206f 100644 --- a/lib/modules/manager/crossplane/extract.spec.ts +++ b/lib/modules/manager/crossplane/extract.spec.ts @@ -102,6 +102,7 @@ describe('modules/manager/crossplane/extract', () => { currentValue: 'v0.2.0', datasource: 'docker', depName: 'xpkg.upbound.io/crossplane-contrib/provider-nop', + packageName: 'xpkg.upbound.io/crossplane-contrib/provider-nop', depType: 'provider', replaceString: 'xpkg.upbound.io/crossplane-contrib/provider-nop:v0.2.0', @@ -113,6 +114,7 @@ describe('modules/manager/crossplane/extract', () => { currentValue: 'v0.2.1', datasource: 'docker', depName: 'xpkg.upbound.io/crossplane-contrib/function-dummy', + packageName: 'xpkg.upbound.io/crossplane-contrib/function-dummy', depType: 'function', replaceString: 'xpkg.upbound.io/crossplane-contrib/function-dummy:v0.2.1', @@ -124,6 +126,7 @@ describe('modules/manager/crossplane/extract', () => { currentValue: 'v0.6.0', datasource: 'docker', depName: 'xpkg.upbound.io/upbound/platform-ref-aws', + packageName: 'xpkg.upbound.io/upbound/platform-ref-aws', depType: 'configuration', replaceString: 'xpkg.upbound.io/upbound/platform-ref-aws:v0.6.0', }, @@ -142,6 +145,7 @@ describe('modules/manager/crossplane/extract', () => { currentValue: 'v0.2.0', datasource: 'docker', depName: 'xpkg.upbound.io/crossplane-contrib/provider-nop', + packageName: 'xpkg.upbound.io/crossplane-contrib/provider-nop', depType: 'provider', replaceString: 'xpkg.upbound.io/crossplane-contrib/provider-nop:v0.2.0', diff --git a/lib/modules/manager/devcontainer/extract.spec.ts b/lib/modules/manager/devcontainer/extract.spec.ts index 0daf77784c51dc5a15f7a23c401ca20052daddcd..0a6a3fdd5d3b4936b8aa7585c1834ebe8bcdfe5e 100644 --- a/lib/modules/manager/devcontainer/extract.spec.ts +++ b/lib/modules/manager/devcontainer/extract.spec.ts @@ -54,6 +54,8 @@ describe('modules/manager/devcontainer/extract', () => { currentValue: '1.2.3', datasource: 'docker', depName: 'devcontainer.registry.renovate.com/test/features/first', + packageName: + 'devcontainer.registry.renovate.com/test/features/first', depType: 'feature', pinDigests: false, replaceString: @@ -90,6 +92,8 @@ describe('modules/manager/devcontainer/extract', () => { currentValue: '1.2.3', datasource: 'docker', depName: 'devcontainer.registry.renovate.com/test/features/first', + packageName: + 'devcontainer.registry.renovate.com/test/features/first', depType: 'feature', pinDigests: false, replaceString: @@ -102,6 +106,8 @@ describe('modules/manager/devcontainer/extract', () => { currentValue: '4.5.6', datasource: 'docker', depName: 'devcontainer.registry.renovate.com/test/features/second', + packageName: + 'devcontainer.registry.renovate.com/test/features/second', depType: 'feature', pinDigests: false, replaceString: @@ -139,6 +145,7 @@ describe('modules/manager/devcontainer/extract', () => { currentValue: '1.2.3', datasource: 'docker', depName: 'devcontainer.registry.renovate.com/test/image', + packageName: 'devcontainer.registry.renovate.com/test/image', depType: 'image', replaceString: 'devcontainer.registry.renovate.com/test/image:1.2.3', @@ -150,6 +157,7 @@ describe('modules/manager/devcontainer/extract', () => { currentValue: '4.5.6', datasource: 'docker', depName: 'devcontainer.registry.renovate.com/test/feature', + packageName: 'devcontainer.registry.renovate.com/test/feature', depType: 'feature', pinDigests: false, replaceString: @@ -183,6 +191,7 @@ describe('modules/manager/devcontainer/extract', () => { currentValue: '1.2.3', datasource: 'docker', depName: 'devcontainer.registry.renovate.com/test/image', + packageName: 'devcontainer.registry.renovate.com/test/image', depType: 'image', replaceString: 'devcontainer.registry.renovate.com/test/image:1.2.3', @@ -346,6 +355,7 @@ describe('modules/manager/devcontainer/extract', () => { currentValue: '1.2.3', datasource: 'docker', depName: 'devcontainer.registry.renovate.com/test/feature', + packageName: 'devcontainer.registry.renovate.com/test/feature', depType: 'feature', pinDigests: false, replaceString: diff --git a/lib/modules/manager/docker-compose/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/docker-compose/__snapshots__/extract.spec.ts.snap index 37f2584f537f373cfb75ac2711f12a8dc9ac529f..d977673c61ec126824660eac6cf1d1a3e419c318 100644 --- a/lib/modules/manager/docker-compose/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/docker-compose/__snapshots__/extract.spec.ts.snap @@ -8,6 +8,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "alpine", "datasource": "docker", "depName": "quay.io/something/redis", + "packageName": "quay.io/something/redis", "replaceString": "quay.io/something/redis:alpine", }, { @@ -16,6 +17,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "10.0.0", "datasource": "docker", "depName": "node", + "packageName": "node", "replaceString": "node:10.0.0", }, { @@ -24,6 +26,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "9.4.0", "datasource": "docker", "depName": "postgres", + "packageName": "postgres", "replaceString": "postgres:9.4.0", }, { @@ -32,6 +35,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "before", "datasource": "docker", "depName": "dockersamples/examplevotingapp_vote", + "packageName": "dockersamples/examplevotingapp_vote", "replaceString": "dockersamples/examplevotingapp_vote:before", }, { @@ -40,6 +44,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "before", "datasource": "docker", "depName": "dockersamples/examplevotingapp_result", + "packageName": "dockersamples/examplevotingapp_result", "replaceString": "dockersamples/examplevotingapp_result:before", }, { @@ -48,6 +53,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": undefined, "datasource": "docker", "depName": "dockersamples/examplevotingapp_worker", + "packageName": "dockersamples/examplevotingapp_worker", "replaceString": "dockersamples/examplevotingapp_worker", }, { @@ -56,6 +62,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "stable", "datasource": "docker", "depName": "dockersamples/visualizer", + "packageName": "dockersamples/visualizer", "replaceString": "dockersamples/visualizer:stable", }, { @@ -75,6 +82,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "alpine", "datasource": "docker", "depName": "quay.io/something/redis", + "packageName": "quay.io/something/redis", "replaceString": "quay.io/something/redis:alpine", }, { @@ -83,6 +91,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "10.0.0", "datasource": "docker", "depName": "node", + "packageName": "node", "replaceString": "node:10.0.0", }, { @@ -91,6 +100,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "9.4.0", "datasource": "docker", "depName": "postgres", + "packageName": "postgres", "replaceString": "postgres:9.4.0", }, { @@ -99,6 +109,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "before", "datasource": "docker", "depName": "dockersamples/examplevotingapp_vote", + "packageName": "dockersamples/examplevotingapp_vote", "replaceString": "dockersamples/examplevotingapp_vote:before", }, { @@ -107,6 +118,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "before", "datasource": "docker", "depName": "dockersamples/examplevotingapp_result", + "packageName": "dockersamples/examplevotingapp_result", "replaceString": "dockersamples/examplevotingapp_result:before", }, { @@ -115,6 +127,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": undefined, "datasource": "docker", "depName": "dockersamples/examplevotingapp_worker", + "packageName": "dockersamples/examplevotingapp_worker", "replaceString": "dockersamples/examplevotingapp_worker", }, { @@ -123,6 +136,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "stable", "datasource": "docker", "depName": "dockersamples/visualizer", + "packageName": "dockersamples/visualizer", "replaceString": "dockersamples/visualizer:stable", }, { @@ -142,6 +156,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "alpine", "datasource": "docker", "depName": "quay.io/something/redis", + "packageName": "quay.io/something/redis", "replaceString": "quay.io/something/redis:alpine", }, { @@ -150,6 +165,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "10.0.0", "datasource": "docker", "depName": "node", + "packageName": "node", "replaceString": "node:10.0.0", }, { @@ -158,6 +174,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "9.4.0", "datasource": "docker", "depName": "postgres", + "packageName": "postgres", "replaceString": "postgres:9.4.0", }, { @@ -166,6 +183,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "before", "datasource": "docker", "depName": "dockersamples/examplevotingapp_vote", + "packageName": "dockersamples/examplevotingapp_vote", "replaceString": "dockersamples/examplevotingapp_vote:before", }, { @@ -174,6 +192,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "before", "datasource": "docker", "depName": "dockersamples/examplevotingapp_result", + "packageName": "dockersamples/examplevotingapp_result", "replaceString": "dockersamples/examplevotingapp_result:before", }, { @@ -182,6 +201,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": undefined, "datasource": "docker", "depName": "dockersamples/examplevotingapp_worker", + "packageName": "dockersamples/examplevotingapp_worker", "replaceString": "dockersamples/examplevotingapp_worker", }, { @@ -190,6 +210,7 @@ exports[`modules/manager/docker-compose/extract extractPackageFile() extracts mu "currentValue": "stable", "datasource": "docker", "depName": "dockersamples/visualizer", + "packageName": "dockersamples/visualizer", "replaceString": "dockersamples/visualizer:stable", }, { diff --git a/lib/modules/manager/docker-compose/extract.spec.ts b/lib/modules/manager/docker-compose/extract.spec.ts index a089c8b465a6125892f85df76b7cd4b98fb67332..e3d0cda891576894d3914621280b375bf16fd457 100644 --- a/lib/modules/manager/docker-compose/extract.spec.ts +++ b/lib/modules/manager/docker-compose/extract.spec.ts @@ -41,18 +41,18 @@ describe('modules/manager/docker-compose/extract', () => { it('extracts default variable values for version 3', () => { const res = extractPackageFile(yamlFile3DefaultValue, '', {}); - expect(res?.deps).toMatchInlineSnapshot(` - [ - { - "autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}", - "currentDigest": "sha256:abcd", - "currentValue": "5.0.0", - "datasource": "docker", - "depName": "redis", - "replaceString": "redis:5.0.0@sha256:abcd", - }, - ] - `); + expect(res?.deps).toEqual([ + { + autoReplaceStringTemplate: + '{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}', + currentDigest: 'sha256:abcd', + currentValue: '5.0.0', + datasource: 'docker', + depName: 'redis', + packageName: 'redis', + replaceString: 'redis:5.0.0@sha256:abcd', + }, + ]); expect(res?.deps).toHaveLength(1); }); @@ -72,6 +72,7 @@ describe('modules/manager/docker-compose/extract', () => { deps: [ { depName: 'node', + packageName: 'node', currentValue: '20.0.0', currentDigest: undefined, replaceString: 'node:20.0.0', @@ -104,6 +105,7 @@ describe('modules/manager/docker-compose/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'my-quay-mirror.registry.com/nginx', + packageName: 'my-quay-mirror.registry.com/nginx', replaceString: 'quay.io/nginx:0.0.1', }, ], @@ -131,6 +133,7 @@ describe('modules/manager/docker-compose/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'quay.io/nginx', + packageName: 'quay.io/nginx', replaceString: 'quay.io/nginx:0.0.1', }, ], @@ -159,6 +162,7 @@ describe('modules/manager/docker-compose/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'my-quay-mirror.registry.com/nginx', + packageName: 'my-quay-mirror.registry.com/nginx', replaceString: 'quay.io/nginx:0.0.1', }, ], @@ -184,6 +188,7 @@ describe('modules/manager/docker-compose/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'quay.io/nginx', + packageName: 'quay.io/nginx', replaceString: 'quay.io/nginx:0.0.1', }, ], diff --git a/lib/modules/manager/dockerfile/extract.spec.ts b/lib/modules/manager/dockerfile/extract.spec.ts index a2bcdab3feca0e2f8f0f019ebbd02e1545ca6889..6c961830c79506198a983f331e2adfac423a1ea6 100644 --- a/lib/modules/manager/dockerfile/extract.spec.ts +++ b/lib/modules/manager/dockerfile/extract.spec.ts @@ -26,6 +26,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node', }, @@ -50,6 +51,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'ghcr.io/astral-sh/uv', + packageName: 'ghcr.io/astral-sh/uv', depType: 'stage', replaceString: 'ghcr.io/astral-sh/uv', }, @@ -60,6 +62,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'example.com/cache/image', + packageName: 'example.com/cache/image', depType: 'final', replaceString: 'example.com/cache/image', }, @@ -76,6 +79,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node', }, @@ -92,6 +96,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8.9.0-alpine', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node:8.9.0-alpine', }, @@ -113,6 +118,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node@sha256:eb85fc5b1198f5e1ec025ea07586bdbbf397e7d82df66c90d7511f533517e063', @@ -135,6 +141,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8.9.0', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node:8.9.0@sha256:eb85fc5b1198f5e1ec025ea07586bdbbf397e7d82df66c90d7511f533517e063', @@ -156,6 +163,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8.9.0-alpine', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node:8.9.0-alpine', }, @@ -176,6 +184,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node', }, @@ -196,6 +205,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8', datasource: 'docker', depName: 'registry2.something.info/node', + packageName: 'registry2.something.info/node', depType: 'final', replaceString: 'registry2.something.info/node:8', }, @@ -216,6 +226,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8-alpine', datasource: 'docker', depName: 'registry2.something.info/node', + packageName: 'registry2.something.info/node', depType: 'final', replaceString: 'registry2.something.info/node:8-alpine', }, @@ -236,6 +247,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8', datasource: 'docker', depName: 'registry2.something.info:5005/node', + packageName: 'registry2.something.info:5005/node', depType: 'final', replaceString: 'registry2.something.info:5005/node:8', }, @@ -256,6 +268,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'registry2.something.info:5005/node', + packageName: 'registry2.something.info:5005/node', depType: 'final', replaceString: 'registry2.something.info:5005/node', }, @@ -289,6 +302,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8', datasource: 'docker', depName: 'mynamespace/node', + packageName: 'mynamespace/node', depType: 'final', replaceString: 'mynamespace/node:8', }, @@ -309,6 +323,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8', datasource: 'docker', depName: 'registry2.something.info/someaccount/node', + packageName: 'registry2.something.info/someaccount/node', depType: 'final', replaceString: 'registry2.something.info/someaccount/node:8', }, @@ -329,6 +344,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8.7.0', datasource: 'docker', depName: 'registry.allmine.info:5005/node', + packageName: 'registry.allmine.info:5005/node', depType: 'final', replaceString: 'registry.allmine.info:5005/node:8.7.0', }, @@ -349,6 +365,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '6.12.3', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'stage', replaceString: 'node:6.12.3', }, @@ -359,6 +376,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '3.6-slim', datasource: 'docker', depName: 'python', + packageName: 'python', depType: 'final', replaceString: 'python:3.6-slim', }, @@ -379,6 +397,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '6.12.3', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node:6.12.3', }, @@ -404,6 +423,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '6.12.3', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node:6.12.3', }, @@ -424,6 +444,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: 'v0.11.0', datasource: 'docker', depName: 'gcr.io/k8s-skaffold/skaffold', + packageName: 'gcr.io/k8s-skaffold/skaffold', depType: 'final', replaceString: 'gcr.io/k8s-skaffold/skaffold:v0.11.0', }, @@ -448,6 +469,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: 'v0.11.0', datasource: 'docker', depName: 'gcr.io/k8s-skaffold/skaffold', + packageName: 'gcr.io/k8s-skaffold/skaffold', depType: 'final', replaceString: 'gcr.io/k8s-skaffold/skaffold:v0.11.0', }, @@ -469,6 +491,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '6.12.3', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node:6.12.3', }, @@ -489,6 +512,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '6.12.3', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'final', replaceString: 'node:6.12.3', }, @@ -509,6 +533,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8.15.1-alpine', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'stage', replaceString: 'node:8.15.1-alpine', }, @@ -519,6 +544,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.23.3', datasource: 'docker', depName: 'golang', + packageName: 'golang', depType: 'stage', replaceString: 'golang:1.23.3', }, @@ -529,6 +555,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: 'latest', datasource: 'docker', depName: 'alpine', + packageName: 'alpine', depType: 'final', replaceString: 'alpine:latest', }, @@ -552,6 +579,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '8.11.3-alpine', datasource: 'docker', depName: 'node', + packageName: 'node', depType: 'stage', replaceString: 'node:8.11.3-alpine@sha256:d743b4141b02fcfb8beb68f92b4cd164f60ee457bf2d053f36785bf86de16b0d', @@ -563,6 +591,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.1.1', datasource: 'docker', depName: 'buildkite/puppeteer', + packageName: 'buildkite/puppeteer', depType: 'final', replaceString: 'buildkite/puppeteer:1.1.1', }, @@ -579,6 +608,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image1', + packageName: 'image1', depType: 'stage', replaceString: 'image1', }, @@ -589,6 +619,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.0.0', datasource: 'docker', depName: 'image2', + packageName: 'image2', depType: 'stage', replaceString: 'image2:1.0.0@sha256:abcdef', }, @@ -599,6 +630,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image4', + packageName: 'image4', depType: 'stage', replaceString: 'image4', }, @@ -609,6 +641,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image5', + packageName: 'image5', depType: 'stage', replaceString: 'image5', }, @@ -619,6 +652,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image6', + packageName: 'image6', depType: 'stage', replaceString: 'image6', }, @@ -629,6 +663,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.0.0', datasource: 'docker', depName: 'image7', + packageName: 'image7', depType: 'stage', replaceString: 'image7:1.0.0@sha256:abcdef', }, @@ -639,6 +674,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image11', + packageName: 'image11', depType: 'stage', replaceString: 'image11', }, @@ -649,6 +685,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image12', + packageName: 'image12', depType: 'stage', replaceString: 'image12', }, @@ -659,6 +696,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image13', + packageName: 'image13', depType: 'final', replaceString: 'image13', }, @@ -675,6 +713,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'calico/node', + packageName: 'calico/node', depType: 'final', replaceString: 'calico/node', }, @@ -691,6 +730,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '18.04', datasource: 'docker', depName: 'ubuntu', + packageName: 'ubuntu', depType: 'final', replaceString: 'ubuntu:18.04', versioning: 'ubuntu', @@ -708,6 +748,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: 'buster', datasource: 'docker', depName: 'debian', + packageName: 'debian', depType: 'final', replaceString: 'debian:buster', versioning: 'debian', @@ -725,6 +766,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '11.4-slim', datasource: 'docker', depName: 'debian', + packageName: 'debian', depType: 'final', replaceString: 'debian:11.4-slim', }, @@ -763,6 +805,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '10', datasource: 'docker', depName: 'docker.io/library/debian', + packageName: 'docker.io/library/debian', depType: 'final', replaceString: 'docker.io/library/debian:10', versioning: 'debian', @@ -802,6 +845,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '18.04', datasource: 'docker', depName: 'public.ecr.aws/ubuntu/ubuntu', + packageName: 'public.ecr.aws/ubuntu/ubuntu', depType: 'final', replaceString: 'public.ecr.aws/ubuntu/ubuntu:18.04', versioning: 'ubuntu', @@ -823,6 +867,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '3.5', datasource: 'docker', depName: 'alpine', + packageName: 'alpine', depType: 'final', replaceString: 'alpine:3.5', }, @@ -839,6 +884,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.20', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', depType: 'final', replaceString: 'nginx:1.20', }, @@ -877,6 +923,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.20', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', depType: 'final', replaceString: 'FROM nginx:1.20${patch1}$patch2\n', }, @@ -897,6 +944,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.60.0-bullseye', datasource: 'docker', depName: 'rust', + packageName: 'rust', depType: 'final', replaceString: 'ARG\tVARIANT="1.60.0-bullseye" \n', }, @@ -916,6 +964,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: 'xenial', datasource: 'docker', depName: 'ubuntu', + packageName: 'ubuntu', depType: 'final', replaceString: 'ARG IMAGE_VERSION=${IMAGE_VERSION:-ubuntu:xenial}\n', versioning: 'ubuntu', @@ -939,6 +988,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'gcr.io/distroless/java17', + packageName: 'gcr.io/distroless/java17', depType: 'final', replaceString: 'ARG sha_digest=sha256:ab37242e81cbc031b2600eef4440fe87055a05c14b40686df85078cc5086c98f', @@ -960,6 +1010,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.19', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', depType: 'stage', replaceString: 'ARG base=nginx:1.19\n', }, @@ -970,6 +1021,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.20', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', depType: 'final', replaceString: 'ARG base=nginx:1.20\n', }, @@ -990,6 +1042,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '9.2-devel-ubuntu16.04', datasource: 'docker', depName: 'nvidia/cuda', + packageName: 'nvidia/cuda', depType: 'final', replaceString: 'nvidia/cuda:9.2-devel-ubuntu16.04', }, @@ -1017,6 +1070,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '3.15.4', datasource: 'docker', depName: 'alpine', + packageName: 'alpine', depType: 'stage', replaceString: ' ARG \\\n' + @@ -1035,6 +1089,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.18.0-alpine', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', depType: 'final', replaceString: 'ARG \\\n' + @@ -1060,6 +1115,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.20', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', depType: 'final', replaceString: 'nginx:1.20', }, @@ -1076,6 +1132,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1', datasource: 'docker', depName: 'docker/dockerfile', + packageName: 'docker/dockerfile', depType: 'syntax', replaceString: 'docker/dockerfile:1', }, @@ -1088,6 +1145,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '3.15.4', datasource: 'docker', depName: 'alpine', + packageName: 'alpine', depType: 'stage', replaceString: ' ARG `\n' + @@ -1105,6 +1163,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '18.04', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', depType: 'stage', replaceString: 'ARG `\n' + @@ -1120,6 +1179,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image5', + packageName: 'image5', depType: 'stage', replaceString: 'image5', }, @@ -1130,6 +1190,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'image12', + packageName: 'image12', depType: 'final', replaceString: 'image12', }, @@ -1150,6 +1211,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: 'nonroot', datasource: 'docker', depName: 'gcr.io/distroless/static-debian11', + packageName: 'gcr.io/distroless/static-debian11', depType: 'final', replaceString: 'ARG REF_NAME=${REF_NAME:-"gcr.io/distroless/static-debian11:nonroot@sha256:abc"}', @@ -1171,6 +1233,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '14.04', datasource: 'docker', depName: 'ubuntu', + packageName: 'ubuntu', depType: 'final', replaceString: 'ARG IMAGE_TAG=14.04\r\n#something unrelated\r\nFROM ubuntu:$IMAGE_TAG@sha256:abc', @@ -1203,6 +1266,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '16.14.2-alpine3.14', datasource: 'docker', depName: 'docker.io/library/node', + packageName: 'docker.io/library/node', depType: 'final', replaceString: 'ARG NODE_IMAGE_HASH="@sha256:ba9c961513b853210ae0ca1524274eafa5fd94e20b856343887ca7274c8450e4"\n' + @@ -1229,6 +1293,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '0.6.2', datasource: 'docker', depName: 'quay.io/myName/myPackage', + packageName: 'quay.io/myName/myPackage', depType: 'final', replaceString: 'quay.io/myName/myPackage:0.6.2', }, @@ -1256,6 +1321,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '0.6.2', datasource: 'docker', depName: 'my-quay-mirror.registry.com/myName/myPackage', + packageName: 'my-quay-mirror.registry.com/myName/myPackage', depType: 'final', replaceString: 'quay.io/myName/myPackage:0.6.2', }, @@ -1283,6 +1349,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '0.6.2', datasource: 'docker', depName: 'myName/myPackage', + packageName: 'myName/myPackage', depType: 'final', replaceString: 'myName/myPackage:0.6.2', }, @@ -1305,6 +1372,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '1.1.7', datasource: 'docker', depName: 'docker/dockerfile', + packageName: 'docker/dockerfile', depType: 'syntax', replaceString: 'docker/dockerfile:1.1.7', }, @@ -1315,6 +1383,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '3.13.5', datasource: 'docker', depName: 'alpine', + packageName: 'alpine', depType: 'final', replaceString: 'alpine:3.13.5', }, @@ -1337,6 +1406,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '3.13.5', datasource: 'docker', depName: 'alpine', + packageName: 'alpine', depType: 'final', replaceString: 'alpine:3.13.5', }, @@ -1362,6 +1432,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '5.0.0', datasource: 'docker', depName: 'redis', + packageName: 'redis', replaceString: 'redis:5.0.0@sha256:abcd', }); @@ -1372,6 +1443,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: '5.0.0', datasource: 'docker', depName: 'redis', + packageName: 'redis', replaceString: 'redis:5.0.0', }); @@ -1382,6 +1454,7 @@ describe('modules/manager/dockerfile/extract', () => { currentDigest: 'sha256:abcd', datasource: 'docker', depName: 'redis', + packageName: 'redis', replaceString: 'redis@sha256:abcd', }); @@ -1395,6 +1468,7 @@ describe('modules/manager/dockerfile/extract', () => { currentValue: 'nonroot', datasource: 'docker', depName: 'gcr.io/distroless/static-debian11', + packageName: 'gcr.io/distroless/static-debian11', replaceString: 'gcr.io/distroless/static-debian11:nonroot@sha256:abc', }); @@ -1473,9 +1547,10 @@ describe('modules/manager/dockerfile/extract', () => { it.each` name | registryAliases | imageName | dep - ${'multiple aliases'} | ${{ foo: 'foo.registry.com', bar: 'bar.registry.com' }} | ${'foo/image:1.0'} | ${{ depName: 'foo.registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `foo/image${versionAndDigestTemplate}` }} - ${'aliased variable'} | ${{ $CI_REGISTRY: 'registry.com' }} | ${'$CI_REGISTRY/image:1.0'} | ${{ depName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `$CI_REGISTRY/image${versionAndDigestTemplate}` }} - ${'variables with brackets'} | ${{ '${CI_REGISTRY}': 'registry.com' }} | ${'${CI_REGISTRY}/image:1.0'} | ${{ depName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `$\{CI_REGISTRY}/image${versionAndDigestTemplate}` }} + ${'simple aliases'} | ${{ 'foo.com/some': 'foo.registry.com' }} | ${'foo.com/some/image:1.0'} | ${{ depName: 'foo.registry.com/image', packageName: 'foo.registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `foo.com/some/image${versionAndDigestTemplate}` }} + ${'multiple aliases'} | ${{ foo: 'foo.registry.com', bar: 'bar.registry.com' }} | ${'foo/image:1.0'} | ${{ depName: 'foo.registry.com/image', packageName: 'foo.registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `foo/image${versionAndDigestTemplate}` }} + ${'aliased variable'} | ${{ $CI_REGISTRY: 'registry.com' }} | ${'$CI_REGISTRY/image:1.0'} | ${{ depName: 'registry.com/image', packageName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `$CI_REGISTRY/image${versionAndDigestTemplate}` }} + ${'variables with brackets'} | ${{ '${CI_REGISTRY}': 'registry.com' }} | ${'${CI_REGISTRY}/image:1.0'} | ${{ depName: 'registry.com/image', packageName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `$\{CI_REGISTRY}/image${versionAndDigestTemplate}` }} ${'not aliased variable'} | ${{}} | ${'$CI_REGISTRY/image:1.0'} | ${{ autoReplaceStringTemplate: defaultAutoReplaceStringTemplate }} ${'plain image'} | ${{}} | ${'registry.com/image:1.0'} | ${{ depName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: defaultAutoReplaceStringTemplate }} `( diff --git a/lib/modules/manager/dockerfile/extract.ts b/lib/modules/manager/dockerfile/extract.ts index 019e7ee86a16533b1d86a9dcd181916efa883c1c..17de386bd19565954534b9884793e5ac6fd2a4dc 100644 --- a/lib/modules/manager/dockerfile/extract.ts +++ b/lib/modules/manager/dockerfile/extract.ts @@ -141,6 +141,7 @@ export function splitImageParts(currentFrom: string): PackageDependency { const dep: PackageDependency = { depName, + packageName: depName, currentValue, currentDigest, }; @@ -176,12 +177,12 @@ export function getDep( // Resolve registry aliases first so that we don't need special casing later on: for (const [name, value] of Object.entries(registryAliases ?? {})) { const escapedName = escapeRegExp(name); - const groups = regEx(`(?<prefix>${escapedName})/(?<depName>.+)`).exec( + const groups = regEx(`${escapedName}/(?<depName>.+)`).exec( currentFrom, )?.groups; if (groups) { const dep = { - ...getDep(`${value}/${groups.depName}`), + ...getDep(`${value}/${groups.depName}`, false), replaceString: currentFrom, }; dep.autoReplaceStringTemplate = getAutoReplaceTemplate(dep); @@ -204,7 +205,6 @@ export function getDep( const specialPrefixes = ['amd64', 'arm64', 'library']; for (const prefix of specialPrefixes) { if (dep.depName.startsWith(`${prefix}/`)) { - dep.packageName = dep.depName; dep.depName = dep.depName.replace(`${prefix}/`, ''); if (specifyReplaceString) { dep.autoReplaceStringTemplate = @@ -229,7 +229,6 @@ export function getDep( if (dep.depName && quayRegex.test(dep.depName)) { const depName = dep.depName.replace(quayRegex, 'quay.io'); if (depName !== dep.depName) { - dep.packageName = dep.depName; dep.depName = depName; dep.autoReplaceStringTemplate = '{{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 3d757597bec4e8be35794564d43d54a28994f9eb..a5b0403ea1628c2bac2e2de470501ebb64f9c076 100644 --- a/lib/modules/manager/droneci/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/droneci/__snapshots__/extract.spec.ts.snap @@ -9,6 +9,7 @@ exports[`modules/manager/droneci/extract extractPackageFile() extracts multiple "datasource": "docker", "depName": "elixir", "depType": "docker", + "packageName": "elixir", "replaceString": "elixir:1.8.1-alpine", }, { @@ -28,6 +29,7 @@ exports[`modules/manager/droneci/extract extractPackageFile() extracts multiple "datasource": "docker", "depName": "mysql", "depType": "docker", + "packageName": "mysql", "replaceString": "mysql:5.7.24", }, { @@ -37,6 +39,7 @@ exports[`modules/manager/droneci/extract extractPackageFile() extracts multiple "datasource": "docker", "depName": "redis", "depType": "docker", + "packageName": "redis", "replaceString": "redis:alpine", }, { diff --git a/lib/modules/manager/droneci/extract.spec.ts b/lib/modules/manager/droneci/extract.spec.ts index f2dc05ea53ad584a42470b8126796548500e71d1..43ab0062e6f1f4a0b070e4ef2da2127c67d99670 100644 --- a/lib/modules/manager/droneci/extract.spec.ts +++ b/lib/modules/manager/droneci/extract.spec.ts @@ -32,6 +32,7 @@ describe('modules/manager/droneci/extract', () => { currentValue: '1.8.1-alpine', datasource: 'docker', depName: 'my-quay-mirror.registry.com/elixir', + packageName: 'my-quay-mirror.registry.com/elixir', replaceString: 'quay.io/elixir:1.8.1-alpine', depType: 'docker', }, @@ -54,6 +55,7 @@ describe('modules/manager/droneci/extract', () => { currentValue: '1.8.1-alpine', datasource: 'docker', depName: 'quay.io/elixir', + packageName: 'quay.io/elixir', replaceString: 'quay.io/elixir:1.8.1-alpine', depType: 'docker', }, @@ -77,6 +79,7 @@ describe('modules/manager/droneci/extract', () => { currentValue: '1.8.1-alpine', datasource: 'docker', depName: 'my-quay-mirror.registry.com/elixir', + packageName: 'my-quay-mirror.registry.com/elixir', replaceString: 'quay.io/elixir:1.8.1-alpine', depType: 'docker', }, diff --git a/lib/modules/manager/fleet/extract.ts b/lib/modules/manager/fleet/extract.ts index a84dfa3a04756b3ee14320cfdb90050806f61713..6470f40b4dc51175cf68188fc9ea3c92c14db519 100644 --- a/lib/modules/manager/fleet/extract.ts +++ b/lib/modules/manager/fleet/extract.ts @@ -61,8 +61,6 @@ function extractFleetHelmBlock(doc: FleetHelmBlock): PackageDependency { return { ...dockerDep, depType: 'fleet', - depName: dockerDep.depName, - packageName: dockerDep.depName, // https://github.com/helm/helm/issues/10312 // https://github.com/helm/helm/issues/10678 pinDigests: false, diff --git a/lib/modules/manager/flux/extract.spec.ts b/lib/modules/manager/flux/extract.spec.ts index 70e97ac27466142b527bc697bd107b5d7f8c7c2e..abd5c4edbdcac04cea6de2e110715cef46ffcad1 100644 --- a/lib/modules/manager/flux/extract.spec.ts +++ b/lib/modules/manager/flux/extract.spec.ts @@ -41,6 +41,7 @@ describe('modules/manager/flux/extract', () => { currentValue: 'v0.13.4', datasource: DockerDatasource.id, depName: 'k8s.gcr.io/external-dns/external-dns', + packageName: 'k8s.gcr.io/external-dns/external-dns', replaceString: 'v0.13.4', versioning: DockerDatasource.id, }, @@ -58,6 +59,7 @@ describe('modules/manager/flux/extract', () => { currentValue: 'v1.8.2', datasource: DockerDatasource.id, depName: 'ghcr.io/kyverno/manifests/kyverno', + packageName: 'ghcr.io/kyverno/manifests/kyverno', replaceString: 'v1.8.2', }, ], @@ -544,6 +546,7 @@ describe('modules/manager/flux/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'ghcr.io/kyverno/manifests/kyverno', + packageName: 'ghcr.io/kyverno/manifests/kyverno', skipReason: 'unversioned-reference', }, ], @@ -578,6 +581,7 @@ describe('modules/manager/flux/extract', () => { currentValue: 'v1.8.2', currentDigest: undefined, depName: 'ghcr.proxy.test/some/path/kyverno/manifests/kyverno', + packageName: 'ghcr.proxy.test/some/path/kyverno/manifests/kyverno', datasource: DockerDatasource.id, replaceString: 'v1.8.2', }, @@ -606,6 +610,7 @@ describe('modules/manager/flux/extract', () => { currentDigest: 'sha256:761c3189c482d0f1f0ad3735ca05c4c398cae201d2169f6645280c7b7b2ce6fc', depName: 'ghcr.io/kyverno/manifests/kyverno', + packageName: 'ghcr.io/kyverno/manifests/kyverno', datasource: DockerDatasource.id, }, ], @@ -636,6 +641,7 @@ describe('modules/manager/flux/extract', () => { 'sha256:761c3189c482d0f1f0ad3735ca05c4c398cae201d2169f6645280c7b7b2ce6fc', currentValue: 'v1.8.2', depName: 'ghcr.io/kyverno/manifests/kyverno', + packageName: 'ghcr.io/kyverno/manifests/kyverno', datasource: DockerDatasource.id, replaceString: 'v1.8.2@sha256:761c3189c482d0f1f0ad3735ca05c4c398cae201d2169f6645280c7b7b2ce6fc', @@ -667,6 +673,7 @@ describe('modules/manager/flux/extract', () => { 'sha256:761c3189c482d0f1f0ad3735ca05c4c398cae201d2169f6645280c7b7b2ce6fc', datasource: DockerDatasource.id, depName: 'ghcr.io/kyverno/manifests/kyverno', + packageName: 'ghcr.io/kyverno/manifests/kyverno', }, ], }); @@ -703,6 +710,7 @@ describe('modules/manager/flux/extract', () => { currentValue: 'v1', datasource: 'docker', depName: 'my-registry/podinfo', + packageName: 'my-registry/podinfo', replaceString: 'v1', }, { @@ -712,6 +720,7 @@ describe('modules/manager/flux/extract', () => { currentValue: '1.8.0', datasource: 'docker', depName: 'podinfo', + packageName: 'podinfo', replaceString: '1.8.0', }, { @@ -719,6 +728,7 @@ describe('modules/manager/flux/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'my-podinfo', + packageName: 'my-podinfo', replaceString: 'my-podinfo', }, { @@ -727,6 +737,7 @@ describe('modules/manager/flux/extract', () => { currentValue: undefined, datasource: 'docker', depName: 'podinfo', + packageName: 'podinfo', replaceString: 'sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3', }, @@ -806,6 +817,7 @@ describe('modules/manager/flux/extract', () => { currentDigest: undefined, currentValue: 'v1.8.2', depName: 'ghcr.io/kyverno/manifests/kyverno', + packageName: 'ghcr.io/kyverno/manifests/kyverno', datasource: DockerDatasource.id, replaceString: 'v1.8.2', }, diff --git a/lib/modules/manager/flux/extract.ts b/lib/modules/manager/flux/extract.ts index 3178c28e989303196cda2d4d1574faa6465fefaf..85a0a13b92421f6e087b5d1a0e410a9ab36184f9 100644 --- a/lib/modules/manager/flux/extract.ts +++ b/lib/modules/manager/flux/extract.ts @@ -123,7 +123,7 @@ function resolveHelmRepository( `${removeOCIPrefix(repo.spec.url)}/${dep.depName}`, false, registryAliases, - ).depName; + ).packageName; return null; } else { return repo.spec.url; diff --git a/lib/modules/manager/github-actions/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/github-actions/__snapshots__/extract.spec.ts.snap index 713985a87545cf3283ba27d335abc4cfa1208e89..2d48fac1dd33b3c91a47d1d5397f71a46c6f5844 100644 --- a/lib/modules/manager/github-actions/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/github-actions/__snapshots__/extract.spec.ts.snap @@ -135,6 +135,7 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "datasource": "docker", "depName": "replicated/dockerfilelint", "depType": "docker", + "packageName": "replicated/dockerfilelint", "replaceString": "replicated/dockerfilelint", }, { @@ -154,6 +155,7 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "datasource": "docker", "depName": "node", "depType": "docker", + "packageName": "node", "replaceString": "node:6@sha256:7b65413af120ec5328077775022c78101f103258a1876ec2f83890bce416e896", }, { @@ -199,6 +201,7 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "datasource": "docker", "depName": "node", "depType": "container", + "packageName": "node", "replaceString": "node:16-bullseye", }, { @@ -208,6 +211,7 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "datasource": "docker", "depName": "redis", "depType": "service", + "packageName": "redis", "replaceString": "redis:5", }, { @@ -217,6 +221,7 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "datasource": "docker", "depName": "postgres", "depType": "service", + "packageName": "postgres", "replaceString": "postgres:10", }, { @@ -235,6 +240,7 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "datasource": "docker", "depName": "node", "depType": "container", + "packageName": "node", "replaceString": "node:16-bullseye", }, { diff --git a/lib/modules/manager/gitlabci/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/gitlabci/__snapshots__/extract.spec.ts.snap index dc093e8051b4117ed8c763dbe4ebe57bf3c69cf7..46e96348ee1863e1b175694e87815f9c47c8c788 100644 --- a/lib/modules/manager/gitlabci/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/gitlabci/__snapshots__/extract.spec.ts.snap @@ -11,6 +11,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "ruby", "depType": "image", + "packageName": "ruby", "replaceString": "ruby:2.5.0", }, { @@ -20,6 +21,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "hadolint/hadolint", "depType": "image", + "packageName": "hadolint/hadolint", "replaceString": "hadolint/hadolint:latest", }, { @@ -29,6 +31,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "docker", "depType": "image", + "packageName": "docker", "replaceString": "docker:latest", }, { @@ -38,6 +41,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "docker", "depType": "service-image", + "packageName": "docker", "replaceString": "docker:dind", }, { @@ -47,6 +51,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "docker", "depType": "image", + "packageName": "docker", "replaceString": "docker:latest", }, { @@ -56,6 +61,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "docker", "depType": "service-image", + "packageName": "docker", "replaceString": "docker:dind", }, { @@ -65,6 +71,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "image-name-test", "depType": "image-name", + "packageName": "image-name-test", "replaceString": "image-name-test:1.15", }, { @@ -74,6 +81,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "image-name-test", "depType": "image-name", + "packageName": "image-name-test", "replaceString": "image-name-test:1.15", }, ], @@ -93,6 +101,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "renovate/renovate", "depType": "image-name", + "packageName": "renovate/renovate", "replaceString": "renovate/renovate:19.70.8-slim", }, { @@ -102,6 +111,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "mariadb", "depType": "service-image", + "packageName": "mariadb", "replaceString": "mariadb:10.4.11", }, { @@ -111,6 +121,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "other/image", "depType": "service-image", + "packageName": "other/image", "replaceString": "other/image:1.0.0", }, ], @@ -130,6 +141,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "renovate/renovate", "depType": "image-name", + "packageName": "renovate/renovate", "replaceString": "renovate/renovate:19.70.8-slim", }, { @@ -139,6 +151,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "mariadb", "depType": "service-image", + "packageName": "mariadb", "replaceString": "mariadb:10.4.11", }, { @@ -148,6 +161,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "other/image", "depType": "service-image", + "packageName": "other/image", "replaceString": "other/image:1.0.0", }, ], @@ -162,6 +176,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "node", "depType": "image", + "packageName": "node", "replaceString": "node:12", }, ], @@ -176,6 +191,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "alpine", "depType": "image", + "packageName": "alpine", "replaceString": "alpine:3.11", }, ], @@ -195,6 +211,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "renovate/renovate", "depType": "image-name", + "packageName": "renovate/renovate", "replaceString": "renovate/renovate:19.70.8-slim", }, { @@ -204,6 +221,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "other/image1", "depType": "service-image", + "packageName": "other/image1", "replaceString": "other/image1:1.0.0", }, { @@ -213,6 +231,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "other/image2", "depType": "service-image", + "packageName": "other/image2", "replaceString": "other/image2:1.0.0", }, { @@ -222,6 +241,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "mooseagency/postgresql", "depType": "service-image", + "packageName": "mooseagency/postgresql", "replaceString": "mooseagency/postgresql:12.3-1@sha256:a5a65569456f221ee1f8a0b3b4e2d440eb5830772d9440c9b30b1dbfd454c778", }, { @@ -231,6 +251,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "mariadb", "depType": "service-image", + "packageName": "mariadb", "replaceString": "mariadb:10.4.11", }, { @@ -240,6 +261,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "postgres", "depType": "service-image", + "packageName": "postgres", "replaceString": "postgres:11.7", }, { @@ -249,6 +271,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "redis", "depType": "service-image", + "packageName": "redis", "replaceString": "redis:latest", }, { @@ -258,6 +281,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "registry.example.com/myimage", "depType": "service-image", + "packageName": "registry.example.com/myimage", "replaceString": "registry.example.com/myimage:latest", }, { @@ -267,6 +291,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "myimage", "depType": "service-image", + "packageName": "myimage", "replaceString": "myimage@sha256:0ecb2ad60", }, { @@ -276,6 +301,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts mult "datasource": "docker", "depName": "tomcat", "depType": "service-image", + "packageName": "tomcat", "replaceString": "tomcat:7-jre8", }, ], @@ -295,6 +321,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts name "datasource": "docker", "depName": "renovate/renovate", "depType": "image-name", + "packageName": "renovate/renovate", "replaceString": "renovate/renovate:19.70.8-slim", }, { @@ -304,6 +331,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts name "datasource": "docker", "depName": "mariadb", "depType": "service-image", + "packageName": "mariadb", "replaceString": "mariadb:10.4.11", }, { @@ -313,6 +341,7 @@ exports[`modules/manager/gitlabci/extract extractAllPackageFiles() extracts name "datasource": "docker", "depName": "other/image", "depType": "service-image", + "packageName": "other/image", "replaceString": "other/image:1.0.0", }, ], diff --git a/lib/modules/manager/gitlabci/extract.spec.ts b/lib/modules/manager/gitlabci/extract.spec.ts index 750273089e2738f30c1b93b68b0d6c1ae376d480..b476ab13ebb3b1dffd74e5455b6bbfd824c4f3a4 100644 --- a/lib/modules/manager/gitlabci/extract.spec.ts +++ b/lib/modules/manager/gitlabci/extract.spec.ts @@ -197,6 +197,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: '31.65.1-slim', datasource: 'docker', depName: 'renovate/renovate', + packageName: 'renovate/renovate', depType: 'image-name', replaceString: '${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/renovate/renovate:31.65.1-slim', @@ -209,6 +210,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: '10.4.11', datasource: 'docker', depName: 'mariadb', + packageName: 'mariadb', depType: 'service-image', replaceString: '$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/mariadb:10.4.11', @@ -221,6 +223,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: '1.0.0', datasource: 'docker', depName: 'other/image1', + packageName: 'other/image1', depType: 'service-image', replaceString: '$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/other/image1:1.0.0', @@ -258,6 +261,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: '31.65.1-slim', datasource: 'docker', depName: 'registry.com/renovate/renovate', + packageName: 'registry.com/renovate/renovate', depType: 'image-name', replaceString: '$CI_REGISTRY/renovate/renovate:31.65.1-slim', }, @@ -268,6 +272,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: '10.4.11', datasource: 'docker', depName: 'foo.registry.com/mariadb', + packageName: 'foo.registry.com/mariadb', depType: 'service-image', replaceString: 'foo/mariadb:10.4.11', }, @@ -278,6 +283,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: '1.0.0', datasource: 'docker', depName: 'registry.com/other/image1', + packageName: 'registry.com/other/image1', depType: 'service-image', replaceString: '$CI_REGISTRY/other/image1:1.0.0', }, @@ -288,6 +294,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: '1.0.0', datasource: 'docker', depName: 'registry.com/build-images/image2', + packageName: 'registry.com/build-images/image2', depType: 'service-image', replaceString: '$BUILD_IMAGES/image2:1.0.0', }, @@ -302,6 +309,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: 'test', datasource: 'docker', depName: 'image', + packageName: 'image', depType: 'image', replaceString: 'image:test', }; @@ -327,6 +335,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: 'test', datasource: 'docker', depName: 'image', + packageName: 'image', depType: 'service-image', replaceString: 'image:test', }, @@ -337,6 +346,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: 'test2', datasource: 'docker', depName: 'image2', + packageName: 'image2', depType: 'service-image', replaceString: 'image2:test2', }, @@ -358,6 +368,7 @@ describe('modules/manager/gitlabci/extract', () => { currentValue: 'test', datasource: 'docker', depName: 'image', + packageName: 'image', depType: 'image', replaceString: 'image:test', }, diff --git a/lib/modules/manager/gitlabci/utils.spec.ts b/lib/modules/manager/gitlabci/utils.spec.ts index 0b89036dd8f5df4724949b7979d166b1dd856dd0..755684d35ff7ddd440037e3c1a637fca5bdeee77 100644 --- a/lib/modules/manager/gitlabci/utils.spec.ts +++ b/lib/modules/manager/gitlabci/utils.spec.ts @@ -47,9 +47,9 @@ describe('modules/manager/gitlabci/utils', () => { it.each` name | registryAliases | imageName | dep - ${'multiple aliases'} | ${{ foo: 'foo.registry.com', bar: 'bar.registry.com' }} | ${'foo/image:1.0'} | ${{ depName: 'foo.registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `foo/image${versionAndDigestTemplate}` }} - ${'aliased variable'} | ${{ $CI_REGISTRY: 'registry.com' }} | ${'$CI_REGISTRY/image:1.0'} | ${{ depName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `$CI_REGISTRY/image${versionAndDigestTemplate}` }} - ${'variables with brackets'} | ${{ '${CI_REGISTRY}': 'registry.com' }} | ${'${CI_REGISTRY}/image:1.0'} | ${{ depName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `$\{CI_REGISTRY}/image${versionAndDigestTemplate}` }} + ${'multiple aliases'} | ${{ foo: 'foo.registry.com', bar: 'bar.registry.com' }} | ${'foo/image:1.0'} | ${{ depName: 'foo.registry.com/image', packageName: 'foo.registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `foo/image${versionAndDigestTemplate}` }} + ${'aliased variable'} | ${{ $CI_REGISTRY: 'registry.com' }} | ${'$CI_REGISTRY/image:1.0'} | ${{ depName: 'registry.com/image', packageName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `$CI_REGISTRY/image${versionAndDigestTemplate}` }} + ${'variables with brackets'} | ${{ '${CI_REGISTRY}': 'registry.com' }} | ${'${CI_REGISTRY}/image:1.0'} | ${{ depName: 'registry.com/image', packageName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: `$\{CI_REGISTRY}/image${versionAndDigestTemplate}` }} ${'not aliased variable'} | ${{}} | ${'$CI_REGISTRY/image:1.0'} | ${{ autoReplaceStringTemplate: defaultAutoReplaceStringTemplate }} ${'plain image'} | ${{}} | ${'registry.com/image:1.0'} | ${{ depName: 'registry.com/image', currentValue: '1.0', autoReplaceStringTemplate: defaultAutoReplaceStringTemplate }} `( diff --git a/lib/modules/manager/helm-values/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/helm-values/__snapshots__/extract.spec.ts.snap index cc2f4c66dfb924b61ef7cf14683fd0f811ab4c0c..22ab3d7bab40ef9e8d49e69d88c4081ab67499e6 100644 --- a/lib/modules/manager/helm-values/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/helm-values/__snapshots__/extract.spec.ts.snap @@ -9,6 +9,7 @@ exports[`modules/manager/helm-values/extract extractPackageFile() extracts from "currentValue": "1.18-alpine", "datasource": "docker", "depName": "docker.io/library/nginx", + "packageName": "docker.io/library/nginx", "replaceString": "docker.io/library/nginx:1.18-alpine", }, { @@ -17,6 +18,7 @@ exports[`modules/manager/helm-values/extract extractPackageFile() extracts from "currentValue": "11.6.0-debian-9-r0", "datasource": "docker", "depName": "bitnami/postgresql", + "packageName": "bitnami/postgresql", "replaceString": "11.6.0-debian-9-r0", "versioning": "docker", }, @@ -26,6 +28,7 @@ exports[`modules/manager/helm-values/extract extractPackageFile() extracts from "currentValue": "0.7.0-debian-9-r12", "datasource": "docker", "depName": "docker.io/bitnami/postgres-exporter", + "packageName": "docker.io/bitnami/postgres-exporter", "replaceString": "0.7.0-debian-9-r12", "versioning": "docker", }, @@ -35,6 +38,7 @@ exports[`modules/manager/helm-values/extract extractPackageFile() extracts from "currentValue": "11.5.0-debian-9-r0", "datasource": "docker", "depName": "docker.io/bitnami/postgresql", + "packageName": "docker.io/bitnami/postgresql", "replaceString": "11.5.0-debian-9-r0@sha256:4762726f1471ef048dd807afdc0e19265e95ffdcc7cb4a34891f680290022809", "versioning": "docker", }, @@ -44,6 +48,7 @@ exports[`modules/manager/helm-values/extract extractPackageFile() extracts from "currentValue": "2.1.3-debian-10-r38", "datasource": "docker", "depName": "docker.io/bitnami/harbor-core", + "packageName": "docker.io/bitnami/harbor-core", "replaceString": "2.1.3-debian-10-r38", "versioning": "docker", }, @@ -60,6 +65,7 @@ exports[`modules/manager/helm-values/extract extractPackageFile() extracts from "currentValue": "1.16.1", "datasource": "docker", "depName": "nginx", + "packageName": "nginx", "replaceString": "1.16.1", "versioning": "docker", }, diff --git a/lib/modules/manager/helm-values/extract.spec.ts b/lib/modules/manager/helm-values/extract.spec.ts index abab66d76f44e0423f697e2494fe3f48dfa33132..f09ad9d57e8a66617c9e485dd9f5e2e19a27601f 100644 --- a/lib/modules/manager/helm-values/extract.spec.ts +++ b/lib/modules/manager/helm-values/extract.spec.ts @@ -96,12 +96,14 @@ describe('modules/manager/helm-values/extract', () => { { currentValue: 'v0.13.10', depName: 'registry.internal/mirror/quay.io/metallb/controller', + packageName: 'registry.internal/mirror/quay.io/metallb/controller', datasource: 'docker', versioning: 'docker', }, { currentValue: 'v0.13.10', depName: 'registry.internal/mirror/quay.io/metallb/speaker', + packageName: 'registry.internal/mirror/quay.io/metallb/speaker', datasource: 'docker', versioning: 'docker', }, diff --git a/lib/modules/manager/kubernetes/extract.spec.ts b/lib/modules/manager/kubernetes/extract.spec.ts index 6a4f5403f20d3df84f0da0878adaf10ca3d678d8..8c47b93a651c9dc82dc896dddfb4b571ba03d0e7 100644 --- a/lib/modules/manager/kubernetes/extract.spec.ts +++ b/lib/modules/manager/kubernetes/extract.spec.ts @@ -28,6 +28,7 @@ describe('modules/manager/kubernetes/extract', () => { currentValue: '1.7.9', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', replaceString: 'nginx:1.7.9', }, { @@ -37,6 +38,7 @@ describe('modules/manager/kubernetes/extract', () => { currentValue: '1.22.1', datasource: 'docker', depName: 'nginx', + packageName: 'nginx', replaceString: 'nginx:1.22.1', }, { @@ -46,6 +48,7 @@ describe('modules/manager/kubernetes/extract', () => { currentValue: 'v1.11.1', datasource: 'docker', depName: 'k8s.gcr.io/kube-proxy-amd64', + packageName: 'k8s.gcr.io/kube-proxy-amd64', replaceString: 'k8s.gcr.io/kube-proxy-amd64:v1.11.1', }, { @@ -77,6 +80,7 @@ describe('modules/manager/kubernetes/extract', () => { currentValue: 'v2.1.0', datasource: 'docker', depName: 'quay.io/external_storage/local-volume-provisioner', + packageName: 'quay.io/external_storage/local-volume-provisioner', replaceString: 'quay.io/external_storage/local-volume-provisioner:v2.1.0', }, @@ -116,6 +120,7 @@ kind: ConfigMap currentValue: '0.0.1', datasource: 'docker', depName: 'my-quay-mirror.registry.com/node', + packageName: 'my-quay-mirror.registry.com/node', replaceString: 'quay.io/node:0.0.1', }, ], @@ -137,6 +142,7 @@ kind: ConfigMap currentValue: '0.0.1', datasource: 'docker', depName: 'quay.io/node', + packageName: 'quay.io/node', replaceString: 'quay.io/node:0.0.1', }, ], @@ -159,6 +165,7 @@ kind: ConfigMap currentValue: '0.0.1', datasource: 'docker', depName: 'my-quay-mirror.registry.com/node', + packageName: 'my-quay-mirror.registry.com/node', replaceString: 'quay.io/node:0.0.1', }, ], @@ -180,6 +187,7 @@ kind: ConfigMap currentValue: undefined, datasource: 'docker', depName: 'busybox', + packageName: 'busybox', replaceString: 'busybox', }, ], diff --git a/lib/modules/manager/kustomize/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/kustomize/__snapshots__/extract.spec.ts.snap index 210d7ccf638dd8891d801de6633af8bd44ca65e1..aae5dc9b65952e88e2260db10b87df134e948703 100644 --- a/lib/modules/manager/kustomize/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/kustomize/__snapshots__/extract.spec.ts.snap @@ -9,6 +9,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() extracts from di "datasource": "docker", "depName": "postgres", "depType": "Kustomization", + "packageName": "postgres", "replaceString": "sha256:b0cfe264cb1143c7c660ddfd5c482464997d62d6bc9f97f8fdf3deefce881a8c", }, { @@ -17,6 +18,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() extracts from di "datasource": "docker", "depName": "postgres", "depType": "Kustomization", + "packageName": "postgres", "replaceString": "sha256:b0cfe264cb1143c7c660ddfd5c482464997d62d6bc9f97f8fdf3deefce881a8c", }, { @@ -52,6 +54,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() extracts from ne "datasource": "docker", "depName": "postgres", "depType": "Kustomization", + "packageName": "postgres", "replaceString": "11", }, { @@ -61,6 +64,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() extracts from ne "datasource": "docker", "depName": "postgres", "depType": "Kustomization", + "packageName": "postgres", "replaceString": "11@sha256:b0cfe264cb1143c7c660ddfd5c482464997d62d6bc9f97f8fdf3deefce881a8c", }, { @@ -118,6 +122,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() extracts newName "datasource": "docker", "depName": "awesome/postgres", "depType": "Kustomization", + "packageName": "awesome/postgres", "replaceString": "awesome/postgres:11@sha256:b0cfe264cb1143c7c660ddfd5c482464997d62d6bc9f97f8fdf3deefce881a8c", }, { @@ -126,6 +131,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() extracts newName "datasource": "docker", "depName": "awesome/postgres", "depType": "Kustomization", + "packageName": "awesome/postgres", "replaceString": "awesome/postgres:11", }, { @@ -134,6 +140,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() extracts newName "datasource": "docker", "depName": "awesome/postgres", "depType": "Kustomization", + "packageName": "awesome/postgres", "replaceString": "awesome/postgres@sha256:b0cfe264cb1143c7c660ddfd5c482464997d62d6bc9f97f8fdf3deefce881a8c", }, ], @@ -231,6 +238,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() should extract d "datasource": "docker", "depName": "node", "depType": "Component", + "packageName": "node", "replaceString": "v0.1.0", }, ] @@ -245,6 +253,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() should extract o "datasource": "docker", "depName": "node", "depType": "Kustomization", + "packageName": "node", "replaceString": "v0.1.0", }, { @@ -254,6 +263,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() should extract o "datasource": "docker", "depName": "group/instance", "depType": "Kustomization", + "packageName": "group/instance", "replaceString": "v0.0.1", }, { @@ -263,6 +273,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() should extract o "datasource": "docker", "depName": "quay.io/test/repo", "depType": "Kustomization", + "packageName": "quay.io/test/repo", "replaceString": "v0.0.2", }, { @@ -272,6 +283,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() should extract o "datasource": "docker", "depName": "gitlab.com/org/suborg/image", "depType": "Kustomization", + "packageName": "gitlab.com/org/suborg/image", "replaceString": "v0.0.3", }, { @@ -281,6 +293,7 @@ exports[`modules/manager/kustomize/extract extractPackageFile() should extract o "datasource": "docker", "depName": "but.this.lives.on.local/private-registry", "depType": "Kustomization", + "packageName": "but.this.lives.on.local/private-registry", "replaceString": "v0.0.4", }, { diff --git a/lib/modules/manager/kustomize/extract.spec.ts b/lib/modules/manager/kustomize/extract.spec.ts index 4465cd9aee81c23e0f95bb0f931078a46b867f1f..d61827dcf50d18eb7c8a9cc7d8f8b877f01591f4 100644 --- a/lib/modules/manager/kustomize/extract.spec.ts +++ b/lib/modules/manager/kustomize/extract.spec.ts @@ -267,6 +267,7 @@ describe('modules/manager/kustomize/extract', () => { datasource: DockerDatasource.id, replaceString: 'v1.0.0', depName: 'node', + packageName: 'node', }; const pkg = extractImage({ name: sample.depName, @@ -284,6 +285,7 @@ describe('modules/manager/kustomize/extract', () => { datasource: DockerDatasource.id, replaceString: 'v1.0.0', depName: 'test/node', + packageName: 'test/node', }; const pkg = extractImage({ name: sample.depName, @@ -301,6 +303,7 @@ describe('modules/manager/kustomize/extract', () => { datasource: DockerDatasource.id, replaceString: 'v1.0.0', depName: 'quay.io/repo/image', + packageName: 'quay.io/repo/image', }; const pkg = extractImage({ name: sample.depName, @@ -318,6 +321,7 @@ describe('modules/manager/kustomize/extract', () => { datasource: DockerDatasource.id, replaceString: 'v1.0.0', depName: 'localhost:5000/repo/image', + packageName: 'localhost:5000/repo/image', }; const pkg = extractImage({ name: sample.depName, @@ -335,6 +339,7 @@ describe('modules/manager/kustomize/extract', () => { replaceString: 'v1.0.0', datasource: DockerDatasource.id, depName: 'localhost:5000/repo/image/service', + packageName: 'localhost:5000/repo/image/service', }; const pkg = extractImage({ name: sample.depName, @@ -352,6 +357,7 @@ describe('modules/manager/kustomize/extract', () => { replaceString: 'v1.0.0', datasource: DockerDatasource.id, depName: 'docker.io/image/service', + packageName: 'docker.io/image/service', }; const pkg = extractImage( { diff --git a/lib/modules/manager/kustomize/extract.ts b/lib/modules/manager/kustomize/extract.ts index 9051607e1ad46d2d1b346a67b502196284b0592a..815917e06ea4fdc52a81fd7fb1d8da83f19d1200 100644 --- a/lib/modules/manager/kustomize/extract.ts +++ b/lib/modules/manager/kustomize/extract.ts @@ -167,7 +167,6 @@ export function extractHelmChart( return { ...dep, depName: helmChart.name, - packageName: dep.depName, // https://github.com/helm/helm/issues/10312 // https://github.com/helm/helm/issues/10678 pinDigests: false, diff --git a/lib/modules/manager/nuget/extract.spec.ts b/lib/modules/manager/nuget/extract.spec.ts index 592ff57f66898968894a79336e8d7b995a851508..cc73215022b96e3519757f3a1c25c6032a8a8fd8 100644 --- a/lib/modules/manager/nuget/extract.spec.ts +++ b/lib/modules/manager/nuget/extract.spec.ts @@ -175,6 +175,7 @@ describe('modules/manager/nuget/extract', () => { autoReplaceStringTemplate: '{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}', depName: 'mcr.microsoft.com/dotnet/runtime', + packageName: 'mcr.microsoft.com/dotnet/runtime', depType: 'docker', datasource: 'docker', currentValue: '7.0.10', @@ -200,6 +201,7 @@ describe('modules/manager/nuget/extract', () => { autoReplaceStringTemplate: '{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}', depName: 'mcr.microsoft.com/dotnet/runtime', + packageName: 'mcr.microsoft.com/dotnet/runtime', depType: 'docker', datasource: 'docker', currentValue: '7.0.10', diff --git a/lib/modules/manager/sveltos/extract.ts b/lib/modules/manager/sveltos/extract.ts index 35d39cceef524502f9ff3b1fa5bbcf04d2ad077b..cf87c449c0a2a4f5ef7f6afeeb62c20f063f7654 100644 --- a/lib/modules/manager/sveltos/extract.ts +++ b/lib/modules/manager/sveltos/extract.ts @@ -54,7 +54,7 @@ function processHelmCharts( const image = trimTrailingSlash(removeOCIPrefix(source.repositoryURL)); dep.datasource = DockerDatasource.id; - dep.packageName = getDep(image, false, registryAliases).depName; + dep.packageName = getDep(image, false, registryAliases).packageName; } else { dep.packageName = removeRepositoryName( source.repositoryName, diff --git a/lib/modules/manager/tekton/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/tekton/__snapshots__/extract.spec.ts.snap index 8f4a5bb10596e954500e164db621572bfda8cff6..a6151f53ed0435e803ba0153546efe929f63cbb6 100644 --- a/lib/modules/manager/tekton/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/tekton/__snapshots__/extract.spec.ts.snap @@ -10,6 +10,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/pipeline", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/pipeline", "replaceString": "gcr.io/tekton-releases/catalog/upstream/pipeline:1.0@sha256:01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b", }, { @@ -19,6 +20,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/pipeline-finally", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/pipeline-finally", "replaceString": "gcr.io/tekton-releases/catalog/upstream/pipeline-finally:1.0@sha256:01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b", }, { @@ -28,6 +30,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver", "replaceString": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver:1.0@sha256:01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b", }, { @@ -37,6 +40,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/list-pipeline", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/list-pipeline", "replaceString": "gcr.io/tekton-releases/catalog/upstream/list-pipeline", }, { @@ -46,6 +50,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/list-pipeline-run", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/list-pipeline-run", "replaceString": "gcr.io/tekton-releases/catalog/upstream/list-pipeline-run", }, { @@ -55,6 +60,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/list-task-run", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/list-task-run", "replaceString": "gcr.io/tekton-releases/catalog/upstream/list-task-run", }, { @@ -64,6 +70,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/trigger-template-task-run", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/trigger-template-task-run", "replaceString": "gcr.io/tekton-releases/catalog/upstream/trigger-template-task-run", }, { @@ -73,6 +80,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/trigger-template-task-run-resolver", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/trigger-template-task-run-resolver", "replaceString": "gcr.io/tekton-releases/catalog/upstream/trigger-template-task-run-resolver", }, { @@ -82,6 +90,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/trigger-template-pipeline-run", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/trigger-template-pipeline-run", "replaceString": "gcr.io/tekton-releases/catalog/upstream/trigger-template-pipeline-run", }, { @@ -91,6 +100,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/trigger-template-pipeline-run-resolver", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/trigger-template-pipeline-run-resolver", "replaceString": "gcr.io/tekton-releases/catalog/upstream/trigger-template-pipeline-run-resolver", }, { @@ -100,6 +110,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/task-run", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/task-run", "replaceString": "gcr.io/tekton-releases/catalog/upstream/task-run", }, { @@ -109,6 +120,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/task-run-resolver", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/task-run-resolver", "replaceString": "gcr.io/tekton-releases/catalog/upstream/task-run-resolver", }, { @@ -118,6 +130,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/pipeline-run", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/pipeline-run", "replaceString": "gcr.io/tekton-releases/catalog/upstream/pipeline-run", }, { @@ -127,6 +140,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/pipeline-run-resolver", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/pipeline-run-resolver", "replaceString": "gcr.io/tekton-releases/catalog/upstream/pipeline-run-resolver", }, { @@ -136,6 +150,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/inline-pipeline", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/inline-pipeline", "replaceString": "gcr.io/tekton-releases/catalog/upstream/inline-pipeline", }, { @@ -157,6 +172,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver", "replaceString": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver:1.0@sha256:01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b", }, { @@ -166,6 +182,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver", "depType": "tekton-bundle", + "packageName": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver", "replaceString": "gcr.io/tekton-releases/catalog/upstream/pipeline-resolver:1.0@sha256:01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b", }, { @@ -175,6 +192,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.io/taskrun/spec/taskSpec/steps/0/image", "depType": "tekton-step-image", + "packageName": "example.io/taskrun/spec/taskSpec/steps/0/image", "replaceString": "example.io/taskrun/spec/taskSpec/steps/0/image", }, { @@ -184,6 +202,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.io/taskrun/spec/taskSpec/sidecars/0/image", "depType": "tekton-step-image", + "packageName": "example.io/taskrun/spec/taskSpec/sidecars/0/image", "replaceString": "example.io/taskrun/spec/taskSpec/sidecars/0/image", }, { @@ -193,6 +212,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.io/taskrun/spec/taskSpec/stepTemplate/image", "depType": "tekton-step-image", + "packageName": "example.io/taskrun/spec/taskSpec/stepTemplate/image", "replaceString": "example.io/taskrun/spec/taskSpec/stepTemplate/image", }, { @@ -202,6 +222,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.io/task/spec/steps/0/image", "depType": "tekton-step-image", + "packageName": "example.io/task/spec/steps/0/image", "replaceString": "example.io/task/spec/steps/0/image", }, { @@ -211,6 +232,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.io/task/spec/sidecars/0/image", "depType": "tekton-step-image", + "packageName": "example.io/task/spec/sidecars/0/image", "replaceString": "example.io/task/spec/sidecars/0/image", }, { @@ -220,6 +242,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.io/task/spec/stepTemplate/image", "depType": "tekton-step-image", + "packageName": "example.io/task/spec/stepTemplate/image", "replaceString": "example.io/task/spec/stepTemplate/image", }, { @@ -229,6 +252,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipeline/spec/tasks/0/taskSpec/steps/0/image", "depType": "tekton-step-image", + "packageName": "example.com/pipeline/spec/tasks/0/taskSpec/steps/0/image", "replaceString": "example.com/pipeline/spec/tasks/0/taskSpec/steps/0/image", }, { @@ -238,6 +262,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipeline/spec/tasks/0/taskSpec/sidecars/0/image", "depType": "tekton-step-image", + "packageName": "example.com/pipeline/spec/tasks/0/taskSpec/sidecars/0/image", "replaceString": "example.com/pipeline/spec/tasks/0/taskSpec/sidecars/0/image", }, { @@ -247,6 +272,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipeline/spec/tasks/0/taskSpec/stepTemplate/image", "depType": "tekton-step-image", + "packageName": "example.com/pipeline/spec/tasks/0/taskSpec/stepTemplate/image", "replaceString": "example.com/pipeline/spec/tasks/0/taskSpec/stepTemplate/image", }, { @@ -256,6 +282,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipeline/spec/finally/0/taskSpec/steps/0/image", "depType": "tekton-step-image", + "packageName": "example.com/pipeline/spec/finally/0/taskSpec/steps/0/image", "replaceString": "example.com/pipeline/spec/finally/0/taskSpec/steps/0/image", }, { @@ -265,6 +292,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipeline/spec/finally/0/taskSpec/sidecars/0/image", "depType": "tekton-step-image", + "packageName": "example.com/pipeline/spec/finally/0/taskSpec/sidecars/0/image", "replaceString": "example.com/pipeline/spec/finally/0/taskSpec/sidecars/0/image", }, { @@ -274,6 +302,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipeline/spec/finally/0/taskSpec/stepTemplate/image", "depType": "tekton-step-image", + "packageName": "example.com/pipeline/spec/finally/0/taskSpec/stepTemplate/image", "replaceString": "example.com/pipeline/spec/finally/0/taskSpec/stepTemplate/image", }, { @@ -283,6 +312,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/steps/0/image", "depType": "tekton-step-image", + "packageName": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/steps/0/image", "replaceString": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/steps/0/image", }, { @@ -292,6 +322,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/sidecars/0/image", "depType": "tekton-step-image", + "packageName": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/sidecars/0/image", "replaceString": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/sidecars/0/image", }, { @@ -301,6 +332,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/stepTemplate/image", "depType": "tekton-step-image", + "packageName": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/stepTemplate/image", "replaceString": "example.com/pipelinerun/spec/pipelineSpec/tasks/0/taskSpec/stepTemplate/image", }, { @@ -310,6 +342,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/steps/0/image", "depType": "tekton-step-image", + "packageName": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/steps/0/image", "replaceString": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/steps/0/image", }, { @@ -319,6 +352,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/sidecars/0/image", "depType": "tekton-step-image", + "packageName": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/sidecars/0/image", "replaceString": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/sidecars/0/image", }, { @@ -328,6 +362,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/stepTemplate/image", "depType": "tekton-step-image", + "packageName": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/stepTemplate/image", "replaceString": "example.com/pipelinerun/spec/pipelineSpec/finally/0/taskSpec/stepTemplate/image", }, { @@ -337,6 +372,7 @@ exports[`modules/manager/tekton/extract extractPackageFile() extracts deps from "datasource": "docker", "depName": "example.com/triggertemplate/spec/resourcetemplates/0/taskrun/spec/taskSpec/steps/0/image", "depType": "tekton-step-image", + "packageName": "example.com/triggertemplate/spec/resourcetemplates/0/taskrun/spec/taskSpec/steps/0/image", "replaceString": "example.com/triggertemplate/spec/resourcetemplates/0/taskrun/spec/taskSpec/steps/0/image", }, ], diff --git a/lib/modules/manager/terraform/extract.spec.ts b/lib/modules/manager/terraform/extract.spec.ts index 273537bc332c5397c831be368a4753b0f828a0ac..6710a6974fb1b5d244001247e9834debbdfba0f8 100644 --- a/lib/modules/manager/terraform/extract.spec.ts +++ b/lib/modules/manager/terraform/extract.spec.ts @@ -457,6 +457,7 @@ describe('modules/manager/terraform/extract', () => { currentValue: '1.24.0', datasource: 'docker', depName: 'index.docker.io/bitnami/nginx', + packageName: 'index.docker.io/bitnami/nginx', depType: 'docker_image', replaceString: 'hub.proxy.test/bitnami/nginx:1.24.0', }, diff --git a/lib/modules/manager/terraform/extractors/resources/helm-release.ts b/lib/modules/manager/terraform/extractors/resources/helm-release.ts index 835ae6ab2380e92191708e8937d4851a17abefdf..11d8bc944c11ebf666d377549bfe32c98356410a 100644 --- a/lib/modules/manager/terraform/extractors/resources/helm-release.ts +++ b/lib/modules/manager/terraform/extractors/resources/helm-release.ts @@ -79,7 +79,7 @@ export class HelmReleaseExtractor extends DependencyExtractor { config: ExtractConfig, dep: PackageDependency, ): void { - const { depName: packageName, datasource } = getDep( + const { packageName, datasource } = getDep( depName, false, config.registryAliases, diff --git a/lib/modules/manager/vendir/extract.ts b/lib/modules/manager/vendir/extract.ts index c711882839d4e193a469d1504eae6b2327f95bb5..13626e8240aa1c491457ed33320610411ddb14e9 100644 --- a/lib/modules/manager/vendir/extract.ts +++ b/lib/modules/manager/vendir/extract.ts @@ -32,7 +32,6 @@ export function extractHelmChart( return { ...dep, depName: helmChart.name, - packageName: dep.depName, depType: 'HelmChart', // https://github.com/helm/helm/issues/10312 // https://github.com/helm/helm/issues/10678 diff --git a/lib/modules/manager/woodpecker/extract.spec.ts b/lib/modules/manager/woodpecker/extract.spec.ts index 9149b024d0a1ed8efc41388c5f93b2673410b5d4..68655ce85e182e122268bc5358750c4834391ae1 100644 --- a/lib/modules/manager/woodpecker/extract.spec.ts +++ b/lib/modules/manager/woodpecker/extract.spec.ts @@ -24,6 +24,7 @@ describe('modules/manager/woodpecker/extract', () => { deps: [ { depName: 'woodpeckerci/plugin-git', + packageName: 'woodpeckerci/plugin-git', currentValue: '2.0.3', currentDigest: undefined, replaceString: 'woodpeckerci/plugin-git:2.0.3', @@ -33,6 +34,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'quay.io/something/redis', + packageName: 'quay.io/something/redis', currentValue: 'alpine', currentDigest: undefined, replaceString: 'quay.io/something/redis:alpine', @@ -42,6 +44,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'node', + packageName: 'node', currentValue: '10.0.0', currentDigest: undefined, replaceString: 'node:10.0.0', @@ -51,6 +54,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'postgres', + packageName: 'postgres', currentValue: '9.4.0', currentDigest: undefined, replaceString: 'postgres:9.4.0', @@ -60,6 +64,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'dockersamples/examplevotingapp_vote', + packageName: 'dockersamples/examplevotingapp_vote', currentValue: 'before', currentDigest: undefined, replaceString: 'dockersamples/examplevotingapp_vote:before', @@ -69,6 +74,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'dockersamples/examplevotingapp_result', + packageName: 'dockersamples/examplevotingapp_result', currentValue: 'before', currentDigest: undefined, replaceString: 'dockersamples/examplevotingapp_result:before', @@ -78,6 +84,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'dockersamples/examplevotingapp_worker', + packageName: 'dockersamples/examplevotingapp_worker', currentValue: undefined, currentDigest: undefined, replaceString: 'dockersamples/examplevotingapp_worker', @@ -87,6 +94,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'dockersamples/visualizer', + packageName: 'dockersamples/visualizer', currentValue: 'stable', currentDigest: undefined, replaceString: 'dockersamples/visualizer:stable', @@ -96,6 +104,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'app-local-debug', + packageName: 'app-local-debug', currentValue: undefined, currentDigest: undefined, replaceString: 'app-local-debug', @@ -105,6 +114,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'postgres', + packageName: 'postgres', currentValue: '9.5.0', currentDigest: undefined, replaceString: 'postgres:9.5.0', @@ -139,6 +149,7 @@ describe('modules/manager/woodpecker/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'my-quay-mirror.registry.com/nginx', + packageName: 'my-quay-mirror.registry.com/nginx', replaceString: 'quay.io/nginx:0.0.1', }, ], @@ -168,6 +179,7 @@ describe('modules/manager/woodpecker/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'quay.io/nginx', + packageName: 'quay.io/nginx', replaceString: 'quay.io/nginx:0.0.1', }, ], @@ -198,6 +210,7 @@ describe('modules/manager/woodpecker/extract', () => { currentValue: '0.0.1', datasource: 'docker', depName: 'my-quay-mirror.registry.com/nginx', + packageName: 'my-quay-mirror.registry.com/nginx', replaceString: 'quay.io/nginx:0.0.1', }, ], @@ -218,6 +231,7 @@ describe('modules/manager/woodpecker/extract', () => { deps: [ { depName: 'quay.io/something/redis', + packageName: 'quay.io/something/redis', currentValue: 'alpine', currentDigest: undefined, replaceString: 'quay.io/something/redis:alpine', @@ -247,6 +261,7 @@ describe('modules/manager/woodpecker/extract', () => { deps: [ { depName: 'woodpeckerci/plugin-git', + packageName: 'woodpeckerci/plugin-git', currentValue: 'latest', currentDigest: undefined, replaceString: 'woodpeckerci/plugin-git:latest', @@ -256,6 +271,7 @@ describe('modules/manager/woodpecker/extract', () => { }, { depName: 'quay.io/something/redis', + packageName: 'quay.io/something/redis', currentValue: 'alpine', currentDigest: undefined, replaceString: 'quay.io/something/redis:alpine', @@ -282,6 +298,7 @@ describe('modules/manager/woodpecker/extract', () => { deps: [ { depName: 'woodpeckerci/plugin-git', + packageName: 'woodpeckerci/plugin-git', currentValue: 'latest', currentDigest: undefined, replaceString: 'woodpeckerci/plugin-git:latest',