Merge branch 'main' into corymhall/docs/integration-testing

aws · Jun 13, 2022 · 985ad66 · 985ad66
2 parents 3f90eb4 + f98029e
commit 985ad66
Show file tree

Hide file tree

Showing 1,219 changed files with 15,248 additions and 13,214 deletions.
diff --git a/.github/workflows/yarn-upgrade-v1main.yml b/.github/workflows/yarn-upgrade-v1main.yml
@@ -22,7 +22,7 @@ jobs:
  - name: Set up Node
  uses: actions/setup-node@v3
  with:
- node-version: 12
+ node-version: 14
 
  - name: Locate Yarn cache
  id: yarn-cache

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
@@ -20,7 +20,7 @@ jobs:
  - name: Set up Node
  uses: actions/setup-node@v3
  with:
- node-version: 12
+ node-version: 14
 
  - name: Locate Yarn cache
  id: yarn-cache
@@ -60,14 +60,14 @@ jobs:
  # Upgrade dependencies at repository root
  ncu --upgrade --filter=@types/node,@types/fs-extra --target=minor
  ncu --upgrade --filter=typescript --target=patch
- ncu --upgrade --reject=@types/node,@types/fs-extra,constructs,typescript,lerna --target=minor
+ ncu --upgrade --reject=@types/node,@types/prettier,@types/fs-extra,constructs,typescript,lerna --target=minor
  # Upgrade all the packages
  lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
  lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
- lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor
+ lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor
  # Upgrade package.jsons in init templates
  for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
