Skip to content

Commit 1c75b65

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into core-duration-subtract
2 parents 91916d4 + 0a23953 commit 1c75b65

68 files changed

Lines changed: 1043 additions & 222 deletions

File tree

Some content is hidden

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

‎.github/workflows/issue-label-assign.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ jobs:
217217
{"area":"@aws-cdk/cfnspec","keywords":["cfn-spec"],"labels":["@aws-cdk/cfnspec"],"assignees":["rix0rrr"]},
218218
{"area":"@aws-cdk/cloud-assembly-schema","keywords":["cloud-assembly-schema","manifest"],"labels":["@aws-cdk/cloud-assembly-schema"],"assignees":["rix0rrr"]},
219219
{"area":"@aws-cdk/cloudformation-diff","keywords":["cloudformation-diff","cfn-diff"],"labels":["@aws-cdk/cloudformation-diff"],"assignees":["skinny85"]},
220-
{"area":"@aws-cdk/cloudformation-include","keywords":["cloudformation-include","cfn-include"],"labels":["@aws-cdk/cloudformation-include"],"assignees":["skinny85"]},
220+
{"area":"@aws-cdk/cloudformation-include","keywords":["cloudformation-include","cfn-include"],"labels":["@aws-cdk/cloudformation-include"],"assignees":["comcalvi"]},
221221
{"area":"@aws-cdk/core","keywords":["cross-account","nested stacks","core"],"labels":["@aws-cdk/core"],"assignees":["rix0rrr"]},
222222
{"area":"@aws-cdk/custom-resources","keywords":["custom-resource","provider"],"labels":["@aws-cdk/custom-resources"],"assignees":["rix0rrr"]},
223223
{"area":"@aws-cdk/cx-api","keywords":["cx-api","cloudartifact","cloudassembly"],"labels":["@aws-cdk/cx-api"],"assignees":["rix0rrr"]},

