colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(org-agenda-api): import single-line secrets via flyctl

Browse Source
This commit is contained in:
Ivan Malison
2026-02-16 16:35:19 -08:00
committed by Kat Huang
parent 4b2cb3a078
commit acf01382ad
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
org-agenda-api/deploy.sh
View File

@@ -110,25 +110,36 @@ AUTH_PASSWORD=$(age -d -i "$IDENTITY" "$CONFIG_DIR/secrets/auth-password.age")
echo "Setting Fly.io secrets..." echo "Setting Fly.io secrets..."
SECRET_ARGS=( # Keep multi-line secrets off stdin-based import.
"GIT_SSH_PRIVATE_KEY=$GIT_SSH_KEY" # Note: flyctl currently only supports multi-line values via NAME=VALUE CLI args.
"AUTH_USER=$AUTH_USER" flyctl secrets set --stage -a "$FLY_APP" "GIT_SSH_PRIVATE_KEY=$GIT_SSH_KEY"
"AUTH_PASSWORD=$AUTH_PASSWORD"
"GIT_USER_EMAIL=$GIT_USER_EMAIL"
"GIT_USER_NAME=$GIT_USER_NAME"
)
# Use GIT_SYNC_REPOSITORIES (multi-repo) or GIT_SYNC_REPOSITORY (single repo) # Use GIT_SYNC_REPOSITORIES (multi-repo) or GIT_SYNC_REPOSITORY (single repo)
GIT_SYNC_SECRET=""
if [[ -n "${GIT_SYNC_REPOSITORIES:-}" ]]; then if [[ -n "${GIT_SYNC_REPOSITORIES:-}" ]]; then
SECRET_ARGS+=("GIT_SYNC_REPOSITORIES=$GIT_SYNC_REPOSITORIES") GIT_SYNC_SECRET="GIT_SYNC_REPOSITORIES=$GIT_SYNC_REPOSITORIES"
elif [[ -n "${GIT_SYNC_REPOSITORY:-}" ]]; then elif [[ -n "${GIT_SYNC_REPOSITORY:-}" ]]; then
SECRET_ARGS+=("GIT_SYNC_REPOSITORY=$GIT_SYNC_REPOSITORY") GIT_SYNC_SECRET="GIT_SYNC_REPOSITORY=$GIT_SYNC_REPOSITORY"
else else
echo "Error: Neither GIT_SYNC_REPOSITORIES nor GIT_SYNC_REPOSITORY set in config.env" echo "Error: Neither GIT_SYNC_REPOSITORIES nor GIT_SYNC_REPOSITORY set in config.env"
exit 1 exit 1
fi fi
flyctl secrets set "${SECRET_ARGS[@]}" --stage -a "$FLY_APP" # flyctl secrets import reads NAME=VALUE pairs per-line; reject embedded newlines.
for v in AUTH_USER AUTH_PASSWORD GIT_USER_EMAIL GIT_USER_NAME GIT_SYNC_SECRET; do
if [[ "${!v}" == *$'\n'* ]]; then
echo "Error: $v contains a newline; cannot safely use flyctl secrets import" >&2
exit 1
fi
done
flyctl secrets import --stage -a "$FLY_APP" <<EOF
AUTH_USER=$AUTH_USER
AUTH_PASSWORD=$AUTH_PASSWORD
GIT_USER_EMAIL=$GIT_USER_EMAIL
GIT_USER_NAME=$GIT_USER_NAME
$GIT_SYNC_SECRET
EOF
echo "Deploying $IMAGE_NAME..." echo "Deploying $IMAGE_NAME..."
flyctl deploy --image "$IMAGE_NAME" -c "$CONFIG_DIR/fly.toml" "$@" flyctl deploy --image "$IMAGE_NAME" -c "$CONFIG_DIR/fly.toml" "$@"