Skip to content

log in using GOOGLE_*_CREDENTIALS if present for CloudSQL import #1136

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
stephencompall-DA merged 2 commits into from
Jun 16, 2025
Merged

log in using GOOGLE_*_CREDENTIALS if present for CloudSQL import #1136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f84b283
log in using GOOGLE_*_CREDENTIALS if present; log more [skip ci]
stephencompall-DA Jun 16, 2025
faa5581
[ci]
stephencompall-DA Jun 16, 2025
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
20 changes: 17 additions & 3 deletions cluster/pulumi/canton-network/src/bigQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,25 @@ function databaseCommandBracket(postgres: CloudPostgres) {
TMP_SQL_FILE="$(mktemp tmp_pub_rep_slots_XXXXXXXXXX.sql --tmpdir)"
GCS_URI="gs://$TMP_BUCKET/$(basename "$TMP_SQL_FILE")"

if [ -s "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
echo "Using $GOOGLE_APPLICATION_CREDENTIALS for authentication"
gcloud auth activate-service-account --key-file="$GOOGLE_APPLICATION_CREDENTIALS"
elif [ -n "$GOOGLE_CREDENTIALS" ]; then
echo "Using GOOGLE_CREDENTIALS for authentication"
echo "$GOOGLE_CREDENTIALS" | gcloud auth activate-service-account --key-file=-
Copy link

Copilot AI Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using echo to pipe GOOGLE_CREDENTIALS may risk exposing sensitive information to stdout or logs. Consider securely passing the credentials (e.g., through a temporary file with appropriate permissions) to reduce potential security exposure.

Suggested change
echo "$GOOGLE_CREDENTIALS" | gcloud auth activate-service-account --key-file=-
TEMP_CREDENTIALS_FILE="$(mktemp)"
echo "$GOOGLE_CREDENTIALS" > "$TEMP_CREDENTIALS_FILE"
chmod 600 "$TEMP_CREDENTIALS_FILE"
gcloud auth activate-service-account --key-file="$TEMP_CREDENTIALS_FILE"
rm -f "$TEMP_CREDENTIALS_FILE"

Copilot uses AI. Check for mistakes.
else
echo 'No GCP credentials found, using default'
fi
echo 'Current gcloud login:'
gcloud auth list --format=config

# create temporary bucket
echo "Creating temporary bucket $TMP_BUCKET"
gsutil mb --pap enforced -p "${privateNetwork.project}" \
-l "${cloudsdkComputeRegion()}" "gs://$TMP_BUCKET"

# grant DB service account access to the bucket
echo "Granting CloudSQL DB access to $TMP_BUCKET"
gsutil iam ch "serviceAccount:${postgres.databaseInstance.serviceAccountEmailAddress}:roles/storage.objectAdmin" \
"gs://$TMP_BUCKET"

Expand All @@ -350,16 +364,16 @@ function databaseCommandBracket(postgres: CloudPostgres) {
footer: pulumi.interpolate`
EOT

# upload SQL to temporary bucket
echo 'Uploading SQL to temporary bucket'
gsutil cp "$TMP_SQL_FILE" "$GCS_URI"

# then import into Cloud SQL
echo 'Importing into CloudSQL'
gcloud sql import sql ${postgres.databaseInstance.name} "$GCS_URI" \
--database="${scanAppDatabaseName(postgres)}" \
--user="${postgres.user.name}" \
--quiet

# cleanup: remove the file from GCS, delete the bucket, remove the local file
echo 'Cleaning up temporary GCS object and bucket'
gsutil rm "$GCS_URI"
gsutil rb "gs://$TMP_BUCKET"
rm "$TMP_SQL_FILE"
Expand Down