Update InsertVpcSubnetQuery IP Block conflict detection logic #6880
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
taspelund
added
bug
bnaecker
approved these changes
Oct 15, 2024
taspelund
force-pushed
the
trey/overlapping_vpc_subnet_query
branch
2 times, most recently
from
64150ba
to
52e884f
Compare
Explicitly cover cases where VPC Subnets are being added with the same network address but differing CIDR masks, e.g. 172.30.0.0/22 and 172.30.0.0/23. Signed-off-by: Trey Aspelund <[email protected]>
Signed-off-by: Trey Aspelund <[email protected]>
Currently the error machinery emits v4 / v6 based on running an additional check to see _which_ address field overlapped. We need to update this check to work in both directions.
Signed-off-by: Trey Aspelund <[email protected]>
taspelund
force-pushed
the
trey/overlapping_vpc_subnet_query
branch
from
52e884f
to
c360e2b
Compare
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.
Updates the logic to detect an IP Block collision when attempting to add a new VPC Subnet.
Initial approach was to call
inet_contains_or_equals()twice (switching order of arguments to ensure the test is run bidirectionally), which did work.However, Ben suggested we instead use
&&to do the testing since it works bidirectionally and reduces the amount of function/operator calls in the query.The first commit in this series is an addition to the VPC Subnet insertion tests, which fail (correctly) without the subsequent commits that address the bad collision detection logic.
Fixes: #6870