Skip to content

Commit 0399ffc

Browse files
pankajy93pankajy93
committed
2 parents b7b169e + 909b590 commit 0399ffc

File tree

200 files changed

+2621
-1184
lines changed

Some content is hidden

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

200 files changed

+2621
-1184
lines changed

‎design/cdk-bootstrap.md

+1-16
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,6 @@ The naming scheme will include the following elements in order to minimize the c
8383
* The account ID we're bootstrapping in.
8484
* The type of the resource (file assets bucket, Docker assets repository, etc.).
8585

86-
### Removing existing customization options
87-
88-
The existing customization options: `--bootstrap-bucket-name` and `--bootstrap-kms-key-id` will be removed.
89-
We will need to know the names of the bootstrap bucket and KMS key and synthesis time.
90-
91-
The only way to customize the bootstrap template will be to deploy your own,
92-
based on the default one the CDK provides,
93-
and then change the default options when creating instances of the `Stack`
94-
class to match the names used in the custom template
95-
(this customization will most likely require overriding some methods,
96-
so probably involves implementing a custom subclass of `Stack`).
97-
9886
### CLI options in detail
9987

10088
#### Existing kept options
@@ -109,10 +97,6 @@ and need to be kept for backwards compatibility reasons:
10997

11098
* `--tags` / `-t`: a list of key=value pairs to add as tags to add to the bootstrap stack.
11199

112-
#### Existing removed options
113-
114-
The following options that exist today will be removed:
115-
116100
* `--toolkit-bucket-name` / `--bootstrap-bucket-name` / `-b`: allows you to explicitly name the file assets S3 bucket
117101
(instead of relying on the default naming scheme).
118102

@@ -129,6 +113,7 @@ These options will be added to the `bootstrap` command:
129113

130114
* `--cloudformation-execution-policies`: allows specifying the ManagedPolicy ARN(s)
131115
that should be attached to the **CloudFormation Execution Role**.
116+
This option is required if `--trust` was passed.
132117

