Skip to content
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

Jump to bottom

fix(ec2): Invalid security group ID #22859

Merged
merged 2 commits into from Dec 8, 2022
Merged

fix(ec2): Invalid security group ID #22859

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
910a40f
fix(ec2): Invalid security group ID
schourode Nov 10, 2022
5e63b6a
Merge remote-tracking branch 'upstream/main' into invalid-security-gr…
mrgrain Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-ec2/lib/security-group.ts
View file
Open in desktop
Expand Up @@ -432,7 +432,7 @@ export class SecurityGroup extends SecurityGroupBase {
vpcId: options.vpc?.vpcId,
},
dummyValue: {
securityGroupId: 'sg-12345',
securityGroupId: 'sg-12345678',
allowAllOutbound: true,
} as cxapi.SecurityGroupContextResponse,
}).value;
Expand Down
34 changes: 30 additions & 4 deletions packages/@aws-cdk/aws-ec2/test/security-group.test.ts
View file
Open in desktop
Expand Up @@ -516,7 +516,9 @@ describe('security group', () => {
});
});
});
});

describe('security group lookup', () => {
testDeprecated('can look up a security group', () => {
const app = new App();
const stack = new Stack(app, 'stack', {
Expand All @@ -528,7 +530,7 @@ describe('security group', () => {

const securityGroup = SecurityGroup.fromLookup(stack, 'stack', 'sg-1234');

expect(securityGroup.securityGroupId).toEqual('sg-12345');
expect(securityGroup.securityGroupId).toEqual('sg-12345678');
expect(securityGroup.allowAllOutbound).toEqual(true);

});
Expand All @@ -547,7 +549,7 @@ describe('security group', () => {
const securityGroup = SecurityGroup.fromLookupById(stack, 'SG1', 'sg-12345');

// THEN
expect(securityGroup.securityGroupId).toEqual('sg-12345');
expect(securityGroup.securityGroupId).toEqual('sg-12345678');
expect(securityGroup.allowAllOutbound).toEqual(true);

});
Expand All @@ -571,7 +573,7 @@ describe('security group', () => {
const securityGroup = SecurityGroup.fromLookupByName(stack, 'SG1', 'sg-12345', vpc);

// THEN
expect(securityGroup.securityGroupId).toEqual('sg-12345');
expect(securityGroup.securityGroupId).toEqual('sg-12345678');
expect(securityGroup.allowAllOutbound).toEqual(true);

});
Expand All @@ -595,11 +597,35 @@ describe('security group', () => {
const securityGroup = SecurityGroup.fromLookupByName(stack, 'SG1', 'my-security-group', vpc);

// THEN
expect(securityGroup.securityGroupId).toEqual('sg-12345');
expect(securityGroup.securityGroupId).toEqual('sg-12345678');
expect(securityGroup.allowAllOutbound).toEqual(true);

});

test('can look up a security group and use it as a peer', () => {
// GIVEN
const app = new App();
const stack = new Stack(app, 'stack', {
env: {
account: '1234',
region: 'us-east-1',
},
});

const vpc = Vpc.fromVpcAttributes(stack, 'VPC', {
vpcId: 'vpc-1234',
availabilityZones: ['dummy1a', 'dummy1b', 'dummy1c'],
});

// WHEN
const securityGroup = SecurityGroup.fromLookupByName(stack, 'SG1', 'my-security-group', vpc);

// THEN
expect(() => {
Peer.securityGroupId(securityGroup.securityGroupId);
}).not.toThrow();
});

test('throws if securityGroupId is tokenized', () => {
// GIVEN
const app = new App();
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/listener.test.ts
View file
Open in desktop
Expand Up @@ -1719,7 +1719,7 @@ describe('tests', () => {
// THEN
Template.fromStack(stack).resourceCountIs('AWS::ElasticLoadBalancingV2::Listener', 0);
expect(listener.listenerArn).toEqual('arn:aws:elasticloadbalancing:us-west-2:123456789012:listener/application/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2');
expect(listener.connections.securityGroups[0].securityGroupId).toEqual('sg-12345');
expect(listener.connections.securityGroups[0].securityGroupId).toEqual('sg-12345678');
});

test('Can add rules to a looked-up ApplicationListener', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts
View file
Open in desktop
Expand Up @@ -579,7 +579,7 @@ describe('tests', () => {
expect(loadBalancer.loadBalancerCanonicalHostedZoneId).toEqual('Z3DZXE0EXAMPLE');
expect(loadBalancer.loadBalancerDnsName).toEqual('my-load-balancer-1234567890.us-west-2.elb.amazonaws.com');
expect(loadBalancer.ipAddressType).toEqual(elbv2.IpAddressType.DUAL_STACK);
expect(loadBalancer.connections.securityGroups[0].securityGroupId).toEqual('sg-12345');
expect(loadBalancer.connections.securityGroups[0].securityGroupId).toEqual('sg-12345678');
expect(loadBalancer.env.region).toEqual('us-west-2');
});

Expand Down