Skip to content

Commit a7e17c3

Browse files
MalewareMaleware
authored
Adopting according to new readability and code style (#618)
1 parent 650af78 commit a7e17c3

File tree

2 files changed

+89
-38
lines changed

2 files changed

+89
-38
lines changed

‎tests/templates/kuttl/overrides/21-assert.yaml

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,43 @@ commands:
77
# Test envOverrides
88
#
99
- script: |
10-
kubectl -n $NAMESPACE get sts druid-broker-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "COMMON_VAR" and .value == "group-value")'
11-
kubectl -n $NAMESPACE get sts druid-broker-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "GROUP_VAR" and .value == "group-value")'
12-
kubectl -n $NAMESPACE get sts druid-broker-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "ROLE_VAR" and .value == "role-value")'
13-
- script: |
14-
kubectl -n $NAMESPACE get sts druid-coordinator-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "COMMON_VAR" and .value == "group-value")'
15-
kubectl -n $NAMESPACE get sts druid-coordinator-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "GROUP_VAR" and .value == "group-value")'
16-
kubectl -n $NAMESPACE get sts druid-coordinator-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "ROLE_VAR" and .value == "role-value")'
17-
- script: |
18-
kubectl -n $NAMESPACE get sts druid-historical-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "COMMON_VAR" and .value == "group-value")'
19-
kubectl -n $NAMESPACE get sts druid-historical-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "GROUP_VAR" and .value == "group-value")'
20-
kubectl -n $NAMESPACE get sts druid-historical-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "ROLE_VAR" and .value == "role-value")'
21-
- script: |
22-
kubectl -n $NAMESPACE get sts druid-middlemanager-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "COMMON_VAR" and .value == "group-value")'
23-
kubectl -n $NAMESPACE get sts druid-middlemanager-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "GROUP_VAR" and .value == "group-value")'
24-
kubectl -n $NAMESPACE get sts druid-middlemanager-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "ROLE_VAR" and .value == "role-value")'
25-
- script: |
26-
kubectl -n $NAMESPACE get sts druid-router-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "COMMON_VAR" and .value == "group-value")'
27-
kubectl -n $NAMESPACE get sts druid-router-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "GROUP_VAR" and .value == "group-value")'
28-
kubectl -n $NAMESPACE get sts druid-router-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "druid") | .env[] | select (.name == "ROLE_VAR" and .value == "role-value")'
10+
#!/usr/bin/env bash
11+
set -euo pipefail
12+
13+
# STS Spec Test Data
14+
DRUID_BROKER_STS=$( kubectl -n "$NAMESPACE" get sts druid-broker-default -o yaml )
15+
DRUID_COORDINATOR_STS=$( kubectl -n "$NAMESPACE" get sts druid-coordinator-default -o yaml )
16+
DRUID_HISTORICAL_STS=$( kubectl -n "$NAMESPACE" get sts druid-historical-default -o yaml )
17+
DRUID_MIDDLEMANAGER_STS=$( kubectl -n "$NAMESPACE" get sts druid-middlemanager-default -o yaml )
18+
DRUID_ROUTER_STS=$( kubectl -n "$NAMESPACE" get sts druid-router-default -o yaml )
19+
YQ_FILTER='
20+
.spec.template.spec.containers[]
21+
| select (.name == "druid")
22+
| .env[]
23+
| select (.name == strenv(KEY) and .value == strenv(VALUE))
24+
'
25+
26+
# DRUID_BROKER_STS Spec Test Assertions
27+
echo "$DRUID_BROKER_STS" | KEY="COMMON_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
28+
echo "$DRUID_BROKER_STS" | KEY="GROUP_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
29+
echo "$DRUID_BROKER_STS" | KEY="ROLE_VAR" VALUE="role-value" yq -e "$YQ_FILTER"
30+
31+
# DRUID_COORDINATOR_STS Spec Test Assertions
32+
echo "$DRUID_COORDINATOR_STS" | KEY="COMMON_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
33+
echo "$DRUID_COORDINATOR_STS" | KEY="GROUP_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
34+
echo "$DRUID_COORDINATOR_STS" | KEY="ROLE_VAR" VALUE="role-value" yq -e "$YQ_FILTER"
35+
36+
# DRUID_HISTORICAL_STS Spec Test Assertions
37+
echo "$DRUID_HISTORICAL_STS" | KEY="COMMON_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
38+
echo "$DRUID_HISTORICAL_STS" | KEY="GROUP_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
39+
echo "$DRUID_HISTORICAL_STS" | KEY="ROLE_VAR" VALUE="role-value" yq -e "$YQ_FILTER"
40+
41+
# DRUID_MIDDLEMANAGER_STS Spec Test Assertions
42+
echo "$DRUID_MIDDLEMANAGER_STS" | KEY="COMMON_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
43+
echo "$DRUID_MIDDLEMANAGER_STS" | KEY="GROUP_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
44+
echo "$DRUID_MIDDLEMANAGER_STS" | KEY="ROLE_VAR" VALUE="role-value" yq -e "$YQ_FILTER"
45+
46+
# DRUID_ROUTER_STS Spec Test Assertions
47+
echo "$DRUID_ROUTER_STS" | KEY="COMMON_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
48+
echo "$DRUID_ROUTER_STS" | KEY="GROUP_VAR" VALUE="group-value" yq -e "$YQ_FILTER"
49+
echo "$DRUID_ROUTER_STS" | KEY="ROLE_VAR" VALUE="role-value" yq -e "$YQ_FILTER"

