Update unittests to support new version of helm unittest

charts/gitops-runtime/tests/app-proxy-image-enrichemnt_test.yaml

@@ -15,7 +15,7 @@ tests:
     app-proxy.image-enrichment.enabled: true
   asserts:
   - failedTemplate:
-      errorMessage: 'app-proxy.image-enrichment is enabled but argo-workflows is disabled. This is not suppurted. Either disable erichment or enable workflows'
+      errorMessage: 'ERROR: app-proxy.image-enrichment is enabled but argo-workflows is disabled. This is not suppurted. Either disable erichment or enable workflows'
 
 - it: Set correct values in app-proxy configmap
   template: 'app-proxy/config.yaml'
@@ -31,7 +31,7 @@ tests:
     app-proxy.image-enrichment.config.clientHeartbeatIntervalInSeconds: 1
     app-proxy.image-enrichment.serviceAccount.name: test
     app-proxy.image-enrichment.config.images:
-      reportImage: 
+      reportImage:
         registry: registry.example
         repository: codefresh/report-image
         tag: 1-test-report
@@ -61,19 +61,19 @@ tests:
   - equal:
       path: data.enrichmentTtlActiveInSeconds
       value: "1"
-  - equal: 
+  - equal:
       path: data.enrichmentClientHeartbeatIntervalInSeconds
       value: "1"
-  - equal: 
+  - equal:
       path: data.enrichmentServiceAccountName
       value: test
-  - equal: 
+  - equal:
       path: data.enrichmentImageReportingImage
       value: registry.example/codefresh/report-image:1-test-report
-  - equal: 
+  - equal:
       path: data.enrichmentGitEnrichmentImage
       value: reg.ex/codefresh/git-enrich:1-test-git
-  - equal: 
+  - equal:
       path: data.enrichmentJiraEnrichmentImage
       value: my.reg/codefresh/jira-enrich:1-test-jira
 
@@ -147,7 +147,7 @@ tests:
             name: cap-app-proxy-cm
             key: enrichmentServiceAccountName
             optional: true
-  - contains: 
+  - contains:
       path: spec.template.spec.containers[0].env
       content:
         name: IRW_REPORT_IMAGE_TASK_IMAGE
@@ -156,7 +156,7 @@ tests:
             name: cap-app-proxy-cm
             key: enrichmentImageReportingImage
             optional: true
-  - contains: 
+  - contains:
       path: spec.template.spec.containers[0].env
       content:
         name: IRW_GIT_ENRICHMENT_TASK_IMAGE
@@ -165,7 +165,7 @@ tests:
             name: cap-app-proxy-cm
             key: enrichmentGitEnrichmentImage
             optional: true
-  - contains: 
+  - contains:
       path: spec.template.spec.containers[0].env
       content:
         name: IRW_JIRA_ENRICHMENT_TASK_IMAGE
@@ -202,8 +202,3 @@ tests:
   - equal:
       path: roleRef.name
       value: cap-app-proxy-enrichment
-
-
-
-
-

charts/gitops-runtime/tests/argo-projects-templates-integration_test.yaml

@@ -1,4 +1,4 @@
-# Test components that depend on templates from Argo projects. 
+# Test components that depend on templates from Argo projects.
 # This is extremely important since currently templates are used that may change between versions of Argo charts.
 suite: Test integration of outputs from Argo Project templates with components that use them in the runtime chart
 templates:
@@ -8,9 +8,9 @@ templates:
   - internal-router/config.yaml
   - event-reporters/events-reporter/eventsource.yaml
   - event-reporters/rollout-reporter/clusterrolebinding.yaml
-tests: 
+tests:
 # ------------------------------------------------------------------------
-# ArgoCD 
+# ArgoCD
 # Affected templates: app-proxy configmap and events-reporter eventsource
 # ------------------------------------------------------------------------
 - it: test app proxy argocd url - http
@@ -61,7 +61,7 @@ tests:
       path: spec.generic.events.url
       value: argo-cd-test-server:443
 # ------------------------------------------------------------------------------------------
