feat: construct library for ECS

.gitignore

@@ -10,3 +10,4 @@ pack
 coverage
 .nyc_output
 .LAST_BUILD
+*.swp

examples/cdk-examples-typescript/.gitignore

@@ -1,2 +1,3 @@
 .LAST_BUILD
-*.snk
+hello-cdk-ecs/cdk.json
+*.snk

examples/cdk-examples-typescript/hello-cdk-ecs-declarative/cdk.json

@@ -0,0 +1,3 @@
+{
+    "app": "../node_modules/.bin/cdk-applet-js fargate-service.yml"
+}

examples/cdk-examples-typescript/hello-cdk-ecs-declarative/fargate-service.yml

@@ -0,0 +1,5 @@
+# applet is loaded from the local ./test-applet.js file
+applet: @aws-cdk/aws-ecs:LoadBalancedFargateServiceApplet
+image: 'amazon/amazon-ecs-sample'
+cpu: "2048"
+memoryMiB: "1024"

examples/cdk-examples-typescript/hello-cdk-ecs/index.ts

@@ -0,0 +1,37 @@
+import ec2 = require('@aws-cdk/aws-ec2');
+import { InstanceType } from '@aws-cdk/aws-ec2';
+import ecs = require('@aws-cdk/aws-ecs');
+import cdk = require('@aws-cdk/cdk');
+
+class BonjourECS extends cdk.Stack {
+  constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
+    super(parent, name, props);
+
+    // For better iteration speed, it might make sense to put this VPC into
+    // a separate stack and import it here. We then have two stacks to
+    // deploy, but VPC creation is slow so we'll only have to do that once
+    // and can iterate quickly on consuming stacks. Not doing that for now.
+    const vpc = new ec2.VpcNetwork(this, 'MyVpc', { maxAZs: 2 });
+    const cluster = new ecs.Ec2Cluster(this, 'Ec2Cluster', {
+      vpc,
+      size: 3,
+      instanceType: new InstanceType("t2.xlarge")
+    });
+
+    // Instantiate ECS Service with just cluster and image
+    const ecsService = new ecs.LoadBalancedEc2Service(this, "Ec2Service", {
+      cluster,
+      memoryLimitMiB: 512,
+      image: ecs.DockerHub.image("amazon/amazon-ecs-sample"),
+    });
+
+    // Output the DNS where you can access your service
+    new cdk.Output(this, 'LoadBalancerDNS', { value: ecsService.loadBalancer.dnsName });
+  }
+}
+
+const app = new cdk.App();
+
+new BonjourECS(app, 'Bonjour');
+
+app.run();

examples/cdk-examples-typescript/hello-cdk-fargate/index.ts

@@ -0,0 +1,29 @@
+import ec2 = require('@aws-cdk/aws-ec2');
+import ecs = require('@aws-cdk/aws-ecs');
+import cdk = require('@aws-cdk/cdk');
+
+class BonjourFargate extends cdk.Stack {
+  constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
+    super(parent, name, props);
+
+    // Create VPC and Fargate Cluster
+    // NOTE: Limit AZs to avoid reaching resource quotas
+    const vpc = new ec2.VpcNetwork(this, 'MyVpc', { maxAZs: 2 });
+    const cluster = new ecs.FargateCluster(this, 'Cluster', { vpc });
+
+    // Instantiate Fargate Service with just cluster and image
+    const fargateService = new ecs.LoadBalancedFargateService(this, "FargateService", {
+      cluster,
+      image: ecs.DockerHub.image("amazon/amazon-ecs-sample"),
+    });
+
+    // Output the DNS where you can access your service
+    new cdk.Output(this, 'LoadBalancerDNS', { value: fargateService.loadBalancer.dnsName });
+  }
+}
+
+const app = new cdk.App();
+
+new BonjourFargate(app, 'Bonjour');
+
+app.run();

examples/cdk-examples-typescript/package.json

@@ -28,7 +28,9 @@
     "@aws-cdk/aws-cognito": "^0.14.1",
     "@aws-cdk/aws-dynamodb": "^0.14.1",
     "@aws-cdk/aws-ec2": "^0.14.1",
+    "@aws-cdk/aws-ecs": "^0.14.1",
     "@aws-cdk/aws-elasticloadbalancing": "^0.14.1",
+    "@aws-cdk/aws-elasticloadbalancingv2": "^0.14.1",
     "@aws-cdk/aws-iam": "^0.14.1",
     "@aws-cdk/aws-lambda": "^0.14.1",
     "@aws-cdk/aws-neptune": "^0.14.1",

packages/@aws-cdk/assets/lib/asset.ts

@@ -124,7 +124,7 @@ export class Asset extends cdk.Construct {
     // for tooling to be able to package and upload a directory to the
     // s3 bucket and plug in the bucket name and key in the correct
     // parameters.
-    const asset: cxapi.AssetMetadataEntry = {
+    const asset: cxapi.FileAssetMetadataEntry = {
       path: this.assetPath,
       id: this.uniqueId,
       packaging: props.packaging,

packages/@aws-cdk/aws-applicationautoscaling/lib/base-scalable-attribute.ts

@@ -62,21 +62,21 @@ export abstract class BaseScalableAttribute extends cdk.Construct {
   /**
    * Scale out or in based on time
    */
-  protected scaleOnSchedule(id: string, props: ScalingSchedule) {
+  protected doScaleOnSchedule(id: string, props: ScalingSchedule) {
     this.target.scaleOnSchedule(id, props);
   }
 
   /**
    * Scale out or in based on a metric value
    */
-  protected scaleOnMetric(id: string, props: BasicStepScalingPolicyProps) {
+  protected doScaleOnMetric(id: string, props: BasicStepScalingPolicyProps) {
     this.target.scaleOnMetric(id, props);
   }
 
   /**
    * Scale out or in in order to keep a metric around a target value
    */
-  protected scaleToTrackMetric(id: string, props: BasicTargetTrackingScalingPolicyProps) {
+  protected doScaleToTrackMetric(id: string, props: BasicTargetTrackingScalingPolicyProps) {
     this.target.scaleToTrackMetric(id, props);
   }
 }

packages/@aws-cdk/aws-dynamodb/lib/scalable-table-attribute.ts

@@ -9,7 +9,7 @@ export class ScalableTableAttribute extends appscaling.BaseScalableAttribute {
    * Scale out or in based on time
    */
   public scaleOnSchedule(id: string, action: appscaling.ScalingSchedule) {
-    super.scaleOnSchedule(id, action);
+    super.doScaleOnSchedule(id, action);
   }
 
   /**
@@ -24,7 +24,7 @@ export class ScalableTableAttribute extends appscaling.BaseScalableAttribute {
         ? appscaling.PredefinedMetric.DynamoDBWriteCapacityUtilization
         : appscaling.PredefinedMetric.DynamoDBReadCapacityUtilization;
 
-    super.scaleToTrackMetric('Tracking', {
+    super.doScaleToTrackMetric('Tracking', {
       policyName: props.policyName,
       disableScaleIn: props.disableScaleIn,
       scaleInCooldownSec: props.scaleInCooldownSec,

packages/@aws-cdk/aws-ecr/lib/repository-ref.ts

@@ -1,3 +1,4 @@
+import ecs = require('@aws-cdk/aws-ecs');
 import iam = require('@aws-cdk/aws-iam');
 import cdk = require('@aws-cdk/cdk');
 
@@ -44,6 +45,32 @@ export abstract class RepositoryRef extends cdk.Construct {
     const parts = cdk.ArnUtils.parse(this.repositoryArn);
     return `${parts.account}.dkr.ecr.${parts.region}.amazonaws.com/${parts.resourceName}`;
   }
+
+  /**
+   * Refer to a particular image tag from this repository
+   */
+  public getImage(tag: string = "latest"): ecs.IContainerImage {
+    return new EcrImage(this, tag);
+  }
+
+  /**
+   * Grant the given principal identity permissions to perform the actions on this repository
+   */
+  public grant(identity?: iam.IPrincipal, ...actions: string[]) {
+    if (!identity) {
+      return;
+    }
+    identity.addToPolicy(new iam.PolicyStatement()
+      .addResource(this.repositoryArn)
+      .addActions(...actions));
+  }
+
+  /**
+   * Grant the given identity permissions to use the images in this repository
+   */
+  public grantUseImage(identity?: iam.IPrincipal) {
+    this.grant(identity, "ecr:BatchCheckLayerAvailability", "ecr:GetDownloadUrlForLayer", "ecr:BatchGetImage");
+  }
 }
 
 export interface RepositoryRefProps {
@@ -67,3 +94,24 @@ class ImportedRepository extends RepositoryRef {
     // FIXME: Add annotation about policy we dropped on the floor
   }
 }
+
+class EcrImage implements ecs.IContainerImage {
+  public readonly imageName: string;
+  private readonly repositoryArn: string;
+
+  constructor(repository: RepositoryRef, tag: string) {
+    this.imageName = `${repository.repositoryUri}:${tag}`;
+    this.repositoryArn = repository.repositoryArn;
+  }
+
+  public bind(containerDefinition: ecs.ContainerDefinition): void {
+    // This image will be in ECR, so we need appropriate permissions.
+    containerDefinition.addToExecutionPolicy(new iam.PolicyStatement()
+      .addActions("ecr:BatchCheckLayerAvailability", "ecr:GetDownloadUrlForLayer", "ecr:BatchGetImage")
+      .addResource(this.repositoryArn));
+
+    containerDefinition.addToExecutionPolicy(new iam.PolicyStatement()
+      .addActions("ecr:GetAuthorizationToken", "logs:CreateLogStream", "logs:PutLogEvents")
+      .addAllResources());
+  }
+}

packages/@aws-cdk/aws-ecr/package.json

@@ -60,6 +60,7 @@
   },
   "dependencies": {
     "@aws-cdk/aws-iam": "^0.14.1",
+    "@aws-cdk/aws-ecs": "^0.14.1",
     "@aws-cdk/cdk": "^0.14.1"
   },
   "homepage": "https://github.com/awslabs/aws-cdk"

packages/@aws-cdk/aws-ecs/.gitignore

@@ -13,4 +13,5 @@ dist
 coverage
 .nycrc
 .LAST_PACKAGE
-*.snk
+!lib/adopt-repository/*
+*.snk

packages/@aws-cdk/aws-ecs/.npmignore

@@ -12,5 +12,5 @@ dist
 
 # Include .jsii
 !.jsii
-
-*.snk
+!lib/adopt-repository/*
+*.snk