-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Showing
10 changed files
with
377 additions
and
24 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| name: pulumi-aws-ec2 | ||
| runtime: nodejs | ||
| description: ec2 integration test |
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 |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| import * as aws from '@pulumi/aws'; | ||
| import * as iam from 'aws-cdk-lib/aws-iam'; | ||
| import * as ec2 from 'aws-cdk-lib/aws-ec2'; | ||
| import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2'; | ||
| import * as pulumicdk from '@pulumi/cdk'; | ||
| import { SecretValue } from 'aws-cdk-lib/core'; | ||
|
|
||
| class Ec2Stack extends pulumicdk.Stack { | ||
| constructor(app: pulumicdk.App, id: string, options?: pulumicdk.StackOptions) { | ||
| super(app, id, options); | ||
| const vpc = new ec2.Vpc(this, 'Vpc', { | ||
| maxAzs: 2, | ||
| ipProtocol: ec2.IpProtocol.DUAL_STACK, | ||
| vpnGateway: true, | ||
| ipAddresses: ec2.IpAddresses.cidr('10.0.0.0/16'), | ||
| natGateways: 1, | ||
| vpnConnections: { | ||
| dynamic: { | ||
| ip: '1.2.3.4', | ||
| tunnelOptions: [ | ||
| { | ||
| preSharedKeySecret: SecretValue.unsafePlainText('secretkey1234'), | ||
| }, | ||
| { | ||
| preSharedKeySecret: SecretValue.unsafePlainText('secretkey5678'), | ||
| }, | ||
| ], | ||
| }, | ||
| static: { | ||
| ip: '4.5.6.7', | ||
| staticRoutes: ['192.168.10.0/24', '192.168.20.0/24'], | ||
| }, | ||
| }, | ||
| subnetConfiguration: [ | ||
| { | ||
| name: 'Public', | ||
| subnetType: ec2.SubnetType.PUBLIC, | ||
| }, | ||
| { | ||
| name: 'Private', | ||
| subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS, | ||
| }, | ||
| { | ||
| name: 'Isolated', | ||
| subnetType: ec2.SubnetType.PRIVATE_ISOLATED, | ||
| }, | ||
| ], | ||
| restrictDefaultSecurityGroup: false, | ||
| }); | ||
|
|
||
| vpc.addFlowLog('FlowLogs', { | ||
| destination: ec2.FlowLogDestination.toCloudWatchLogs(), | ||
| }); | ||
|
|
||
| vpc.addGatewayEndpoint('Dynamo', { | ||
| service: ec2.GatewayVpcEndpointAwsService.DYNAMODB, | ||
| }); | ||
| vpc.addInterfaceEndpoint('ecr', { | ||
| service: ec2.InterfaceVpcEndpointAwsService.ECR_DOCKER, | ||
| }); | ||
|
|
||
| new ec2.PrefixList(this, 'PrefixList', {}); | ||
| const nacl = new ec2.NetworkAcl(this, 'NetworkAcl', { | ||
| vpc, | ||
| subnetSelection: { subnetType: ec2.SubnetType.PUBLIC }, | ||
| }); | ||
| nacl.addEntry('AllowAll', { | ||
| cidr: ec2.AclCidr.anyIpv4(), | ||
| ruleAction: ec2.Action.ALLOW, | ||
| ruleNumber: 100, | ||
| traffic: ec2.AclTraffic.allTraffic(), | ||
| }); | ||
| new ec2.KeyPair(this, 'KeyPair'); | ||
|
|
||
| const nlb = new elbv2.NetworkLoadBalancer(this, 'NLB1', { vpc }); | ||
| new ec2.VpcEndpointService(this, 'EndpointService', { | ||
| vpcEndpointServiceLoadBalancers: [nlb], | ||
| allowedPrincipals: [new iam.ArnPrincipal('ec2.amazonaws.com')], | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| new pulumicdk.App( | ||
| 'app', | ||
| (scope: pulumicdk.App) => { | ||
| new Ec2Stack(scope, 'teststack'); | ||
| }, | ||
| { | ||
| appOptions: { | ||
| remapCloudControlResource: (logicalId, typeName, props, options) => { | ||
| if (typeName === 'AWS::EC2::VPNGatewayRoutePropagation') { | ||
| const tableIds: string[] = props.RouteTableIds; | ||
| return tableIds.flatMap((tableId, i) => { | ||
| const id = i === 0 ? logicalId : `${logicalId}-${i}`; | ||
| return { | ||
| logicalId: id, | ||
| resource: new aws.ec2.VpnGatewayRoutePropagation( | ||
| id, | ||
| { | ||
| routeTableId: tableId, | ||
| vpnGatewayId: props.VpnGatewayId, | ||
| }, | ||
| options, | ||
| ), | ||
| }; | ||
| }); | ||
| } | ||
| if (typeName === 'AWS::EC2::NetworkAclEntry') { | ||
| return new aws.ec2.NetworkAclRule(logicalId, { | ||
| egress: props.Egress, | ||
| toPort: props.PortRange?.To, | ||
| fromPort: props.PortRange?.From, | ||
| protocol: props.Protocol, | ||
| ruleNumber: props.RuleNumber, | ||
| networkAclId: props.NetworkAclId, | ||
| ruleAction: props.RuleAction, | ||
| cidrBlock: props.CidrBlock, | ||
| ipv6CidrBlock: props.Ipv6CidrBlock, | ||
| icmpCode: props.Icmp?.Code, | ||
| icmpType: props.Icmp?.Type, | ||
| }); | ||
| } | ||
| return undefined; | ||
| }, | ||
| }, | ||
| }, | ||
| ); |
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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "name": "pulumi-aws-cdk", | ||
| "devDependencies": { | ||
| "@types/node": "^10.0.0" | ||
| }, | ||
| "dependencies": { | ||
| "@pulumi/aws": "^6.0.0", | ||
| "@pulumi/aws-native": "^1.5.0", | ||
| "@pulumi/cdk": "^0.5.0", | ||
| "@pulumi/pulumi": "^3.0.0", | ||
| "aws-cdk-lib": "2.149.0", | ||
| "constructs": "10.3.0", | ||
| "esbuild": "^0.24.0" | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "compilerOptions": { | ||
| "strict": true, | ||
| "outDir": "bin", | ||
| "target": "es2019", | ||
| "module": "commonjs", | ||
| "moduleResolution": "node", | ||
| "sourceMap": true, | ||
| "experimentalDecorators": true, | ||
| "pretty": true, | ||
| "noFallthroughCasesInSwitch": true, | ||
| "noImplicitReturns": true, | ||
| "forceConsistentCasingInFileNames": true | ||
| }, | ||
| "include": [ | ||
| "./*.ts" | ||
| ] | ||
| } |
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
Oops, something went wrong.