-# Argo Workflows 
+# Argo Workflows
 # Affected templates: app-proxy ClusterRoleBinding to argo-server role, intenal-url config
 # ------------------------------------------------------------------------------------------
 - it: test app proxy ClusterRoleBinding to argo workflows role
@@ -87,7 +87,7 @@ tests:
     argo-workflows.server.secure: true
   asserts:
   - matchRegex:
-      path: data.default\.conf\.template
+      path: data["default.conf.template"]
       pattern: .proxy_pass https://argo-test-server:2746+
 
 - it: check worklfow route users argo-workflows server name and protocol http
@@ -101,7 +101,7 @@ tests:
     argo-workflows.server.secure: false
   asserts:
   - matchRegex:
-      path: data.default\.conf\.template
+      path: data["default.conf.template"]
       pattern: .proxy_pass http://argo-test-server:2746+
 
 - it: test app proxy argocd workflows url - http
@@ -130,7 +130,7 @@ tests:
       path: data.argoWorkflowsUrl
       value: https://argo-test-server:2746
 # ------------------------------------------------------------------------------------------
-# Argo rollouts 
+# Argo rollouts
 # Affected templates - rollouts reporter clusterrolebinding
 # ------------------------------------------------------------------------------------------
 - it: test rollout reporter ClusterRoleBinding to argo rollouts role
@@ -143,4 +143,4 @@ tests:
   asserts:
   - equal:
       path: roleRef.name
-      value: rollouts-test
+      value: rollouts-test

charts/gitops-runtime/tests/custom-ca_test.yaml

@@ -379,25 +379,24 @@ tests:
   values:
   - ./values/mandatory-values.yaml
   asserts:
-  - isEmpty:
+  - notExists:
       path: spec.triggers[0].template.http.tls
 
 - it: rollout reporter sensor - no tls
   template: event-reporters/rollout-reporter/sensor.yaml
   values:
   - ./values/mandatory-values.yaml
   asserts:
-  - isEmpty:
+  - notExists:
       path: spec.triggers[0].template.http.tls
 
 - it: workflow reporter sensor - no tls
   template: event-reporters/workflow-reporter/sensor.yaml
   values:
   - ./values/mandatory-values.yaml
   asserts:
-  - isEmpty:
+  - notExists:
       path: spec.triggers[0].template.http.tls
-
 # --------------------------------------------------------
 # workflowPipelinesGitWebhooks
 # --------------------------------------------------------

charts/gitops-runtime/tests/gitops-controller-misc_test.yaml

@@ -6,6 +6,8 @@ templates:
 tests:
 - it: override both images works
   template: 'charts/gitops-operator/templates/deployment.yaml'
+  values:
+  - ./values/mandatory-values.yaml
   set:
     gitops-operator:
       image:
@@ -195,43 +197,54 @@ tests:
         kind: ClusterRole
         apiVersion: rbac.authorization.k8s.io/v1
         name: codefresh-gitops-operator-proxy
+        any: true
     - containsDocument:
         kind: ClusterRoleBinding
         apiVersion: rbac.authorization.k8s.io/v1
         name: codefresh-gitops-operator-proxy
+        any: true
     - containsDocument:
         kind: ClusterRoleBinding
         apiVersion: rbac.authorization.k8s.io/v1
         name: restrictedgitsource-editor
+        any: true
     - containsDocument:
         kind: ClusterRole
         apiVersion: rbac.authorization.k8s.io/v1
         name: restrictedgitsource-editor
+        any: true
     - containsDocument:
         kind: ClusterRole
         apiVersion: rbac.authorization.k8s.io/v1
         name: restrictedgitsource-viewer
+        any: true
     - containsDocument:
         kind: ClusterRole
         apiVersion: rbac.authorization.k8s.io/v1
         name: codefresh-gitops-operator
+        any: true
     - containsDocument:
         kind: ClusterRoleBinding
         apiVersion: rbac.authorization.k8s.io/v1
         name: codefresh-gitops-operator
+        any: true
     - containsDocument:
         kind: ClusterRoleBinding
         apiVersion: rbac.authorization.k8s.io/v1
         name: restrictedgitsource-viewer
+        any: true
     - containsDocument:
         kind: Role
         apiVersion: rbac.authorization.k8s.io/v1
         name: leader-election
