Skip to content

backup: fix gke wif with empty credential file #6885

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

Closed
Leavrth wants to merge 1 commit into from
+26 −22
Closed

backup: fix gke wif with empty credential file #6885

Show file tree
Hide file tree
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
24 changes: 13 additions & 11 deletions images/tidb-backup-manager/e2e-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,18 @@ cleanup() {

trap cleanup EXIT

export GOOGLE_APPLICATION_CREDENTIALS=/tmp/google-credentials.json
GCS_SERVICE_ACCOUNT_FILE_CONFIG=
if [ -n "${GCS_SERVICE_ACCOUNT_JSON_KEY:-}" ]; then
export GOOGLE_APPLICATION_CREDENTIALS=/tmp/google-credentials.json
GCS_SERVICE_ACCOUNT_FILE_CONFIG="service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}"
echo "Create google-credentials.json file."
cat <<EOF > "${GOOGLE_APPLICATION_CREDENTIALS}"
${GCS_SERVICE_ACCOUNT_JSON_KEY}
EOF
else
unset GOOGLE_APPLICATION_CREDENTIALS
fi

echo "Create rclone.conf file."
cat <<EOF > /tmp/rclone.conf
[s3]
Expand All @@ -41,7 +52,7 @@ storage_class = ${AWS_STORAGE_CLASS}
[gcs]
type = google cloud storage
project_number = ${GCS_PROJECT_ID}
service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}
${GCS_SERVICE_ACCOUNT_FILE_CONFIG}
object_acl = ${GCS_OBJECT_ACL}
bucket_acl = ${GCS_BUCKET_ACL}
location = ${GCS_LOCATION}
Expand All @@ -52,15 +63,6 @@ account = ${AZUREBLOB_ACCOUNT}
key = ${AZUREBLOB_KEY}
EOF

if [[ -n "${GCS_SERVICE_ACCOUNT_JSON_KEY:-}" ]]; then
echo "Create google-credentials.json file."
cat <<EOF > ${GOOGLE_APPLICATION_CREDENTIALS}
${GCS_SERVICE_ACCOUNT_JSON_KEY}
EOF
else
touch ${GOOGLE_APPLICATION_CREDENTIALS}
fi

BACKUP_BIN=/tidb-backup-manager

COV_NAME="backup-manager.$(( ( RANDOM % 100000 ) + 1 ))"
Expand Down
24 changes: 13 additions & 11 deletions images/tidb-backup-manager/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,18 @@ cleanup() {

trap cleanup EXIT

export GOOGLE_APPLICATION_CREDENTIALS=/tmp/google-credentials.json
GCS_SERVICE_ACCOUNT_FILE_CONFIG=
if [ -n "${GCS_SERVICE_ACCOUNT_JSON_KEY:-}" ]; then
export GOOGLE_APPLICATION_CREDENTIALS=/tmp/google-credentials.json
GCS_SERVICE_ACCOUNT_FILE_CONFIG="service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}"
echo "Create google-credentials.json file."
cat <<EOF > "${GOOGLE_APPLICATION_CREDENTIALS}"
${GCS_SERVICE_ACCOUNT_JSON_KEY}
EOF
else
unset GOOGLE_APPLICATION_CREDENTIALS
fi

echo "Create rclone.conf file."
cat <<EOF > /tmp/rclone.conf
[s3]
Expand All @@ -43,7 +54,7 @@ storage_class = ${AWS_STORAGE_CLASS}
[gcs]
type = google cloud storage
project_number = ${GCS_PROJECT_ID}
service_account_file = ${GOOGLE_APPLICATION_CREDENTIALS}
${GCS_SERVICE_ACCOUNT_FILE_CONFIG}
object_acl = ${GCS_OBJECT_ACL}
bucket_acl = ${GCS_BUCKET_ACL}
location = ${GCS_LOCATION}
Expand All @@ -54,15 +65,6 @@ account = ${AZUREBLOB_ACCOUNT}
key = ${AZUREBLOB_KEY}
EOF

if [[ -n "${GCS_SERVICE_ACCOUNT_JSON_KEY:-}" ]]; then
echo "Create google-credentials.json file."
cat <<EOF > ${GOOGLE_APPLICATION_CREDENTIALS}
${GCS_SERVICE_ACCOUNT_JSON_KEY}
EOF
else
touch ${GOOGLE_APPLICATION_CREDENTIALS}
fi

BACKUP_BIN=/tidb-backup-manager
if [[ -n "${AWS_DEFAULT_REGION}" ]]; then
EXEC_COMMAND="exec"
Expand Down
Loading