Skip to content

Commit 70b75ad

Browse files
ChriscbrChriscbr
committed
Merge remote-tracking branch 'origin/v2-main' into v2/forward-merge-20220228
2 parents 6595d04 + d831d01 commit 70b75ad

File tree

779 files changed

+6885
-6189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

779 files changed

+6885
-6189
lines changed

‎CHANGELOG.v2.alpha.md

+357
Large diffs are not rendered by default.

‎CHANGELOG.v2.md

+1,860
Large diffs are not rendered by default.

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,4 @@ this capability, please see the
172172
* [Changelog](./CHANGELOG.md)
173173
* [NOTICE](./NOTICE)
174174
* [License](./LICENSE)
175+

‎deprecated_apis.txt

+1,102-1,110
Large diffs are not rendered by default.

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"packages/@aws-cdk/*/lambda-packages/*",
1111
"tools/*",
1212
"tools/@aws-cdk/*",
13-
"scripts/script-tests",
13+
"scripts/@aws-cdk/script-tests",
1414
"packages/individual-packages/*"
1515
],
1616
"rejectCycles": "true",

‎package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"include": "dependencies/node-version"
77
},
88
"scripts": {
9-
"pkglint": "lerna --scope @aws-cdk/pkglint run build && lerna run pkglint",
9+
"pkglint": "lerna run build --scope @aws-cdk/pkglint --include-dependencies && lerna run pkglint",
10+
"prebuild": "node ./scripts/check-yarn-lock.js",
1011
"build": "./build.sh",
1112
"pack": "./pack.sh",
1213
"compat": "./scripts/check-api-compatibility.sh",
@@ -55,7 +56,7 @@
5556
"release.json",
5657
"scripts/resolve-version.js",
5758
"scripts/resolve-version-lib.js",
58-
"version.v1.json"
59+
"version.v2.json"
5960
],
6061
"cacheBucket": "nozem-artifacts-eu",
6162
"cacheBucketRegion": "eu-west-1"

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
import * as ec2 from '@aws-cdk/aws-ec2';
22
import * as ecs from '@aws-cdk/aws-ecs';
3-
import * as cdk from '@aws-cdk/core';
3+
import { Construct } from 'constructs';
44
import { EnvironmentCapacityType } from './extensions/extension-interfaces';
55

