New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: construct library for ECS #1058

Merged

rix0rrr merged 165 commits into aws:master from SoManyHs:ecs-demo

Nov 6, 2018

Contributor

SoManyHs commented Oct 31, 2018

Add an initial version of a construct library for AWS Elastic Container Service.

This construct library isn't fully feature-complete yet. This is the first iteration so
that people can use it for experimentation and put it to the test, and we can improve
on it later.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license.

SoManyHs and others added 30 commits

September 28, 2018 11:42


          Ignore swp files

939452c


          Add ECS lib and example

7302a2f


          Add service and task def constructs

4c7127a


          WIP adding VPC/ASG

98749ec


          Refactor ECS demo

6d0942f

- Fix linting errors
- VPC is now an argument and not created inside the cluster
- Link the AutoScalingGroup up to the cluster via userData
- Give the ASG instance role the required IAM permissions
- Extend ECS-optimized AMI table with all regions
- Add an example configuration option to deny containers
  access to EC2 instance metadata service.


          Add more props on Service

bddfe56


          Add TODO for AMI IDs


          Weird hack?

a63c377

Was getting error:
lib/index.ts(7,1): error TS2308: Module './cluster' has already exported
a member named 'ClusterName'. Consider explicitly re-exporting to
resolve the ambiguity.
lib/index.ts(7,1): error TS2308: Module './task-definition' has already
exported a member named 'TaskDefinitionArn'. Consider explicitly
re-exporting to resolve the ambiguity.

This seemed to make npm run build happy


          Update example to instantiate service separately

b00e0dd


          WIP Add Container Definitions

80ba2e4


          WIP Add other Task Def properties

0980f52


          Merge remote-tracking branch 'official/master' into ecs-demo


          Indentation 4 -> 2

2d53d89


          Fix type errors

dbdab86


          Use SSM parameter for ECS Optimized AMI

ee6b427


          Move containerdefinition to its own file

2b16dad


          Merge branch 'ecs-demo' of github.com:SoManyHs/aws-cdk into ecs-demo

16a92c0


          Turning ContainerDefinition into a construct

ae881c2


          Add enum for placement constraints

0672e6a


          Rename fleet to autoScalingGroup

4f93a5b


          Qualify "PlacementConstraintType" usage with package name

9b61b89


          ECR can return itself as container image

98bf81b


          Automatically generate execution and task roles

ae1d525


          Make taskRole public

23072a9


          Remove shellCommand from healthCheck

e5cc7f2


          Rename toContainerDefinitionJson to renderContainerDefinition

047eed8


          Some work on Service

65d3f79


          Merge branch 'ecs-demo' of github.com:SoManyHs/aws-cdk into ecs-demo

11541d3


          Separate Fargate and ECS clusters

fb17532


          Separate ECS and Fargate Service

be8cb86


          Fix handler, update expectation

4ed101b

Contributor

rix0rrr commented Nov 2, 2018

CodeBuild failures are caused by this:

ScalableTaskCount.cs(39,30): error CS0507: 'ScalableTaskCount.ScaleOnMetric(string, IBasicStepScalingPolicyProps)': cannot change access modifiers when overriding 'protected' inherited member 'BaseScalableAttribute.ScaleOnMetric(string, IBasicStepScalingPolicyProps)' [/tmp/jsii-pacmak-codetyA9XM/Amazon.CDK.AWS.ECS/Amazon.CDK.AWS.ECS.csproj] 
ScalableTaskCount.cs(46,30): error CS0507: 'ScalableTaskCount.ScaleOnSchedule(string, IScalingSchedule)': cannot change access modifiers when overriding 'protected' inherited member 'BaseScalableAttribute.ScaleOnSchedule(string, IScalingSchedule)' [/tmp/jsii-pacmak-codetyA9XM/Amazon.CDK.AWS.ECS/Amazon.CDK.AWS.ECS.csproj]

Rico Huijbers and others added 11 commits

November 2, 2018 16:18


          Minor tweaks that Clare wanted to see

54e4665


          Rename autoscaling methods so C# doesn't complain

e2d338f


          Set ECS_AWSVPC_BLOCK_IMDS=true config option

b0f54a8


          Update test expectation

8f0f6b1


          Add helper scripts to compile sources faster

15b8804


          Extract capacity from EC2 cluster

07f1f57

Make Connections be able to manage multiple security groups.
Give broad permissions again, otherwise it doesn't work


          Fix rename of members on ScalableTaskCount

d883432


          Make a generic TaskDefinition for both launch types

edd4d5f


          Fix import

ed0956a


          One EcsCluster to Rule Them All

33a35b9


          Update README

