Fix IPV6 cidr blocks #197
Merged
Fix IPV6 cidr blocks #197
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
Depends on pulumi/pulumi-aws-native#1797 Because of pulumi/pulumi-aws-native#1798 we need to add a special case for Ipv6 cidr blocks that are added to the VPC via a `VPCCidrBlock` resource. This PR adds special handling where we track both the `Vpc` and the `VpcCidrBlock` resource and swap any references.
flostadler
reviewed
Nov 7, 2024
src/graph.ts
Outdated
| @@ -115,15 +115,19 @@ export class GraphBuilder { | |||
| // Map of resource logicalId to GraphNode. Allows for easy lookup by logicalId | |||
| cfnElementNodes: Map<string, GraphNode>; | |||
|
|
|||
| // If the app has a VpcCidrBlock resource, this will be set to the GraphNode representing it | |||
| vpcCidrBlockNode?: GraphNode; | |||
There was a problem hiding this comment.
Nit: I'd prefer if we'd save that in the result of GraphBuilder::build. E.g. turn this into a GraphResult struct that has the necessary params we need.
I wouldn't expect a Builder to store state beyond what's needed to build
src/graph.ts
Outdated
| this.vpcCidrBlockNode = node; | ||
| } | ||
| if (resource.Type === 'AWS::EC2::VPC') { | ||
| this.vpcNode = node; |
There was a problem hiding this comment.
Can a stack only have a single VPC?
There was a problem hiding this comment.
I think that case would be exceedingly rare, but I should be able to update this to handle that case
src/graph.ts
Outdated
| // Here we switching the dependency to be on the `VpcCidrBlock` resource (since that will also have a dependency | ||
| // on the VPC resource) | ||
| if ( | ||
| logicalId === this.vpcNode?.logicalId && |
There was a problem hiding this comment.
Along the lines of my earlier Q, what happens if the stack has multiple VPCs?
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.
Depends on pulumi/pulumi-aws-native#1797
Because of pulumi/pulumi-aws-native#1798 we need to add a special case for Ipv6 cidr blocks that are added to the VPC via a
VPCCidrBlockresource.This PR adds special handling where we track both the
Vpcand theVpcCidrBlockresource and swap any references.