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

fix: [nomad-step-2] S2.5 — bin/disinto init --import-env / --import-sops / --age-key wire-up (#883) #899

Closed
dev-qwen wants to merge 2 commits from fix/issue-883 into main
pull from: fix/issue-883
merge into: disinto-admin:main
Conversation 0 Commits 2 Files changed 3 +7 -7
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cc1e914a0c - Show all commits

6
bin/disinto
View file

@ -723,7 +723,7 @@ _disinto_init_nomad() {
echo "[auth] [dry-run] ${vault_auth_sh}"
echo ""
else
echo "[import] no --import-env/--import-sops — skipping; set them or seed kv/disinto/* manually before deploying secret-dependent services"
echo "[import] no --import-env/--import-sops - skipping; set them or seed kv/disinto/* manually before deploying secret-dependent services"
echo ""
fi
@ -818,7 +818,7 @@ _disinto_init_nomad() {
sudo -n -- "${import_cmd[@]}" || exit $?
fi
else
echo "[import] no --import-env/--import-sops — skipping; set them or seed kv/disinto/* manually before deploying secret-dependent services"
echo "[import] no --import-env/--import-sops - skipping; set them or seed kv/disinto/* manually before deploying secret-dependent services"
fi
# Deploy services if requested
@ -1134,7 +1134,7 @@ p.write_text(text)
echo "[ensure] CLAUDE_CONFIG_DIR"
echo "[ensure] state files (.dev-active, .reviewer-active, .gardener-active)"
echo ""
echo "Dry run complete — no changes made."
echo "Dry run complete - no changes made."
exit 0
fi

2
lib/init/nomad/cluster-up.sh
View file

@ -135,7 +135,7 @@ EOF
→ export VAULT_ADDR=${VAULT_ADDR_DEFAULT}
→ export NOMAD_ADDR=${NOMAD_ADDR_DEFAULT}
Dry run complete — no changes made.
Dry run complete - no changes made.
EOF
exit 0
fi

6
tests/disinto-init-nomad.bats
View file

@ -44,7 +44,7 @@ setup_file() {
[[ "$output" == *"[dry-run] Step 8/9: systemctl start nomad + poll until ≥1 node ready"* ]]
[[ "$output" == *"[dry-run] Step 9/9: write /etc/profile.d/disinto-nomad.sh"* ]]
[[ "$output" == *"Dry run complete — no changes made."* ]]
[[ "$output" == *"Dry run complete - no changes made."* ]]
}
# ── --backend=nomad --empty --dry-run ────────────────────────────────────────
@ -58,7 +58,7 @@ setup_file() {
# both modes invoke the same cluster-up dry-run.
[[ "$output" == *"nomad backend: --empty (cluster-up only, no jobs)"* ]]
[[ "$output" == *"[dry-run] Step 1/9: install nomad + vault binaries + docker daemon"* ]]
[[ "$output" == *"Dry run complete — no changes made."* ]]
[[ "$output" == *"Dry run complete - no changes made."* ]]
}
# ── --backend=docker (regression guard) ──────────────────────────────────────
@ -238,7 +238,7 @@ setup_file() {
@test "disinto init --backend=nomad without import flags shows skip message" {
run "$DISINTO_BIN" init placeholder/repo --backend=nomad --dry-run
[ "$status" -eq 0 ]
[[ "$output" == *"no --import-env/--import-sops — skipping"* ]]
[[ "$output" == *"no --import-env/--import-sops - skipping"* ]]
}
@test "disinto init --backend=nomad --import-env --import-sops --age-key --with forgejo --dry-run shows all plans" {