Fix provider crash when userinfo email is nil #6839
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi there, I'm the Modular magician. I've detected the following information about your changes: Diff reportYour PR generated some diffs in downstreams - here they are. Terraform GA: Diff ( 1 file changed, 3 insertions(+)) |
rileykarson
approved these changes
Nov 16, 2022
| @@ -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 | |||
There was a problem hiding this comment.
We could consider checking for an error response from the cast as well- what we've done is probably sufficient, however!
Tests analyticsTotal tests: Action takenTriggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed testsTestAccComputeForwardingRule_update |
This was referenced Nov 16, 2022
googlerjk
pushed a commit
to googlerjk/magic-modules
that referenced
this pull request
Nov 22, 2022
googlerjk
pushed a commit
to googlerjk/magic-modules
that referenced
this pull request
Nov 25, 2022
kimihrr
pushed a commit
to kimihrr/kimiah-magic-modules
that referenced
this pull request
Dec 6, 2022
hao-nan-li
pushed a commit
to hao-nan-li/magic-modules
that referenced
this pull request
Dec 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes hashicorp/terraform-provider-google#13051
It is not certain why the userinfo endpoint is no longer returning the email in some cases. Following up internally.
If this PR is for Terraform, I acknowledge that I have:
make testandmake lintto ensure it passes unit and linter tests.Release Note Template for Downstream PRs (will be copied)