From 759c126c46d9d5a8714fccc4b3544d830630c5af Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Wed, 16 Nov 2022 20:57:53 +0000 Subject: [PATCH] Fix provider crash when userinfo email is nil (#6839) Fixes https://github.com/hashicorp/terraform-provider-google/issues/13051 Signed-off-by: Modular Magician --- .changelog/6839.txt | 3 +++ google/utils.go | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 .changelog/6839.txt diff --git a/.changelog/6839.txt b/.changelog/6839.txt new file mode 100644 index 00000000000..b51bc5b20c2 --- /dev/null +++ b/.changelog/6839.txt @@ -0,0 +1,3 @@ +```release-note:bug +provider: fixed a crash during provider authentication for certain environments +``` diff --git a/google/utils.go b/google/utils.go index 0005cec2c51..c04c93bcf63 100644 --- a/google/utils.go +++ b/google/utils.go @@ -519,6 +519,9 @@ func GetCurrentUserEmail(config *Config, userAgent string) (string, error) { if err != nil { return "", fmt.Errorf("error retrieving userinfo for your provider credentials. have you enabled the 'https://www.googleapis.com/auth/userinfo.email' scope? error: %s", err) } + if res["email"] == nil { + return "", fmt.Errorf("error retrieving email from userinfo. email was nil in the response.") + } return res["email"].(string), nil }