‎pack.sh‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,12 @@ function lerna_scopes() {
3939
# Compile examples with respect to "decdk" directory, as all packages will
4040
# be symlinked there so they can all be included.
4141
echo "Extracting code samples" >&2
42-
$ROSETTA extract \
42+
node --experimental-worker $(which $ROSETTA) \
4343
--compile \
4444
--output samples.tabl.json \
4545
--directory packages/decdk \
4646
$(cat $TMPDIR/jsii.txt)
4747

48-
echo "Infusing examples back into assemblies" >&2
49-
$ROSETTA infuse \
50-
samples.tabl.json \
51-
$(cat $TMPDIR/jsii.txt)
52-
5348
# Jsii packaging (all at once using jsii-pacmak)
5449
echo "Packaging jsii modules" >&2
5550
$PACMAK \

‎packages/@aws-cdk-containers/ecs-service-extensions/test/integ.all-service-addons.expected.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@
102102
"productionenvironmentvpcPublicSubnet1NATGateway6075E4CA": {
103103
"Type": "AWS::EC2::NatGateway",
104104
"Properties": {
105+
"SubnetId": {
106+
"Ref": "productionenvironmentvpcPublicSubnet1Subnet8D92C089"
107+
},
105108
"AllocationId": {
106109
"Fn::GetAtt": [
107110
"productionenvironmentvpcPublicSubnet1EIP54BA88DB",
108111
"AllocationId"
109112
]
110113
},
111-
"SubnetId": {
112-
"Ref": "productionenvironmentvpcPublicSubnet1Subnet8D92C089"
113-
},
114114
"Tags": [
115115
{
116116
"Key": "Name",
@@ -199,15 +199,15 @@
199199
"productionenvironmentvpcPublicSubnet2NATGatewayE1850FCC": {
200200
"Type": "AWS::EC2::NatGateway",
201201
"Properties": {
202+
"SubnetId": {
203+
"Ref": "productionenvironmentvpcPublicSubnet2Subnet298E6C31"
204+
},
202205
"AllocationId": {
203206
"Fn::GetAtt": [
204207
"productionenvironmentvpcPublicSubnet2EIP14CA46AA",
205208
"AllocationId"
206209
]
207210
},
208-
"SubnetId": {
209-
"Ref": "productionenvironmentvpcPublicSubnet2Subnet298E6C31"
210-
},
211211
"Tags": [
212212
{
213213
"Key": "Name",
@@ -296,15 +296,15 @@
296296
"productionenvironmentvpcPublicSubnet3NATGateway94604057": {
297297
"Type": "AWS::EC2::NatGateway",
298298
"Properties": {
299+
"SubnetId": {
300+
"Ref": "productionenvironmentvpcPublicSubnet3SubnetC7B5665D"
301+
},
299302
"AllocationId": {
300303
"Fn::GetAtt": [
301304
"productionenvironmentvpcPublicSubnet3EIP53405AED",
302305
"AllocationId"
303306
]
304307
},
305-
"SubnetId": {
306-
"Ref": "productionenvironmentvpcPublicSubnet3SubnetC7B5665D"
307-
},
308308
"Tags": [
309309
{
310310
"Key": "Name",
@@ -2391,6 +2391,10 @@
23912391
{
23922392
"Key": "deregistration_delay.timeout_seconds",
23932393
"Value": "10"
2394+
},
2395+
{
2396+
"Key": "stickiness.enabled",
2397+
"Value": "false"
23942398
}
23952399
],
23962400
"TargetType": "ip",

‎packages/@aws-cdk-containers/ecs-service-extensions/test/integ.imported-environment.expected.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"/",
1919
{
20-
"Ref": "AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3Bucket60C7B412"
20+
"Ref": "AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3Bucket85F9E22A"
2121
},
2222
"/",
2323
{
@@ -27,7 +27,7 @@
2727
"Fn::Split": [
2828
"||",
2929
{
30-
"Ref": "AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3VersionKey6900DC52"
30+
"Ref": "AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3VersionKey8103F967"
3131
}
3232
]
3333
}
@@ -40,7 +40,7 @@
4040
"Fn::Split": [
4141
"||",
4242
{
43-
"Ref": "AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3VersionKey6900DC52"
43+
"Ref": "AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3VersionKey8103F967"
4444
}
4545
]
4646
}
@@ -163,6 +163,10 @@
163163
{
164164
"Key": "deregistration_delay.timeout_seconds",
165165
"Value": "10"
166+
},
167+
{
168+
"Key": "stickiness.enabled",
169+
"Value": "false"
166170
}
167171
],
168172
"TargetType": "ip",
@@ -358,17 +362,17 @@
358362
}
359363
},
360364
"Parameters": {
361-
"AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3Bucket60C7B412": {
365+
"AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3Bucket85F9E22A": {
362366
"Type": "String",
363-
"Description": "S3 bucket for asset \"b537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8\""
367+
"Description": "S3 bucket for asset \"e2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886\""
364368
},
365-
"AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3VersionKey6900DC52": {
369+
"AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3VersionKey8103F967": {
366370
"Type": "String",
367-
"Description": "S3 key for asset version \"b537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8\""
371+
"Description": "S3 key for asset version \"e2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886\""
368372
},
369-
"AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8ArtifactHash5EEB924C": {
373+
"AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886ArtifactHash6FA4ABA8": {
370374
"Type": "String",
371-
"Description": "Artifact hash for asset \"b537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8\""
375+
"Description": "Artifact hash for asset \"e2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886\""
372376
}
373377
}
374378
}

‎packages/@aws-cdk/assert-internal/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
> announced in the release notes. This means that while you may use them, you may need to update
1212
> your source code when upgrading to a newer version of this package.
1313
14+
If using monocdk, use [@monocdk-experiment/assert](https://www.npmjs.com/package/@monocdk-experiment/assert) instead.
15+
1416
---
1517

1618
<!--END STABILITY BANNER-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"metadata": {
5151
"jsii": {
5252
"rosetta": {
53-
"strict": true
53+
"strict": false
5454
}
5555
}
5656
}

‎packages/@aws-cdk/aws-apigateway/lib/api-key.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ export interface ApiKeyOptions extends ResourceOptions {
4040
* @default none
4141
*/
4242
readonly value?: string;
43+
44+
/**
45+
* A description of the purpose of the API key.
46+
* @link http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-description
47+
* @default none
48+
*/
49+
readonly description?: string;
4350
}
4451

4552
/**
@@ -59,13 +66,6 @@ export interface ApiKeyProps extends ApiKeyOptions {
5966
*/
6067
readonly customerId?: string;
6168

62-
/**
63-
* A description of the purpose of the API key.
64-
* @link http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-description
65-
* @default none
66-
*/
67-
readonly description?: string;
68-
6969
/**
7070
* Indicates whether the API key can be used by clients.
7171
* @link http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-enabled

‎packages/@aws-cdk/aws-apigateway/test/api-key.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,23 @@ describe('api key', () => {
4141
});
4242
});
4343

44+
test('add description to apiKey', () => {
45+
// GIVEN
46+
const stack = new cdk.Stack();
47+
const api = new apigateway.RestApi(stack, 'test-api');
48+
api.root.addMethod('GET'); // api must have atleast one method.
49+
50+
// WHEN
51+
api.addApiKey('my-api-key', {
52+
description: 'The most secret api key',
53+
});
54+
55+
// THEN
56+
expect(stack).toHaveResource('AWS::ApiGateway::ApiKey', {
57+
Description: 'The most secret api key',
58+
});
59+
});
60+
4461
test('use an imported api key', () => {
4562
// GIVEN
4663
const stack = new cdk.Stack();

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.alb.expected.json‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@
9595
"VPCPublicSubnet1NATGatewayE0556630": {
9696
"Type": "AWS::EC2::NatGateway",
9797
"Properties": {
98+
"SubnetId": {
99+
"Ref": "VPCPublicSubnet1SubnetB4246D30"
100+
},
98101
"AllocationId": {
99102
"Fn::GetAtt": [
100103
"VPCPublicSubnet1EIP6AD938E8",
101104
"AllocationId"
102105
]
103106
},
104-
"SubnetId": {
105-
"Ref": "VPCPublicSubnet1SubnetB4246D30"
106-
},
107107
"Tags": [
108108
{
109109
"Key": "Name",
@@ -192,15 +192,15 @@
192192
"VPCPublicSubnet2NATGateway3C070193": {
193193
"Type": "AWS::EC2::NatGateway",
194194
"Properties": {
195+
"SubnetId": {
196+
"Ref": "VPCPublicSubnet2Subnet74179F39"
197+
},
195198
"AllocationId": {
196199
"Fn::GetAtt": [
197200
"VPCPublicSubnet2EIP4947BC00",
198201
"AllocationId"
199202
]
200203
},
201-
"SubnetId": {
202-
"Ref": "VPCPublicSubnet2Subnet74179F39"
203-
},
204204
"Tags": [
205205
{
206206
"Key": "Name",
@@ -289,15 +289,15 @@
289289
"VPCPublicSubnet3NATGatewayD3048F5C": {
290290
"Type": "AWS::EC2::NatGateway",
291291
"Properties": {
292+
"SubnetId": {
293+
"Ref": "VPCPublicSubnet3Subnet631C5E25"
294+
},
292295
"AllocationId": {
293296
"Fn::GetAtt": [
294297
"VPCPublicSubnet3EIPAD4BC883",
295298
"AllocationId"
296299
]
297300
},
298-
"SubnetId": {
299-
"Ref": "VPCPublicSubnet3Subnet631C5E25"
300-
},
301301
"Tags": [
302302
{
303303
"Key": "Name",
@@ -596,6 +596,12 @@
596596
"Properties": {
597597
"Port": 80,
598598
"Protocol": "HTTP",
599+
"TargetGroupAttributes": [
600+
{
601+
"Key": "stickiness.enabled",
602+
"Value": "false"
603+
}
604+
],
599605
"VpcId": {
600606
"Ref": "VPCB9E5F0B4"
601607
}

‎packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@
9595
"VPCPublicSubnet1NATGatewayE0556630": {
9696
"Type": "AWS::EC2::NatGateway",
9797
"Properties": {
98+
"SubnetId": {
99+
"Ref": "VPCPublicSubnet1SubnetB4246D30"
100+
},
98101
"AllocationId": {
99102
"Fn::GetAtt": [
100103
"VPCPublicSubnet1EIP6AD938E8",
101104
"AllocationId"
102105
]
103106
},
104-
"SubnetId": {
105-
"Ref": "VPCPublicSubnet1SubnetB4246D30"
106-
},
107107
"Tags": [
108108
{
109109
"Key": "Name",
@@ -192,15 +192,15 @@
192192
"VPCPublicSubnet2NATGateway3C070193": {
193193
"Type": "AWS::EC2::NatGateway",
194194
"Properties": {
195+
"SubnetId": {
196+
"Ref": "VPCPublicSubnet2Subnet74179F39"
197+
},
195198
"AllocationId": {
196199
"Fn::GetAtt": [
197200
"VPCPublicSubnet2EIP4947BC00",
198201
"AllocationId"
199202
]
200203
},
201-
"SubnetId": {
202-
"Ref": "VPCPublicSubnet2Subnet74179F39"
203-
},
204204
"Tags": [
205205
{
206206
"Key": "Name",
@@ -671,6 +671,12 @@
671671
"Properties": {
672672
"Port": 80,
673673
"Protocol": "HTTP",
674+
"TargetGroupAttributes": [
675+
{
676+
"Key": "stickiness.enabled",
677+
"Value": "false"
678+
}
679+
],
674680
"TargetType": "instance",
675681
"VpcId": {
676682
"Ref": "VPCB9E5F0B4"

0 commit comments

Comments
 (0)