Skip to content

fix: load masked values #17807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilWindle merged 1 commit into from
Oct 20, 2025
Merged

fix: load masked values #17807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions spartan/scripts/setup_gcp_secrets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ mask_secret_value() {
echo "::add-mask::$element"
done
fi

echo "$secret_value"
}

# Map of environment variables to GCP secret names
Expand Down Expand Up @@ -102,14 +100,14 @@ for env_var in "${!SECRET_MAPPINGS[@]}"; do
if grep -q "^${env_var}=REPLACE_WITH_GCP_SECRET" "$ENV_FILE"; then
# Export the secret value
secret_file=$(get_secret "$secret_name")
secret_value=$(mask_secret_value "$env_var" "$secret_file")
export $env_var="${secret_value}"
mask_secret_value "$env_var" "$secret_file"
export $env_var="$(cat "$secret_file")"
elif grep -q "^${env_var}=REPLACE_WITH_GCP_SECRET/" "$ENV_FILE"; then
# Handle cases like STORE_SNAPSHOT_URL=REPLACE_WITH_GCP_SECRET/network/
suffix=$(grep "^${env_var}=REPLACE_WITH_GCP_SECRET/" "$ENV_FILE" | cut -d'/' -f2-)
secret_file=$(get_secret "$secret_name")
secret_value=$(mask_secret_value "$env_var" "$secret_file")
export $env_var='${secret_value}/'$suffix
mask_secret_value "$env_var" "$secret_file"
export $env_var="$(cat $secret_file)/$suffix"
elif grep -q "^${env_var}=.*REPLACE_WITH_GCP_SECRET" "$ENV_FILE"; then
# Replace inline occurrences within the value, preserving surrounding content
full_value=$(grep "^${env_var}=" "$ENV_FILE" | cut -d'=' -f2-)
Expand All @@ -118,7 +116,8 @@ for env_var in "${!SECRET_MAPPINGS[@]}"; do
full_value="${full_value:1:-1}"
fi
secret_file=$(get_secret "$secret_name")
secret_value=$(mask_secret_value "$env_var" "$secret_file")
mask_secret_value "$env_var" "$secret_file"
secret_value="$(cat "$secret_file")"
replaced_value="${full_value//REPLACE_WITH_GCP_SECRET/$secret_value}"
export $env_var="$replaced_value"
fi
Expand Down
Loading