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

fix: [nomad-step-2] S2-fix-B — extract _hvault_default_env helper to lib/hvault.sh (prereq for other S2 fixes) (#919)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Details
ci/woodpecker/push/nomad-validate Pipeline was successful
Details
ci/woodpecker/pr/ci Pipeline was successful
Details
ci/woodpecker/pr/nomad-validate Pipeline was successful
Details
ci/woodpecker/pr/secret-scan Pipeline was successful
Details

Browse source
This commit is contained in:
Agent 2026-04-16 21:16:40 +00:00
parent 3e29a9a61d
commit 677f2a97e7
5 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/hvault.sh
View file

@ -16,6 +16,18 @@ set -euo pipefail
# ── Internal helpers ─────────────────────────────────────────────────────────
# _hvault_default_env — ensure VAULT_ADDR and VAULT_TOKEN are set for local-cluster operation
# Safe to call multiple times; no-op if both are already exported.
# Reads VAULT_TOKEN from /etc/vault.d/root.token if the file is readable.
_hvault_default_env() {
: "${VAULT_ADDR:=http://127.0.0.1:8200}"
export VAULT_ADDR
if [ -z "${VAULT_TOKEN:-}" ] && [ -r /etc/vault.d/root.token ]; then
VAULT_TOKEN="$(cat /etc/vault.d/root.token)"
export VAULT_TOKEN
fi
}
# _hvault_err — emit structured JSON error to stderr
# Args: func_name, message, [detail]
_hvault_err() {

6
lib/init/nomad/vault-nomad-auth.sh
View file

@ -49,11 +49,9 @@ APPLY_ROLES_SH="${REPO_ROOT}/tools/vault-apply-roles.sh"
SERVER_HCL_SRC="${REPO_ROOT}/nomad/server.hcl"
SERVER_HCL_DST="/etc/nomad.d/server.hcl"
VAULT_ADDR="${VAULT_ADDR:-http://127.0.0.1:8200}"
export VAULT_ADDR
# shellcheck source=../../hvault.sh
# shellcheck source=../../lib/hvault.sh
source "${REPO_ROOT}/lib/hvault.sh"
_hvault_default_env
log() { printf '[vault-auth] %s\n' "$*"; }
die() { printf '[vault-auth] ERROR: %s\n' "$*" >&2; exit 1; }