Merge

.github/workflows/auto-approve-v2-merge-forward.yml

@@ -0,0 +1,26 @@
+# Automatically approve PRs that merge master forward to v2-main
+#
+# Only does approvals! mergify takes care of the actual merge.
+name: Auto-approve forward merges onto v2-main
+on:
+ pull_request:
+ types:
+ - labeled
+ - opened
+ - ready_for_review
+ - reopened
+ - synchronize
+ - unlabeled
+ - unlocked
+
+jobs:
+ approve:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: hmarr/auto-approve-action@v2.0.0
+ if: >
+ github.event.pull_request.user.login == 'aws-cdk-automation'
+ && github.event.pull_request.base.ref == 'v2-main'
+ && contains(github.event.pull_request.labels.*.name, 'pr/forward-merge')
+ with:
+ github-token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -40,5 +40,8 @@ yarn-error.log
 # Parcel default cache directory
 .parcel-cache
 
+# VSCode history plugin
+.vscode/.history/
+
 # Cloud9
 .c9

.gitpod.yml

@@ -1,4 +1,10 @@
+github:
+ prebuilds:
+ pullRequestsFromForks: true
+ addComment: true
+
 image: jsii/superchain
+
 tasks:
  - init: yarn build --skip-test --no-bail --skip-prereqs --skip-compat
 

.mergify.yml

@@ -19,6 +19,7 @@ pull_request_rules:
  commit_message: title+body
  conditions:
  - base!=release
+ - -base~=^v2
  - -title~=(WIP|wip)
  - -label~=(blocked|do-not-merge|no-squash|two-approvers)
  - -merged
@@ -41,6 +42,7 @@ pull_request_rules:
  commit_message: title+body
  conditions:
  - base!=release
+ - -base~=^v2
  - -title~=(WIP|wip)
  - label~=two-approvers
  - -label~=(blocked|do-not-merge|no-squash)
@@ -64,6 +66,7 @@ pull_request_rules:
  strict_method: merge
  commit_message: title+body
  conditions:
+ - -base~=^v2
  - -title~=(WIP|wip)
  - -label~=(blocked|do-not-merge)
  # Only if no-squash is set
@@ -119,3 +122,21 @@ pull_request_rules:
  - "#changes-requested-reviews-by=0"
  - status-success~=AWS CodeBuild us-east-1
  - status-success=validate-pr
+ - name: automatic merge of v2 forward merges
+ actions:
+ comment:
+ message: Forward merge successful!
+ merge:
+ method: merge
+ strict: smart+fasttrack
+ strict_method: merge
+ commit_message: title+body
+ conditions:
+ - base=v2-main
+ - label~=forward-merge
+ - -label~=(blocked|do-not-merge)
+ - -merged
+ - -closed
+ - author~=aws-cdk-automation
+ - "#approved-reviews-by>=1"
+ - status-success~=AWS CodeBuild us-east-1

CONTRIBUTING.md

