fix(aws-alb-fargate): change container used to launch integ tests (#962)

* Change Docker Containter used for test * Delete commented code, add comments re: container * More cuts
awslabs · May 4, 2023 · 30ba7d9 · 30ba7d9
1 parent 344f150
commit 30ba7d9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/...s-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.expected.json b/...s-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.expected.json
@@ -651,7 +651,6 @@
           "Ref": "Vpc8378EB38"
         },
         "ResourceType": "VPC",
-        "TrafficType": "ALL",
         "DeliverLogsPermissionArn": {
           "Fn::GetAtt": [
             "VpcFlowLogIAMRole6A475D41",
@@ -667,7 +666,8 @@
             "Key": "Name",
             "Value": "all-existing-private-http/Vpc"
           }
-        ]
+        ],
+        "TrafficType": "ALL"
       }
     },
     "VpcECRAPI9A3B6A2B": {
@@ -913,7 +913,7 @@
         "ContainerDefinitions": [
           {
             "Essential": true,
-            "Image": "nginx",
+            "Image": "public.ecr.aws/m7z7i5e4/integration-test-image:latest",
             "MemoryReservation": 512,
             "Name": "test-container",
             "PortMappings": [

diff --git a/...atterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.ts b/...atterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-existing-private-http.ts
@@ -26,7 +26,8 @@ const stack = new Stack(app, defaults.generateIntegStackName(__filename), {
 });
 stack.templateOptions.description = 'Integration Test for private HTTPS API with existing VPC, LoadBalancer and Service';
 
-const image = ecs.ContainerImage.fromRegistry('nginx');
+// This is a minimal web server in our account that passes health checks
+const image = ecs.ContainerImage.fromRegistry('public.ecr.aws/m7z7i5e4/integration-test-image:latest');
 
 const testExistingVpc = defaults.getTestVpc(stack);
 

diff --git a/...ns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.expected.json b/...ns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.expected.json
@@ -682,7 +682,6 @@
           "Ref": "Vpc8378EB38"
         },
         "ResourceType": "VPC",
-        "TrafficType": "ALL",
         "DeliverLogsPermissionArn": {
           "Fn::GetAtt": [
             "VpcFlowLogIAMRole6A475D41",
@@ -698,7 +697,8 @@
             "Key": "Name",
             "Value": "all-new-public-http/Vpc"
           }
-        ]
+        ],
+        "TrafficType": "ALL"
       }
     },
     "VpcECRAPI9A3B6A2B": {
@@ -1186,7 +1186,7 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
           },
-          "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip"
+          "S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip"
         },
         "Timeout": 900,
         "MemorySize": 128,
@@ -1375,7 +1375,7 @@
         "ContainerDefinitions": [
           {
             "Essential": true,
-            "Image": "nginx",
+            "Image": "public.ecr.aws/m7z7i5e4/integration-test-image:latest",
             "MemoryReservation": 512,
             "Name": "test-construct-container",
             "PortMappings": [

diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.ts b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-public-http.ts
@@ -26,7 +26,8 @@ const stack = new Stack(app, generateIntegStackName(__filename), {
 });
 stack.templateOptions.description = 'Integration Test for public HTTP API with new VPC, LoadBalancer and Service';
 
-const image = ecs.ContainerImage.fromRegistry('nginx');
+// This is a minimal web server in our account that passes health checks
+const image = ecs.ContainerImage.fromRegistry('public.ecr.aws/m7z7i5e4/integration-test-image:latest');
 
 const testProps: AlbToFargateProps = {
   publicApi: true,

diff --git a/...ns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json b/...ns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.expected.json
@@ -53,10 +53,10 @@
             }
           }
         ],
+        "Priority": 10,
         "ListenerArn": {
           "Ref": "testconstructtestconstructlistener484444F1"
-        },
-        "Priority": 10
+        }
       }
     },
     "Vpc8378EB38": {
@@ -709,7 +709,6 @@
           "Ref": "Vpc8378EB38"
         },
         "ResourceType": "VPC",
-        "TrafficType": "ALL",
         "DeliverLogsPermissionArn": {
           "Fn::GetAtt": [
             "VpcFlowLogIAMRole6A475D41",
@@ -725,7 +724,8 @@
             "Key": "Name",
             "Value": "all-new-two-targets/Vpc"
           }
-        ]
+        ],
+        "TrafficType": "ALL"
       }
     },
     "VpcECRAPI9A3B6A2B": {
@@ -1213,7 +1213,7 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
           },
-          "S3Key": "e57c1acaa363d7d2b81736776007a7091bc73dff4aeb8135627c4511a51e7dca.zip"
+          "S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip"
         },
         "Timeout": 900,
         "MemorySize": 128,
@@ -1402,7 +1402,7 @@
         "ContainerDefinitions": [
           {
             "Essential": true,
-            "Image": "nginx",
+            "Image": "public.ecr.aws/m7z7i5e4/integration-test-image:latest",
             "MemoryReservation": 512,
             "Name": "test-construct-container",
             "PortMappings": [

diff --git a/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.ts b/source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/integ.all-new-two-targets.ts
@@ -26,7 +26,8 @@ const stack = new Stack(app, defaults.generateIntegStackName(__filename), {
 });
 stack.templateOptions.description = 'Integration Test for public HTTP API with new VPC, LoadBalancer and Service and 2 targets';
 
-const image = ecs.ContainerImage.fromRegistry('nginx');
+// This is a minimal web server in our account that passes health checks
+const image = ecs.ContainerImage.fromRegistry('public.ecr.aws/m7z7i5e4/integration-test-image:latest');
 
 const testProps: AlbToFargateProps = {
   publicApi: true,