Skip to content

Commit 91dd379

Browse files
committed
hurl: Split read/write token expected variables
Also update GHA for it.
1 parent 4e6cd4d commit 91dd379

3 files changed

Lines changed: 29 additions & 5 deletions

File tree

.github/workflows/ci-reusable.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,22 @@ jobs:
6969
tag: 1.10.0
7070
VALUES
7171
helm repo add checkmk-chart https://checkmk.github.io/checkmk_kube_agent
72-
helm upgrade --install --create-namespace -n checkmk-monitoring myrelease checkmk-chart/checkmk -f values.yaml
72+
helm upgrade \
73+
--install \
74+
--create-namespace \
75+
-n checkmk-monitoring \
76+
myrelease checkmk-chart/checkmk \
77+
-f values.yaml
7378
- name: Install hurl
7479
uses: gacts/install-hurl@4e426ea8f8626b6f9e87f473751d8a0572370ba3
7580
- name: Run hurl tests
7681
run: |
77-
TKN=$(kubectl get secret myrelease-checkmk-checkmk -n checkmk-monitoring -o=jsonpath='{.data.token}' | base64 --decode)
82+
READ_TKN=$(kubectl get secret myrelease-checkmk-checkmk \
83+
-n checkmk-monitoring \
84+
-o=jsonpath='{.data.token}' \
85+
| base64 --decode)
86+
WRITE_TKN=$(kc exec -it daemonsets/myrelease-checkmk-node-collector-machine-sections \
87+
-- cat /var/run/secrets/kubernetes.io/serviceaccount/token)
7888
sleep 15 # TODO: do a loop or something instead
7989
./target/release/cmk-rustik-cache-server \
8090
--log-level=warning \
@@ -83,4 +93,8 @@ jobs:
8393
--reader-whitelist=checkmk-monitoring:myrelease-checkmk-checkmk \
8494
--writer-whitelist=checkmk-monitoring:myrelease-checkmk-node-collector-container-metrics,checkmk-monitoring:myrelease-checkmk-node-collector-machine-sections &
8595
sleep 2
86-
hurl --test metrics-cache/tests/hurl/ --variables-file metrics-cache/tests/hurl/vars --variable token=$TKN
96+
hurl \
97+
--test metrics-cache/tests/hurl/ \
98+
--variables-file metrics-cache/tests/hurl/vars \
99+
--variable read_token=$READ_TKN \
100+
--variable write_token=$WRITE_TKN

metrics-cache/tests/hurl/machine_sections.hurl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ HTTP 401
88
#header "Content-Type" == "application/json"
99

1010
POST {{baseurl}}/update_machine_sections
11-
Authorization: Bearer {{token}}
11+
Authorization: Bearer {{read_token}}
12+
Content-Type: application/json
13+
file,fixtures/machine_sections_from_python.json;
14+
HTTP 401
15+
16+
POST {{baseurl}}/update_machine_sections
17+
Authorization: Bearer {{write_token}}
1218
Content-Type: application/json
1319
file,fixtures/machine_sections_from_python.json;
1420
HTTP 200

metrics-cache/tests/hurl/root.hurl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ HTTP 401
99

1010
# The root endpoint should allow properly authorized requests.
1111
GET {{baseurl}}/
12-
Authorization: Bearer {{token}}
12+
Authorization: Bearer {{read_token}}
13+
HTTP 200
14+
15+
GET {{baseurl}}/
16+
Authorization: Bearer {{write_token}}
1317
HTTP 200

0 commit comments

Comments
 (0)