Skip to content

fix(apigatewayv2): vpclink - explicit subnet specification still causes private subnets to be included #12401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 3 commits into from
Jan 7, 2021
Merged

fix(apigatewayv2): vpclink - explicit subnet specification still causes private subnets to be included #12401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c493593
fix(apigatewayv2): specifying subnets to vpclink explicitly adds extr…
ayush987goyal Jan 7, 2021
627a72e
use subnet selection
ayush987goyal Jan 7, 2021
bcd28e8
Merge branch 'master' into pr/vpclink-fix
mergify[bot] Jan 7, 2021
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
9 changes: 3 additions & 6 deletions packages/@aws-cdk/aws-apigatewayv2/lib/http/vpc-link.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface VpcLinkProps {
*
* @default - private subnets of the provided VPC. Use `addSubnets` to add more subnets
*/
readonly subnets?: ec2.ISubnet[];
readonly subnets?: ec2.SubnetSelection;

/**
* A list of security groups for the VPC link.
Expand Down Expand Up @@ -99,11 +99,8 @@ export class VpcLink extends Resource implements IVpcLink {

this.vpcLinkId = cfnResource.ref;

this.addSubnets(...props.vpc.privateSubnets);

if (props.subnets) {
this.addSubnets(...props.subnets);
}
const { subnets } = props.vpc.selectSubnets(props.subnets ?? { subnetType: ec2.SubnetType.PRIVATE });
this.addSubnets(...subnets);

if (props.securityGroups) {
this.addSecurityGroups(...props.securityGroups);
Expand Down
8 changes: 1 addition & 7 deletions packages/@aws-cdk/aws-apigatewayv2/test/http/vpc-link.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,14 @@ describe('VpcLink', () => {
// WHEN
new VpcLink(stack, 'VpcLink', {
vpc,
subnets: [subnet1, subnet2],
subnets: { subnets: [subnet1, subnet2] },
securityGroups: [sg1, sg2, sg3],
});

// THEN
expect(stack).toHaveResource('AWS::ApiGatewayV2::VpcLink', {
Name: 'VpcLink',
SubnetIds: [
{
Ref: 'VPCPrivateSubnet1Subnet8BCA10E0',
},
{
Ref: 'VPCPrivateSubnet2SubnetCFCDAA7A',
},
{
Ref: 'subnet1Subnet16A4B3BD',
},
Expand Down