+        any: true
     - containsDocument:
         kind: Role
         apiVersion: rbac.authorization.k8s.io/v1
         name: leader-election
+        any: true
     - containsDocument:
         kind: RoleBinding
         apiVersion: rbac.authorization.k8s.io/v1
         name: leader-election
+        any: true

charts/gitops-runtime/tests/ingress_test.yaml

@@ -53,7 +53,7 @@ tests:
     tunnel-client.enabled: false
   asserts:
     - failedTemplate:
-        errorMessage: When global.runtime.ingress.enabled is false and tunnel-client.enabled is false -  global.runtime.ingressUrl must be provided
+        errorMessage: "ERROR: When global.runtime.ingress.enabled is false and tunnel-client.enabled is false -  global.runtime.ingressUrl must be provided"
 
 - it: fail on ingressUrl that is not http or https
   template: templates/codefresh-cm.yaml
@@ -65,7 +65,7 @@ tests:
     global.runtime.ingressUrl: test.test.fail
   asserts:
     - failedTemplate:
-        errorMessage: Only http and https are supported for global.runtime.ingressUrl
+        errorMessage: "ERROR: Only http and https are supported for global.runtime.ingressUrl"
 
 - it: codefresh-cm ingressHost is set correctly when ingress enabled
   template: templates/codefresh-cm.yaml
@@ -130,4 +130,4 @@ tests:
       value:
       - hosts:
         - "test.example.com"
-        secretName: blah
+        secretName: blah

charts/gitops-runtime/tests/runtime-gitcredentials_test.yaml

@@ -10,11 +10,9 @@ tests:
   - ./values/mandatory-values.yaml
   set:
     global.runtime.gitCredentials.password.value: bar
-  assert:
-  - contains:
-        path: metadata
-        content:
-          name: test-runtime1-git-password
+  asserts:
+  - hasDocuments:
+      count: 1
 
 - it: secret not created for secretKeyRef
   template: 'git-password-secret.yaml'
@@ -23,7 +21,7 @@ tests:
   set:
     global.runtime.gitCredentials.password.secretKeyRef.name: bar
     global.runtime.gitCredentials.password.secretKeyRef.key: foo
-  assert:
+  asserts:
   - hasDocuments:
       count: 0
 
@@ -71,7 +69,7 @@ tests:
           secretKeyRef:
             name: bar
             key: foo
-            optional: true 
+            optional: true
 
 - it: Plain text value takes precedence
   template: 'app-proxy/deployment.yaml'
@@ -115,4 +113,4 @@ tests:
     global.runtime.gitCredentials.password.secretKeyRef.name: foo
   asserts:
   - failedTemplate:
-       errorMessage: 'secretKeyRef for global.runtime.gitCredentials.password illegal - must have key field'
+       errorMessage: 'secretKeyRef for global.runtime.gitCredentials.password illegal - must have key field'

charts/gitops-runtime/tests/workflows-enabled-disabled_test.yaml

@@ -46,7 +46,7 @@ tests:
     argo-workflows.enabled: false
   asserts:
   - notMatchRegex:
-      path: data.default\.conf\.template
+      path: data["default.conf.template"]
       pattern: .+/workflows.+
 
 - it: internal router config has workflows route when workflows enabled
@@ -57,7 +57,7 @@ tests:
     argo-workflows.enabled: true
   asserts:
   - matchRegex:
-      path: data.default\.conf\.template
+      path: data["default.conf.template"]
       pattern: .+/workflows.+
 
 - it: test app proxy empty argo workflows url when disabled
@@ -69,4 +69,4 @@ tests:
   asserts:
   - equal:
       path: data.argoWorkflowsUrl
-      value:
+      value:

scripts/helm-unittests.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+## Reference: https://github.com/norwoodj/helm-docs
+set -eux
+CHART_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+echo "$CHART_DIR"
+
+echo "Running Helm unittests"
+docker run --entrypoint "/bin/sh" -it --rm -v $CHART_DIR/charts:/charts alpine/helm:3.14.4 -c 'helm plugin install https://github.com/helm-unittest/helm-unittest.git --version 0.5.1 && helm unittest /charts/gitops-runtime'