aws · njlynch · Mar 5, 2021 · Mar 9, 2021 · Mar 9, 2021 · Mar 9, 2021
diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
  "include": "dependencies/node-version"
  },
  "scripts": {
- "pkglint": "lerna --scope pkglint run build && lerna run pkglint",
+ "pkglint": "lerna run build --scope pkglint --include-dependencies && lerna run pkglint",
  "build": "./build.sh",
  "pack": "./pack.sh",
  "compat": "./scripts/check-api-compatibility.sh",

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/environment.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/environment.ts
@@ -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 you want to deploy.
  * services within.
@@ -96,7 +92,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);

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/appmesh.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/appmesh.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';
 

diff --git a/...cdk-containers/ecs-service-extensions/lib/extensions/assign-public-ip/assign-public-ip.ts b/...cdk-containers/ecs-service-extensions/lib/extensions/assign-public-ip/assign-public-ip.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.

diff --git a/...-containers/ecs-service-extensions/lib/extensions/assign-public-ip/task-record-manager.ts b/...-containers/ecs-service-extensions/lib/extensions/assign-public-ip/task-record-manager.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;

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/cloudwatch-agent.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/cloudwatch-agent.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';
 
 /**

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/container.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/container.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
  */

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,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';
-
 /**
  * A list of the capacity types that are supported. These
  * capacity types may change the behavior of an extension.
@@ -109,7 +106,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.

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/firelens.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/firelens.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

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/http-load-balancer.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/http-load-balancer.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

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/xray.ts b/packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/xray.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';
 
 /**

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,10 @@
 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 { 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';
-
 /**
  * The settings for an ECS Service
  */
