Skip to content

Commit 19b417c

Browse files
tomhjptomhjp
authoredFeb 25, 2022
Fix unit test assertions (#693)
·
v0.29.1v0.20.0
1 parent b447a92 commit 19b417c

10 files changed

+19
-19
lines changed
 

‎test/unit/csi-clusterrole.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ load _helpers
2929
--set "csi.enabled=true" \
3030
. | tee /dev/stderr |
3131
yq -r '.metadata.name' | tee /dev/stderr)
32-
[ "${actual}" = "RELEASE-NAME-vault-csi-provider-clusterrole" ]
32+
[ "${actual}" = "release-name-vault-csi-provider-clusterrole" ]
3333
}

‎test/unit/csi-clusterrolebinding.bats

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ load _helpers
2929
--set "csi.enabled=true" \
3030
. | tee /dev/stderr |
3131
yq -r '.roleRef.name' | tee /dev/stderr)
32-
[ "${actual}" = "RELEASE-NAME-vault-csi-provider-clusterrole" ]
32+
[ "${actual}" = "release-name-vault-csi-provider-clusterrole" ]
3333
}
3434

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

‎test/unit/csi-daemonset.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ load _helpers
6161
--set "csi.enabled=true" \
6262
. | tee /dev/stderr |
6363
yq -r '.spec.template.spec.serviceAccountName' | tee /dev/stderr)
64-
[ "${actual}" = "RELEASE-NAME-vault-csi-provider" ]
64+
[ "${actual}" = "release-name-vault-csi-provider" ]
6565
}
6666

6767
# Image

‎test/unit/csi-serviceaccount.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ load _helpers
2929
--set "csi.enabled=true" \
3030
. | tee /dev/stderr |
3131
yq -r '.metadata.name' | tee /dev/stderr)
32-
[ "${actual}" = "RELEASE-NAME-vault-csi-provider" ]
32+
[ "${actual}" = "release-name-vault-csi-provider" ]
3333
}
3434

3535
@test "csi/serviceAccount: specify annotations" {

‎test/unit/injector-deployment.bats

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ load _helpers
157157

158158
local value=$(echo $object |
159159
yq -r 'map(select(.name=="AGENT_INJECT_TLS_AUTO")) | .[] .value' | tee /dev/stderr)
160-
[ "${value}" = "RELEASE-NAME-vault-agent-injector-cfg" ]
160+
[ "${value}" = "release-name-vault-agent-injector-cfg" ]
161161

162162
# helm template does uses current context namespace and ignores namespace flags, so
163163
# discover the targeted namespace so we can check the rendered value correctly.
164164
local namespace=$(kubectl config view --minify --output 'jsonpath={..namespace}')
165165

166166
local value=$(echo $object |
167167
yq -r 'map(select(.name=="AGENT_INJECT_TLS_AUTO_HOSTS")) | .[] .value' | tee /dev/stderr)
168-
[ "${value}" = "RELEASE-NAME-vault-agent-injector-svc,RELEASE-NAME-vault-agent-injector-svc.${namespace:-default},RELEASE-NAME-vault-agent-injector-svc.${namespace:-default}.svc" ]
168+
[ "${value}" = "release-name-vault-agent-injector-svc,release-name-vault-agent-injector-svc.${namespace:-default},release-name-vault-agent-injector-svc.${namespace:-default}.svc" ]
169169
}
170170

171171
@test "injector/deployment: manual TLS adds volume mount" {

‎test/unit/server-ha-statefulset.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ load _helpers
428428

429429
local value=$(echo $object |
430430
yq -r 'map(select(.name=="VAULT_CLUSTER_ADDR")) | .[] .value' | tee /dev/stderr)
431-
[ "${value}" = 'https://$(HOSTNAME).RELEASE-NAME-vault-internal:8201' ]
431+
[ "${value}" = 'https://$(HOSTNAME).release-name-vault-internal:8201' ]
432432
}
433433

434434
#--------------------------------------------------------------------

‎test/unit/server-ingress.bats

+5-5
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ load _helpers
165165
--set 'server.service.enabled=true' \
166166
. | tee /dev/stderr |
167167
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
168-
[ "${actual}" = "RELEASE-NAME-vault-active" ]
168+
[ "${actual}" = "release-name-vault-active" ]
169169
}
170170

