feat(ecs): support secret environment variables

packages/@aws-cdk/aws-ecs-patterns/lib/base/load-balanced-service-base.ts

@@ -65,7 +65,7 @@ export interface LoadBalancedServiceBaseProps {
    *
    * @default - No environment variables.
    */
-  readonly environment?: { [key: string]: string };
+  readonly environment?: { [key: string]: ecs.EnvironmentValue };
 
   /**
    * Whether to create an AWS log driver

packages/@aws-cdk/aws-ecs-patterns/lib/base/queue-processing-service-base.ts

@@ -43,7 +43,7 @@ export interface QueueProcessingServiceBaseProps {
    *
    * @default 'QUEUE_NAME: queue.queueName'
    */
-  readonly environment?: { [key: string]: string };
+  readonly environment?: { [key: string]: ecs.EnvironmentValue };
 
   /**
    * A queue for which to process items from.
@@ -88,7 +88,7 @@ export abstract class QueueProcessingServiceBase extends cdk.Construct {
   /**
    * Environment variables that will include the queue name
    */
-  public readonly environment: { [key: string]: string };
+  public readonly environment: { [key: string]: ecs.EnvironmentValue };
   /**
    * The minimum number of tasks to run
    */
@@ -121,7 +121,7 @@ export abstract class QueueProcessingServiceBase extends cdk.Construct {
     this.logDriver = enableLogging ? this.createAWSLogDriver(this.node.id) : undefined;
 
     // Add the queue name to environment variables
-    this.environment = { ...(props.environment || {}), QUEUE_NAME: this.sqsQueue.queueName };
+    this.environment = { ...(props.environment || {}), QUEUE_NAME: ecs.EnvironmentValue.fromString(this.sqsQueue.queueName) };
 
     // Determine the desired task count (minimum) and maximum scaling capacity
     this.desiredCount = props.desiredTaskCount || 1;

packages/@aws-cdk/aws-ecs-patterns/lib/ecs/scheduled-ecs-task.ts

@@ -49,7 +49,7 @@ export interface ScheduledEc2TaskProps {
    *
    * @default none
    */
-  readonly environment?: { [key: string]: string };
+  readonly environment?: { [key: string]: ecs.EnvironmentValue };
 
   /**
    * The hard limit (in MiB) of memory to present to the container.

packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.lit.expected.json

@@ -649,11 +649,7 @@
             "Cpu": 1,
             "Environment": [
               {
-                "Name": "name",
-                "Value": "TRIGGER"
-              },
-              {
-                "Name": "value",
+                "Name": "TRIGGER",
                 "Value": "CloudWatch Events"
               }
             ],

packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.lit.ts

@@ -26,7 +26,7 @@ class EventStack extends cdk.Stack {
       desiredTaskCount: 2,
       memoryLimitMiB: 512,
       cpu: 1,
-      environment: { name: 'TRIGGER', value: 'CloudWatch Events' },
+      environment: { TRIGGER: ecs.EnvironmentValue.fromString('CloudWatch Events') },
       schedule: events.Schedule.rate(cdk.Duration.minutes(1)),
     });
     /// !hide

packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts

@@ -22,8 +22,8 @@ export = {
       image: ecs.ContainerImage.fromRegistry('test'),
       desiredCount: 2,
       environment: {
-        TEST_ENVIRONMENT_VARIABLE1: "test environment variable 1 value",
-        TEST_ENVIRONMENT_VARIABLE2: "test environment variable 2 value"
+        TEST_ENVIRONMENT_VARIABLE1: ecs.EnvironmentValue.fromString("test environment variable 1 value"),
+        TEST_ENVIRONMENT_VARIABLE2: ecs.EnvironmentValue.fromString("test environment variable 2 value")
       }
     });
 
@@ -96,8 +96,8 @@ export = {
       image: ecs.ContainerImage.fromRegistry('test'),
       desiredCount: 2,
       environment: {
-        TEST_ENVIRONMENT_VARIABLE1: "test environment variable 1 value",
-        TEST_ENVIRONMENT_VARIABLE2: "test environment variable 2 value"
+        TEST_ENVIRONMENT_VARIABLE1: ecs.EnvironmentValue.fromString("test environment variable 1 value"),
+        TEST_ENVIRONMENT_VARIABLE2: ecs.EnvironmentValue.fromString("test environment variable 2 value")
       }
     });
 
@@ -153,8 +153,8 @@ export = {
       desiredCount: 2,
       enableLogging: false,
       environment: {
-        TEST_ENVIRONMENT_VARIABLE1: "test environment variable 1 value",
-        TEST_ENVIRONMENT_VARIABLE2: "test environment variable 2 value"
+        TEST_ENVIRONMENT_VARIABLE1: ecs.EnvironmentValue.fromString("test environment variable 1 value"),
+        TEST_ENVIRONMENT_VARIABLE2: ecs.EnvironmentValue.fromString("test environment variable 2 value")
       }
     });
 

packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.queue-processing-ecs-service.ts

@@ -84,8 +84,8 @@ export = {
       enableLogging: false,
       desiredTaskCount: 2,
       environment: {
-        TEST_ENVIRONMENT_VARIABLE1: "test environment variable 1 value",
-        TEST_ENVIRONMENT_VARIABLE2: "test environment variable 2 value"
+        TEST_ENVIRONMENT_VARIABLE1: ecs.EnvironmentValue.fromString("test environment variable 1 value"),
+        TEST_ENVIRONMENT_VARIABLE2: ecs.EnvironmentValue.fromString("test environment variable 2 value")
       },
       queue,
       maxScalingCapacity: 5

packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.scheduled-ecs-task.ts

@@ -85,7 +85,7 @@ export = {
       desiredTaskCount: 2,
       memoryLimitMiB: 512,
       cpu: 2,
-      environment: { name: 'TRIGGER', value: 'CloudWatch Events' },
+      environment: { TRIGGER: ecs.EnvironmentValue.fromString('CloudWatch Events') },
       schedule: events.Schedule.expression('rate(1 minute)')
     });
 
@@ -111,11 +111,7 @@ export = {
           Cpu: 2,
           Environment: [
             {
-              Name: "name",
-              Value: "TRIGGER"
-            },
-            {
-              Name: "value",
+              Name: "TRIGGER",
               Value: "CloudWatch Events"
             }
           ],

packages/@aws-cdk/aws-ecs-patterns/test/fargate/test.queue-processing-fargate-service.ts

@@ -82,8 +82,8 @@ export = {
       enableLogging: false,
       desiredTaskCount: 2,
       environment: {
-        TEST_ENVIRONMENT_VARIABLE1: "test environment variable 1 value",
-        TEST_ENVIRONMENT_VARIABLE2: "test environment variable 2 value"
+        TEST_ENVIRONMENT_VARIABLE1: ecs.EnvironmentValue.fromString("test environment variable 1 value"),
+        TEST_ENVIRONMENT_VARIABLE2: ecs.EnvironmentValue.fromString("test environment variable 2 value")
       },
       queue,
       maxScalingCapacity: 5

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

@@ -1,11 +1,59 @@
 import iam = require('@aws-cdk/aws-iam');
+import secretsmanager = require('@aws-cdk/aws-secretsmanager');
+import ssm = require('@aws-cdk/aws-ssm');
 import cdk = require('@aws-cdk/cdk');
 import { NetworkMode, TaskDefinition } from './base/task-definition';
 import { ContainerImage, ContainerImageConfig } from './container-image';
 import { CfnTaskDefinition } from './ecs.generated';
 import { LinuxParameters } from './linux-parameters';
 import { LogDriver, LogDriverConfig } from './log-drivers/log-driver';
 
+/**
+ * Environment variable value type.
+ */
+export enum EnvironmentValueType {
+  /**
+   * A string in clear text.
+   */
+  STRING = 'string',
+
+  /**
+   * The full ARN of the AWS Secrets Manager secret or the full ARN of the
+   * parameter in the AWS Systems Manager Parameter Store.
+   */
+  SECRET = 'secret',
+}
+
+/**
+ * An environment variable value.
+ */
+export class EnvironmentValue {
+  /**
+   * Creates a environment variable value from a string.
+   */
+  public static fromString(value: string) {
+    return new EnvironmentValue(value, EnvironmentValueType.STRING);
+  }
+
+  /**
+   * Creates a environment variable value from a parameter stored in AWS
+   * Systems Manager Parameter Store.
+   */
+  public static fromSsmParameter(parameter: ssm.IParameter) {
+    return new EnvironmentValue(parameter.parameterArn, EnvironmentValueType.SECRET);
+  }
+
+  /**
+   * Creates a environment variable value from a secret stored in AWS Secrets
+   * Manager.
+   */
+  public static fromSecretsManager(secret: secretsmanager.ISecret) {
+    return new EnvironmentValue(secret.secretArn, EnvironmentValueType.SECRET);
+  }
+
+  constructor(public readonly value: string, public readonly type: EnvironmentValueType) {}
+}
+
 export interface ContainerDefinitionOptions {
   /**
    * The image to use for a container.
@@ -81,7 +129,7 @@ export interface ContainerDefinitionOptions {
    *
    * @default - No environment variables.
    */
-  readonly environment?: { [key: string]: string };
+  readonly environment?: { [key: string]: EnvironmentValue };
 
   /**
    * Indicates whether the task stops if this container fails.
@@ -390,6 +438,17 @@ export class ContainerDefinition extends cdk.Construct {
    * Render this container definition to a CloudFormation object
    */
   public renderContainerDefinition(): CfnTaskDefinition.ContainerDefinitionProperty {
+    const environment = [];
+    const secrets = [];
+    for (const [k, v] of Object.entries(this.props.environment || {})) {
+      if (v.type === EnvironmentValueType.STRING) {
+        environment.push({ name: k, value: v.value });
+      }
+      if (v.type === EnvironmentValueType.SECRET) {
+        secrets.push({ name: k, valueFrom: v.value });
+      }
+    }
+
     return {
       command: this.props.command,
       cpu: this.props.cpu,
@@ -415,8 +474,10 @@ export class ContainerDefinition extends cdk.Construct {
       volumesFrom: this.volumesFrom.map(renderVolumeFrom),
       workingDirectory: this.props.workingDirectory,
       logConfiguration: this.logDriverConfig,
-      environment: this.props.environment && renderKV(this.props.environment, 'name', 'value'),
-      extraHosts: this.props.extraHosts && renderKV(this.props.extraHosts, 'hostname', 'ipAddress'),
+      environment: environment.length !== 0 ? environment : undefined,
+      secrets: secrets.length !== 0 ? secrets : undefined,
+      extraHosts: this.props.extraHosts && Object.entries(this.props.extraHosts)
+        .map(([k, v]) => ({ hostname: k, ipAddress: v })),
       healthCheck: this.props.healthCheck && renderHealthCheck(this.props.healthCheck),
       links: this.links,
       linuxParameters: this.linuxParameters && this.linuxParameters.renderLinuxParameters(),
@@ -472,14 +533,6 @@ export interface HealthCheck {
   readonly timeout?: cdk.Duration;
 }
 
-function renderKV(env: { [key: string]: string }, keyName: string, valueName: string): any {
-  const ret = [];
-  for (const [key, value] of Object.entries(env)) {
-    ret.push({ [keyName]: key, [valueName]: value });
-  }
-  return ret;
-}
-
 function renderHealthCheck(hc: HealthCheck): CfnTaskDefinition.HealthCheckProperty {
   return {
     command: getHealthCheckCommand(hc),

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

@@ -1,5 +1,6 @@
 import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert';
 import secretsmanager = require('@aws-cdk/aws-secretsmanager');
+import ssm = require('@aws-cdk/aws-ssm');
 import cdk = require('@aws-cdk/cdk');
 import { Test } from 'nodeunit';
 import ecs = require('../lib');
@@ -265,7 +266,7 @@ export = {
       image: ecs.ContainerImage.fromRegistry('test'),
       memoryLimitMiB: 1024,
       environment: {
-        TEST_ENVIRONMENT_VARIABLE: "test environment variable value"
+        TEST_ENVIRONMENT_VARIABLE: ecs.EnvironmentValue.fromString("test environment variable value")
       }
     });
 
@@ -285,6 +286,70 @@ export = {
 
   },
 
+  'can add secret environment variables to the container definition'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const taskDefinition = new ecs.Ec2TaskDefinition(stack, 'TaskDef');
+
+    const secret = new secretsmanager.Secret(stack, 'Secret');
+    const parameter = ssm.StringParameter.fromSecureStringParameterAttributes(stack, 'Parameter', {
+      parameterName: '/name',
+      version: 1
+    });
+
+    // WHEN
+    taskDefinition.addContainer('cont', {
+      image: ecs.ContainerImage.fromRegistry('test'),
+      memoryLimitMiB: 1024,
+      environment: {
+        SECRET: ecs.EnvironmentValue.fromSecretsManager(secret),
+        PARAMETER: ecs.EnvironmentValue.fromSsmParameter(parameter),
+      }
+    });
+
+    // THEN
+    expect(stack).to(haveResourceLike('AWS::ECS::TaskDefinition', {
+      ContainerDefinitions: [
+        {
+          Secrets: [
+            {
+              Name: "SECRET",
+              ValueFrom: {
+                Ref: "SecretA720EF05"
+              }
+            },
+            {
+              Name: "PARAMETER",
+              ValueFrom: {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:",
+                    {
+                      Ref: "AWS::Partition"
+                    },
+                    ":ssm:",
+                    {
+                      Ref: "AWS::Region"
+                    },
+                    ":",
+                    {
+                      Ref: "AWS::AccountId"
+                    },
+                    ":parameter/name"
+                  ]
+                ]
+              }
+            },
+          ]
+        }
+      ]
+    }));
+
+    test.done();
+
+  },
+
   'can add AWS logging to container definition'(test: Test) {
     // GIVEN
     const stack = new cdk.Stack();