Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
5ef45ee
rebase
holmanb Dec 12, 2021
e980d81
merge
holmanb Jan 12, 2022
610e3e0
Add test demonstrating the connection and request as separate calls
holmanb Dec 15, 2021
8aecd35
merge
holmanb Jan 12, 2022
59ca67b
add tests for get_session_to_first_response
holmanb Dec 15, 2021
3a9e54a
merge
holmanb Jan 12, 2022
c6fe5fa
merge
holmanb Jan 12, 2022
9ca2317
merge
holmanb Jan 12, 2022
ce7157b
merge
holmanb Jan 12, 2022
dc348b2
isort
holmanb Jan 12, 2022
6aba1a6
flake
holmanb Jan 12, 2022
77ef0a1
workaround for python versions prior to 3.9
holmanb Jan 12, 2022
d1066d4
pacify isort, pylint
holmanb Jan 12, 2022
cffec7f
test
holmanb Jan 12, 2022
c06abbb
flake
holmanb Jan 12, 2022
88dd51e
black
holmanb Jan 12, 2022
acf9b42
remove unneeded code
holmanb Jan 13, 2022
6b59a88
httppretty
holmanb Jan 19, 2022
1b3290b
add generic async url testing code
holmanb Jan 19, 2022
aeaf079
fmt
holmanb Jan 19, 2022
0015b3a
fix failing tests
holmanb Jan 19, 2022
d7da424
fix various tests
holmanb Jan 19, 2022
b28912b
I heard you like callbacks so I put some callbacks in your callbacks
holmanb Jan 20, 2022
c49dd61
update comments
holmanb Jan 20, 2022
9168acc
Be explicit about variable scope
holmanb Jan 24, 2022
7381a93
fmt
holmanb Jan 24, 2022
e0b9820
Update cloudinit/url_helper.py
holmanb Jan 26, 2022
913d364
ip6 first
holmanb Jan 26, 2022
8934a86
add test stagger assertions
holmanb Jan 26, 2022
f1e28cf
update mocked endpoint
holmanb Jan 26, 2022
769d680
only connect asyncrhonously in _maybe_fetch_api_token
holmanb Jan 31, 2022
b6901b9
parallel PUT means multiple token refreshes, update test accordingly
holmanb Jan 31, 2022
2aa20c6
parallel http request cause non-determinism here, so our tests need t…
holmanb Jan 31, 2022
bf201b4
set defaults in function signature keyword args
holmanb Feb 2, 2022
1fac446
httpretty has threading issues, use responses
holmanb Mar 7, 2022
e3290a1
Activate responses
holmanb Mar 17, 2022
ece5a01
check if responses might work across versions
holmanb Mar 22, 2022
0e80fa8
work around bug in responses: https://github.com/getsentry/responses/…
holmanb Apr 6, 2022
d1f9222
use responses with new test (rebased)
holmanb Apr 6, 2022
40fd9dc
fixup! use responses with new test (rebased)
holmanb Apr 6, 2022
0579ef0
pass callback as argument
holmanb Apr 6, 2022
17f5777
Re-enable previously failing tests.
holmanb Apr 6, 2022
1042fbd
make logger callback be passed as an argument, comment functions
holmanb Apr 6, 2022
5d41539
Reworking dual_stack for more robust connection handling:
holmanb Apr 8, 2022
50cb1db
Force readurl to hit the retry loop (requires failures > number of co…
holmanb Apr 8, 2022
89638f4
8bit diff
holmanb Apr 8, 2022
e8c9f67
Make the pythons happy:
holmanb Apr 8, 2022
60e8d07
fmt
holmanb Apr 8, 2022
d99febf
lazy logging per pylint
holmanb Apr 8, 2022
ead44e7
review fixes
holmanb Apr 11, 2022
79f260f
integration test
TheRealFalcon Apr 13, 2022
8b03d30
bump pycloudlib
TheRealFalcon Apr 13, 2022
a5fa336
do not wait for timeout
holmanb Apr 13, 2022
58e8cf3
undo test change
holmanb Apr 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cloudinit/sources/DataSourceEc2.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ class DataSourceEc2(sources.DataSource):
# Default metadata urls that will be used if none are provided
# They will be checked for 'resolveability' and some of the
# following may be discarded if they do not resolve
metadata_urls = ["http://169.254.169.254", "http://instance-data.:8773"]
metadata_urls = [
"http://169.254.169.254",
"http://[fd00:ec2::254]",
"http://instance-data.:8773",
]

# The minimum supported metadata_version from the ec2 metadata apis
min_metadata_version = "2009-04-04"
Expand Down Expand Up @@ -253,6 +257,7 @@ def _maybe_fetch_api_token(self, mdurls, timeout=None, max_wait=None):
exception_cb=self._imds_exception_cb,
request_method=request_method,
headers_redact=AWS_TOKEN_REDACT,
connect_synchronously=False,
)
except uhelp.UrlError:
# We use the raised exception to interupt the retry loop.
Expand Down
Loading