feat(aws-ecs): expose environment from containerDefinition

packages/@aws-cdk/aws-ecs/README.md

@@ -651,8 +651,7 @@ rule.addTarget(new targets.EcsTask({
   containerOverrides: [{
     containerName: 'TheContainer',
     environment: [{
-      name: 'I_WAS_TRIGGERED',
-      value: 'From CloudWatch Events'
+      I_WAS_TRIGGERED: 'From CloudWatch Events'
     }],
   }],
 }));

packages/@aws-cdk/aws-ecs/lib/container-definition.ts

@@ -392,6 +392,11 @@ export class ContainerDefinition extends CoreConstruct {
    */
   public readonly taskDefinition: TaskDefinition;
 
+  /**
+   * The environment variables for this container
+   */
+  public readonly environment?: { [key: string]: string };
+
   /**
    * The environment files for this container
    */
@@ -437,6 +442,7 @@ export class ContainerDefinition extends CoreConstruct {
     this.memoryLimitSpecified = props.memoryLimitMiB !== undefined || props.memoryReservationMiB !== undefined;
     this.linuxParameters = props.linuxParameters;
     this.containerName = props.containerName ?? this.node.id;
+    this.environment = props.environment ?? undefined;
 
     this.imageConfig = props.image.bind(this, this);
     if (props.logging) {
@@ -669,7 +675,7 @@ export class ContainerDefinition extends CoreConstruct {
       volumesFrom: cdk.Lazy.any({ produce: () => this.volumesFrom.map(renderVolumeFrom) }, { omitEmptyArray: true }),
       workingDirectory: this.props.workingDirectory,
       logConfiguration: this.logDriverConfig,
-      environment: this.props.environment && renderKV(this.props.environment, 'name', 'value'),
+      environment: this.environment && renderKV(this.environment, 'name', 'value'),
       environmentFiles: this.environmentFiles && renderEnvironmentFiles(this.environmentFiles),
       secrets: this.secrets,
       extraHosts: this.props.extraHosts && renderKV(this.props.extraHosts, 'hostname', 'ipAddress'),

packages/@aws-cdk/aws-ecs/test/container-definition.test.ts

@@ -43,7 +43,8 @@ describe('container definition', () => {
       const stack = new cdk.Stack();
       const taskDefinition = new ecs.Ec2TaskDefinition(stack, 'TaskDef');
       const secret = new secretsmanager.Secret(stack, 'Secret');
-      new ecs.ContainerDefinition(stack, 'Container', {
+      const environment = { keyOne: 'valueOne', keyTwo: 'valueTwo' };
+      const containerDefinition = new ecs.ContainerDefinition(stack, 'Container', {
         image: ecs.ContainerImage.fromRegistry('/aws/aws-example-app'),
         taskDefinition,
         memoryLimitMiB: 1024,
@@ -60,10 +61,7 @@ describe('container definition', () => {
         },
         dockerSecurityOptions: ['ECS_SELINUX_CAPABLE=true'],
         entryPoint: ['top', '-b'],
-        environment: {
-          key: 'foo',
-          value: 'bar',
-        },
+        environment,
         environmentFiles: [ecs.EnvironmentFile.fromAsset(path.join(__dirname, 'demo-envfiles/test-envfile.env'))],
         essential: true,
         extraHosts: {
@@ -89,6 +87,7 @@ describe('container definition', () => {
           { namespace: 'SomeNamespace', value: 'SomeValue' },
         ],
       });
+      containerDefinition.environment!.keyThree = 'valueThree';
 
       // THEN
       expect(stack).toHaveResourceLike('AWS::ECS::TaskDefinition', {
@@ -118,12 +117,16 @@ describe('container definition', () => {
             ],
             Environment: [
               {
-                Name: 'key',
-                Value: 'foo',
+                Name: 'keyOne',
+                Value: 'valueOne',
+              },
+              {
+                Name: 'keyTwo',
+                Value: 'valueTwo',
               },
               {
-                Name: 'value',
-                Value: 'bar',
+                Name: 'keyThree',
+                Value: 'valueThree',
               },
             ],
             EnvironmentFiles: [{