feat: add a whole-set form and clear for chart overrides
The `scheduler-k3s:charts:set` command only changed one chart override at a time, so matching a chart's stored overrides to a declared set meant reading the report, computing the difference in both directions and issuing one command per added, changed and removed property, with a failure partway through leaving a mixture of the two sets. A `--replace` flag on `scheduler-k3s:charts:set` now takes a chart name followed by `property=value` pairs and writes the declared map for that chart in a single call. Every pair is parsed before anything is written, so a rejected pair leaves the stored overrides untouched, and a pair ending in `=` stores an empty value, which the per-property form cannot express. An empty pair list is rejected rather than treated as a request to remove everything, and the new `scheduler-k3s:charts:clear` command handles that case by removing every override for a chart.
This commit is contained in:
10 files changed
+278
-42
No files matched your search
@@ -7,9 +7,8 @@ setup() {
|
||||
}
|
||||
|
||||
teardown() {
|
||||
dokku scheduler-k3s:charts:set cert-manager.installCRDs >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:set cert-manager.version >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:set traefik.replicas >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:clear cert-manager >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:clear traefik >/dev/null 2>/dev/null || true
|
||||
global_teardown
|
||||
}
|
||||
|
||||
|
||||
@@ -7,9 +7,8 @@ setup() {
|
||||
}
|
||||
|
||||
teardown() {
|
||||
dokku scheduler-k3s:charts:set traefik.service.annotations.prometheus.io/scrape >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:set traefik.controller.config >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:set cert-manager.installCRDs >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:clear cert-manager >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:clear traefik >/dev/null 2>/dev/null || true
|
||||
global_teardown
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
#!/usr/bin/env bats
|
||||
|
||||
load test_helper
|
||||
|
||||
setup() {
|
||||
global_setup
|
||||
}
|
||||
|
||||
teardown() {
|
||||
dokku scheduler-k3s:charts:clear cert-manager >/dev/null 2>/dev/null || true
|
||||
dokku scheduler-k3s:charts:clear traefik >/dev/null 2>/dev/null || true
|
||||
global_teardown
|
||||
}
|
||||
|
||||
@test "(scheduler-k3s:charts:set) --replace writes the declared map in one call" {
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set traefik.replicas 2"
|
||||
assert_success
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set traefik.foo bar"
|
||||
assert_success
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set cert-manager.installCRDs false"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace traefik replicas=3 service.annotations.prometheus.io/scrape=true opt=a=b empty="
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:report traefik --format json | jq -c -S ."
|
||||
assert_success
|
||||
assert_output '{"traefik.empty":"","traefik.opt":"a=b","traefik.replicas":"3","traefik.service.annotations.prometheus.io/scrape":"true"}'
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:report cert-manager --format json | jq -c -S ."
|
||||
assert_success
|
||||
assert_output '{"cert-manager.installCRDs":"false"}'
|
||||
}
|
||||
|
||||
@test "(scheduler-k3s:charts:set) --replace rejects invalid input without writing" {
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set traefik.replicas 2"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace"
|
||||
assert_failure
|
||||
assert_output_contains "Missing chart name"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace not-a-chart replicas=3"
|
||||
assert_failure
|
||||
assert_output_contains "Invalid chart name"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace replicas=3"
|
||||
assert_failure
|
||||
assert_output_contains "Invalid chart name"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace traefik"
|
||||
assert_failure
|
||||
assert_output_contains "scheduler-k3s:charts:clear"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace traefik replicas=3 malformed"
|
||||
assert_failure
|
||||
assert_output_contains "Invalid key=value pair: malformed"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace traefik replicas=3 =3"
|
||||
assert_failure
|
||||
assert_output_contains "Invalid key=value pair: =3"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace traefik replicas=3 replicas=4"
|
||||
assert_failure
|
||||
assert_output_contains "Duplicate key specified: replicas"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:report traefik --format json | jq -c -S ."
|
||||
assert_success
|
||||
assert_output '{"traefik.replicas":"2"}'
|
||||
}
|
||||
|
||||
@test "(scheduler-k3s:charts:clear) removes every override for a chart" {
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set --replace traefik replicas=2 foo=bar"
|
||||
assert_success
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:set cert-manager.installCRDs false"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:clear traefik"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:report traefik --format json"
|
||||
assert_success
|
||||
assert_output "{}"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:report cert-manager --format json | jq -c -S ."
|
||||
assert_success
|
||||
assert_output '{"cert-manager.installCRDs":"false"}'
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:clear traefik"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:clear"
|
||||
assert_failure
|
||||
assert_output_contains "Missing chart name"
|
||||
|
||||
run /bin/bash -c "dokku scheduler-k3s:charts:clear not-a-chart"
|
||||
assert_failure
|
||||
assert_output_contains "Invalid chart name"
|
||||
}
|
||||
Reference in new issue
Block a user