‎tests/templates/kuttl/overrides/22-assert.yaml

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,52 @@ commands:
77
# Test configOverrides
88
#
99
- script: |
10-
kubectl -n $NAMESPACE get cm druid-broker-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.common=group-value"
11-
kubectl -n $NAMESPACE get cm druid-broker-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.group=group-value"
12-
kubectl -n $NAMESPACE get cm druid-broker-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.role=role-value"
13-
- script: |
14-
kubectl -n $NAMESPACE get cm druid-coordinator-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.common=group-value"
15-
kubectl -n $NAMESPACE get cm druid-coordinator-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.group=group-value"
16-
kubectl -n $NAMESPACE get cm druid-coordinator-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.role=role-value"
17-
- script: |
18-
kubectl -n $NAMESPACE get cm druid-historical-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.common=group-value"
19-
kubectl -n $NAMESPACE get cm druid-historical-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.group=group-value"
20-
kubectl -n $NAMESPACE get cm druid-historical-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.role=role-value"
21-
- script: |
22-
kubectl -n $NAMESPACE get cm druid-middlemanager-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.common=group-value"
23-
kubectl -n $NAMESPACE get cm druid-middlemanager-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.group=group-value"
24-
kubectl -n $NAMESPACE get cm druid-middlemanager-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.role=role-value"
25-
- script: |
26-
kubectl -n $NAMESPACE get cm druid-router-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.common=group-value"
27-
kubectl -n $NAMESPACE get cm druid-router-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.group=group-value"
28-
kubectl -n $NAMESPACE get cm druid-router-default -o yaml | yq -e '.data."runtime.properties"' | grep "prop.role=role-value"
10+
#!/usr/bin/env bash
11+
set -euo pipefail
12+
13+
# Config Test Data
14+
DRUID_BROKER_CONFIG=$(
15+
kubectl -n "$NAMESPACE" get cm druid-broker-default -o yaml \
16+
| yq -e '.data."runtime.properties"'
17+
)
18+
DRUID_COORDINATOR_CONFIG=$(
19+
kubectl -n "$NAMESPACE" get cm druid-coordinator-default -o yaml \
20+
| yq -e '.data."runtime.properties"'
21+
)
22+
DRUID_HISTORICAL_CONFIG=$(
23+
kubectl -n "$NAMESPACE" get cm druid-historical-default -o yaml \
24+
| yq -e '.data."runtime.properties"'
25+
)
26+
DRUID_MIDDLEMANAGER_CONFIG=$(
27+
kubectl -n "$NAMESPACE" get cm druid-middlemanager-default -o yaml \
28+
| yq -e '.data."runtime.properties"'
29+
)
30+
DRUID_ROUTER_CONFIG=$(
31+
kubectl -n "$NAMESPACE" get cm druid-router-default -o yaml \
32+
| yq -e '.data."runtime.properties"'
33+
)
34+
35+
# DRUID_BROKER_CONFIG Test Assertions
36+
echo "$DRUID_BROKER_CONFIG" | grep "prop.common=group-value"
37+
echo "$DRUID_BROKER_CONFIG" | grep "prop.group=group-value"
38+
echo "$DRUID_BROKER_CONFIG" | grep "prop.role=role-value"
39+
40+
# DRUID_COORDINATOR_CONFIG Test Assertions
41+
echo "$DRUID_COORDINATOR_CONFIG" | grep "prop.common=group-value"
42+
echo "$DRUID_COORDINATOR_CONFIG" | grep "prop.group=group-value"
43+
echo "$DRUID_COORDINATOR_CONFIG" | grep "prop.role=role-value"
44+
45+
# DRUID_HISTORICAL_CONFIG Test Assertions
46+
echo "$DRUID_HISTORICAL_CONFIG" | grep "prop.common=group-value"
47+
echo "$DRUID_HISTORICAL_CONFIG" | grep "prop.group=group-value"
48+
echo "$DRUID_HISTORICAL_CONFIG" | grep "prop.role=role-value"
49+
50+
# DRUID_MIDDLEMANAGER_CONFIG Test Assertions
51+
echo "$DRUID_MIDDLEMANAGER_CONFIG" | grep "prop.common=group-value"
52+
echo "$DRUID_MIDDLEMANAGER_CONFIG" | grep "prop.group=group-value"
53+
echo "$DRUID_MIDDLEMANAGER_CONFIG" | grep "prop.role=role-value"
54+
55+
# DRUID_ROUTER_CONFIG Test Assertions
56+
echo "$DRUID_ROUTER_CONFIG" | grep "prop.common=group-value"
57+
echo "$DRUID_ROUTER_CONFIG" | grep "prop.group=group-value"
58+
echo "$DRUID_ROUTER_CONFIG" | grep "prop.role=role-value"

0 commit comments

Comments
 (0)