@@ -77,13 +77,12 @@ you need to have the following SDKs and tools locally:
 - [Node.js >= 10.13.0](https://nodejs.org/download/release/latest-v10.x/)
  - We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
  - ⚠️ versions `13.0.0` to `13.6.0` are not supported due to compatibility issues with our dependencies.
-- [Yarn >= 1.19.1, < 1.3](https://yarnpkg.com/lang/en/docs/install)
+- [Yarn >= 1.19.1, < 2](https://yarnpkg.com/lang/en/docs/install)
 - [Java >= OpenJDK 8, 11, 14](https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html)
 - [Apache Maven >= 3.6.0, < 4.0](http://maven.apache.org/install.html)
 - [.NET Core SDK 3.1.x](https://www.microsoft.com/net/download)
 - [Python >= 3.6.5, < 4.0](https://www.python.org/downloads/release/python-365/)
-- [Ruby >= 2.5.1, < 3.0](https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-5-1-released/)
-- [Docker 19.03](https://docs.docker.com/get-docker/)
+- [Docker >= 19.03](https://docs.docker.com/get-docker/)
 
 The basic commands to get the repository cloned and built locally follow:
 

build.sh

@@ -37,6 +37,11 @@ done
 export PATH=$(npm bin):$PATH
 export NODE_OPTIONS="--max-old-space-size=4096 ${NODE_OPTIONS:-}"
 
+if ! [ -x "$(command -v yarn)" ]; then
+ echo "yarn is not installed. Install it from here- https://yarnpkg.com/en/docs/install."
+ exit 1
+fi
+
 echo "============================================================================================="
 echo "installing..."
 yarn install --frozen-lockfile --network-timeout 1000000
@@ -65,11 +70,6 @@ rm -rf $BUILD_INDICATOR
 export MERKLE_BUILD_CACHE=$(mktemp -d)
 trap "rm -rf $MERKLE_BUILD_CACHE" EXIT
 
-if ! [ -x "$(command -v yarn)" ]; then
- echo "yarn is not installed. Install it from here- https://yarnpkg.com/en/docs/install."
- exit 1
-fi
-
 echo "============================================================================================="
 echo "building..."
 time lerna run $bail --stream $runtarget || fail

buildspec.yaml

@@ -18,6 +18,7 @@ phases:
  - /bin/bash ./fetch-dotnet-snk.sh
  build:
  commands:
+ - 'if ${BUMP_CANDIDATE:-false}; then /bin/bash ./scripts/bump-candidate.sh; fi'
  - /bin/bash ./scripts/align-version.sh
  - /bin/bash ./build.sh
  post_build:

lerna.json

@@ -11,5 +11,5 @@
  "tools/*"
  ],
  "rejectCycles": "true",
- "version": "1.66.0"
+ "version": "1.69.0"
 }

package.json

@@ -82,18 +82,18 @@
  "aws-cdk-lib/semver/**",
  "aws-cdk-lib/yaml",
  "aws-cdk-lib/yaml/**",
- "monocdk-experiment/case",
- "monocdk-experiment/case/**",
- "monocdk-experiment/fs-extra",
- "monocdk-experiment/fs-extra/**",
- "monocdk-experiment/jsonschema",
- "monocdk-experiment/jsonschema/**",
- "monocdk-experiment/minimatch",
- "monocdk-experiment/minimatch/**",
- "monocdk-experiment/semver",
- "monocdk-experiment/semver/**",
- "monocdk-experiment/yaml",
- "monocdk-experiment/yaml/**"
+ "monocdk/case",
+ "monocdk/case/**",
+ "monocdk/fs-extra",
+ "monocdk/fs-extra/**",
+ "monocdk/jsonschema",
+ "monocdk/jsonschema/**",
+ "monocdk/minimatch",
+ "monocdk/minimatch/**",
+ "monocdk/semver",
+ "monocdk/semver/**",
+ "monocdk/yaml",
+ "monocdk/yaml/**"
  ]
  }
 }

packages/@aws-cdk-containers/ecs-service-extensions/.gitignore

@@ -6,6 +6,9 @@ dist
 lib/generated/resources.ts
 .jsii
 
+.coverage
+__pycache__
+
 .LAST_BUILD
 .nyc_output
 coverage
@@ -14,4 +17,4 @@ nyc.config.js
 *.snk
 !.eslintrc.js
 
-junit.xml
+junit.xml

packages/@aws-cdk-containers/ecs-service-extensions/.npmignore

@@ -22,3 +22,5 @@ tsconfig.json
 
 **/cdk.out
 junit.xml
+
+test/

packages/@aws-cdk-containers/ecs-service-extensions/README.md

@@ -114,6 +114,7 @@ nameDescription.add(new FireLensExtension());
 nameDescription.add(new XRayExtension());
 nameDescription.add(new CloudwatchAgentExtension());
 nameDescription.add(new HttpLoadBalancerExtension());
+nameDescription.add(new AssignPublicIpExtension());
 ```
 
 ## Launching the `ServiceDescription` as a `Service`

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/assign-public-ip/assign-public-ip.ts

@@ -0,0 +1,85 @@
+import * as ec2 from '@aws-cdk/aws-ec2';
+import * as ecs from '@aws-cdk/aws-ecs';
+import * as route53 from '@aws-cdk/aws-route53';
+import * as cdk from '@aws-cdk/core';
+import { Service } from '../../service';
+import { Container } from '../container';
+import { ServiceExtension, ServiceBuild, EnvironmentCapacityType } from '../extension-interfaces';
+import { TaskRecordManager } from './task-record-manager';
+
+export interface AssignPublicIpExtensionOptions {
+ /**
+ * Enable publishing task public IPs to a recordset in a Route 53 hosted zone.
+ *
+ * Note: If you want to change the DNS zone or record name, you will need to
+ * remove this extension completely and then re-add it.
+ */
+ dns?: AssignPublicIpDnsOptions;
+}
+
+export interface AssignPublicIpDnsOptions {
+ /**
+ * A DNS Zone to expose task IPs in.
+ */
+ zone: route53.IHostedZone;
+
+ /**
+ * Name of the record to add to the zone and in which to add the task IP
+ * addresses to.
+ *
+ * @example 'myservice'
+ */
+ recordName: string;
+}
+
+/**
+ * Modifies the service to assign a public ip to each task and optionally
+ * exposes public IPs in a Route 53 record set.
+ *
+ * Note: If you want to change the DNS zone or record name, you will need to
+ * remove this extension completely and then re-add it.
+ */
+export class AssignPublicIpExtension extends ServiceExtension {
+ dns?: AssignPublicIpDnsOptions;
+
+ constructor(options?: AssignPublicIpExtensionOptions) {
+ super('public-ip');
+
+ this.dns = options?.dns;
+ }
+
+ private hasDns() {
+ return Boolean(this.dns);
+ }
+
+ public prehook(service: Service, _scope: cdk.Construct) {
+ super.prehook(service, _scope);
+
+ if (service.capacityType != EnvironmentCapacityType.FARGATE) {
+ throw new Error('AssignPublicIp only supports Fargate tasks');
+ }
+ }
+
+ public modifyServiceProps(props: ServiceBuild) {
+ return {
+ ...props,
+ assignPublicIp: true,
+ } as ServiceBuild;
+ }
+
+ public useService(service: ecs.Ec2Service | ecs.FargateService) {
+ if (this.hasDns()) {
+ new TaskRecordManager(service, 'TaskRecordManager', {
+ service: service,
+ dnsZone: this.dns!.zone,
+ dnsRecordName: this.dns!.recordName,
+ });
+
+ const container = this.parentService.serviceDescription.get('service-container') as Container;
+ service.connections.allowFromAnyIpv4(
+ ec2.Port.tcp(container.trafficPort),
+ 'Accept inbound traffic on traffic port from anywhere',
+ );
+ }
+ }
+}

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/assign-public-ip/index.ts

@@ -0,0 +1 @@
+export * from './assign-public-ip';

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/assign-public-ip/lambda/.style.yapf

@@ -0,0 +1,6 @@
+# Format using: yapf -ri .
+# Since you're here, unit test using: python -m unittest discover
+[style]
+based_on_style = pep8
+column_limit = 120
+SPLIT_BEFORE_NAMED_ASSIGNS = False

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/assign-public-ip/lambda/Pipfile

@@ -0,0 +1,14 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+yapf = "*"
+boto3 = "*"
+coverage = "*"
+
+[requires]
+python_version = "3.8"