fix bats tests

hashicorp · Aug 7, 2023 · c3bcb63 · c3bcb63
1 parent 4722f9a
commit c3bcb63
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/charts/consul/test/unit/connect-inject-clusterrole.bats b/charts/consul/test/unit/connect-inject-clusterrole.bats
@@ -227,21 +227,17 @@ load _helpers
       -s templates/connect-inject-clusterrole.yaml  \
       --set 'global.openshift.enabled=true' \
       . | tee /dev/stderr |
-      yq -r '.rules[13]' | tee /dev/stderr | pbcopy)
-
-  local actual=$(echo $object | yq -r '.resourceNames[| index("restricted-v2")' | tee /dev/stderr)
-  [ "${actual}" != null ]
+      yq '.rules[13].resourceNames | index("restricted-v2")' | tee /dev/stderr)
+  [ "${object}" == 0 ]
 }
 
 @test "connectInject/ClusterRole: adds permission to securitycontextconstraints for Openshift with global.openshift.enabled=true and sets apiGateway Openshift SCC Name" {
   cd `chart_dir`
   local object=$(helm template \
       -s templates/connect-inject-clusterrole.yaml  \
       --set 'global.openshift.enabled=true' \
-      --set '.Values.connectInject.apiGateway.openshiftSccName="fakescc"' \
+      --set 'connectInject.apiGateway.managedGatewayClass.openshiftSccName=fakescc' \
       . | tee /dev/stderr |
-      yq -r '.rules[13]' | tee /dev/stderr | pbcopy)
-
-  local actual=$(echo $object | yq -r '.resourceNames[| index("fakescc")' | tee /dev/stderr)
-  [ "${actual}" != null ]
+       yq '.rules[13].resourceNames | index("fakescc")' | tee /dev/stderr)
+   [ "${object}" == 0 ]
 }
diff --git a/charts/consul/test/unit/gateway-resources-job.bats b/charts/consul/test/unit/gateway-resources-job.bats
@@ -92,6 +92,7 @@ target=templates/gateway-resources-job.yaml
       --set 'connectInject.apiGateway.managedGatewayClass.tolerations=- key: bar' \
       --set 'connectInject.apiGateway.managedGatewayClass.copyAnnotations.service.annotations=- bingo' \
       --set 'connectInject.apiGateway.managedGatewayClass.serviceType=Foo' \
+      --set 'connectInject.apiGateway.managedGatewayClass.openshiftSccName=hello' \
       . | tee /dev/stderr |
       yq '.spec.template.spec.containers[0].args' | tee /dev/stderr)
 
@@ -121,6 +122,12 @@ target=templates/gateway-resources-job.yaml
 
   local actual=$(echo "$spec" | jq '.[16]')
   [ "${actual}" = "\"- bingo\"" ]
+
+    local actual=$(echo "$spec" | jq '.[17]')
+    [ "${actual}" = "\"-service-type=Foo\"" ]
+
+  local actual=$(echo "$spec" | jq '.[18]')
+  [ "${actual}" = "\"-openshift-scc-name=hello\"" ]
 }