fixes

liorschach · liorschach · commit 18fcbdec6c26 · 2024-11-07T19:09:59.000+02:00
diff --git a/.circleci/tests/golden.go b/.circleci/tests/golden.go
@@ -13,7 +13,7 @@ import (
 
 var update = flag.Bool("update-golden", false, "update golden test output files")
 
-type TemplateGoldenTest struct {
+type goldenHelmTest struct {
 	ChartPath          string
 	Release            string
 	Namespace          string
@@ -24,8 +24,8 @@ type TemplateGoldenTest struct {
 	GoldenSubDirectory string
 }
 
-// TestContainerGoldenTestDefaults Code is based on the article here:  https://medium.com/@zelldon91/advanced-test-practices-for-helm-charts-587caeeb4cb
-func TestContainerGoldenTestDefaults(t *testing.T, testCase *TemplateGoldenTest) {
+// runGoldenHelmTest Code is based on the article here:  https://medium.com/@zelldon91/advanced-test-practices-for-helm-charts-587caeeb4cb
+func runGoldenHelmTest(t *testing.T, testCase *goldenHelmTest) {
 	r := require.New(t)
 
 	options := &helm.Options{
diff --git a/.circleci/tests/golden/custom/wiz-admission-controller.golden.yaml b/.circleci/tests/golden/custom/wiz-admission-controller.golden.yaml
@@ -35,8 +35,8 @@ metadata:
     app.kubernetes.io/version: "2.7"
     app.kubernetes.io/managed-by: Helm
 stringData:
-  clientId: "<insert-client-id>"
-  clientToken: "<insert-client-token>"
+  clientId: "<required-client-id>"
+  clientToken: "<required-client-token>"
 ---
 # Source: wiz-admission-controller/templates/serviceaccount.yaml
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/.circleci/tests/golden/custom/wiz-sensor.golden.yaml b/.circleci/tests/golden/custom/wiz-sensor.golden.yaml
@@ -26,8 +26,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
 type: Opaque
 stringData:
-  clientId: "<insert-clientId>"
-  clientToken: "<insert-clientToken>"
+  clientId: "<required-clientId>"
+  clientToken: "<required-clientToken>"
 ---
 # Source: wiz-sensor/templates/imagepullsecret.yaml
 apiVersion: v1
diff --git a/.circleci/tests/golden/default/wiz-admission-controller.golden.yaml b/.circleci/tests/golden/default/wiz-admission-controller.golden.yaml
@@ -38,8 +38,8 @@ metadata:
     app.kubernetes.io/version: "2.7"
     app.kubernetes.io/managed-by: Helm
 stringData:
-  clientId: "<insert-client-id>"
-  clientToken: "<insert-client-token>"
+  clientId: "<required-client-id>"
+  clientToken: "<required-client-token>"
 ---
 # Source: wiz-admission-controller/templates/serviceaccount.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -207,7 +207,7 @@ spec:
     metadata:
       annotations:
         rollme.proxyHash: 19514bab71d978154200cb24acbc4334cc95e5470ccab6e9216c99152171633a
-        rollme.wizApiTokenHash: be7f348cb8721e285ea80fa05ef524362ac46a57b0539e78b390db2bb0acb1be
+        rollme.wizApiTokenHash: cbb3aea2a985eff2a33543866bfc77f891c84358af93ca8653c159e043cf8ae4
         rollme.webhookCert: "REDACTED"
       labels:
         
@@ -362,7 +362,7 @@ spec:
         metadata:
           annotations:
             rollme.proxyHash: 19514bab71d978154200cb24acbc4334cc95e5470ccab6e9216c99152171633a
-            rollme.wizApiTokenHash: be7f348cb8721e285ea80fa05ef524362ac46a57b0539e78b390db2bb0acb1be
+            rollme.wizApiTokenHash: cbb3aea2a985eff2a33543866bfc77f891c84358af93ca8653c159e043cf8ae4
           labels:
             helm.sh/chart: "REDACTED"
             app.kubernetes.io/chartName: wiz-admission-controller
diff --git a/.circleci/tests/golden/default/wiz-kubernetes-connector.golden.yaml b/.circleci/tests/golden/default/wiz-kubernetes-connector.golden.yaml
@@ -193,8 +193,8 @@ metadata:
     "helm.sh/hook": pre-install, pre-upgrade
     "helm.sh/hook-weight": "-1"
 stringData:
-  clientId: "<insert-client-id>"
-  clientToken: "<insert-client-token>"
+  clientId: "<required-client-id>"
+  clientToken: "<required-client-token>"
 ---
 # Source: wiz-kubernetes-connector/templates/service-account-cluster-reader.yaml
 apiVersion: v1
@@ -283,7 +283,7 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded 
-    rollme.wizApiTokenHash: 465be91677156a402d5d5c6cb47fddad732ebdd57e3458a877eb2cc544b9f217
+    rollme.wizApiTokenHash: bfe1394784ba2a07711575f7efaf1fbc40474018a130af5f96cf9ca9758395d9
     rollme.proxyHash: 9aa53d69075371b3fa23ebeea2fd2416ea81fb533499d071ca2d576f17c7c886
     rollme.brokerHash: 115ba85431eeaf8db3ff2173aee02d16e67df1555d5e1ef74cfa7ac0d812cab2   
 
diff --git a/.circleci/tests/golden/default/wiz-kubernetes-integration.golden.yaml b/.circleci/tests/golden/default/wiz-kubernetes-integration.golden.yaml
@@ -12,5 +12,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
   annotations:
 stringData:
-  clientId: "<insert-client-id>"
-  clientToken: "<insert-client-token>"
+  clientId: "<required-client-id>"
+  clientToken: "<required-client-token>"
diff --git a/.circleci/tests/golden/default/wiz-sensor.golden.yaml b/.circleci/tests/golden/default/wiz-sensor.golden.yaml
@@ -30,8 +30,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
 type: Opaque
 stringData:
-  clientId: "<insert-clientId>"
-  clientToken: "<insert-clientToken>"
+  clientId: "<required-clientId>"
+  clientToken: "<required-clientToken>"
 ---
 # Source: wiz-sensor/templates/imagepullsecret.yaml
 apiVersion: v1
@@ -49,7 +49,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
   namespace: release-helm-namespace
 data:
-  .dockerconfigjson: eyJhdXRocyI6IHsid2l6aW8uYXp1cmVjci5pbyI6IHsiYXV0aCI6ICJQR2x1YzJWeWRDMTFjMlZ5Ym1GdFpUNDZQR2x1YzJWeWRDMXdZWE56ZDI5eVpEND0ifX19
+  .dockerconfigjson: eyJhdXRocyI6IHsid2l6aW8uYXp1cmVjci5pbyI6IHsiYXV0aCI6ICJQSEpsY1hWcGNtVmtMWFZ6WlhKdVlXMWxQam84Y21WeGRXbHlaV1F0Y0dGemMzZHZjbVErIn19fQ==
 ---
 # Source: wiz-sensor/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/.circleci/tests/helm_repository_test.go b/.circleci/tests/helm_repository_test.go
@@ -17,16 +17,16 @@ const (
 	chartsRootDir = "../../."
 )
 
-type ss struct {
+type helmRepoSuite struct {
 	suite.Suite
 }
 
 func TestSs(t *testing.T) {
-	suite.Run(t, new(ss))
+	suite.Run(t, new(helmRepoSuite))
 }
 
-func (s *ss) TestChartTemplateWithDefaultValues() {
-	charts := s.getCharts(chartsRootDir)
+func (s *helmRepoSuite) TestChartTemplateWithDefaultValues() {
+	charts := s.getChartsInDirectory(chartsRootDir)
 
 	for _, chartName := range charts {
 		s.Run(chartName, func() {
@@ -35,7 +35,7 @@ func (s *ss) TestChartTemplateWithDefaultValues() {
 			s.NoError(err)
 			defaultValuesFilePath := path.Join(chartDir, "values.yaml")
 
-			TestContainerGoldenTestDefaults(s.T(), &TemplateGoldenTest{
+			runGoldenHelmTest(s.T(), &goldenHelmTest{
 				ChartPath:          chartDirFullPath,
 				Release:            "release-test",
 				Namespace:          "release-helm-namespace",
@@ -47,7 +47,7 @@ func (s *ss) TestChartTemplateWithDefaultValues() {
 	}
 }
 
-func (s *ss) TestChartTemplatesWithCustomValues() {
+func (s *helmRepoSuite) TestChartTemplatesWithCustomValues() {
 	testFiles, err := os.ReadDir("testfiles")
 	s.NoError(err)
 
@@ -60,7 +60,7 @@ func (s *ss) TestChartTemplatesWithCustomValues() {
 			s.NoError(err)
 
 			valuesFilePath := path.Join("testfiles", testFile.Name())
-			TestContainerGoldenTestDefaults(s.T(), &TemplateGoldenTest{
+			runGoldenHelmTest(s.T(), &goldenHelmTest{
 				ChartPath:          chartDirFullPath,
 				Release:            "release-test",
 				Namespace:          "release-helm-namespace",
@@ -72,7 +72,7 @@ func (s *ss) TestChartTemplatesWithCustomValues() {
 	}
 }
 
-func (s *ss) getChartDirectory(chartName string) string {
+func (s *helmRepoSuite) getChartDirectory(chartName string) string {
 	chartDir := path.Join(chartsRootDir, chartName)
 	if _, err := os.Stat(path.Join(chartDir, "Chart.yaml")); os.IsNotExist(err) {
 		//	fail the test
@@ -86,8 +86,8 @@ func (s *ss) getChartDirectory(chartName string) string {
 	return chartDir
 }
 
-func (s *ss) getCharts(dir string) []string {
-	// These charts are the "must" that we will fail the test if they do not exist
+func (s *helmRepoSuite) getChartsInDirectory(dir string) []string {
+	// There's no need to add directories to this list, but this is for extra care, to ensure we don't miss these charts
 	charts := map[string]struct{}{
 		"wiz-broker":                 {},
 		"wiz-sensor":                 {},
diff --git a/wiz-admission-controller/values.yaml b/wiz-admission-controller/values.yaml
@@ -8,8 +8,8 @@ commonLabels: { } # Labels applied on all the resources (not used for selection)
 
 # Wiz Service Account used to authenticate to Wiz.
 wizApiToken:
-  clientId: "<insert-client-id>" # Client ID of the Wiz Service Account.
-  clientToken: "<insert-client-token>" # Client secret of the Wiz Service Account.
+  clientId: "<required-client-id>" # Client ID of the Wiz Service Account.
+  clientToken: "<required-client-token>" # Client secret of the Wiz Service Account.
   clientEndpoint: "" # Defaults to commercial.
   # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
diff --git a/wiz-kubernetes-connector/values.yaml b/wiz-kubernetes-connector/values.yaml
@@ -74,8 +74,8 @@ autoCreateConnector:
     proxySidecarPort: 15000
 
 wizApiToken:
-  clientId: "<insert-client-id>" # Client ID of the Wiz Service Account.
-  clientToken: "<insert-client-token>" # Client secret of the Wiz Service Account.
+  clientId: "<required-client-id>" # Client ID of the Wiz Service Account.
+  clientToken: "<required-client-token>" # Client secret of the Wiz Service Account.
   clientEndpoint: "" # Defaults to commercial.
                      # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
diff --git a/wiz-kubernetes-integration/values.yaml b/wiz-kubernetes-integration/values.yaml
@@ -8,8 +8,8 @@ global:
 
   # Wiz Service Account used to authenticate to Wiz.
   wizApiToken:
-    clientId: "<insert-client-id>" # Client ID of the Wiz Service Account.
-    clientToken: "<insert-client-token>" # Client secret of the Wiz Service Account.
+    clientId: "<required-client-id>" # Client ID of the Wiz Service Account.
+    clientToken: "<required-client-token>" # Client secret of the Wiz Service Account.
     clientEndpoint: "" # Defaults to commercial.
                        # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
diff --git a/wiz-sensor/values.yaml b/wiz-sensor/values.yaml
@@ -88,8 +88,8 @@ wizApiToken:
     name: ""
 
   # The chart will refuse to install unless these are set to valid values
-  clientId: "<insert-clientId>"
-  clientToken: "<insert-clientToken>"
+  clientId: "<required-clientId>"
+  clientToken: "<required-clientToken>"
   clientEndpoint: "" # Set custom endpoint - should be "fedramp" for FEDRAMP environments
 
 httpProxyConfiguration:
@@ -133,8 +133,8 @@ imagePullSecret:
   # For general directions on how to pre-create this kind of secret please refer to:
   # https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials
   # the default registry server URL to use in the secret is wizio.azurecr.io. For FEDRAMP use wizfedramp.azurecr.us.
-  username: "<insert-username>"
-  password: "<insert-password>"
+  username: "<required-username>"
+  password: "<required-password>"
 
   # override the default name of the pull secret
   # If not set and create is true, a name is generated using the fullname template