171171
@test "server/ingress: uses regular service when configured with ha - yaml" {
@@ -180,7 +180,7 @@ load _helpers
180180
--set 'server.service.enabled=true' \
181181
. | tee /dev/stderr |
182182
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
183-
[ "${actual}" = "RELEASE-NAME-vault" ]
183+
[ "${actual}" = "release-name-vault" ]
184184
}
185185

186186
@test "server/ingress: uses regular service when not ha - yaml" {
@@ -194,7 +194,7 @@ load _helpers
194194
--set 'server.service.enabled=true' \
195195
. | tee /dev/stderr |
196196
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
197-
[ "${actual}" = "RELEASE-NAME-vault" ]
197+
[ "${actual}" = "release-name-vault" ]
198198
}
199199

200200
@test "server/ingress: k8s 1.18.3 uses regular service when not ha - yaml" {
@@ -209,7 +209,7 @@ load _helpers
209209
--kube-version 1.18.3 \
210210
. | tee /dev/stderr |
211211
yq -r '.spec.rules[0].http.paths[0].backend.serviceName' | tee /dev/stderr)
212-
[ "${actual}" = "RELEASE-NAME-vault" ]
212+
[ "${actual}" = "release-name-vault" ]
213213
}
214214

215215
@test "server/ingress: uses regular service when not ha and activeService is true - yaml" {
@@ -224,7 +224,7 @@ load _helpers
224224
--set 'server.service.enabled=true' \
225225
. | tee /dev/stderr |
226226
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
227-
[ "${actual}" = "RELEASE-NAME-vault" ]
227+
[ "${actual}" = "release-name-vault" ]
228228
}
229229

230230
@test "server/ingress: pathType is added to Kubernetes version == 1.19.0" {

‎test/unit/server-route.bats

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ load _helpers
9999
--set 'server.route.enabled=true' \
100100
. | tee /dev/stderr |
101101
yq -r '.spec.to.name' | tee /dev/stderr)
102-
[ "${actual}" = "RELEASE-NAME-vault" ]
102+
[ "${actual}" = "release-name-vault" ]
103103
}
104104

105105
@test "server/route: OpenShift - route points to main service when not ha and activeService is true" {
@@ -112,7 +112,7 @@ load _helpers
112112
--set 'server.route.activeService=true' \
113113
. | tee /dev/stderr |
114114
yq -r '.spec.to.name' | tee /dev/stderr)
115-
[ "${actual}" = "RELEASE-NAME-vault" ]
115+
[ "${actual}" = "release-name-vault" ]
116116
}
117117

118118
@test "server/route: OpenShift - route points to active service by when HA by default" {
@@ -125,7 +125,7 @@ load _helpers
125125
--set 'server.ha.enabled=true' \
126126
. | tee /dev/stderr |
127127
yq -r '.spec.to.name' | tee /dev/stderr)
128-
[ "${actual}" = "RELEASE-NAME-vault-active" ]
128+
[ "${actual}" = "release-name-vault-active" ]
129129
}
130130

131131
@test "server/route: OpenShift - route points to general service by when HA when configured" {
@@ -139,7 +139,7 @@ load _helpers
139139
--set 'server.ha.enabled=true' \
140140
. | tee /dev/stderr |
141141
yq -r '.spec.to.name' | tee /dev/stderr)
142-
[ "${actual}" = "RELEASE-NAME-vault" ]
142+
[ "${actual}" = "release-name-vault" ]
143143
}
144144

145145
@test "server/route: OpenShift - route termination mode set to default passthrough" {

‎test/unit/server-serviceaccount.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ load _helpers
2626
--set 'server.dev.enabled=true' \
2727
. | tee /dev/stderr |
2828
yq -r '.metadata.name' | tee /dev/stderr)
29-
[ "${actual}" = "RELEASE-NAME-vault" ]
29+
[ "${actual}" = "release-name-vault" ]
3030

3131
}
3232

‎test/unit/server-statefulset.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,7 @@ load _helpers
16401640
--set 'server.serviceAccount.create=true' \
16411641
. | tee /dev/stderr |
16421642
yq -r '.spec.template.spec.serviceAccountName' | tee /dev/stderr)
1643-
[ "${actual}" = "RELEASE-NAME-vault" ]
1643+
[ "${actual}" = "release-name-vault" ]
16441644

16451645

16461646
}

0 commit comments

Comments
 (0)
Please sign in to comment.