Skip to content

Commit 77f8c5b

Browse files
committed
fix(test): make configmap diff better readable
1 parent 9e91f3f commit 77f8c5b

1 file changed

Lines changed: 29 additions & 21 deletions

File tree

tests/templates/kuttl/smoke/14-assert.yaml.j2

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,20 @@ commands:
2727
ZOOKEEPER: test-zk-server.__NAMESPACE__.svc.cluster.local:{{ zk_client_port }}
2828
ZOOKEEPER_CHROOT: /
2929
ZOOKEEPER_CLIENT_PORT: "{{ zk_client_port }}"
30-
ZOOKEEPER_HOSTS: test-zk-server.__NAMESPACE__.svc.cluster.local:{{ zk_client_port }}
30+
ZOOKEEPER_HOSTS: test-zk-server.__NAMESPACE__.svc.domainexample.local:{{ zk_client_port }}
3131
YAMLEOF
3232
)
3333
actual=$(kubectl -n $NAMESPACE get cm test-zk -o yaml | yq -o=json '.data')
34-
if [ "$expected" != "$actual" ]; then
34+
expected_file=$(mktemp) && actual_file=$(mktemp)
35+
printf '%s\n' "$expected" > "$expected_file"
36+
printf '%s\n' "$actual" > "$actual_file"
37+
if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
3538
echo "ERROR: ConfigMap test-zk data drifted from snapshot."
36-
echo "=== expected ==="
37-
printf '%s\n' "$expected"
38-
echo "=== actual ==="
39-
printf '%s\n' "$actual"
39+
printf '%s\n' "$diff_out"
40+
rm -f "$expected_file" "$actual_file"
4041
exit 1
4142
fi
43+
rm -f "$expected_file" "$actual_file"
4244
- script: |
4345
ZNODE_UID=$(kubectl -n $NAMESPACE get zookeeperznode test-znode -o jsonpath='{.metadata.uid}')
4446
expected=$(cat <<'YAMLEOF' | sed -e "s|__NAMESPACE__|$NAMESPACE|g" -e "s|__ZNODE_UID__|$ZNODE_UID|g" | yq -o=json
@@ -49,14 +51,16 @@ commands:
4951
YAMLEOF
5052
)
5153
actual=$(kubectl -n $NAMESPACE get cm test-znode -o yaml | yq -o=json '.data')
52-
if [ "$expected" != "$actual" ]; then
54+
expected_file=$(mktemp) && actual_file=$(mktemp)
55+
printf '%s\n' "$expected" > "$expected_file"
56+
printf '%s\n' "$actual" > "$actual_file"
57+
if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
5358
echo "ERROR: ConfigMap test-znode data drifted from snapshot."
54-
echo "=== expected ==="
55-
printf '%s\n' "$expected"
56-
echo "=== actual ==="
57-
printf '%s\n' "$actual"
59+
printf '%s\n' "$diff_out"
60+
rm -f "$expected_file" "$actual_file"
5861
exit 1
5962
fi
63+
rm -f "$expected_file" "$actual_file"
6064
- script: |
6165
expected=$(cat <<'YAMLEOF' | sed "s|__NAMESPACE__|$NAMESPACE|g" | yq -o=json
6266
logback.xml: |
@@ -149,14 +153,16 @@ commands:
149153
YAMLEOF
150154
)
151155
actual=$(kubectl -n $NAMESPACE get cm test-zk-server-primary -o yaml | yq -o=json '.data')
152-
if [ "$expected" != "$actual" ]; then
156+
expected_file=$(mktemp) && actual_file=$(mktemp)
157+
printf '%s\n' "$expected" > "$expected_file"
158+
printf '%s\n' "$actual" > "$actual_file"
159+
if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
153160
echo "ERROR: ConfigMap test-zk-server-primary data drifted from snapshot."
154-
echo "=== expected ==="
155-
printf '%s\n' "$expected"
156-
echo "=== actual ==="
157-
printf '%s\n' "$actual"
161+
printf '%s\n' "$diff_out"
162+
rm -f "$expected_file" "$actual_file"
158163
exit 1
159164
fi
165+
rm -f "$expected_file" "$actual_file"
160166
- script: |
161167
expected=$(cat <<'YAMLEOF' | sed "s|__NAMESPACE__|$NAMESPACE|g" | yq -o=json
162168
logback.xml: |
@@ -248,11 +254,13 @@ commands:
248254
YAMLEOF
249255
)
250256
actual=$(kubectl -n $NAMESPACE get cm test-zk-server-secondary -o yaml | yq -o=json '.data')
251-
if [ "$expected" != "$actual" ]; then
257+
expected_file=$(mktemp) && actual_file=$(mktemp)
258+
printf '%s\n' "$expected" > "$expected_file"
259+
printf '%s\n' "$actual" > "$actual_file"
260+
if ! diff_out=$(diff -u "$expected_file" "$actual_file"); then
252261
echo "ERROR: ConfigMap test-zk-server-secondary data drifted from snapshot."
253-
echo "=== expected ==="
254-
printf '%s\n' "$expected"
255-
echo "=== actual ==="
256-
printf '%s\n' "$actual"
262+
printf '%s\n' "$diff_out"
263+
rm -f "$expected_file" "$actual_file"
257264
exit 1
258265
fi
266+
rm -f "$expected_file" "$actual_file"

0 commit comments

Comments
 (0)