Merge remote-tracking branch 'origin/v2-main' into v2/forward-merge-20210930

# Conflicts:
#	lerna.json
#	package.json
#	packages/@aws-cdk/app-delivery/package.json
#	packages/@aws-cdk/assert/package.json
#	packages/@aws-cdk/assertions/package.json
#	packages/@aws-cdk/aws-apprunner/package.json
#	packages/@aws-cdk/aws-appsync/package.json
#	packages/@aws-cdk/aws-batch/package.json
#	packages/@aws-cdk/aws-certificatemanager/package.json
#	packages/@aws-cdk/aws-cloud9/package.json
#	packages/@aws-cdk/aws-cloudformation/test/integ.nested-stacks-refs2.ts
#	packages/@aws-cdk/aws-cloudformation/test/integ.nested-stacks-refs3.ts
#	packages/@aws-cdk/aws-cloudformation/test/integ.trivial-lambda-resource.ts
#	packages/@aws-cdk/aws-cloudfront-origins/package.json
#	packages/@aws-cdk/aws-cloudfront/package.json
#	packages/@aws-cdk/aws-codeguruprofiler/package.json
#	packages/@aws-cdk/aws-codepipeline/test/artifacts.test.ts
#	packages/@aws-cdk/aws-ecr-assets/package.json
#	packages/@aws-cdk/aws-ecr-assets/test/image-asset.test.ts
#	packages/@aws-cdk/aws-ecs/package.json
#	packages/@aws-cdk/aws-ecs/test/container-definition.test.ts
#	packages/@aws-cdk/aws-ecs/test/ec2/ec2-task-definition.test.ts
#	packages/@aws-cdk/aws-efs/package.json
#	packages/@aws-cdk/aws-eks/package.json
#	packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
#	packages/@aws-cdk/aws-elasticsearch/package.json
#	packages/@aws-cdk/aws-events/test/rule.test.ts
#	packages/@aws-cdk/aws-globalaccelerator/package.json
#	packages/@aws-cdk/aws-kinesisanalytics-flink/package.json
#	packages/@aws-cdk/aws-kms/package.json
#	packages/@aws-cdk/aws-lambda-python/package.json
#	packages/@aws-cdk/aws-lambda/test/code.test.ts
#	packages/@aws-cdk/aws-msk/package.json
#	packages/@aws-cdk/aws-opensearchservice/package.json
#	packages/@aws-cdk/aws-s3-deployment/package.json
#	packages/@aws-cdk/aws-ssm/package.json
#	packages/@aws-cdk/aws-synthetics/package.json
#	packages/@aws-cdk/core/test/stack.test.ts
#	packages/@monocdk-experiment/assert/package.json
#	packages/aws-cdk-lib/package.json
#	packages/aws-cdk/package.json
#	packages/monocdk/package.json
#	tools/@aws-cdk/cfn2ts/transform-packages.ts
#	tools/@aws-cdk/individual-pkg-gen/transform-packages.ts
#	tools/@aws-cdk/pkglint/lib/rules.ts
#	tools/individual-pkg-gen/copy-files-removing-deps.ts
#	yarn.lock

Author: njlynch

CHANGELOG.v2.md

@@ -10,7 +10,7 @@
     "packages/@aws-cdk/*/lambda-packages/*",
     "tools/*",
     "tools/@aws-cdk/*",
-    "scripts/script-tests",
+    "scripts/@aws-cdk/script-tests",
     "packages/individual-packages/*"
   ],
   "rejectCycles": "true",

lerna.json

@@ -6,7 +6,8 @@
     "include": "dependencies/node-version"
   },
   "scripts": {
-    "pkglint": "lerna --scope @aws-cdk/pkglint run build && lerna run pkglint",
+    "pkglint": "lerna run build --scope @aws-cdk/pkglint --include-dependencies && lerna run pkglint",
+    "prebuild": "node ./scripts/check-yarn-lock.js",
     "build": "./build.sh",
     "pack": "./pack.sh",
     "compat": "./scripts/check-api-compatibility.sh",
@@ -51,7 +52,7 @@
       "release.json",
       "scripts/resolve-version.js",
       "scripts/resolve-version-lib.js",
-      "version.v1.json"
+      "version.v2.json"
     ],
     "cacheBucket": "nozem-artifacts-eu",
     "cacheBucketRegion": "eu-west-1"

package.json

