Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unit test assertions #693

Merged
merged 1 commit into from
Feb 25, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/unit/csi-clusterrole.bats
Original file line number Diff line number Diff line change
@@ -29,5 +29,5 @@ load _helpers
--set "csi.enabled=true" \
. | 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 changes: 2 additions & 2 deletions test/unit/csi-clusterrolebinding.bats
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ load _helpers
--set "csi.enabled=true" \
. | 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
@@ -40,5 +40,5 @@ load _helpers
--set "csi.enabled=true" \
. | tee /dev/stderr |
yq -r '.subjects[0].name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault-csi-provider" ]
[ "${actual}" = "release-name-vault-csi-provider" ]
}
2 changes: 1 addition & 1 deletion test/unit/csi-daemonset.bats
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ load _helpers
--set "csi.enabled=true" \
. | 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
2 changes: 1 addition & 1 deletion test/unit/csi-serviceaccount.bats
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ load _helpers
--set "csi.enabled=true" \
. | 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" {
4 changes: 2 additions & 2 deletions test/unit/injector-deployment.bats
Original file line number Diff line number Diff line change
@@ -157,15 +157,15 @@ load _helpers

local value=$(echo $object |
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
# discover the targeted namespace so we can check the rendered value correctly.
local namespace=$(kubectl config view --minify --output 'jsonpath={..namespace}')

local value=$(echo $object |
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" {
2 changes: 1 addition & 1 deletion test/unit/server-ha-statefulset.bats
Original file line number Diff line number Diff line change
@@ -428,7 +428,7 @@ load _helpers

local value=$(echo $object |
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 changes: 5 additions & 5 deletions test/unit/server-ingress.bats
Original file line number Diff line number Diff line change
@@ -165,7 +165,7 @@ load _helpers
--set 'server.service.enabled=true' \
. | 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" {
@@ -180,7 +180,7 @@ load _helpers
--set 'server.service.enabled=true' \
. | 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" {
@@ -194,7 +194,7 @@ load _helpers
--set 'server.service.enabled=true' \
. | 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" {
@@ -209,7 +209,7 @@ load _helpers
--kube-version 1.18.3 \
. | 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" {
@@ -224,7 +224,7 @@ load _helpers
--set 'server.service.enabled=true' \
. | 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" {
8 changes: 4 additions & 4 deletions test/unit/server-route.bats
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ load _helpers
--set 'server.route.enabled=true' \
. | 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" {
@@ -112,7 +112,7 @@ load _helpers
--set 'server.route.activeService=true' \
. | 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" {
@@ -125,7 +125,7 @@ load _helpers
--set 'server.ha.enabled=true' \
. | 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" {
@@ -139,7 +139,7 @@ load _helpers
--set 'server.ha.enabled=true' \
. | 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" {
2 changes: 1 addition & 1 deletion test/unit/server-serviceaccount.bats
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ load _helpers
--set 'server.dev.enabled=true' \
. | tee /dev/stderr |
yq -r '.metadata.name' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ]
[ "${actual}" = "release-name-vault" ]

}

2 changes: 1 addition & 1 deletion test/unit/server-statefulset.bats
Original file line number Diff line number Diff line change
@@ -1640,7 +1640,7 @@ load _helpers
--set 'server.serviceAccount.create=true' \
. | tee /dev/stderr |
yq -r '.spec.template.spec.serviceAccountName' | tee /dev/stderr)
[ "${actual}" = "RELEASE-NAME-vault" ]
[ "${actual}" = "release-name-vault" ]


}