SoManyHs force-pushed the ecs-demo branch from 93e5937 to 2431901 Compare

November 6, 2018 06:38

SoManyHs added 2 commits

November 5, 2018 23:03


          Update integ test expectations

7c0a148


          Add moar unit tests

32db35d

eladb reviewed

View reviewed changes

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

packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts Outdated

+                /**
+                 * Task Definition used for running tasks in the service
+                 */
+                taskDefinition: Ec2TaskDefinition;

Contributor

eladb Nov 5, 2018

Shouldn't that be just TaskDefinition?

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

+              Creating an ECS cluster and adding capacity to it looks like this:
+              ```ts
+              const cluster = new ecs.EcsCluster(this, 'Cluster', {

Contributor

eladb Nov 6, 2018

Probably no need to repeat this

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

+              });
+              // Either add default capacity
+              cluster.addDefaultAutoScalingGroupCapacity({

Contributor

eladb Nov 6, 2018

Maybe instead of "default" we should call this "standard" or even "EcsOptimized"

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

+              to the task definition, and it will be marked *essential*) and optionally
+              some supporting containers which are used to support the main container,
+              doings things like upload logs or metrics to monitoring services.

Contributor

eladb Nov 6, 2018

Didn't we merge Ec2TaskDefinition with FargateTaskDefinition?

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

+                DockerHub.
+              * `repository.getImage(tag)`: use the given ECR repository as the image
+                to start.

Contributor

eladb Nov 6, 2018

I would remove repository.getImage(tag) to avoid the dependency between ECR => ECS (that's the wrong direction)

Rico Huijbers added 2 commits

November 6, 2018 10:57


          Rename EcsCluster => Cluster, add slightly more handler tests

233a376


          Make a single static accessor for all types of Container images

b616248

eladb approved these changes

View reviewed changes

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

		to start.
		* `ecs.ContainerImage.fromAsset({ directory: './image' })`: build and upload an

Contributor

eladb Nov 6, 2018

I'd make directory the first positional argument and options as an optional, so usage will be:

ecs.ContainerImage.fromAsset('./image');
ecs.ContainerImage.fromAsset('./image', { options... });

packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts

+                /**
+                 * Create the execution role if it doesn't exist
+                 */
+                public obtainExecutionRole(): iam.IRole {

Contributor

eladb Nov 6, 2018

Does this need to be public?

Contributor

rix0rrr Nov 6, 2018

It needs to be accessible from SomeImage.bind(). So yes.

packages/@aws-cdk/aws-ecs/lib/base/task-definition.ts Outdated

+              /**
+               * An extension for Task Definitions
+               *
+               * Classes can want to make changes to a TaskDefinition (such as

Contributor

eladb Nov 6, 2018

"can want"?

packages/@aws-cdk/aws-ecs/lib/images/dockerhub.ts

+              /**
+               * Factory for DockerHub images
+               */
+              export class DockerHub {

Contributor

eladb Nov 6, 2018

not needed I think

Rico Huijbers added 5 commits

November 6, 2018 12:53


          Small fixes

ea6eeae


          Re-add missing handler

98990b4


          Merge remote-tracking branch 'origin/master' into ecs-demo

ffa7360


          Oops wrong name

908db1f


          Merge remote-tracking branch 'origin/master' into ecs-demo

64c37fc

rix0rrr merged commit ae03ddb into aws:master

rix0rrr pushed a commit that referenced this pull request


          v0.15.0

1a864d1

Bug Fixes
=========

* **aws-autoscaling:** allow minSize to be set to 0 ([#1015](#1015)) ([67f7fa1](67f7fa1))
* **aws-codebuild:** correctly pass the timeout property to CFN when creating a Project. ([#1071](#1071)) ([b1322bb](b1322bb))
* **aws-codebuild:** correctly set S3 path when using it as artifact. ([#1072](#1072)) ([f32cba9](f32cba9))
* **aws-kms:** add output value when exporting an encryption key ([#1036](#1036)) ([cb490be](cb490be))
* Switch from `js-yaml` to `yaml` ([#1092](#1092)) ([0b132b5](0b132b5))

Features
=========

* **applets:** integrate into toolkit ([#1039](#1039)) ([fdabe95](fdabe95)), closes [#849](#849) [#342](#342) [#291](#291)
* **aws-codecommit:** use CloudWatch Events instead of polling by default in the CodePipeline Action. ([#1026](#1026)) ([d09d30c](d09d30c))
* **aws-dynamodb:** allow specifying partition/sort keys in props ([#1054](#1054)) ([ec87331](ec87331)), closes [#1051](#1051)
* **aws-ec2:** AmazonLinuxImage supports AL2 ([#1081](#1081)) ([97b57a5](97b57a5)), closes [#1062](#1062)
* **aws-lambda:** high level API for event sources ([#1063](#1063)) ([1be3442](1be3442))
* **aws-sqs:** improvements to IAM grants API ([#1052](#1052)) ([6f2475e](6f2475e))
* don't upload the same asset multiple times ([#1011](#1011)) ([35937b6](35937b6)), closes [#989](#989)
* **codepipeline/cfn:** Use fewer statements for pipeline permissions ([#1009](#1009)) ([8f4c2ab](8f4c2ab))
* add a new construct library for ECS ([#1058](#1058)) ([ae03ddb](ae03ddb))
* **pkglint:** Make sure .snk files are ignored ([#1049](#1049)) ([53c8d76](53c8d76)), closes [#643](#643)
* **toolkit:** deployment ui improvements ([#1067](#1067)) ([c832eaf](c832eaf))

BREAKING CHANGES
=========

* The ec2.Connections object has been changed to be able to manage multiple
  security groups. The relevant property has been changed from `securityGroup`
  to `securityGroups` (an array of security group objects).
* **aws-codecommit:** This modifies the default behavior of the CodeCommit
  Action.  It also changes the internal API contract between the
  aws-codepipeline-api module and the CodePipeline Actions in the service
  packages.
* **applets:** The applet schema has changed to allow Multiple applets can be
  define in one file by structuring the files like this:
* **applets:** The applet schema has changed to allow definition of multiple
  applets in the same file.

The schema now looks like this:

    applets:
      MyApplet:
        type: ./my-applet-file
        properties:
          property1: value
          ...
By starting an applet specifier with npm://, applet modules can
directly be referenced in NPM. You can include a version specifier
(@1.2.3) to reference specific versions.
* **aws-sqs:** `queue.grantReceiveMessages` has been removed. It is unlikely
  that this would be sufficient to interact with a queue. Alternatively you can
  use `queue.grantConsumeMessages` or `queue.grant('sqs:ReceiveMessage')` if
  there's a need to only grant this action.

rix0rrr mentioned this pull request

Merged

rix0rrr pushed a commit that referenced this pull request


          v0.15.0

68e18a4

Bug Fixes
========

* **aws-autoscaling:** allow minSize to be set to 0 ([#1015](#1015)) ([67f7fa1](67f7fa1))
* **aws-codebuild:** correctly pass the timeout property to CFN when creating a Project. ([#1071](#1071)) ([b1322bb](b1322bb))
* **aws-codebuild:** correctly set S3 path when using it as artifact. ([#1072](#1072)) ([f32cba9](f32cba9))
* **aws-kms:** add output value when exporting an encryption key ([#1036](#1036)) ([cb490be](cb490be))
* Switch from `js-yaml` to `yaml` ([#1092](#1092)) ([0b132b5](0b132b5))

Features
========

* don't upload the same asset multiple times ([#1011](#1011)) ([35937b6](35937b6)), closes [#989](#989)
* **app-delivery:** CI/CD for CDK Stacks ([#1022](#1022)) ([f2fe4e9](f2fe4e9))
* add a new construct library for ECS ([#1058](#1058)) ([ae03ddb](ae03ddb))
* **applets:** integrate into toolkit ([#1039](#1039)) ([fdabe95](fdabe95)), closes [#849](#849) [#342](#342) [#291](#291)
* **aws-codecommit:** use CloudWatch Events instead of polling by default in the CodePipeline Action. ([#1026](#1026)) ([d09d30c](d09d30c))
* **aws-dynamodb:** allow specifying partition/sort keys in props ([#1054](#1054)) ([ec87331](ec87331)), closes [#1051](#1051)
* **aws-ec2:** AmazonLinuxImage supports AL2 ([#1081](#1081)) ([97b57a5](97b57a5)), closes [#1062](#1062)
* **aws-lambda:** high level API for event sources ([#1063](#1063)) ([1be3442](1be3442))
* **aws-sqs:** improvements to IAM grants API ([#1052](#1052)) ([6f2475e](6f2475e))
* **codepipeline/cfn:** Use fewer statements for pipeline permissions ([#1009](#1009)) ([8f4c2ab](8f4c2ab))
* **pkglint:** Make sure .snk files are ignored ([#1049](#1049)) ([53c8d76](53c8d76)), closes [#643](#643)
* **toolkit:** deployment ui improvements ([#1067](#1067)) ([c832eaf](c832eaf))
* Update to CloudFormation resource specification v2.11.0

BREAKING CHANGES
========

* The ec2.Connections object has been changed to be able to manage multiple
  security groups. The relevant property has been changed from `securityGroup`
  to `securityGroups` (an array of security group objects).
* **aws-codecommit:** this modifies the default behavior of the CodeCommit
  Action.  It also changes the internal API contract between the
  aws-codepipeline-api module and the CodePipeline Actions in the service
  packages.
* **applets:** The applet schema has changed to allow Multiple applets can be
  define in one file by structuring the files like this:
* **applets:** The applet schema has changed to allow definition of multiple
  applets in the same file.

The schema now looks like this:

    applets:
      MyApplet:
        type: ./my-applet-file
        properties:
          property1: value
          ...
By starting an applet specifier with npm://, applet modules can directly be
referenced in NPM. You can include a version specifier (@1.2.3) to reference
specific versions.
* **aws-sqs:** `queue.grantReceiveMessages` has been removed. It is unlikely
  that this would be sufficient to interact with a queue. Alternatively you can
  use `queue.grantConsumeMessages` or `queue.grant('sqs:ReceiveMessage')` if
  there's a need to only grant this action.

rix0rrr added a commit that referenced this pull request


          v0.15.0 (#1094)

fbb2067

Bug Fixes
========

* **aws-autoscaling:** allow minSize to be set to 0 ([#1015](#1015)) ([67f7fa1](67f7fa1))
* **aws-codebuild:** correctly pass the timeout property to CFN when creating a Project. ([#1071](#1071)) ([b1322bb](b1322bb))
* **aws-codebuild:** correctly set S3 path when using it as artifact. ([#1072](#1072)) ([f32cba9](f32cba9))
* **aws-kms:** add output value when exporting an encryption key ([#1036](#1036)) ([cb490be](cb490be))
* Switch from `js-yaml` to `yaml` ([#1092](#1092)) ([0b132b5](0b132b5))

Features
========

* don't upload the same asset multiple times ([#1011](#1011)) ([35937b6](35937b6)), closes [#989](#989)
* **app-delivery:** CI/CD for CDK Stacks ([#1022](#1022)) ([f2fe4e9](f2fe4e9))
* add a new construct library for ECS ([#1058](#1058)) ([ae03ddb](ae03ddb))
* **applets:** integrate into toolkit ([#1039](#1039)) ([fdabe95](fdabe95)), closes [#849](#849) [#342](#342) [#291](#291)
* **aws-codecommit:** use CloudWatch Events instead of polling by default in the CodePipeline Action. ([#1026](#1026)) ([d09d30c](d09d30c))
* **aws-dynamodb:** allow specifying partition/sort keys in props ([#1054](#1054)) ([ec87331](ec87331)), closes [#1051](#1051)
* **aws-ec2:** AmazonLinuxImage supports AL2 ([#1081](#1081)) ([97b57a5](97b57a5)), closes [#1062](#1062)
* **aws-lambda:** high level API for event sources ([#1063](#1063)) ([1be3442](1be3442))
* **aws-sqs:** improvements to IAM grants API ([#1052](#1052)) ([6f2475e](6f2475e))
* **codepipeline/cfn:** Use fewer statements for pipeline permissions ([#1009](#1009)) ([8f4c2ab](8f4c2ab))
* **pkglint:** Make sure .snk files are ignored ([#1049](#1049)) ([53c8d76](53c8d76)), closes [#643](#643)
* **toolkit:** deployment ui improvements ([#1067](#1067)) ([c832eaf](c832eaf))
* Update to CloudFormation resource specification v2.11.0

BREAKING CHANGES
========

* The ec2.Connections object has been changed to be able to manage multiple
  security groups. The relevant property has been changed from `securityGroup`
  to `securityGroups` (an array of security group objects).
* **aws-codecommit:** this modifies the default behavior of the CodeCommit
  Action.  It also changes the internal API contract between the
  aws-codepipeline-api module and the CodePipeline Actions in the service
  packages.
* **applets:** The applet schema has changed to allow Multiple applets can be
  define in one file by structuring the files like this:
* **applets:** The applet schema has changed to allow definition of multiple
  applets in the same file.

The schema now looks like this:

    applets:
      MyApplet:
        type: ./my-applet-file
        properties:
          property1: value
          ...
By starting an applet specifier with npm://, applet modules can directly be
referenced in NPM. You can include a version specifier (@1.2.3) to reference
specific versions.
* **aws-sqs:** `queue.grantReceiveMessages` has been removed. It is unlikely
  that this would be sufficient to interact with a queue. Alternatively you can
  use `queue.grantConsumeMessages` or `queue.grant('sqs:ReceiveMessage')` if
  there's a need to only grant this action.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet