Michal.Wrobel/openbao-helm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unit test assertions (#693)

Browse source
This commit is contained in:
Tom Proctor 2022-02-25 19:01:04 +00:00 committed by GitHub
parent b447a92bd7
commit 19b417cbaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/unit/csi-clusterrole.bats
View file

@ -29,5 +29,5 @@ load _helpers
--set "csi.enabled=true" \ --set "csi.enabled=true" \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.metadata.name' | tee /dev/stderr) yq -r '.metadata.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault-csi-provider-clusterrole" ] [ "${actual}" = "release-name-vault-csi-provider-clusterrole" ]
} }

4
test/unit/csi-clusterrolebinding.bats
View file

@ -29,7 +29,7 @@ load _helpers
--set "csi.enabled=true" \ --set "csi.enabled=true" \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.roleRef.name' | tee /dev/stderr) yq -r '.roleRef.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault-csi-provider-clusterrole" ] [ "${actual}" = "release-name-vault-csi-provider-clusterrole" ]
} }
# ClusterRoleBinding service account name # ClusterRoleBinding service account name
@ -40,5 +40,5 @@ load _helpers
--set "csi.enabled=true" \ --set "csi.enabled=true" \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.subjects[0].name' | tee /dev/stderr) yq -r '.subjects[0].name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault-csi-provider" ] [ "${actual}" = "release-name-vault-csi-provider" ]
} }

2
test/unit/csi-daemonset.bats
View file

@ -61,7 +61,7 @@ load _helpers
--set "csi.enabled=true" \ --set "csi.enabled=true" \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.template.spec.serviceAccountName' | tee /dev/stderr) yq -r '.spec.template.spec.serviceAccountName' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault-csi-provider" ] [ "${actual}" = "release-name-vault-csi-provider" ]
} }
# Image # Image

2
test/unit/csi-serviceaccount.bats
View file

@ -29,7 +29,7 @@ load _helpers
--set "csi.enabled=true" \ --set "csi.enabled=true" \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.metadata.name' | tee /dev/stderr) yq -r '.metadata.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault-csi-provider" ] [ "${actual}" = "release-name-vault-csi-provider" ]
} }
@test "csi/serviceAccount: specify annotations" { @test "csi/serviceAccount: specify annotations" {

4
test/unit/injector-deployment.bats
View file

@ -157,7 +157,7 @@ load _helpers
local value=$(echo $object | local value=$(echo $object |
yq -r 'map(select(.name=="AGENT_INJECT_TLS_AUTO")) | .[] .value' | tee /dev/stderr) yq -r 'map(select(.name=="AGENT_INJECT_TLS_AUTO")) | .[] .value' | tee /dev/stderr)
[ "${value}" = "RELEASE-NAME-vault-agent-injector-cfg" ] [ "${value}" = "release-name-vault-agent-injector-cfg" ]
# helm template does uses current context namespace and ignores namespace flags, so # helm template does uses current context namespace and ignores namespace flags, so
# discover the targeted namespace so we can check the rendered value correctly. # discover the targeted namespace so we can check the rendered value correctly.
@ -165,7 +165,7 @@ load _helpers
local value=$(echo $object | local value=$(echo $object |
yq -r 'map(select(.name=="AGENT_INJECT_TLS_AUTO_HOSTS")) | .[] .value' | tee /dev/stderr) yq -r 'map(select(.name=="AGENT_INJECT_TLS_AUTO_HOSTS")) | .[] .value' | tee /dev/stderr)
[ "${value}" = "RELEASE-NAME-vault-agent-injector-svc,RELEASE-NAME-vault-agent-injector-svc.${namespace:-default},RELEASE-NAME-vault-agent-injector-svc.${namespace:-default}.svc" ] [ "${value}" = "release-name-vault-agent-injector-svc,release-name-vault-agent-injector-svc.${namespace:-default},release-name-vault-agent-injector-svc.${namespace:-default}.svc" ]
} }
@test "injector/deployment: manual TLS adds volume mount" { @test "injector/deployment: manual TLS adds volume mount" {

2
test/unit/server-ha-statefulset.bats
View file

@ -428,7 +428,7 @@ load _helpers
local value=$(echo $object | local value=$(echo $object |
yq -r 'map(select(.name=="VAULT_CLUSTER_ADDR")) | .[] .value' | tee /dev/stderr) yq -r 'map(select(.name=="VAULT_CLUSTER_ADDR")) | .[] .value' | tee /dev/stderr)
[ "${value}" = 'https://$(HOSTNAME).RELEASE-NAME-vault-internal:8201' ] [ "${value}" = 'https://$(HOSTNAME).release-name-vault-internal:8201' ]
} }
#-------------------------------------------------------------------- #--------------------------------------------------------------------

10
test/unit/server-ingress.bats
View file

@ -165,7 +165,7 @@ load _helpers
--set 'server.service.enabled=true' \ --set 'server.service.enabled=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr) yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault-active" ] [ "${actual}" = "release-name-vault-active" ]
} }
@test "server/ingress: uses regular service when configured with ha - yaml" { @test "server/ingress: uses regular service when configured with ha - yaml" {
@ -180,7 +180,7 @@ load _helpers
--set 'server.service.enabled=true' \ --set 'server.service.enabled=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr) yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }
@test "server/ingress: uses regular service when not ha - yaml" { @test "server/ingress: uses regular service when not ha - yaml" {
@ -194,7 +194,7 @@ load _helpers
--set 'server.service.enabled=true' \ --set 'server.service.enabled=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr) yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }
@test "server/ingress: k8s 1.18.3 uses regular service when not ha - yaml" { @test "server/ingress: k8s 1.18.3 uses regular service when not ha - yaml" {
@ -209,7 +209,7 @@ load _helpers
--kube-version 1.18.3 \ --kube-version 1.18.3 \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.rules[0].http.paths[0].backend.serviceName' | tee /dev/stderr) yq -r '.spec.rules[0].http.paths[0].backend.serviceName' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }
@test "server/ingress: uses regular service when not ha and activeService is true - yaml" { @test "server/ingress: uses regular service when not ha and activeService is true - yaml" {
@ -224,7 +224,7 @@ load _helpers
--set 'server.service.enabled=true' \ --set 'server.service.enabled=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr) yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }
@test "server/ingress: pathType is added to Kubernetes version == 1.19.0" { @test "server/ingress: pathType is added to Kubernetes version == 1.19.0" {

8
test/unit/server-route.bats
View file

@ -99,7 +99,7 @@ load _helpers
--set 'server.route.enabled=true' \ --set 'server.route.enabled=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.to.name' | tee /dev/stderr) yq -r '.spec.to.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }
@test "server/route: OpenShift - route points to main service when not ha and activeService is true" { @test "server/route: OpenShift - route points to main service when not ha and activeService is true" {
@ -112,7 +112,7 @@ load _helpers
--set 'server.route.activeService=true' \ --set 'server.route.activeService=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.to.name' | tee /dev/stderr) yq -r '.spec.to.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }
@test "server/route: OpenShift - route points to active service by when HA by default" { @test "server/route: OpenShift - route points to active service by when HA by default" {
@ -125,7 +125,7 @@ load _helpers
--set 'server.ha.enabled=true' \ --set 'server.ha.enabled=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.to.name' | tee /dev/stderr) yq -r '.spec.to.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault-active" ] [ "${actual}" = "release-name-vault-active" ]
} }
@test "server/route: OpenShift - route points to general service by when HA when configured" { @test "server/route: OpenShift - route points to general service by when HA when configured" {
@ -139,7 +139,7 @@ load _helpers
--set 'server.ha.enabled=true' \ --set 'server.ha.enabled=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.to.name' | tee /dev/stderr) yq -r '.spec.to.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }
@test "server/route: OpenShift - route termination mode set to default passthrough" { @test "server/route: OpenShift - route termination mode set to default passthrough" {

2
test/unit/server-serviceaccount.bats
View file

@ -26,7 +26,7 @@ load _helpers
--set 'server.dev.enabled=true' \ --set 'server.dev.enabled=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.metadata.name' | tee /dev/stderr) yq -r '.metadata.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }

2
test/unit/server-statefulset.bats
View file

@ -1640,7 +1640,7 @@ load _helpers
--set 'server.serviceAccount.create=true' \ --set 'server.serviceAccount.create=true' \
. | tee /dev/stderr | . | tee /dev/stderr |
yq -r '.spec.template.spec.serviceAccountName' | tee /dev/stderr) yq -r '.spec.template.spec.serviceAccountName' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ] [ "${actual}" = "release-name-vault" ]
} }