133118
## Bootstrap resources version
134119

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@
8686
"pkglint": "0.0.0"
8787
},
8888
"dependencies": {
89-
"@aws-cdk/core": "0.0.0"
89+
"@aws-cdk/core": "0.0.0",
90+
"constructs": "^1.1.2"
9091
},
9192
"peerDependencies": {
92-
"@aws-cdk/core": "0.0.0"
93+
"@aws-cdk/core": "0.0.0",
94+
"constructs": "^1.1.2"
9395
},
9496
"engines": {
9597
"node": ">= 10.3.0"

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
"@aws-cdk/aws-events": "0.0.0",
4848
"@aws-cdk/aws-iam": "0.0.0",
4949
"@aws-cdk/core": "0.0.0",
50-
"@aws-cdk/cx-api": "0.0.0"
50+
"@aws-cdk/cx-api": "0.0.0",
51+
"constructs": "^1.1.2"
5152
},
5253
"devDependencies": {
5354
"@aws-cdk/assert": "0.0.0",
@@ -83,7 +84,8 @@
8384
"@aws-cdk/aws-events": "0.0.0",
8485
"@aws-cdk/aws-iam": "0.0.0",
8586
"@aws-cdk/core": "0.0.0",
86-
"@aws-cdk/cx-api": "0.0.0"
87+
"@aws-cdk/cx-api": "0.0.0",
88+
"constructs": "^1.1.2"
8789
},
8890
"engines": {
8991
"node": ">= 10.3.0"

‎packages/@aws-cdk/assert/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@
3838
"dependencies": {
3939
"@aws-cdk/cloudformation-diff": "0.0.0",
4040
"@aws-cdk/core": "0.0.0",
41-
"@aws-cdk/cx-api": "0.0.0"
41+
"@aws-cdk/cx-api": "0.0.0",
42+
"constructs": "^1.1.2"
4243
},
4344
"peerDependencies": {
4445
"@aws-cdk/core": "0.0.0",
45-
"jest": "^24.9.0"
46+
"jest": "^24.9.0",
47+
"constructs": "^1.1.2"
4648
},
4749
"repository": {
4850
"url": "https://github.com/aws/aws-cdk.git",

‎packages/@aws-cdk/assets/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,14 @@
7878
"dependencies": {
7979
"@aws-cdk/core": "0.0.0",
8080
"@aws-cdk/cx-api": "0.0.0",
81-
"minimatch": "^3.0.4"
81+
"minimatch": "^3.0.4",
82+
"constructs": "^1.1.2"
8283
},
8384
"homepage": "https://github.com/aws/aws-cdk",
8485
"peerDependencies": {
8586
"@aws-cdk/core": "0.0.0",
86-
"@aws-cdk/cx-api": "0.0.0"
87+
"@aws-cdk/cx-api": "0.0.0",
88+
"constructs": "^1.1.2"
8789
},
8890
"engines": {
8991
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-accessanalyzer/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,12 @@
8787
"pkglint": "0.0.0"
8888
},
8989
"dependencies": {
90-
"@aws-cdk/core": "0.0.0"
90+
"@aws-cdk/core": "0.0.0",
91+
"constructs": "^1.1.2"
9192
},
9293
"peerDependencies": {
93-
"@aws-cdk/core": "0.0.0"
94+
"@aws-cdk/core": "0.0.0",
95+
"constructs": "^1.1.2"
9496
},
9597
"engines": {
9698
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-acmpca/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,12 @@
8787
"pkglint": "0.0.0"
8888
},
8989
"dependencies": {
90-
"@aws-cdk/core": "0.0.0"
90+
"@aws-cdk/core": "0.0.0",
91+
"constructs": "^1.1.2"
9192
},
9293
"peerDependencies": {
93-
"@aws-cdk/core": "0.0.0"
94+
"@aws-cdk/core": "0.0.0",
95+
"constructs": "^1.1.2"
9496
},
9597
"engines": {
9698
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-amazonmq/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@
8686
"pkglint": "0.0.0"
8787
},
8888
"dependencies": {
89-
"@aws-cdk/core": "0.0.0"
89+
"@aws-cdk/core": "0.0.0",
90+
"constructs": "^1.1.2"
9091
},
9192
"peerDependencies": {
92-
"@aws-cdk/core": "0.0.0"
93+
"@aws-cdk/core": "0.0.0",
94+
"constructs": "^1.1.2"
9395
},
9496
"engines": {
9597
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-amplify/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,16 @@
9292
"@aws-cdk/aws-kms": "0.0.0",
9393
"@aws-cdk/aws-codebuild": "0.0.0",
9494
"@aws-cdk/aws-secretsmanager": "0.0.0",
95-
"@aws-cdk/core": "0.0.0"
95+
"@aws-cdk/core": "0.0.0",
96+
"constructs": "^1.1.2"
9697
},
9798
"peerDependencies": {
9899
"@aws-cdk/aws-iam": "0.0.0",
99100
"@aws-cdk/aws-kms": "0.0.0",
100101
"@aws-cdk/aws-codebuild": "0.0.0",
101102
"@aws-cdk/aws-secretsmanager": "0.0.0",
102-
"@aws-cdk/core": "0.0.0"
103+
"@aws-cdk/core": "0.0.0",
104+
"constructs": "^1.1.2"
103105
},
104106
"engines": {
105107
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-apigateway/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
"@aws-cdk/aws-elasticloadbalancingv2": "0.0.0",
7777
"@aws-cdk/aws-iam": "0.0.0",
7878
"@aws-cdk/aws-lambda": "0.0.0",
79-
"@aws-cdk/core": "0.0.0"
79+
"@aws-cdk/core": "0.0.0",
80+
"constructs": "^1.1.2"
8081
},
8182
"homepage": "https://github.com/aws/aws-cdk",
8283
"peerDependencies": {
@@ -85,7 +86,8 @@
8586
"@aws-cdk/aws-elasticloadbalancingv2": "0.0.0",
8687
"@aws-cdk/aws-iam": "0.0.0",
8788
"@aws-cdk/aws-lambda": "0.0.0",
88-
"@aws-cdk/core": "0.0.0"
89+
"@aws-cdk/core": "0.0.0",
90+
"constructs": "^1.1.2"
8991
},
9092
"engines": {
9193
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-apigatewayv2/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@
8686
"pkglint": "0.0.0"
8787
},
8888
"dependencies": {
89-
"@aws-cdk/core": "0.0.0"
89+
"@aws-cdk/core": "0.0.0",
90+
"constructs": "^1.1.2"
9091
},
9192
"peerDependencies": {
92-
"@aws-cdk/core": "0.0.0"
93+
"@aws-cdk/core": "0.0.0",
94+
"constructs": "^1.1.2"
9395
},
9496
"engines": {
9597
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-appconfig/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@
7171
"pkglint": "0.0.0"
7272
},
7373
"dependencies": {
74-
"@aws-cdk/core": "0.0.0"
74+
"@aws-cdk/core": "0.0.0",
75+
"constructs": "^1.1.2"
7576
},
7677
"peerDependencies": {
77-
"@aws-cdk/core": "0.0.0"
78+
"@aws-cdk/core": "0.0.0",
79+
"constructs": "^1.1.2"
7880
},
7981
"engines": {
8082
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-applicationautoscaling/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,16 @@
7474
"@aws-cdk/aws-autoscaling-common": "0.0.0",
7575
"@aws-cdk/aws-cloudwatch": "0.0.0",
7676
"@aws-cdk/aws-iam": "0.0.0",
77-
"@aws-cdk/core": "0.0.0"
77+
"@aws-cdk/core": "0.0.0",
78+
"constructs": "^1.1.2"
7879
},
7980
"homepage": "https://github.com/aws/aws-cdk",
8081
"peerDependencies": {
8182
"@aws-cdk/aws-autoscaling-common": "0.0.0",
8283
"@aws-cdk/aws-cloudwatch": "0.0.0",
8384
"@aws-cdk/aws-iam": "0.0.0",
84-
"@aws-cdk/core": "0.0.0"
85+
"@aws-cdk/core": "0.0.0",
86+
"constructs": "^1.1.2"
8587
},
8688
"engines": {
8789
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-appmesh/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,15 @@
7676
"@aws-cdk/aws-ec2": "0.0.0",
7777
"@aws-cdk/aws-iam": "0.0.0",
7878
"@aws-cdk/aws-servicediscovery": "0.0.0",
79-
"@aws-cdk/core": "0.0.0"
79+
"@aws-cdk/core": "0.0.0",
80+
"constructs": "^1.1.2"
8081
},
8182
"peerDependencies": {
8283
"@aws-cdk/aws-ec2": "0.0.0",
8384
"@aws-cdk/aws-iam": "0.0.0",
8485
"@aws-cdk/aws-servicediscovery": "0.0.0",
85-
"@aws-cdk/core": "0.0.0"
86+
"@aws-cdk/core": "0.0.0",
87+
"constructs": "^1.1.2"
8688
},
8789
"engines": {
8890
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-appstream/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@
8686
"pkglint": "0.0.0"
8787
},
8888
"dependencies": {
89-
"@aws-cdk/core": "0.0.0"
89+
"@aws-cdk/core": "0.0.0",
90+
"constructs": "^1.1.2"
9091
},
9192
"peerDependencies": {
92-
"@aws-cdk/core": "0.0.0"
93+
"@aws-cdk/core": "0.0.0",
94+
"constructs": "^1.1.2"
9395
},
9496
"engines": {
9597
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-appsync/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,17 @@
9090
"@aws-cdk/aws-dynamodb": "0.0.0",
9191
"@aws-cdk/aws-iam": "0.0.0",
9292
"@aws-cdk/aws-lambda": "0.0.0",
93-
"@aws-cdk/core": "0.0.0"
93+
"@aws-cdk/core": "0.0.0",
94+
"constructs": "^1.1.2"
9495
},
9596
"homepage": "https://github.com/aws/aws-cdk",
9697
"peerDependencies": {
9798
"@aws-cdk/aws-cognito": "0.0.0",
9899
"@aws-cdk/aws-dynamodb": "0.0.0",
99100
"@aws-cdk/aws-iam": "0.0.0",
100101
"@aws-cdk/aws-lambda": "0.0.0",
101-
"@aws-cdk/core": "0.0.0"
102+
"@aws-cdk/core": "0.0.0",
103+
"constructs": "^1.1.2"
102104
},
103105
"engines": {
104106
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-athena/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,13 @@
8585
"pkglint": "0.0.0"
8686
},
8787
"dependencies": {
88-
"@aws-cdk/core": "0.0.0"
88+
"@aws-cdk/core": "0.0.0",
89+
"constructs": "^1.1.2"
8990
},
9091
"homepage": "https://github.com/aws/aws-cdk",
9192
"peerDependencies": {
92-
"@aws-cdk/core": "0.0.0"
93+
"@aws-cdk/core": "0.0.0",
94+
"constructs": "^1.1.2"
9395
},
9496
"engines": {
9597
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-autoscaling-common/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,14 @@
6868
},
6969
"dependencies": {
7070
"@aws-cdk/aws-iam": "0.0.0",
71-
"@aws-cdk/core": "0.0.0"
71+
"@aws-cdk/core": "0.0.0",
72+
"constructs": "^1.1.2"
7273
},
7374
"homepage": "https://github.com/aws/aws-cdk",
7475
"peerDependencies": {
7576
"@aws-cdk/aws-iam": "0.0.0",
76-
"@aws-cdk/core": "0.0.0"
77+
"@aws-cdk/core": "0.0.0",
78+
"constructs": "^1.1.2"
7779
},
7880
"awslint": {
7981
"exclude": [

‎packages/@aws-cdk/aws-autoscaling-hooktargets/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
"@aws-cdk/aws-sns": "0.0.0",
9292
"@aws-cdk/aws-sns-subscriptions": "0.0.0",
9393
"@aws-cdk/aws-sqs": "0.0.0",
94-
"@aws-cdk/core": "0.0.0"
94+
"@aws-cdk/core": "0.0.0",
95+
"constructs": "^1.1.2"
9596
},
9697
"homepage": "https://github.com/aws/aws-cdk",
9798
"peerDependencies": {
@@ -101,7 +102,8 @@
101102
"@aws-cdk/aws-sns": "0.0.0",
102103
"@aws-cdk/aws-sns-subscriptions": "0.0.0",
103104
"@aws-cdk/aws-sqs": "0.0.0",
104-
"@aws-cdk/core": "0.0.0"
105+
"@aws-cdk/core": "0.0.0",
106+
"constructs": "^1.1.2"
105107
},
106108
"engines": {
107109
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ export class AutoScalingGroup extends AutoScalingGroupBase implements
440440

441441
// use delayed evaluation
442442
const imageConfig = props.machineImage.getImage(this);
443-
this.userData = props.userData || imageConfig.userData || ec2.UserData.forOperatingSystem(imageConfig.osType);
443+
this.userData = props.userData ?? imageConfig.userData;
444444
const userDataToken = Lazy.stringValue({ produce: () => Fn.base64(this.userData.render()) });
445445
const securityGroupsToken = Lazy.listValue({ produce: () => this.securityGroups.map(sg => sg.securityGroupId) });
446446

‎packages/@aws-cdk/aws-autoscaling/lib/lifecycle-hook-target.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Construct } from '@aws-cdk/core/lib/construct';
1+
import { Construct } from '@aws-cdk/core';
22
import { ILifecycleHook } from './lifecycle-hook';
33

44
/**

‎packages/@aws-cdk/aws-autoscaling/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
"@aws-cdk/aws-elasticloadbalancingv2": "0.0.0",
8080
"@aws-cdk/aws-iam": "0.0.0",
8181
"@aws-cdk/aws-sns": "0.0.0",
82-
"@aws-cdk/core": "0.0.0"
82+
"@aws-cdk/core": "0.0.0",
83+
"constructs": "^1.1.2"
8384
},
8485
"homepage": "https://github.com/aws/aws-cdk",
8586
"peerDependencies": {
@@ -90,7 +91,8 @@
9091
"@aws-cdk/aws-elasticloadbalancingv2": "0.0.0",
9192
"@aws-cdk/aws-iam": "0.0.0",
9293
"@aws-cdk/aws-sns": "0.0.0",
93-
"@aws-cdk/core": "0.0.0"
94+
"@aws-cdk/core": "0.0.0",
95+
"constructs": "^1.1.2"
9496
},
9597
"engines": {
9698
"node": ">= 10.3.0"

‎packages/@aws-cdk/aws-autoscalingplans/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,13 @@
8585
"pkglint": "0.0.0"
8686
},
8787
"dependencies": {
88-
"@aws-cdk/core": "0.0.0"
88+
"@aws-cdk/core": "0.0.0",
89+
"constructs": "^1.1.2"
8990
},
9091
"homepage": "https://github.com/aws/aws-cdk",
9192
"peerDependencies": {
92-
"@aws-cdk/core": "0.0.0"
93+
"@aws-cdk/core": "0.0.0",
94+
"constructs": "^1.1.2"
9395
},
9496
"engines": {
9597
"node": ">= 10.3.0"

0 commit comments

Comments
 (0)