disinto-admin/disinto
1
0
Fork 0
Code Issues 17 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: [nomad-step-3] S3-fix-4 — KV key-name mismatch: wp_forgejo_client vs forgejo_client (#954) #958

Merged
dev-qwen merged 1 commit from fix/issue-954 into main 2026-04-17 10:37:51 +00:00
Conversation 2 Commits 1 Files changed 2 +10 -1
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/vault-import.bats
View file

@ -137,6 +137,7 @@ setup() {
"${VAULT_ADDR}/v1/kv/data/disinto/shared/woodpecker" "${VAULT_ADDR}/v1/kv/data/disinto/shared/woodpecker"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
echo "$output" | grep -q "wp-agent-secret" echo "$output" | grep -q "wp-agent-secret"
# Forgejo keys are normalized: WP_FORGEJO_* → forgejo_* (no wp_ prefix in key name)
echo "$output" | grep -q "wp-forgejo-client" echo "$output" | grep -q "wp-forgejo-client"
echo "$output" | grep -q "wp-forgejo-secret" echo "$output" | grep -q "wp-forgejo-secret"
echo "$output" | grep -q "wp-token" echo "$output" | grep -q "wp-token"
@ -294,6 +295,8 @@ setup() {
"deploy-key-test" "deploy-key-test"
"npm-test-token" "npm-test-token"
"dockerhub-test-token" "dockerhub-test-token"
# Note: forgejo-client and forgejo-secret are NOT in the output
# because they are read from Vault, not logged
) )
for pattern in "${secret_patterns[@]}"; do for pattern in "${secret_patterns[@]}"; do

8
tools/vault-import.sh
View file

@ -391,7 +391,13 @@ EOF
local val="${!key}" local val="${!key}"
if [ -n "$val" ]; then if [ -n "$val" ]; then
local lowercase_key="${key,,}" local lowercase_key="${key,,}"
operations+=("woodpecker|$lowercase_key|$env_file|$key") # Normalize WP_FORGEJO_* → forgejo_* (strip wp_ prefix to match template)
if [[ "$lowercase_key" =~ ^wp_(.+)$ ]]; then
vault_key="${BASH_REMATCH[1]}"
else
vault_key="$lowercase_key"
fi
operations+=("woodpecker|$vault_key|$env_file|$key")
fi fi
done done