-
Notifications
You must be signed in to change notification settings - Fork 307
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
Make metadata timeout more accessible and controlleable for AppEngine stubs. #1518
Open
ludoch
wants to merge
8
commits into
googleapis:main
Choose a base branch
from
ludoch:ludowork
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
03c0713
Update _metadata.py
ludoch 7100b59
Update _metadata.py
ludoch 1fe93bc
Merge branch 'googleapis:main' into main
ludoch 51e12cd
Merge branch 'googleapis:main' into main
ludoch d5620de
Add a test with new _metadata.py changes
ludoch afb2519
Add tests for metadata changes.
ludoch 6b89d56
Update environment_vars.py
ludoch a8b2822
Merge branch 'googleapis:main' into ludowork
ludoch 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -105,8 +105,45 @@ def test_ping_success(mock_metrics_header_value): | |
request.assert_called_once_with( | ||
method="GET", | ||
url=_metadata._METADATA_IP_ROOT, | ||
headers=MDS_PING_REQUEST_HEADER, | ||
timeout=_metadata._METADATA_DEFAULT_TIMEOUT, | ||
headers=_metadata._METADATA_HEADER, | ||
timeout=_metadata._METADATA_PING_DEFAULT_TIMEOUT, | ||
) | ||
|
||
@mock.patch("google.auth.metrics.mds_ping", return_value=MDS_PING_METRICS_HEADER_VALUE) | ||
def test_ping_success_with_gce_metadata_timeout(mock_metrics_header_value): | ||
request = make_request("", headers=_metadata._METADATA_HEADERS) | ||
gce_metadata_timeout = .5 | ||
os.environ[ | ||
environment_vars.GCE_METADATA_TIMEOUT] = str(gce_metadata_timeout) | ||
|
||
try: | ||
assert _metadata.ping(request) | ||
finally: | ||
del os.environ[environment_vars.GCE_METADATA_TIMEOUT] | ||
|
||
request.assert_called_once_with( | ||
method="GET", | ||
url=_metadata._METADATA_IP_ROOT, | ||
headers=_metadata._METADATA_HEADER, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. _METADATA_HEADERS |
||
timeout=gce_metadata_timeout, | ||
) | ||
|
||
@mock.patch("google.auth.metrics.mds_ping", return_value=MDS_PING_METRICS_HEADER_VALUE) | ||
def test_ping_success_with_invalid_gce_metadata_timeout(mock_metrics_header_value): | ||
request = make_request("", headers=_metadata._METADATA_HEADERS) | ||
os.environ[ | ||
environment_vars.GCE_METADATA_TIMEOUT] = "Not a valid float value!" | ||
|
||
try: | ||
assert _metadata.ping(request) | ||
finally: | ||
del os.environ[environment_vars.GCE_METADATA_TIMEOUT] | ||
|
||
request.assert_called_once_with( | ||
method="GET", | ||
url=_metadata._METADATA_IP_ROOT, | ||
headers=_metadata._METADATA_HEADERS, | ||
timeout=_metadata._METADATA_PING_DEFAULT_TIMEOUT, # Fallback value. | ||
) | ||
|
||
|
||
|
@@ -156,7 +193,7 @@ def test_ping_success_custom_root(mock_metrics_header_value): | |
method="GET", | ||
url="http://" + fake_ip, | ||
headers=MDS_PING_REQUEST_HEADER, | ||
timeout=_metadata._METADATA_DEFAULT_TIMEOUT, | ||
timeout=_metadata._METADATA_PING_DEFAULT_TIMEOUT, | ||
) | ||
|
||
|
||
|
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.
_METADATA_HEADERS