update integrations tests and fix linting as required

aws · Dec 20, 2023 · be56ba6 · be56ba6
1 parent df24694
commit be56ba6
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 34 deletions.
diff --git a/...est/ec2/integ.app-mesh-proxy-config.js.snapshot/aws-ecs-integ-appmesh-proxy.template.json b/...est/ec2/integ.app-mesh-proxy-config.js.snapshot/aws-ecs-integ-appmesh-proxy.template.json
@@ -919,6 +919,14 @@
    "Properties": {
     "ContainerDefinitions": [
      {
+      "Environment": [
+       {
+        "Name": "AWS_REGION",
+        "Value": {
+         "Ref": "AWS::Region"
+        }
+       }
+      ],
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "Memory": 256,

diff --git a/...eg/test/aws-ecs/test/ec2/integ.firelens-s3-config.js.snapshot/aws-ecs-integ.template.json b/...eg/test/aws-ecs/test/ec2/integ.firelens-s3-config.js.snapshot/aws-ecs-integ.template.json
@@ -964,6 +964,14 @@
       "Name": "log_router"
      },
      {
+      "Environment": [
+       {
+        "Name": "AWS_REGION",
+        "Value": {
+         "Ref": "AWS::Region"
+        }
+       }
+      ],
       "Essential": true,
       "Image": "nginx",
       "LogConfiguration": {

diff --git a/...rk-integ/test/aws-ecs/test/ec2/integ.lb-awsvpc-nw.js.snapshot/aws-ecs-integ.template.json b/...rk-integ/test/aws-ecs/test/ec2/integ.lb-awsvpc-nw.js.snapshot/aws-ecs-integ.template.json
@@ -919,6 +919,18 @@
    "Properties": {
     "ContainerDefinitions": [
      {
+      "Environment": [
+       {
+        "Name": "SOME_VARIABLE",
+        "Value": "value"
+       },
+       {
+         "Name": "AWS_REGION",
+         "Value": {
+           "Ref": "AWS::Region"
+         }
+       }
+     ],
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "Memory": 256,

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.lb-awsvpc-nw.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.lb-awsvpc-nw.ts
@@ -20,6 +20,9 @@ const taskDefinition = new ecs.Ec2TaskDefinition(stack, 'TaskDef', {
 const container = taskDefinition.addContainer('web', {
   image: ecs.ContainerImage.fromRegistry('amazon/amazon-ecs-sample'),
   memoryLimitMiB: 256,
+  environment: {
+    SOME_VARIABLE: 'value',
+  },
 });
 
 container.addPortMappings({

diff --git a/...cs/test/ec2/integ.pseudo-terminal.js.snapshot/aws-ecs-integ-pseudo-terminal.template.json b/...cs/test/ec2/integ.pseudo-terminal.js.snapshot/aws-ecs-integ-pseudo-terminal.template.json
@@ -919,6 +919,14 @@
    "Properties": {
     "ContainerDefinitions": [
      {
+      "Environment": [
+       {
+        "Name": "AWS_REGION",
+        "Value": {
+         "Ref": "AWS::Region"
+        }
+       }
+      ],
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "Memory": 256,

diff --git a/...nteg/test/aws-ecs/test/ec2/integ.sd-awsvpc-nw.js.snapshot/aws-ecs-integ-ecs.template.json b/...nteg/test/aws-ecs/test/ec2/integ.sd-awsvpc-nw.js.snapshot/aws-ecs-integ-ecs.template.json
@@ -928,6 +928,14 @@
    "Properties": {
     "ContainerDefinitions": [
      {
+      "Environment": [
+       {
+        "Name": "AWS_REGION",
+        "Value": {
+         "Ref": "AWS::Region"
+        }
+       }
+      ],
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "Memory": 256,

diff --git a/packages/aws-cdk-lib/aws-ecs/lib/ec2/ec2-task-definition.ts b/packages/aws-cdk-lib/aws-ecs/lib/ec2/ec2-task-definition.ts
@@ -12,7 +12,7 @@ import {
   PidMode,
   TaskDefinition,
 } from '../base/task-definition';
-import { ContainerDefinition, ContainerDefinitionOptions } from '../container-definition'
+import { ContainerDefinition, ContainerDefinitionOptions } from '../container-definition';
 import { PlacementConstraint } from '../placement';
 
 /**
@@ -131,24 +131,6 @@ export class Ec2TaskDefinition extends TaskDefinition implements IEc2TaskDefinit
     }
   }
 
-  /**
-   * Tasks running in AWSVPC networking mode requires an additional environment variable for the region to be sourced.
-   * This override adds in the additional environment variable as required
-   */
-  override addContainer(id: string, props: ContainerDefinitionOptions): ContainerDefinition {
-    if (this.networkMode === NetworkMode.AWS_VPC) {
-      return new ContainerDefinition(this, id, {
-        taskDefinition: this, ...props,
-        environment: {
-          ...props.environment,
-          AWS_REGION: Stack.of(this).region
-        }
-      });
-    }
-    // If network mode is not AWSVPC, then just add the container as normal
-    return new ContainerDefinition(this, id, {taskDefinition: this, ...props});
-  }
-
   /**
    * Constructs a new instance of the Ec2TaskDefinition class.
    */
@@ -165,4 +147,23 @@ export class Ec2TaskDefinition extends TaskDefinition implements IEc2TaskDefinit
     // Validate the placement constraints
     Ec2TaskDefinition.validatePlacementConstraints(props.placementConstraints ?? []);
   }
+
+  /**
+   * Tasks running in AWSVPC networking mode requires an additional environment variable for the region to be sourced.
+   * This override adds in the additional environment variable as required
+   */
+  override addContainer(id: string, props: ContainerDefinitionOptions): ContainerDefinition {
+    if (this.networkMode === NetworkMode.AWS_VPC) {
+      return new ContainerDefinition(this, id, {
+        taskDefinition: this,
+        ...props,
+        environment: {
+          ...props.environment,
+          AWS_REGION: Stack.of(this).region,
+        },
+      });
+    }
+    // If network mode is not AWSVPC, then just add the container as normal
+    return new ContainerDefinition(this, id, { taskDefinition: this, ...props });
+  }
 }
diff --git a/packages/aws-cdk-lib/aws-ecs/test/ec2/ec2-task-definition.test.ts b/packages/aws-cdk-lib/aws-ecs/test/ec2/ec2-task-definition.test.ts
@@ -1121,9 +1121,9 @@ describe('ec2 task definition', () => {
         image: ecs.ContainerImage.fromRegistry('amazon/amazon-ecs-sample'),
         memoryLimitMiB: 512,
         environment: {
-          SOME_VARIABLE: 'some-value'
-        }
-      })
+          SOME_VARIABLE: 'some-value',
+        },
+      });
 
       // THEN it should include the AWS_REGION env variable
       Template.fromStack(stack).hasResourceProperties('AWS::ECS::TaskDefinition', {
@@ -1134,14 +1134,14 @@ describe('ec2 task definition', () => {
           Memory: 512,
           Environment: [{
             Name: 'SOME_VARIABLE',
-            Value: 'some-value'
+            Value: 'some-value',
           }, {
             Name: 'AWS_REGION',
             Value: {
-              Ref: 'AWS::Region'
-            }
-          }]
-        }]
+              Ref: 'AWS::Region',
+            },
+          }],
+        }],
       });
 
       // GIVEN HOST network mode
@@ -1153,9 +1153,9 @@ describe('ec2 task definition', () => {
         image: ecs.ContainerImage.fromRegistry('amazon/amazon-ecs-sample'),
         memoryLimitMiB: 512,
         environment: {
-          SOME_VARIABLE: 'some-value'
-        }
-      })
+          SOME_VARIABLE: 'some-value',
+        },
+      });
 
       // THEN it should add in any env variables
       Template.fromStack(anotherStack).hasResourceProperties('AWS::ECS::TaskDefinition', {
@@ -1166,11 +1166,11 @@ describe('ec2 task definition', () => {
           Memory: 512,
           Environment: [{
             Name: 'SOME_VARIABLE',
-            Value: 'some-value'
-          }]
-        }]
+            Value: 'some-value',
+          }],
+        }],
       });
-    })
+    });
   });
 
   describe('setting inferenceAccelerators', () => {