Skip to content

Commit ffa2a6d

Browse files
committed
Merge branch 'master' into v2/forward-merge-20220329
2 parents c7e309d + f1c465d commit ffa2a6d

File tree

104 files changed

+5968
-444
lines changed

Some content is hidden

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

104 files changed

+5968
-444
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@aws-cdk/pkglint": "0.0.0",
2929
"@types/jest": "^27.4.1",
3030
"jest": "^27.5.1",
31-
"ts-jest": "^27.1.3"
31+
"ts-jest": "^27.1.4"
3232
},
3333
"dependencies": {
3434
"@aws-cdk/cloud-assembly-schema": "0.0.0",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"aws-cdk-migration": "0.0.0",
4343
"constructs": "^10.0.0",
4444
"jest": "^27.3.1",
45-
"ts-jest": "^27.1.3"
45+
"ts-jest": "^27.1.4"
4646
},
4747
"dependencies": {
4848
"@aws-cdk/cloudformation-diff": "0.0.0"

packages/@aws-cdk/assertions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@types/jest": "^27.4.1",
6969
"jest": "^27.5.1",
7070
"constructs": "^10.0.0",
71-
"ts-jest": "^27.1.3"
71+
"ts-jest": "^27.1.4"
7272
},
7373
"dependencies": {
7474
"@aws-cdk/cloud-assembly-schema": "0.0.0",

packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@
4444
"lambda-tester": "^3.6.0",
4545
"sinon": "^9.2.4",
4646
"nock": "^13.2.4",
47-
"ts-jest": "^27.1.3"
47+
"ts-jest": "^27.1.4"
4848
}
4949
}

packages/@aws-cdk/aws-codepipeline-actions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cx-api": "0.0.0",
8686
"@aws-cdk/pkglint": "0.0.0",
8787
"@types/jest": "^27.4.1",
88-
"@types/lodash": "^4.14.180",
88+
"@types/lodash": "^4.14.181",
8989
"jest": "^27.5.1",
9090
"lodash": "^4.17.21"
9191
},

