fixes

Author: liorschach

.circleci/tests/custom_values_charts_test.go

@@ -8,30 +8,39 @@ import (
 )
 
 func (s *helmRepoSuite) TestChartWithCustomValues() {
-	testFilesDirectory := path.Join("testfiles", "custom_values")
-	testFiles, err := os.ReadDir(testFilesDirectory)
+	testFilesDirectory := "testfiles"
+	testChartsDirectory, err := os.ReadDir(testFilesDirectory)
 	s.NoError(err)
 
-	for _, testFile := range testFiles {
-		testFileName := testFile.Name()
-
-		s.Run(testFileName, func() {
-			chartName := strings.Split(strings.Split(testFileName, ".")[0], "_")[0]
-			chartDir := s.getChartDirectory(chartName)
-
-			chartDirFullPath, err := filepath.Abs(chartDir)
-			s.NoError(err)
-
-			valuesFilePath := path.Join(testFilesDirectory, testFileName)
-			runGoldenHelmTest(s.T(), &goldenHelmTest{
-				ChartPath: chartDirFullPath,
-				Release:   "release-test",
-				Namespace: "release-helm-namespace",
-				// remove .yaml from the test file name
-				GoldenFileName:     strings.TrimSuffix(testFileName, ".yaml"),
-				ValueFiles:         []string{valuesFilePath},
-				GoldenSubDirectory: "custom",
+	for _, testChart := range testChartsDirectory {
+		if !testChart.IsDir() {
+			continue
+		}
+
+		chartName := testChart.Name()
+
+		chartDirectory, err := os.ReadDir(path.Join(testFilesDirectory, chartName))
+		s.NoError(err)
+
+		for _, testFile := range chartDirectory {
+			testFileName := testFile.Name()
+			s.Run(testFileName, func() {
+				chartDir := s.getChartDirectory(chartName)
+
+				chartDirFullPath, err := filepath.Abs(chartDir)
+				s.NoError(err)
+
+				valuesFilePath := path.Join(testFilesDirectory, chartName, testFileName)
+				runGoldenHelmTest(s.T(), &goldenHelmTest{
+					ChartPath: chartDirFullPath,
+					Release:   "release-test",
+					Namespace: "release-helm-namespace",
+					// remove .yaml from the test file name
+					GoldenFileName:     strings.TrimSuffix(testFileName, ".yaml"),
+					ValueFiles:         []string{valuesFilePath},
+					GoldenSubDirectory: path.Join("custom", chartName),
+				})
 			})
-		})
+		}
 	}
 }

.circleci/tests/golden/custom/flux2.golden.yaml renamed to .circleci/tests/golden/custom/flux2/flux2.golden.yaml

@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
   name: allow-egress
 spec:
   egress:
@@ -30,7 +30,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
   name: allow-scraping
 spec:
   ingress:
@@ -52,7 +52,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
   name: allow-webhooks
 spec:
   ingress:
@@ -74,7 +74,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
   name: helm-controller
 ---
 # Source: flux2/templates/kustomize-controller-sa.yaml
@@ -87,7 +87,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
   name: kustomize-controller
 ---
 # Source: flux2/templates/source-controller-serviceaccount.yaml
@@ -100,7 +100,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
   name: source-controller
 ---
 # Source: flux2/templates/aggregate-clusterroles.yaml
@@ -158,7 +158,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
 rules:
 - apiGroups: ['source.toolkit.fluxcd.io']
   resources: ['*']
@@ -236,7 +236,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
   name: cluster-reconciler
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -260,7 +260,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -294,7 +294,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     control-plane: controller
   name: source-controller
 spec:
@@ -317,7 +317,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     control-plane: controller
   name: helm-controller
 spec:
@@ -398,7 +398,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     control-plane: controller
   name: kustomize-controller
 spec:
@@ -481,7 +481,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     app.kubernetes.io/version: "2.2.3"
     app.kubernetes.io/part-of: flux
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     control-plane: controller
   name: source-controller
 spec:

.circleci/tests/golden/custom/git-proxy.golden.yaml renamed to .circleci/tests/golden/custom/git-proxy/git-proxy.golden.yaml

@@ -5,7 +5,7 @@ kind: Service
 metadata:
   name: release-test-git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -31,7 +31,7 @@ kind: Service
 metadata:
   name: git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -57,7 +57,7 @@ kind: Deployment
 metadata:
   name: release-test-git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"

.circleci/tests/golden/custom/git-proxy_azure-workload-idnetity.golden.yaml renamed to .circleci/tests/golden/custom/git-proxy/git-proxy_azure-workload-idnetity.golden.yaml

@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: wiz-git-proxy-sa
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -22,7 +22,7 @@ type: Opaque
 metadata:
   name: azure-creds
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -40,7 +40,7 @@ kind: Service
 metadata:
   name: release-test-git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -66,7 +66,7 @@ kind: Service
 metadata:
   name: git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -92,7 +92,7 @@ kind: Deployment
 metadata:
   name: release-test-git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"

.circleci/tests/golden/custom/git-proxy_service-account.golden.yaml renamed to .circleci/tests/golden/custom/git-proxy/git-proxy_service-account.golden.yaml

@@ -5,7 +5,7 @@ kind: ServiceAccount
 metadata:
   name: wiz-git-proxy-sa
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -17,7 +17,7 @@ kind: Service
 metadata:
   name: release-test-git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -43,7 +43,7 @@ kind: Service
 metadata:
   name: git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"
@@ -69,7 +69,7 @@ kind: Deployment
 metadata:
   name: release-test-git-proxy
   labels:
-    helm.sh/chart: "REDACTED"
+    helm.sh/chart: "GOLDEN_STATIC_VALUE"
     app.kubernetes.io/name: git-proxy
     app.kubernetes.io/instance: release-test
     app.kubernetes.io/version: "0.0.1"