feat(manager/terraform): support OCI registry in helm_release `reposi…

…tory` (#20237) Co-authored-by: Sebastian Poxhofer <secustor@users.noreply.github.com>
renovatebot · Feb 7, 2023 · c127ead · c127ead
1 parent f805a82
commit c127ead
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/lib/modules/manager/terraform/__fixtures__/helm.tf b/lib/modules/manager/terraform/__fixtures__/helm.tf
@@ -45,3 +45,11 @@ resource "helm_release" "karpenter" {
   chart = "oci://public.ecr.aws/karpenter/karpenter"
   version = "v0.22.1"
 }
+
+## chart in OCI registry
+resource "helm_release" "karpenter_oci_repo" {
+  name  = "karpenter"
+  repository = "oci://public.ecr.aws/karpenter"
+  chart = "karpenter"
+  version = "v0.22.1"
+}
diff --git a/lib/modules/manager/terraform/extract.spec.ts b/lib/modules/manager/terraform/extract.spec.ts
@@ -574,7 +574,7 @@ describe('modules/manager/terraform/extract', () => {
 
     it('extract helm releases', async () => {
       const res = await extractPackageFile(helm, 'helm.tf', {});
-      expect(res?.deps).toHaveLength(7);
+      expect(res?.deps).toHaveLength(8);
       expect(res?.deps.filter((dep) => dep.skipReason)).toHaveLength(2);
       expect(res?.deps).toIncludeAllPartialMembers([
         {
@@ -623,6 +623,13 @@ describe('modules/manager/terraform/extract', () => {
           depName: 'public.ecr.aws/karpenter/karpenter',
           depType: 'helm_release',
         },
+        {
+          currentValue: 'v0.22.1',
+          datasource: 'docker',
+          depName: 'karpenter',
+          depType: 'helm_release',
+          registryUrls: ['https://public.ecr.aws/karpenter'],
+        },
       ]);
     });
 

diff --git a/lib/modules/manager/terraform/extractors/resources/helm-release.ts b/lib/modules/manager/terraform/extractors/resources/helm-release.ts
@@ -27,7 +27,15 @@ export class HelmReleaseExtractor extends DependencyExtractor {
         datasource: HelmDatasource.id,
       };
       if (is.nonEmptyString(helmRelease.repository)) {
-        dep.registryUrls = [helmRelease.repository];
+        if (isOCIRegistry(helmRelease.repository)) {
+          // For oci repos, we remove the oci:// and use the docker datasource
+          dep.registryUrls = [
+            helmRelease.repository.replace('oci://', 'https://'),
+          ];
+          dep.datasource = DockerDatasource.id;
+        } else {
+          dep.registryUrls = [helmRelease.repository];
+        }
       }
       if (!helmRelease.chart) {
         dep.skipReason = 'invalid-name';