packages/@aws-cdk/aws-dynamodb/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"aws-sdk-mock": "5.6.0",
9393
"jest": "^27.5.1",
9494
"sinon": "^9.2.4",
95-
"ts-jest": "^27.1.3"
95+
"ts-jest": "^27.1.4"
9696
},
9797
"dependencies": {
9898
"@aws-cdk/aws-applicationautoscaling": "0.0.0",

packages/@aws-cdk/aws-ec2/README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,16 @@ MachineImage.genericLinux({ ... })` and configure the right AMI ID for the
199199
regions you want to deploy to.
200200

201201
By default, the NAT instances will route all traffic. To control what traffic
202-
gets routed, pass `allowAllTraffic: false` and access the
203-
`NatInstanceProvider.connections` member after having passed it to the VPC:
202+
gets routed, pass a custom value for `defaultAllowedTraffic` and access the
203+
`NatInstanceProvider.connections` member after having passed the NAT provider to
204+
the VPC:
204205

205206
```ts
206207
declare const instanceType: ec2.InstanceType;
207208

208209
const provider = ec2.NatProvider.instance({
209210
instanceType,
210-
allowAllTraffic: false,
211+
defaultAllowedTraffic: ec2.NatTrafficDirection.OUTBOUND_ONLY,
211212
});
212213
new ec2.Vpc(this, 'TheVPC', {
213214
natGatewayProvider: provider,

packages/@aws-cdk/aws-eks/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
"@types/sinon": "^9.0.11",
9191
"@types/yaml": "1.9.6",
9292
"aws-sdk": "^2.848.0",
93-
"cdk8s": "^1.5.48",
94-
"cdk8s-plus-21": "^1.0.0-beta.117",
93+
"cdk8s": "^1.5.56",
94+
"cdk8s-plus-21": "^1.0.0-beta.124",
9595
"jest": "^27.5.1",
9696
"sinon": "^9.2.4"
9797
},

packages/@aws-cdk/aws-lambda-nodejs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"@aws-cdk/pkglint": "0.0.0",
8080
"@types/jest": "^27.4.1",
8181
"delay": "5.0.0",
82-
"esbuild": "^0.14.27"
82+
"esbuild": "^0.14.29"
8383
},
8484
"dependencies": {
8585
"@aws-cdk/aws-lambda": "0.0.0",

packages/@aws-cdk/aws-lambda/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"@aws-cdk/pkglint": "0.0.0",
9393
"@types/aws-lambda": "^8.10.93",
9494
"@types/jest": "^27.4.1",
95-
"@types/lodash": "^4.14.180",
95+
"@types/lodash": "^4.14.181",
9696
"jest": "^27.5.1",
9797
"lodash": "^4.17.21"
9898
},

packages/@aws-cdk/aws-sam/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/pkglint": "0.0.0",
8888
"@types/jest": "^27.4.1",
8989
"jest": "^27.5.1",
90-
"ts-jest": "^27.1.3"
90+
"ts-jest": "^27.1.4"
9191
},
9292
"dependencies": {
9393
"@aws-cdk/core": "0.0.0",

packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json

+235-100
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
export * from './cloud-assembly';
22
export * from './assets';
33
export * from './manifest';
4+
export * from './integ-tests';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
/**
2+
* In what scenarios should the CLI ask for approval
3+
*/
4+
export enum RequireApproval {
5+
/**
6+
* Never ask for approval
7+
*/
8+
NEVER = 'never',
9+
10+
/**
11+
* Prompt for approval for any type of change to the stack
12+
*/
13+
ANYCHANGE = 'any-change',
14+
15+
/**
16+
* Only prompt for approval if there are security related changes
17+
*/
18+
BROADENING = 'broadening'
19+
}
20+
21+
/**
22+
* Default CDK CLI options that apply to all commands
23+
*/
24+
export interface DefaultCdkOptions {
25+
/**
26+
* List of stacks to deploy
27+
*
28+
* Requried if `all` is not set
29+
*
30+
* @default - []
31+
*/
32+
readonly stacks?: string[];
33+
34+
/**
35+
* Deploy all stacks
36+
*
37+
* Requried if `stacks` is not set
38+
*
39+
* @default - false
40+
*/
41+
readonly all?: boolean;
42+
43+
/**
44+
* command-line for executing your app or a cloud assembly directory
45+
* e.g. "node bin/my-app.js"
46+
* or
47+
* "cdk.out"
48+
*
49+
* @default - read from cdk.json
50+
*/
51+
readonly app?: string;
52+
53+
54+
/**
55+
* Role to pass to CloudFormation for deployment
56+
*
57+
* @default - use the bootstrap cfn-exec role
58+
*/
59+
readonly roleArn?: string;
60+
61+
/**
62+
* Additional context
63+
*
64+
* @default - no additional context
65+
*/
66+
readonly context?: { [name: string]: string };
67+
68+
/**
69+
* Print trace for stack warnings
70+
*
71+
* @default false
72+
*/
73+
readonly trace?: boolean;
74+
75+
/**
76+
* Do not construct stacks with warnings
77+
*
78+
* @default false
79+
*/
80+
readonly strict?: boolean;
81+
82+
/**
83+
* Perform context lookups.
84+
*
85+
* Synthesis fails if this is disabled and context lookups need
86+
* to be performed
87+
*
88+
* @default true
89+
*/
90+
readonly lookups?: boolean;
91+
92+
/**
93+
* Ignores synthesis errors, which will likely produce an invalid output
94+
*
95+
* @default false
96+
*/
97+
readonly ignoreErrors?: boolean;
98+
99+
/**
100+
* Use JSON output instead of YAML when templates are printed
101+
* to STDOUT
102+
*
103+
* @default false
104+
*/
105+
readonly json?: boolean;
106+
107+
/**
108+
* show debug logs
109+
*
110+
* @default false
111+
*/
112+
readonly verbose?: boolean;
113+
114+
/**
115+
* enable emission of additional debugging information, such as creation stack
116+
* traces of tokens
117+
*
118+
* @default false
119+
*/
120+
readonly debug?: boolean;
121+
122+
/**
123+
* Use the indicated AWS profile as the default environment
124+
*
125+
* @default - no profile is used
126+
*/
127+
readonly profile?: string;
128+
129+
/**
130+
* Use the indicated proxy. Will read from
131+
* HTTPS_PROXY environment if specified
132+
*
133+
* @default - no proxy
134+
*/
135+
readonly proxy?: string;
136+
137+
/**
138+
* Path to CA certificate to use when validating HTTPS
139+
* requests.
140+
*
141+
* @default - read from AWS_CA_BUNDLE environment variable
142+
*/
143+
readonly caBundlePath?: string;
144+
145+
/**
146+
* Force trying to fetch EC2 instance credentials
147+
*
148+
* @default - guess EC2 instance status
149+
*/
150+
readonly ec2Creds?: boolean;
151+
152+
/**
153+
* Include "AWS::CDK::Metadata" resource in synthesized templates
154+
*
155+
* @default true
156+
*/
157+
readonly versionReporting?: boolean;
158+
159+
/**
160+
* Include "aws:cdk:path" CloudFormation metadata for each resource
161+
*
162+
* @default true
163+
*/
164+
readonly pathMetadata?: boolean;
165+
166+
/**
167+
* Include "aws:asset:*" CloudFormation metadata for resources that use assets
168+
*
169+
* @default true
170+
*/
171+
readonly assetMetadata?: boolean;
172+
173+
/**
174+
* Copy assets to the output directory
175+
*
176+
* Needed for local debugging the source files with SAM CLI
177+
*
178+
* @default false
179+
*/
180+
readonly staging?: boolean;
181+
182+
/**
183+
* Emits the synthesized cloud assembly into a directory
184+
*
185+
* @default cdk.out
186+
*/
187+
readonly output?: string;
188+
189+
/**
190+
* Show relevant notices
191+
*
192+
* @default true
193+
*/
194+
readonly notices?: boolean;
195+
196+
/**
197+
* Show colors and other style from console output
198+
*
199+
* @default true
200+
*/
201+
readonly color?: boolean;
202+
}

0 commit comments

Comments
 (0)