6-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
7-
// eslint-disable-next-line no-duplicate-imports, import/order
8-
import { Construct } from '@aws-cdk/core';
9-
106
/**
117
* Settings for the environment where you want to deploy your services.
128
*/
@@ -98,7 +94,7 @@ export class Environment extends Construct implements IEnvironment {
9894
*/
9995
public readonly capacityType: EnvironmentCapacityType;
10096

101-
private readonly scope: cdk.Construct;
97+
private readonly scope: Construct;
10298

10399
constructor(scope: Construct, id: string, props?: EnvironmentProps) {
104100
super(scope, id);

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ import * as ecs from '@aws-cdk/aws-ecs';
55
import * as iam from '@aws-cdk/aws-iam';
66
import * as cdk from '@aws-cdk/core';
77
import * as regionInfo from '@aws-cdk/region-info';
8+
import { Construct } from 'constructs';
89
import { Service } from '../service';
910
import { Container } from './container';
1011
import { ServiceExtension, ServiceBuild } from './extension-interfaces';
1112

12-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
13-
// eslint-disable-next-line no-duplicate-imports, import/order
14-
import { Construct } from '@aws-cdk/core';
15-
1613
// The version of the App Mesh envoy sidecar to add to the task.
1714
const APP_MESH_ENVOY_SIDECAR_VERSION = 'v1.15.1.0-prod';
1815

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
import * as ec2 from '@aws-cdk/aws-ec2';
22
import * as ecs from '@aws-cdk/aws-ecs';
33
import * as route53 from '@aws-cdk/aws-route53';
4+
import { Construct } from 'constructs';
45
import { Service } from '../../service';
56
import { Container } from '../container';
67
import { ServiceExtension, ServiceBuild, EnvironmentCapacityType } from '../extension-interfaces';
78
import { TaskRecordManager } from './task-record-manager';
89

9-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
10-
// eslint-disable-next-line no-duplicate-imports, import/order
11-
import { Construct } from '@aws-cdk/core';
12-
1310
export interface AssignPublicIpExtensionOptions {
1411
/**
1512
* 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/task-record-manager.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import * as route53 from '@aws-cdk/aws-route53';
1010
import * as sqs from '@aws-cdk/aws-sqs';
1111
import * as cdk from '@aws-cdk/core';
1212
import * as customresources from '@aws-cdk/custom-resources';
13-
14-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
15-
// eslint-disable-next-line no-duplicate-imports, import/order
16-
import { Construct } from '@aws-cdk/core';
13+
import { Construct } from 'constructs';
1714

1815
export interface TaskRecordManagerProps {
1916
service: ecs.Ec2Service | ecs.FargateService;

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import * as ecs from '@aws-cdk/aws-ecs';
22
import * as iam from '@aws-cdk/aws-iam';
3+
import { Construct } from 'constructs';
34
import { Service } from '../service';
45
import { ServiceExtension } from './extension-interfaces';
56

6-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
7-
// eslint-disable-next-line no-duplicate-imports, import/order
8-
import { Construct } from '@aws-cdk/core';
9-
107
const CLOUDWATCH_AGENT_IMAGE = 'amazon/cloudwatch-agent:latest';
118

129
/**

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ import * as ecs from '@aws-cdk/aws-ecs';
22
import * as awslogs from '@aws-cdk/aws-logs';
33
import * as cdk from '@aws-cdk/core';
44
import * as cxapi from '@aws-cdk/cx-api';
5+
import { Construct, Node } from 'constructs';
56
import { Service } from '../service';
67
import { ServiceExtension } from './extension-interfaces';
78

8-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
9-
// eslint-disable-next-line no-duplicate-imports, import/order
10-
import { Construct } from '@aws-cdk/core';
11-
129
/**
1310
* Setting for the main application container of a service.
1411
*/
@@ -112,7 +109,7 @@ export class Container extends ServiceExtension {
112109
// If no observability extensions have been added to the service description then we can configure the `awslogs` log driver
113110
if (!containerProps.logging) {
114111
// Create a log group for the service if one is not provided by the user (only if feature flag is set)
115-
if (!this.logGroup && this.parentService.node.tryGetContext(cxapi.ECS_SERVICE_EXTENSIONS_ENABLE_DEFAULT_LOG_DRIVER)) {
112+
if (!this.logGroup && Node.of(this.parentService).tryGetContext(cxapi.ECS_SERVICE_EXTENSIONS_ENABLE_DEFAULT_LOG_DRIVER)) {
116113
this.logGroup = new awslogs.LogGroup(this.scope, `${this.parentService.id}-logs`, {
117114
logGroupName: `${this.parentService.id}-logs`,
118115
removalPolicy: cdk.RemovalPolicy.DESTROY,

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import * as ecs from '@aws-cdk/aws-ecs';
22
import * as cdk from '@aws-cdk/core';
33
import { Service, ConnectToProps } from '../service';
4-
5-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
6-
// eslint-disable-next-line no-duplicate-imports, import/order
7-
import { Construct } from '@aws-cdk/core';
4+
import { Construct } from 'constructs';
85

96
/**
107
* The types of capacity that are supported. These capacity types may change the
@@ -115,7 +112,7 @@ export abstract class ServiceExtension {
115112
* the extension is told what Service it is now working on.
116113
*/
117114
protected parentService!: Service;
118-
protected scope!: cdk.Construct;
115+
protected scope!: Construct;
119116

120117
// A list of other extensions which want to mutate the
121118
// container definition for this extension.

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import * as ecs from '@aws-cdk/aws-ecs';
22
import * as awslogs from '@aws-cdk/aws-logs';
33
import * as cdk from '@aws-cdk/core';
4+
import { Construct } from 'constructs';
45
import { Service } from '../service';
56
import { Container } from './container';
67
import { ContainerMutatingHook, ServiceExtension } from './extension-interfaces';
78

8-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
9-
// eslint-disable-next-line no-duplicate-imports, import/order
10-
import { Construct } from '@aws-cdk/core';
11-
129
/**
1310
* Settings for the hook which mutates the application container
1411
* to route logs through FireLens.

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
import * as ecs from '@aws-cdk/aws-ecs';
22
import * as alb from '@aws-cdk/aws-elasticloadbalancingv2';
33
import * as cdk from '@aws-cdk/core';
4+
import { Construct } from 'constructs';
45
import { Service } from '../service';
56
import { ServiceExtension, ServiceBuild } from './extension-interfaces';
67

7-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
8-
// eslint-disable-next-line no-duplicate-imports, import/order
9-
import { Construct } from '@aws-cdk/core';
10-
118
export interface HttpLoadBalancerProps {
129
/**
1310
* The number of ALB requests per target.
1411
*/
1512
readonly requestsPerTarget?: number;
1613
}
14+
1715
/**
1816
* This extension add a public facing load balancer for sending traffic
1917
* to one or more replicas of the application container.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { ContainerMutatingHook, ServiceExtension } from './extension-interfaces'
66

77
// Keep this import separate from other imports to reduce chance for merge conflicts with v2-main
88
// eslint-disable-next-line no-duplicate-imports, import/order
9-
import { Construct } from '@aws-cdk/core';
9+
import { Construct } from 'constructs';
1010

1111
/**
1212
* 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 {
151151
}
152152
}
153153
}
154-
}
154+
}

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ import * as sns from '@aws-cdk/aws-sns';
1010
import * as subscription from '@aws-cdk/aws-sns-subscriptions';
1111
import * as sqs from '@aws-cdk/aws-sqs';
1212
import * as cdk from '@aws-cdk/core';
13+
import { Construct } from 'constructs';
1314
import { Service } from '../../service';
1415
import { Container } from '../container';
1516
import { ContainerMutatingHook, ServiceExtension } from '../extension-interfaces';
1617

17-
// Keep this import separate from other imports to reduce chance for merge conflicts with v2-main
18-
// eslint-disable-next-line no-duplicate-imports, import/order
19-
import { Construct } from '@aws-cdk/core';
20-
2118
/**
2219
* An interface that will be implemented by all the resources that can be subscribed to.
2320
*/
@@ -415,4 +412,4 @@ export class QueueExtension extends ServiceExtension {
415412
public get autoscalingOptions() : QueueAutoScalingOptions | undefined {
416413
return this._autoscalingOptions;
417414
}
418-
}
415+
}

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import * as ecs from '@aws-cdk/aws-ecs';
22
import * as iam from '@aws-cdk/aws-iam';
33
import * as cdk from '@aws-cdk/core';
4+
import { Construct } from 'constructs';
45
import { Service } from '../service';
56
import { ServiceExtension } from './extension-interfaces';
67

7-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
8-
// eslint-disable-next-line no-duplicate-imports, import/order
9-
import { Construct } from '@aws-cdk/core';
10-
118
const XRAY_DAEMON_IMAGE = 'amazon/aws-xray-daemon:latest';
129

1310
/**

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import * as ec2 from '@aws-cdk/aws-ec2';
22
import * as ecs from '@aws-cdk/aws-ecs';
33
import * as iam from '@aws-cdk/aws-iam';
4-
import * as cdk from '@aws-cdk/core';
54
import { IEnvironment } from './environment';
65
import { EnvironmentCapacityType, ServiceBuild } from './extensions/extension-interfaces';
76
import { ServiceDescription } from './service-description';
87

98
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
109
// eslint-disable-next-line no-duplicate-imports, import/order
11-
import { Construct } from '@aws-cdk/core';
10+
import { Construct } from 'constructs';
1211

1312
/**
1413
* connectToProps will have all the extra parameters which are required for connecting services.
@@ -149,7 +148,7 @@ export class Service extends Construct {
149148
*/
150149
private urls: Record<string, string> = {};
151150

152-
private readonly scope: cdk.Construct;
151+
private readonly scope: Construct;
153152

154153
constructor(scope: Construct, id: string, props: ServiceProps) {
155154
super(scope, id);

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@aws-cdk-containers/ecs-service-extensions",
33
"version": "0.0.0",
4+
"private": true,
45
"description": "The CDK Construct Library that helps you build ECS services using simple extensions",
56
"main": "lib/index.js",
67
"types": "lib/index.d.ts",
@@ -72,7 +73,7 @@
7273
"@aws-cdk/custom-resources": "0.0.0",
7374
"@aws-cdk/cx-api": "0.0.0",
7475
"@aws-cdk/region-info": "0.0.0",
75-
"constructs": "^3.3.69"
76+
"constructs": "^10.0.0"
7677
},
7778
"homepage": "https://github.com/aws/aws-cdk",
7879
"peerDependencies": {
@@ -101,10 +102,10 @@
101102
"@aws-cdk/custom-resources": "0.0.0",
102103
"@aws-cdk/cx-api": "0.0.0",
103104
"@aws-cdk/region-info": "0.0.0",
104-
"constructs": "^3.3.69"
105+
"constructs": "^10.0.0"
105106
},
106107
"engines": {
107-
"node": ">= 10.13.0 <13 || >=13.7.0"
108+
"node": ">= 14.15.0"
108109
},
109110
"awscdkio": {
110111
"announce": false

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@aws-cdk/alexa-ask",
33
"version": "0.0.0",
4+
"private": true,
45
"description": "The CDK Construct Library for Alexa::ASK",
56
"main": "lib/index.js",
67
"types": "lib/index.d.ts",
@@ -88,14 +89,14 @@
8889
},
8990
"dependencies": {
9091
"@aws-cdk/core": "0.0.0",
91-
"constructs": "^3.3.69"
92+
"constructs": "^10.0.0"
9293
},
9394
"peerDependencies": {
9495
"@aws-cdk/core": "0.0.0",
95-
"constructs": "^3.3.69"
96+
"constructs": "^10.0.0"
9697
},
9798
"engines": {
98-
"node": ">= 10.13.0 <13 || >=13.7.0"
99+
"node": ">= 14.15.0"
99100
},
100101
"stability": "experimental",
101102
"maturity": "cfn-only",

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ import * as events from '@aws-cdk/aws-events';
55
import * as iam from '@aws-cdk/aws-iam';
66
import * as cxschema from '@aws-cdk/cloud-assembly-schema';
77
import * as cdk from '@aws-cdk/core';
8-
9-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
10-
// eslint-disable-next-line no-duplicate-imports, import/order
11-
import { Construct } from '@aws-cdk/core';
8+
import { Construct } from 'constructs';
129

1310
export interface PipelineDeployStackActionProps {
1411
/**

‎packages/@aws-cdk/app-delivery/package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "@aws-cdk/app-delivery",
33
"description": "Continuous Integration / Continuous Delivery for CDK Applications",
44
"deprecated": "Use the @aws-cdk/pipelines module instead",
5+
"private": true,
56
"version": "0.0.0",
67
"main": "lib/index.js",
78
"types": "lib/index.d.ts",
@@ -64,7 +65,7 @@
6465
"@aws-cdk/cloud-assembly-schema": "0.0.0",
6566
"@aws-cdk/core": "0.0.0",
6667
"@aws-cdk/cx-api": "0.0.0",
67-
"constructs": "^3.3.69"
68+
"constructs": "^10.0.0"
6869
},
6970
"devDependencies": {
7071
"@aws-cdk/assertions": "0.0.0",
@@ -102,10 +103,10 @@
102103
"@aws-cdk/cloud-assembly-schema": "0.0.0",
103104
"@aws-cdk/core": "0.0.0",
104105
"@aws-cdk/cx-api": "0.0.0",
105-
"constructs": "^3.3.69"
106+
"constructs": "^10.0.0"
106107
},
107108
"engines": {
108-
"node": ">= 10.13.0 <13 || >=13.7.0"
109+
"node": ">= 14.15.0"
109110
},
110111
"stability": "deprecated",
111112
"maturity": "deprecated",
@@ -125,6 +126,6 @@
125126
"announce": false
126127
},
127128
"publishConfig": {
128-
"tag": "latest"
129+
"tag": "next"
129130
}
130131
}

0 commit comments

Comments
 (0)