diff --git a/lib/manager/helm-requirements/__snapshots__/extract.spec.ts.snap b/lib/manager/helm-requirements/__snapshots__/extract.spec.ts.snap index 50e5657e881624329ed62b0b89b327d8d95db9cd..1e6908d6178a43a132b0c52331d45593914dc386 100644 --- a/lib/manager/helm-requirements/__snapshots__/extract.spec.ts.snap +++ b/lib/manager/helm-requirements/__snapshots__/extract.spec.ts.snap @@ -33,6 +33,13 @@ Object { "https://my-registry.gcr.io/", ], }, + Object { + "currentValue": "1.0.0", + "depName": "example", + "registryUrls": Array [ + "https://registry.example.com/", + ], + }, ], } `; diff --git a/lib/manager/helm-requirements/extract.spec.ts b/lib/manager/helm-requirements/extract.spec.ts index b2bf6c877546ab9ced03e8e6ba53b0b35d8e6575..36cd773fd9c7b178335c14a987de19f82e7621a4 100644 --- a/lib/manager/helm-requirements/extract.spec.ts +++ b/lib/manager/helm-requirements/extract.spec.ts @@ -93,11 +93,15 @@ describe('lib/manager/helm-requirements/extract', () => { - name: redis version: 0.9.0 repository: '@placeholder' + - name: example + version: 1.0.0 + repository: alias:longalias `; const fileName = 'requirements.yaml'; const result = extractPackageFile(content, fileName, { aliases: { placeholder: 'https://my-registry.gcr.io/', + longalias: 'https://registry.example.com/', }, }); expect(result).not.toBeNull(); diff --git a/lib/manager/helm-requirements/extract.ts b/lib/manager/helm-requirements/extract.ts index 11363a61a74b290248cde33bf9692cf6dfebe8e6..4ea6d08a761ff298177fa536d56b9437f3cee659 100644 --- a/lib/manager/helm-requirements/extract.ts +++ b/lib/manager/helm-requirements/extract.ts @@ -44,9 +44,11 @@ export function extractPackageFile( } res.registryUrls = [dep.repository]; - if (dep.repository.startsWith('@')) { - const repoWithAtRemoved = dep.repository.slice(1); - const alias = config.aliases[repoWithAtRemoved]; + if (dep.repository.startsWith('@') || dep.repository.startsWith('alias:')) { + const repoWithPrefixRemoved = dep.repository.slice( + dep.repository[0] === '@' ? 1 : 6 + ); + const alias = config.aliases[repoWithPrefixRemoved]; if (alias) { res.registryUrls = [alias]; return res; diff --git a/lib/manager/helmv3/__snapshots__/extract.spec.ts.snap b/lib/manager/helmv3/__snapshots__/extract.spec.ts.snap index 424bf34f10890814250d651781f6df40b390e84a..a1f566e5e2653b153db4a1d8bf8fdac7eca084ff 100644 --- a/lib/manager/helmv3/__snapshots__/extract.spec.ts.snap +++ b/lib/manager/helmv3/__snapshots__/extract.spec.ts.snap @@ -34,6 +34,13 @@ Object { "https://my-registry.gcr.io/", ], }, + Object { + "currentValue": "1.0.0", + "depName": "example", + "registryUrls": Array [ + "https://registry.example.com/", + ], + }, ], "packageFileVersion": "0.1.0", } diff --git a/lib/manager/helmv3/extract.spec.ts b/lib/manager/helmv3/extract.spec.ts index c4e402ead3b1806c3bd86d012594d455e4a789db..48bad50e84424694801aa54a4bd662e1f43770f8 100644 --- a/lib/manager/helmv3/extract.spec.ts +++ b/lib/manager/helmv3/extract.spec.ts @@ -73,11 +73,15 @@ describe('lib/manager/helm-requirements/extract', () => { - name: redis version: 0.9.0 repository: '@placeholder' + - name: example + version: 1.0.0 + repository: alias:longalias `; const fileName = 'Chart.yaml'; const result = await extractPackageFile(content, fileName, { aliases: { placeholder: 'https://my-registry.gcr.io/', + longalias: 'https://registry.example.com/', }, }); expect(result).not.toBeNull(); diff --git a/lib/manager/helmv3/extract.ts b/lib/manager/helmv3/extract.ts index b15c4018e0b712e09ed8d15b611cd0e90b56c707..3150934684037a1e21ad35a6b622ad95e25610fa 100644 --- a/lib/manager/helmv3/extract.ts +++ b/lib/manager/helmv3/extract.ts @@ -58,9 +58,14 @@ export async function extractPackageFile( }; if (dep.repository) { res.registryUrls = [dep.repository]; - if (dep.repository.startsWith('@')) { - const repoWithAtRemoved = dep.repository.slice(1); - const alias = config.aliases[repoWithAtRemoved]; + if ( + dep.repository.startsWith('@') || + dep.repository.startsWith('alias:') + ) { + const repoWithPrefixRemoved = dep.repository.slice( + dep.repository[0] === '@' ? 1 : 6 + ); + const alias = config.aliases[repoWithPrefixRemoved]; if (alias) { res.registryUrls = [alias]; return res;