@@ -76,7 +72,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);

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/package.json b/packages/@aws-cdk-containers/ecs-service-extensions/package.json
@@ -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",
@@ -66,7 +67,7 @@
  "@aws-cdk/core": "0.0.0",
  "@aws-cdk/custom-resources": "0.0.0",
  "@aws-cdk/region-info": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "homepage": "https://github.com/aws/aws-cdk",
  "peerDependencies": {
@@ -91,7 +92,7 @@
  "@aws-cdk/core": "0.0.0",
  "@aws-cdk/custom-resources": "0.0.0",
  "@aws-cdk/region-info": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "engines": {
  "node": ">= 10.13.0 <13 || >=13.7.0"

diff --git a/packages/@aws-cdk/alexa-ask/package.json b/packages/@aws-cdk/alexa-ask/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",
@@ -79,11 +80,11 @@
  },
  "dependencies": {
  "@aws-cdk/core": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "peerDependencies": {
  "@aws-cdk/core": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "engines": {
  "node": ">= 10.13.0 <13 || >=13.7.0"

diff --git a/packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts b/packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts
@@ -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 {
  /**

diff --git a/packages/@aws-cdk/app-delivery/package.json b/packages/@aws-cdk/app-delivery/package.json
@@ -2,6 +2,7 @@
  "name": "@aws-cdk/app-delivery",
  "description": "Continuous Integration / Continuous Delivery for CDK Applications",
  "deprecated": "Use the @aws-cdk/pipelines module instead",
+ "private": true,
  "version": "0.0.0",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
@@ -55,7 +56,7 @@
  "@aws-cdk/core": "0.0.0",
  "@aws-cdk/cx-api": "0.0.0",
  "@aws-cdk/cloud-assembly-schema": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "devDependencies": {
  "@aws-cdk/assert": "0.0.0",
@@ -93,7 +94,7 @@
  "@aws-cdk/core": "0.0.0",
  "@aws-cdk/cx-api": "0.0.0",
  "@aws-cdk/cloud-assembly-schema": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "engines": {
  "node": ">= 10.13.0 <13 || >=13.7.0"

diff --git a/packages/@aws-cdk/assert/lib/synth-utils.ts b/packages/@aws-cdk/assert/lib/synth-utils.ts
@@ -7,7 +7,7 @@ export class SynthUtils {
  /**
  * Returns the cloud assembly template artifact for a stack.
  */
- public static synthesize(stack: core.Stack, options: core.SynthesisOptions = { }): cxapi.CloudFormationStackArtifact {
+ public static synthesize(stack: core.Stack, options: core.StageSynthesisOptions = { }): cxapi.CloudFormationStackArtifact {
  // always synthesize against the root (be it an App or whatever) so all artifacts will be included
  const assembly = synthesizeApp(stack, options);
  return assembly.getStackArtifact(stack.artifactId);
@@ -16,7 +16,7 @@ export class SynthUtils {
  /**
  * Synthesizes the stack and returns the resulting CloudFormation template.
  */
- public static toCloudFormation(stack: core.Stack, options: core.SynthesisOptions = { }): any {
+ public static toCloudFormation(stack: core.Stack, options: core.StageSynthesisOptions = { }): any {
  const synth = this._synthesizeWithNested(stack, options);
  if (synth instanceof cxapi.CloudFormationStackArtifact) {
  return synth.template;
@@ -48,7 +48,7 @@ export class SynthUtils {
  * @return CloudFormationStackArtifact for normal stacks or the actual template for nested stacks
  * @internal
  */
- public static _synthesizeWithNested(stack: core.Stack, options: core.SynthesisOptions = { }): cxapi.CloudFormationStackArtifact | object {
+ public static _synthesizeWithNested(stack: core.Stack, options: core.StageSynthesisOptions = { }): cxapi.CloudFormationStackArtifact | object {
  // always synthesize against the root (be it an App or whatever) so all artifacts will be included
  const assembly = synthesizeApp(stack, options);
 
@@ -64,7 +64,7 @@ export class SynthUtils {
 /**
  * Synthesizes the app in which a stack resides and returns the cloud assembly object.
  */
-function synthesizeApp(stack: core.Stack, options: core.SynthesisOptions) {
+function synthesizeApp(stack: core.Stack, options: core.StageSynthesisOptions) {
  const root = stack.node.root;
  if (!core.Stage.isStage(root)) {
  throw new Error('unexpected: all stacks must be part of a Stage or an App');

diff --git a/packages/@aws-cdk/assert/package.json b/packages/@aws-cdk/assert/package.json
@@ -1,6 +1,7 @@
 {
  "name": "@aws-cdk/assert",
  "version": "0.0.0",
+ "private": true,
  "description": "An assertion library for use with CDK Apps",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
@@ -32,11 +33,11 @@
  "@aws-cdk/cloudformation-diff": "0.0.0",
  "@aws-cdk/core": "0.0.0",
  "@aws-cdk/cx-api": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "peerDependencies": {
  "@aws-cdk/core": "0.0.0",
- "constructs": "^3.2.0",
+ "constructs": "10.0.0-pre.5",
  "jest": "^26.6.3"
  },
  "repository": {

diff --git a/packages/@aws-cdk/assets/lib/staging.ts b/packages/@aws-cdk/assets/lib/staging.ts
@@ -4,7 +4,7 @@ import { FingerprintOptions } from './fs/options';
 
 // 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';
 
 /**
  * Deprecated

diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json
@@ -1,6 +1,7 @@
 {
  "name": "@aws-cdk/assets",
  "version": "0.0.0",
+ "private": true,
  "description": "This module is deprecated. All types are now available under the core module",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
@@ -81,13 +82,13 @@
  "dependencies": {
  "@aws-cdk/core": "0.0.0",
  "@aws-cdk/cx-api": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "homepage": "https://github.com/aws/aws-cdk",
  "peerDependencies": {
  "@aws-cdk/core": "0.0.0",
  "@aws-cdk/cx-api": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "engines": {
  "node": ">= 10.13.0 <13 || >=13.7.0"

diff --git a/packages/@aws-cdk/aws-accessanalyzer/package.json b/packages/@aws-cdk/aws-accessanalyzer/package.json
@@ -1,6 +1,7 @@
 {
  "name": "@aws-cdk/aws-accessanalyzer",
  "version": "0.0.0",
+ "private": true,
  "description": "The CDK Construct Library for AWS::AccessAnalyzer",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
@@ -80,11 +81,11 @@
  },
  "dependencies": {
  "@aws-cdk/core": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "peerDependencies": {
  "@aws-cdk/core": "0.0.0",
- "constructs": "^3.2.0"
+ "constructs": "10.0.0-pre.5"
  },
  "engines": {
  "node": ">= 10.13.0 <13 || >=13.7.0"