Fix GCE creds serialization w/ oauth2client >= 4.0 #195
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
When updating gsutil to use oauth2client 4.1.2 and apitools 0.5.19, testing on GCE instances showed that GceAssertionCredentials were not being written to our credential storage file. Debugging showed that this was because of a KeyError when looking for the 'scope' attribute in a serialized credential (no longer included as of oauth2client 3.0). This change maintains backward compatibility for oauth2client versions that used the 'scope' attribute while also working for current versions that don't include 'scope' when constructing a GceAssertionCredentials object.
|
FYI: Fixed the linter errors and ensured credential serialization still works on GCE. |
|
Is it possible emulate each version (serializable/unserializable) of GceAssertionCredentials in a unit test to ensure to_json/from_json both work? |
|
Not sure how/why to test a version that doesn't support |
|
LGTM pending fixing the Travis CI lint errors. |
|
D'oh. Fixed. |
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.
When updating gsutil to use oauth2client 4.1.2 and apitools 0.5.19,
testing on GCE instances showed that GceAssertionCredentials were not
being written to our credential storage file. Debugging showed that this
was because of a KeyError when looking for the 'scope' attribute in a
serialized credential (no longer included as of oauth2client 3.0). The
'scope' value was also mistakenly being passed in as an argument for
'email'. This change maintains backward compatibility for oauth2client
versions that used the 'scope' attribute while also working for current
versions that don't include 'scope' when constructing a
GceAssertionCredentials object.