- (cd $(dirname $pj) && ncu --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}')
+ (cd $(dirname $pj) && ncu --upgrade --reject='@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}')
  done
 
  # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -57,7 +57,7 @@ The following tools need to be installed on your system prior to installing the
 - [Node.js >= 14.15.0](https://nodejs.org/download/release/latest-v14.x/)
  - We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
 - [Yarn >= 1.19.1, < 2](https://yarnpkg.com/lang/en/docs/install)
-- [.NET Core SDK 3.1.x](https://www.microsoft.com/net/download)
+- [.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/)
 - [Docker >= 19.03](https://docs.docker.com/get-docker/)
  - the Docker daemon must also be running

diff --git a/INTEGRATION_TESTS.md b/INTEGRATION_TESTS.md
@@ -94,7 +94,7 @@ const stack = new cdk.Stack(app, 'aws-cdk-lambda-1');
 const fn = new lambda.Function(stack, 'MyLambda', {
  code: new lambda.InlineCode('foo'),
  handler: 'index.handler',
- runtime: lambda.Runtime.NODEJS_10_X,
+ runtime: lambda.Runtime.NODEJS_14_X,
 });
 
 new integ.IntegTest(app, 'LambdaTest', {

diff --git a/package.json b/package.json
@@ -18,25 +18,25 @@
  "devDependencies": {
  "@types/prettier": "2.6.0",
  "@yarnpkg/lockfile": "^1.1.0",
- "cdk-generate-synthetic-examples": "^0.1.10",
+ "cdk-generate-synthetic-examples": "^0.1.12",
  "conventional-changelog-cli": "^2.2.2",
  "fs-extra": "^9.1.0",
  "graceful-fs": "^4.2.10",
  "jest-junit": "^13.2.0",
- "jsii-diff": "^1.58.0",
- "jsii-pacmak": "^1.58.0",
- "jsii-reflect": "^1.58.0",
- "jsii-rosetta": "^1.58.0",
+ "jsii-diff": "^1.60.1",
+ "jsii-pacmak": "^1.60.1",
+ "jsii-reflect": "^1.60.1",
+ "jsii-rosetta": "^1.60.1",
  "lerna": "^4.0.0",
  "patch-package": "^6.4.7",
  "semver": "^6.3.0",
- "standard-version": "^9.3.2",
+ "standard-version": "^9.5.0",
  "typescript": "~3.9.10"
  },
  "resolutions": {
  "colors": "1.4.0",
- "string-width": "^4.2.3",
- "markdown-it": "^12.3.2"
+ "markdown-it": "^12.3.2",
+ "string-width": "^4.2.3"
  },
  "repository": {
  "type": "git",

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/extension-interfaces.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/extension-interfaces.ts
@@ -1,7 +1,7 @@
 import * as ecs from '@aws-cdk/aws-ecs';
 import * as cdk from '@aws-cdk/core';
-import { Service, ConnectToProps } from '../service';
 import { Construct } from 'constructs';
+import { Service, ConnectToProps } from '../service';
 
 /**
  * The types of capacity that are supported. These capacity types may change the

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/injecter.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/injecter.ts
@@ -1,13 +1,10 @@
 import * as ecs from '@aws-cdk/aws-ecs';
 import * as sns from '@aws-cdk/aws-sns';
+import { Construct } from 'constructs';
 import { Service } from '../service';
 import { Container } from './container';
 import { ContainerMutatingHook, ServiceExtension } from './extension-interfaces';
 
-// Keep this import separate from other imports to reduce chance for merge conflicts with v2-main
-// eslint-disable-next-line no-duplicate-imports, import/order
-import { Construct } from 'constructs';
-
 /**
  * An interface that will be implemented by all the resources that can be published events or written data to.
  */

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/service.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/service.ts
@@ -1,14 +1,11 @@
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as ecs from '@aws-cdk/aws-ecs';
 import * as iam from '@aws-cdk/aws-iam';
+import { Construct } from 'constructs';
 import { IEnvironment } from './environment';
 import { EnvironmentCapacityType, ServiceBuild } from './extensions/extension-interfaces';
 import { ServiceDescription } from './service-description';
 
-// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
-// eslint-disable-next-line no-duplicate-imports, import/order
-import { Construct } from 'constructs';
-
 /**
  * connectToProps will have all the extra parameters which are required for connecting services.
  */

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/package.json b/packages/@aws-cdk-containers/ecs-service-extensions/package.json
@@ -38,7 +38,7 @@
  },
  "license": "Apache-2.0",
  "devDependencies": {
- "@types/jest": "^27.5.0",
+ "@types/jest": "^27.5.2",
  "@aws-cdk/cdk-build-tools": "0.0.0",
  "@aws-cdk/integ-runner": "0.0.0",
  "@aws-cdk/aws-autoscaling": "0.0.0",

diff --git a/...ers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/aws-ecs-integ.assets.json b/...ers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/aws-ecs-integ.assets.json
@@ -1,5 +1,5 @@
 {
- "version": "17.0.0",
+ "version": "20.0.0",
  "files": {
  "8f06a3db22794ebc7ff89b4745fd706afd46e17816fe46da72e5125cabae725d": {
  "source": {
@@ -40,15 +40,15 @@
  }
  }
  },
- "80aa78a4817ba118f8e03b489e7276a0100cd9dae8b7dd32db16e53b45d438b4": {
+ "0b2a2f517aed512c15790ab888051365faa60d6c56c60f963b9f68bd63700087": {
  "source": {
  "path": "aws-ecs-integ.template.json",
  "packaging": "file"
  },
  "destinations": {
  "current_account-current_region": {
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "80aa78a4817ba118f8e03b489e7276a0100cd9dae8b7dd32db16e53b45d438b4.json",
+ "objectKey": "0b2a2f517aed512c15790ab888051365faa60d6c56c60f963b9f68bd63700087.json",
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
  }
  }

diff --git a/...s/ecs-service-extensions/test/assign-public-ip.integ.snapshot/aws-ecs-integ.template.json b/...s/ecs-service-extensions/test/assign-public-ip.integ.snapshot/aws-ecs-integ.template.json
@@ -1090,7 +1090,7 @@
  }
  },
  "Handler": "framework.onEvent",
- "Runtime": "nodejs12.x",
+ "Runtime": "nodejs14.x",
  "Timeout": 900
  },
  "DependsOn": [
@@ -1279,7 +1279,7 @@
  ]
  },
  "Handler": "index.handler",
- "Runtime": "nodejs12.x",
+ "Runtime": "nodejs14.x",
  "Timeout": 120
  },
  "DependsOn": [

diff --git a/...s/@aws-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/cdk.out b/...s/@aws-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"17.0.0"}
+{"version":"20.0.0"}
diff --git a/...aws-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/integ.json b/...aws-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/integ.json
@@ -0,0 +1,14 @@
+{
+ "version": "20.0.0",
+ "testCases": {
+ "integ.assign-public-ip": {
+ "stacks": [
+ "aws-ecs-integ"
+ ],
+ "diffAssets": false,
+ "stackUpdateWorkflow": true
+ }
+ },
+ "synthContext": {},
+ "enableLookups": false
+}
diff --git a/...-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/manifest.json b/...-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
- "version": "17.0.0",
+ "version": "20.0.0",
  "artifacts": {
  "Tree": {
  "type": "cdk:tree",
@@ -146,10 +146,7 @@
  "/aws-ecs-integ/name-task-definition/Resource": [
  {
  "type": "aws:cdk:logicalId",
- "data": "nametaskdefinition690762BB",
- "trace": [
- "!!DESTRUCTIVE_CHANGES: WILL_REPLACE"
- ]
+ "data": "nametaskdefinition690762BB"
  }
  ],
  "/aws-ecs-integ/name-task-definition/ExecutionRole/Resource": [