Skip to content

Commit 82783b8

Browse files
committed
Fix more cfn_nag issues
1 parent 31472a6 commit 82783b8

8 files changed

+111
-54
lines changed

Diff for: source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.expected.json

+31-21
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Description": "Integration Test for aws-route53-alb",
33
"Resources": {
4-
"testroute53albtestroute53albzone04BEDFE6": {
4+
"privateapistackprivateapistackzone3E5194E7": {
55
"Type": "AWS::Route53::HostedZone",
66
"Properties": {
77
"Name": "www.example.com.",
@@ -15,7 +15,7 @@
1515
]
1616
}
1717
},
18-
"testroute53albtestroute53albalb7C171F50": {
18+
"privateapistackprivateapistackalb7242E759": {
1919
"Type": "AWS::ElasticLoadBalancingV2::LoadBalancer",
2020
"Properties": {
2121
"LoadBalancerAttributes": [
@@ -30,7 +30,7 @@
3030
{
3131
"Key": "access_logs.s3.bucket",
3232
"Value": {
33-
"Ref": "testroute53albAC463A50"
33+
"Ref": "privateapistack09C932BB"
3434
}
3535
},
3636
{
@@ -42,7 +42,7 @@
4242
"SecurityGroups": [
4343
{
4444
"Fn::GetAtt": [
45-
"testroute53albtestroute53albalbSecurityGroupC3716E02",
45+
"privateapistackprivateapistackalbSecurityGroup5A8A9725",
4646
"GroupId"
4747
]
4848
}
@@ -61,14 +61,14 @@
6161
"Type": "application"
6262
},
6363
"DependsOn": [
64-
"testroute53albPolicy478FC0AF",
65-
"testroute53albAC463A50"
64+
"privateapistackPolicy98558170",
65+
"privateapistack09C932BB"
6666
]
6767
},
68-
"testroute53albtestroute53albalbSecurityGroupC3716E02": {
68+
"privateapistackprivateapistackalbSecurityGroup5A8A9725": {
6969
"Type": "AWS::EC2::SecurityGroup",
7070
"Properties": {
71-
"GroupDescription": "Automatically created Security Group for ELB deployPrivateApitestroute53albtestroute53albalb1145D1AD",
71+
"GroupDescription": "Automatically created Security Group for ELB deployPrivateApiprivateapistackprivateapistackalb5DF93E18",
7272
"SecurityGroupEgress": [
7373
{
7474
"CidrIp": "255.255.255.255/32",
@@ -83,11 +83,21 @@
8383
}
8484
},
8585
"DependsOn": [
86-
"testroute53albPolicy478FC0AF",
87-
"testroute53albAC463A50"
88-
]
86+
"privateapistackPolicy98558170",
87+
"privateapistack09C932BB"
88+
],
89+
"Metadata": {
90+
"cfn_nag": {
91+
"rules_to_suppress": [
92+
{
93+
"id": "W29",
94+
"reason": "CDK created rule that blocks all traffic."
95+
}
96+
]
97+
}
98+
}
8999
},
90-
"testroute53albAC463A50": {
100+
"privateapistack09C932BB": {
91101
"Type": "AWS::S3::Bucket",
92102
"Properties": {
93103
"BucketEncryption": {
@@ -122,11 +132,11 @@
122132
}
123133
}
124134
},
125-
"testroute53albPolicy478FC0AF": {
135+
"privateapistackPolicy98558170": {
126136
"Type": "AWS::S3::BucketPolicy",
127137
"Properties": {
128138
"Bucket": {
129-
"Ref": "testroute53albAC463A50"
139+
"Ref": "privateapistack09C932BB"
130140
},
131141
"PolicyDocument": {
132142
"Statement": [
@@ -148,7 +158,7 @@
148158
[
149159
{
150160
"Fn::GetAtt": [
151-
"testroute53albAC463A50",
161+
"privateapistack09C932BB",
152162
"Arn"
153163
]
154164
},
@@ -158,7 +168,7 @@
158168
},
159169
{
160170
"Fn::GetAtt": [
161-
"testroute53albAC463A50",
171+
"privateapistack09C932BB",
162172
"Arn"
163173
]
164174
}
@@ -191,7 +201,7 @@
191201
[
192202
{
193203
"Fn::GetAtt": [
194-
"testroute53albAC463A50",
204+
"privateapistack09C932BB",
195205
"Arn"
196206
]
197207
},
@@ -209,7 +219,7 @@
209219
}
210220
}
211221
},
212-
"testroute53albtestroute53albaliasCCC6DDF3": {
222+
"privateapistackprivateapistackalias54E3713F": {
213223
"Type": "AWS::Route53::RecordSet",
214224
"Properties": {
215225
"Name": "www.example.com.",
@@ -222,7 +232,7 @@
222232
"dualstack.",
223233
{
224234
"Fn::GetAtt": [
225-
"testroute53albtestroute53albalb7C171F50",
235+
"privateapistackprivateapistackalb7242E759",
226236
"DNSName"
227237
]
228238
}
@@ -231,13 +241,13 @@
231241
},
232242
"HostedZoneId": {
233243
"Fn::GetAtt": [
234-
"testroute53albtestroute53albalb7C171F50",
244+
"privateapistackprivateapistackalb7242E759",
235245
"CanonicalHostedZoneID"
236246
]
237247
}
238248
},
239249
"HostedZoneId": {
240-
"Ref": "testroute53albtestroute53albzone04BEDFE6"
250+
"Ref": "privateapistackprivateapistackzone3E5194E7"
241251
}
242252
}
243253
},

Diff for: source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import { App, Stack, Aws } from "@aws-cdk/core";
1616
import { Route53ToAlb, Route53ToAlbProps } from "../lib";
1717
import { generateIntegStackName } from '@aws-solutions-constructs/core';
18+
import * as defaults from '@aws-solutions-constructs/core';
19+
import { CfnSecurityGroup } from "@aws-cdk/aws-ec2";
1820

1921
// Setup
2022
const app = new App();
@@ -31,7 +33,10 @@ const props: Route53ToAlbProps = {
3133
}
3234
};
3335

34-
new Route53ToAlb(stack, 'test-route53-alb', props);
36+
const testConstruct = new Route53ToAlb(stack, 'private-api-stack', props);
37+
38+
const newSecurityGroup = testConstruct.loadBalancer.connections.securityGroups[0].node.defaultChild as CfnSecurityGroup;
39+
defaults.addCfnSuppressRules(newSecurityGroup, [{ id: 'W29', reason: 'CDK created rule that blocks all traffic.'}]);
3540

3641
// Synth
3742
app.synth();

Diff for: source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.expected.json

+11-1
Original file line numberDiff line numberDiff line change
@@ -716,9 +716,19 @@
716716
"VpcId": {
717717
"Ref": "Vpc8378EB38"
718718
}
719+
},
720+
"Metadata": {
721+
"cfn_nag": {
722+
"rules_to_suppress": [
723+
{
724+
"id": "W29",
725+
"reason": "CDK created rule that blocks all traffic."
726+
}
727+
]
728+
}
719729
}
720730
},
721-
"testroute53albtestroute53albaliasCCC6DDF3": {
731+
"publicapistackpublicapistackalias4096038C": {
722732
"Type": "AWS::Route53::RecordSet",
723733
"Properties": {
724734
"Name": "www.test-example.com.",

Diff for: source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiExistingAlb.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { ApplicationLoadBalancer } from "@aws-cdk/aws-elasticloadbalancingv2";
1818
import { PublicHostedZone } from "@aws-cdk/aws-route53";
1919
import { Route53ToAlb, Route53ToAlbProps } from "../lib";
2020
import { generateIntegStackName } from '@aws-solutions-constructs/core';
21+
import { CfnSecurityGroup } from "@aws-cdk/aws-ec2";
2122

2223
// Setup
2324
const app = new App();
@@ -53,7 +54,10 @@ const props: Route53ToAlbProps = {
5354
existingLoadBalancerObj: existingAlb,
5455
};
5556

56-
new Route53ToAlb(stack, 'test-route53-alb', props);
57+
const testConstruct = new Route53ToAlb(stack, 'public-api-stack', props);
58+
59+
const newSecurityGroup = testConstruct.loadBalancer.connections.securityGroups[0].node.defaultChild as CfnSecurityGroup;
60+
defaults.addCfnSuppressRules(newSecurityGroup, [{ id: 'W29', reason: 'CDK created rule that blocks all traffic.'}]);
5761

5862
// Synth
5963
app.synth();

Diff for: source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json

+29-19
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@
658658
"Name": "www.test-example.com."
659659
}
660660
},
661-
"testroute53albtestroute53albalb7C171F50": {
661+
"newalbstacknewalbstackalb50B67E3E": {
662662
"Type": "AWS::ElasticLoadBalancingV2::LoadBalancer",
663663
"Properties": {
664664
"LoadBalancerAttributes": [
@@ -673,7 +673,7 @@
673673
{
674674
"Key": "access_logs.s3.bucket",
675675
"Value": {
676-
"Ref": "testroute53albAC463A50"
676+
"Ref": "newalbstackADB02838"
677677
}
678678
},
679679
{
@@ -686,7 +686,7 @@
686686
"SecurityGroups": [
687687
{
688688
"Fn::GetAtt": [
689-
"testroute53albtestroute53albalbSecurityGroupC3716E02",
689+
"newalbstacknewalbstackalbSecurityGroup7BBB827C",
690690
"GroupId"
691691
]
692692
}
@@ -705,17 +705,17 @@
705705
"Type": "application"
706706
},
707707
"DependsOn": [
708-
"testroute53albPolicy478FC0AF",
709-
"testroute53albAC463A50",
708+
"newalbstackPolicyB7C2D898",
709+
"newalbstackADB02838",
710710
"VpcPublicSubnet1DefaultRoute3DA9E72A",
711711
"VpcPublicSubnet2DefaultRoute97F91067",
712712
"VpcPublicSubnet3DefaultRoute4697774F"
713713
]
714714
},
715-
"testroute53albtestroute53albalbSecurityGroupC3716E02": {
715+
"newalbstacknewalbstackalbSecurityGroup7BBB827C": {
716716
"Type": "AWS::EC2::SecurityGroup",
717717
"Properties": {
718-
"GroupDescription": "Automatically created Security Group for ELB deployPublicApiNewAlbtestroute53albtestroute53albalbC4C12C26",
718+
"GroupDescription": "Automatically created Security Group for ELB deployPublicApiNewAlbnewalbstacknewalbstackalbC987D9E9",
719719
"SecurityGroupEgress": [
720720
{
721721
"CidrIp": "255.255.255.255/32",
@@ -730,11 +730,21 @@
730730
}
731731
},
732732
"DependsOn": [
733-
"testroute53albPolicy478FC0AF",
734-
"testroute53albAC463A50"
735-
]
733+
"newalbstackPolicyB7C2D898",
734+
"newalbstackADB02838"
735+
],
736+
"Metadata": {
737+
"cfn_nag": {
738+
"rules_to_suppress": [
739+
{
740+
"id": "W29",
741+
"reason": "CDK created rule that blocks all traffic."
742+
}
743+
]
744+
}
745+
}
736746
},
737-
"testroute53albAC463A50": {
747+
"newalbstackADB02838": {
738748
"Type": "AWS::S3::Bucket",
739749
"Properties": {
740750
"BucketEncryption": {
@@ -769,11 +779,11 @@
769779
}
770780
}
771781
},
772-
"testroute53albPolicy478FC0AF": {
782+
"newalbstackPolicyB7C2D898": {
773783
"Type": "AWS::S3::BucketPolicy",
774784
"Properties": {
775785
"Bucket": {
776-
"Ref": "testroute53albAC463A50"
786+
"Ref": "newalbstackADB02838"
777787
},
778788
"PolicyDocument": {
779789
"Statement": [
@@ -795,7 +805,7 @@
795805
[
796806
{
797807
"Fn::GetAtt": [
798-
"testroute53albAC463A50",
808+
"newalbstackADB02838",
799809
"Arn"
800810
]
801811
},
@@ -805,7 +815,7 @@
805815
},
806816
{
807817
"Fn::GetAtt": [
808-
"testroute53albAC463A50",
818+
"newalbstackADB02838",
809819
"Arn"
810820
]
811821
}
@@ -838,7 +848,7 @@
838848
[
839849
{
840850
"Fn::GetAtt": [
841-
"testroute53albAC463A50",
851+
"newalbstackADB02838",
842852
"Arn"
843853
]
844854
},
@@ -856,7 +866,7 @@
856866
}
857867
}
858868
},
859-
"testroute53albtestroute53albaliasCCC6DDF3": {
869+
"newalbstacknewalbstackalias05E0DF53": {
860870
"Type": "AWS::Route53::RecordSet",
861871
"Properties": {
862872
"Name": "www.test-example.com.",
@@ -869,7 +879,7 @@
869879
"dualstack.",
870880
{
871881
"Fn::GetAtt": [
872-
"testroute53albtestroute53albalb7C171F50",
882+
"newalbstacknewalbstackalb50B67E3E",
873883
"DNSName"
874884
]
875885
}
@@ -878,7 +888,7 @@
878888
},
879889
"HostedZoneId": {
880890
"Fn::GetAtt": [
881-
"testroute53albtestroute53albalb7C171F50",
891+
"newalbstacknewalbstackalb50B67E3E",
882892
"CanonicalHostedZoneID"
883893
]
884894
}

Diff for: source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { App, Stack, Aws } from "@aws-cdk/core";
1616
import * as defaults from '@aws-solutions-constructs/core';
1717
import { PublicHostedZone } from "@aws-cdk/aws-route53";
1818
import { Route53ToAlb, Route53ToAlbProps } from "../lib";
19+
import { CfnSecurityGroup } from "@aws-cdk/aws-ec2";
1920

2021
// Setup
2122
const app = new App();
@@ -47,7 +48,10 @@ const props: Route53ToAlbProps = {
4748
}
4849
};
4950

50-
new Route53ToAlb(stack, 'test-route53-alb', props);
51+
const testConstruct = new Route53ToAlb(stack, 'new-alb-stack', props);
52+
53+
const newSecurityGroup = testConstruct.loadBalancer.connections.securityGroups[0].node.defaultChild as CfnSecurityGroup;
54+
defaults.addCfnSuppressRules(newSecurityGroup, [{ id: 'W29', reason: 'CDK created rule that blocks all traffic.'}]);
5155

5256
// Synth
5357
app.synth();

0 commit comments

Comments
 (0)