Skip to content

infra/gcp/iam: fix ensure_service_account #2057

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
k8s-ci-robot merged 1 commit into from
May 19, 2021
Merged

infra/gcp/iam: fix ensure_service_account #2057

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
18 changes: 11 additions & 7 deletions infra/gcp/lib_iam.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,23 @@ function ensure_service_account() {

local before="${TMPDIR}/service-account.before.yaml"
local after="${TMPDIR}/service-account.after.yaml"
local verb=""
local updated=false

if ! gcloud iam service-accounts --project "${project}" describe "${email}" >"${before}" 2>/dev/null; then
verb="create"
gcloud iam service-accounts create \
--project "${project}" \
"${name}" \
--display-name="${display_name}"
updated=true
elif [ "$(<"${before}" yq -r .displayName)" != "${display_name}" ]; then
verb="update"
fi

if [ -n "${verb}" ]; then
gcloud iam service-accounts "${verb}" \
gcloud iam service-accounts update \
--project "${project}" \
"${email}" \
--display-name="${display_name}"
updated=true
fi

if [ "${updated}" == "true" ]; then
gcloud iam service-accounts --project "${project}" describe "${email}" > "${after}"
diff_colorized "${before}" "${after}"
fi
Expand Down