@@ -1,12 +1,8 @@
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as ecs from '@aws-cdk/aws-ecs';
-import * as cdk from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { EnvironmentCapacityType } from './extensions/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 '@aws-cdk/core';
-
 /**
  * Settings for the environment where you want to deploy your services.
  */
@@ -98,7 +94,7 @@ export class Environment extends Construct implements IEnvironment {
    */
   public readonly capacityType: EnvironmentCapacityType;
 
-  private readonly scope: cdk.Construct;
+  private readonly scope: Construct;
 
   constructor(scope: Construct, id: string, props?: EnvironmentProps) {
     super(scope, id);

packages/@aws-cdk-containers/ecs-service-extensions/lib/environment.ts

@@ -5,14 +5,11 @@ import * as ecs from '@aws-cdk/aws-ecs';
 import * as iam from '@aws-cdk/aws-iam';
 import * as cdk from '@aws-cdk/core';
 import * as regionInfo from '@aws-cdk/region-info';
+import { Construct } from 'constructs';
 import { Service } from '../service';
 import { Container } from './container';
 import { ServiceExtension, ServiceBuild } 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 '@aws-cdk/core';
-
 // The version of the App Mesh envoy sidecar to add to the task.
 const APP_MESH_ENVOY_SIDECAR_VERSION = 'v1.15.1.0-prod';
 

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/appmesh.ts

@@ -1,15 +1,12 @@
 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 { Construct } from 'constructs';
 import { Service } from '../../service';
 import { Container } from '../container';
 import { ServiceExtension, ServiceBuild, EnvironmentCapacityType } from '../extension-interfaces';
 import { TaskRecordManager } from './task-record-manager';
 
-// 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 '@aws-cdk/core';
-
 export interface AssignPublicIpExtensionOptions {
   /**
    * Enable publishing task public IPs to a recordset in a Route 53 hosted zone.

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

@@ -10,10 +10,7 @@ import * as route53 from '@aws-cdk/aws-route53';
 import * as sqs from '@aws-cdk/aws-sqs';
 import * as cdk from '@aws-cdk/core';
 import * as customresources from '@aws-cdk/custom-resources';
-
-// 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 '@aws-cdk/core';
+import { Construct } from 'constructs';
 
 export interface TaskRecordManagerProps {
   service: ecs.Ec2Service | ecs.FargateService;

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

@@ -1,12 +1,9 @@
 import * as ecs from '@aws-cdk/aws-ecs';
 import * as iam from '@aws-cdk/aws-iam';
+import { Construct } from 'constructs';
 import { Service } from '../service';
 import { 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 '@aws-cdk/core';
-
 const CLOUDWATCH_AGENT_IMAGE = 'amazon/cloudwatch-agent:latest';
 
 /**

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/cloudwatch-agent.ts

@@ -1,11 +1,8 @@
 import * as ecs from '@aws-cdk/aws-ecs';
+import { Construct } from 'constructs';
 import { Service } from '../service';
 import { 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 '@aws-cdk/core';
-
 /**
  * Setting for the main application container of a service.
  */

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/container.ts

@@ -1,11 +1,8 @@
 import * as ecs from '@aws-cdk/aws-ecs';
 import * as cdk from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { Service } from '../service';
 
-// 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 '@aws-cdk/core';
-
 /**
  * The types of capacity that are supported. These capacity types may change the
  * behavior of an extension.
@@ -115,7 +112,7 @@ export abstract class ServiceExtension {
    * the extension is told what Service it is now working on.
    */
   protected parentService!: Service;
-  protected scope!: cdk.Construct;
+  protected scope!: Construct;
 
   // A list of other extensions which want to mutate the
   // container definition for this extension.

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/extension-interfaces.ts

@@ -1,14 +1,11 @@
 import * as ecs from '@aws-cdk/aws-ecs';
 import * as awslogs from '@aws-cdk/aws-logs';
 import * as cdk from '@aws-cdk/core';
+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 '@aws-cdk/core';
-
 /**
  * Settings for the hook which mutates the application container
  * to route logs through FireLens.

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/firelens.ts

@@ -1,13 +1,10 @@
 import * as ecs from '@aws-cdk/aws-ecs';
 import * as alb from '@aws-cdk/aws-elasticloadbalancingv2';
 import * as cdk from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { Service } from '../service';
 import { ServiceExtension, ServiceBuild } 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 '@aws-cdk/core';
-
 /**
  * This extension add a public facing load balancer for sending traffic
  * to one or more replicas of the application container.

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/http-load-balancer.ts

@@ -6,7 +6,7 @@ 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 '@aws-cdk/core';
+import { Construct } from 'constructs';
 
 /**
  * An interface that will be implemented by all the resources that can be published events or written data to.
@@ -151,4 +151,4 @@ export class InjecterExtension extends ServiceExtension {
       }
     }
   }
-}
+}

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/injecter.ts

@@ -3,14 +3,11 @@ import * as sns from '@aws-cdk/aws-sns';
 import * as subscription from '@aws-cdk/aws-sns-subscriptions';
 import * as sqs from '@aws-cdk/aws-sqs';
 import * as cdk from '@aws-cdk/core';
+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 '@aws-cdk/core';
-
 /**
  * An interface that will be implemented by all the resources that can be subscribed to.
  */
@@ -209,4 +206,4 @@ export class QueueExtension extends ServiceExtension {
   public get eventsQueue() : sqs.IQueue {
     return this._eventsQueue;
   }
-}
+}

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/queue.ts

@@ -1,13 +1,10 @@
 import * as ecs from '@aws-cdk/aws-ecs';
 import * as iam from '@aws-cdk/aws-iam';
 import * as cdk from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { Service } from '../service';
 import { 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 '@aws-cdk/core';
-
 const XRAY_DAEMON_IMAGE = 'amazon/aws-xray-daemon:latest';
 
 /**

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/xray.ts

@@ -1,14 +1,13 @@
 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 * as cdk from '@aws-cdk/core';
 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 '@aws-cdk/core';
+import { Construct } from 'constructs';
 
 /**
  * The settings for an ECS Service.
@@ -86,7 +85,7 @@ export class Service extends Construct {
    */
   private urls: Record<string, string> = {};
 
-  private readonly scope: cdk.Construct;
+  private readonly scope: Construct;
 
   constructor(scope: Construct, id: string, props: ServiceProps) {
     super(scope, id);

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

@@ -1,6 +1,7 @@
 {
   "name": "@aws-cdk-containers/ecs-service-extensions",
   "version": "0.0.0",
+  "private": true,
   "description": "The CDK Construct Library that helps you build ECS services using simple extensions",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -69,7 +70,7 @@
     "@aws-cdk/core": "0.0.0",
     "@aws-cdk/custom-resources": "0.0.0",
     "@aws-cdk/region-info": "0.0.0",
-    "constructs": "^3.3.69"
+    "constructs": "^10.0.0"
   },
   "homepage": "https://github.com/aws/aws-cdk",
   "peerDependencies": {
@@ -96,7 +97,7 @@
     "@aws-cdk/core": "0.0.0",
     "@aws-cdk/custom-resources": "0.0.0",
     "@aws-cdk/region-info": "0.0.0",
-    "constructs": "^3.3.69"
+    "constructs": "^10.0.0"
   },
   "engines": {
     "node": ">= 10.13.0 <13 || >=13.7.0"

packages/@aws-cdk-containers/ecs-service-extensions/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@aws-cdk/alexa-ask",
   "version": "0.0.0",
+  "private": true,
   "description": "The CDK Construct Library for Alexa::ASK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -81,11 +82,11 @@
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",
-    "constructs": "^3.3.69"
+    "constructs": "^10.0.0"
   },
   "peerDependencies": {
     "@aws-cdk/core": "0.0.0",
-    "constructs": "^3.3.69"
+    "constructs": "^10.0.0"
   },
   "engines": {
     "node": ">= 10.13.0 <13 || >=13.7.0"

packages/@aws-cdk/alexa-ask/package.json

@@ -5,10 +5,7 @@ import * as events from '@aws-cdk/aws-events';
 import * as iam from '@aws-cdk/aws-iam';
 import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import * as cdk from '@aws-cdk/core';
-
-// 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 '@aws-cdk/core';
+import { Construct } from 'constructs';
 
 export interface PipelineDeployStackActionProps {
   /**

packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts

@@ -57,7 +57,7 @@
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/core": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "constructs": "^3.3.69"
+    "constructs": "^10.0.0"
   },
   "devDependencies": {
     "@aws-cdk/assert-internal": "0.0.0",
@@ -95,7 +95,7 @@
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/core": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "constructs": "^3.3.69"
+    "constructs": "^10.0.0"
   },
   "engines": {
     "node": ">= 10.13.0 <13 || >=13.7.0"
@@ -118,6 +118,7 @@
     "announce": false
   },
   "publishConfig": {
-    "tag": "latest"
-  }
+    "tag": "next"
+  },
+  "private": true
 }