do not attempt dns resolution on ip addresses#2040
Merged
Conversation
TheRealFalcon
approved these changes
Mar 10, 2023
Contributor
TheRealFalcon
left a comment
TheRealFalcon
left a comment
There was a problem hiding this comment.
Change looks good. I think we should probably add a mock to the unit test to ensure we're not attempting to resolve, but that's minor enough that I'm gonna approve anyway.
| Therefore, the fast path checks if the address contains an IP and exits | ||
| early if the path is a valid IP. | ||
| """ | ||
| assert util.is_resolvable("http://169.254.169.254/") |
Contributor
There was a problem hiding this comment.
Nit: We should probably add an is True to these asserts so we're more specific than just asserting truthiness.
| early if the path is a valid IP. | ||
| """ | ||
| assert util.is_resolvable("http://169.254.169.254/") | ||
| assert util.is_resolvable("http://[fd00:ec2::254]/") |
Contributor
There was a problem hiding this comment.
I think we should be checking that socket.getaddrinfo isn't called here.
Member
Author
There was a problem hiding this comment.
It gets used higher up in the function, but I can mock the global variable to skip that code.
2 tasks
2 tasks
aale24
pushed a commit
to aale24/cloud-init
that referenced
this pull request
Feb 28, 2026
Building on the previous optimization in canonical#2040, add an additional optimization to fail early when the hostname is not resolvable at all.
blackboxsw
pushed a commit
to blackboxsw/cloud-init
that referenced
this pull request
Apr 13, 2026
…le (canonical#6772) Building on the previous optimization in canonical#2040, add an additional optimization to fail early when the hostname is not resolvable at all.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
A slight optimization in the default case.