-
Notifications
You must be signed in to change notification settings - Fork 310
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.
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
feat: Introduce the functionality to override token_uri in credentials #1159
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Binary file not shown.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -483,6 +483,50 @@ def test_with_quota_project(self, sign, get, utcnow): | |
# Check that the signer have been initialized with a Request object | ||
assert isinstance(self.credentials._signer._request, transport.Request) | ||
|
||
@mock.patch( | ||
"google.auth._helpers.utcnow", | ||
return_value=datetime.datetime.utcfromtimestamp(0), | ||
) | ||
@mock.patch("google.auth.compute_engine._metadata.get", autospec=True) | ||
@mock.patch("google.auth.iam.Signer.sign", autospec=True) | ||
def test_with_token_uri(self, sign, get, utcnow): | ||
get.side_effect = [ | ||
{"email": "[email protected]", "scopes": ["one", "two"]} | ||
] | ||
sign.side_effect = [b"signature"] | ||
|
||
request = mock.create_autospec(transport.Request, instance=True) | ||
self.credentials = credentials.IDTokenCredentials( | ||
request=request, | ||
target_audience="https://audience.com", | ||
token_uri="http://xyz.com", | ||
) | ||
assert self.credentials._token_uri == "http://xyz.com" | ||
creds_with_token_uri = self.credentials.with_token_uri("http://abc.com") | ||
assert creds_with_token_uri._token_uri == "http://abc.com" | ||
|
||
@mock.patch( | ||
"google.auth._helpers.utcnow", | ||
return_value=datetime.datetime.utcfromtimestamp(0), | ||
) | ||
@mock.patch("google.auth.compute_engine._metadata.get", autospec=True) | ||
@mock.patch("google.auth.iam.Signer.sign", autospec=True) | ||
def test_with_token_uri_exception(self, sign, get, utcnow): | ||
get.side_effect = [ | ||
{"email": "[email protected]", "scopes": ["one", "two"]} | ||
] | ||
sign.side_effect = [b"signature"] | ||
|
||
request = mock.create_autospec(transport.Request, instance=True) | ||
self.credentials = credentials.IDTokenCredentials( | ||
request=request, | ||
target_audience="https://audience.com", | ||
use_metadata_identity_endpoint=True, | ||
) | ||
assert self.credentials._token_uri is None | ||
with pytest.raises(ValueError): | ||
self.credentials.with_token_uri("http://abc.com") | ||
|
||
@responses.activate | ||
def test_with_quota_project_integration(self): | ||
""" Test that it is possible to refresh credentials | ||
|
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this is needed for the credentials.py? What credentials types it affects?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Python library uses helper methods to override things like quota project, scopes etc. checkout
with_quota_project
method in many credentials.This override method is added to all the credentials that have a token uri.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is the question - do we need it for every credential type?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the auth credetials has it as not implemented exception and here we have a default implementation? It is preferable to have explicit implementation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am following the existing pattern https://github.com/googleapis/google-auth-library-python/blob/main/google/auth/credentials.py#:~:text=class%20CredentialsWithQuotaProject(,quota%20project.%22)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
credentials.py is user credential. It is not a base class for other credentials. Base class is the credentials.py in auth package.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
figured out that this is in fact user creds