Fix more cfn_nag issues

Author: biffgaut

source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.expected.json

@@ -666,7 +666,7 @@
         ]
       }
     },
-    "testroute53albtestroute53albalb7C171F50": {
+    "existingzonestackexistingzonestackalbCFB3D7E4": {
       "Type": "AWS::ElasticLoadBalancingV2::LoadBalancer",
       "Properties": {
         "LoadBalancerAttributes": [
@@ -681,7 +681,7 @@
           {
             "Key": "access_logs.s3.bucket",
             "Value": {
-              "Ref": "testroute53albAC463A50"
+              "Ref": "existingzonestackEFB9F5B3"
             }
           },
           {
@@ -693,7 +693,7 @@
         "SecurityGroups": [
           {
             "Fn::GetAtt": [
-              "testroute53albtestroute53albalbSecurityGroupC3716E02",
+              "existingzonestackexistingzonestackalbSecurityGroup6F32DCA5",
               "GroupId"
             ]
           }
@@ -712,14 +712,14 @@
         "Type": "application"
       },
       "DependsOn": [
-        "testroute53albPolicy478FC0AF",
-        "testroute53albAC463A50"
+        "existingzonestackPolicyFEC9C88E",
+        "existingzonestackEFB9F5B3"
       ]
     },
-    "testroute53albtestroute53albalbSecurityGroupC3716E02": {
+    "existingzonestackexistingzonestackalbSecurityGroup6F32DCA5": {
       "Type": "AWS::EC2::SecurityGroup",
       "Properties": {
-        "GroupDescription": "Automatically created Security Group for ELB deployPrivateApiExistingZonetestroute53albtestroute53albalb73DF0A20",
+        "GroupDescription": "Automatically created Security Group for ELB deployPrivateApiExistingZoneexistingzonestackexistingzonestackalbFBEA12EB",
         "SecurityGroupEgress": [
           {
             "CidrIp": "255.255.255.255/32",
@@ -734,11 +734,21 @@
         }
       },
       "DependsOn": [
-        "testroute53albPolicy478FC0AF",
-        "testroute53albAC463A50"
-      ]
+        "existingzonestackPolicyFEC9C88E",
+        "existingzonestackEFB9F5B3"
+      ],
+      "Metadata": {
+        "cfn_nag": {
+          "rules_to_suppress": [
+            {
+              "id": "W29",
+              "reason": "CDK created rule that blocks all traffic."
+            }
+          ]
+        }
+      }
     },
-    "testroute53albAC463A50": {
+    "existingzonestackEFB9F5B3": {
       "Type": "AWS::S3::Bucket",
       "Properties": {
         "BucketEncryption": {
@@ -773,11 +783,11 @@
         }
       }
     },
-    "testroute53albPolicy478FC0AF": {
+    "existingzonestackPolicyFEC9C88E": {
       "Type": "AWS::S3::BucketPolicy",
       "Properties": {
         "Bucket": {
-          "Ref": "testroute53albAC463A50"
+          "Ref": "existingzonestackEFB9F5B3"
         },
         "PolicyDocument": {
           "Statement": [
@@ -799,7 +809,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "testroute53albAC463A50",
+                          "existingzonestackEFB9F5B3",
                           "Arn"
                         ]
                       },
@@ -809,7 +819,7 @@
                 },
                 {
                   "Fn::GetAtt": [
-                    "testroute53albAC463A50",
+                    "existingzonestackEFB9F5B3",
                     "Arn"
                   ]
                 }
@@ -842,7 +852,7 @@
                   [
                     {
                       "Fn::GetAtt": [
-                        "testroute53albAC463A50",
+                        "existingzonestackEFB9F5B3",
                         "Arn"
                       ]
                     },
@@ -860,7 +870,7 @@
         }
       }
     },
-    "testroute53albtestroute53albaliasCCC6DDF3": {
+    "existingzonestackexistingzonestackalias77D2E65D": {
       "Type": "AWS::Route53::RecordSet",
       "Properties": {
         "Name": "www.test-example.com.",
@@ -873,7 +883,7 @@
                 "dualstack.",
                 {
                   "Fn::GetAtt": [
-                    "testroute53albtestroute53albalb7C171F50",
+                    "existingzonestackexistingzonestackalbCFB3D7E4",
                     "DNSName"
                   ]
                 }
@@ -882,7 +892,7 @@
           },
           "HostedZoneId": {
             "Fn::GetAtt": [
-              "testroute53albtestroute53albalb7C171F50",
+              "existingzonestackexistingzonestackalbCFB3D7E4",
               "CanonicalHostedZoneID"
             ]
           }

source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.ts

@@ -16,11 +16,11 @@ import { App, Stack, Aws } from "@aws-cdk/core";
 import * as defaults from '@aws-solutions-constructs/core';
 import { PrivateHostedZone } from "@aws-cdk/aws-route53";
 import { Route53ToAlb, Route53ToAlbProps } from "../lib";
-import { generateIntegStackName } from '@aws-solutions-constructs/core';
+import { CfnSecurityGroup } from "@aws-cdk/aws-ec2";
 
 // Setup
 const app = new App();
-const stack = new Stack(app, generateIntegStackName(__filename), {
+const stack = new Stack(app, defaults.generateIntegStackName(__filename), {
   env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' },
 });
 stack.templateOptions.description = 'Integration Test for aws-route53-alb';
@@ -46,7 +46,11 @@ const props: Route53ToAlbProps = {
   existingVpc: newVpc,
 };
 
-new Route53ToAlb(stack, 'test-route53-alb', props);
+const testConstruct = new Route53ToAlb(stack, 'existing-zone-stack', props);
+
+const newSecurityGroup = testConstruct.loadBalancer.connections.securityGroups[0].node.defaultChild as CfnSecurityGroup;
+defaults.addCfnSuppressRules(newSecurityGroup, [{ id: 'W29', reason: 'CDK created rule that blocks all traffic.'}]);
+
 
 // Synth
 app.synth();

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

@@ -681,7 +681,6 @@
             "Value": ""
           }
         ],
-        "Name": "new-alb",
         "Scheme": "internet-facing",
         "SecurityGroups": [
           {

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

@@ -43,9 +43,6 @@ const props: Route53ToAlbProps = {
   publicApi: true,
   existingHostedZoneInterface: newZone,
   existingVpc: newVpc,
-  loadBalancerProps: {
-    loadBalancerName: 'new-alb',
-  }
 };
 
 const testConstruct = new Route53ToAlb(stack, 'new-alb-stack', props);