Skip to content

Commit 70cc458

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into main
2 parents 0d6fbaf + 79c58ed commit 70cc458

734 files changed

Lines changed: 34317 additions & 3937 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.

‎build.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ while [[ "${1:-}" != "" ]]; do
4545
shift
4646
done
4747

48-
export PATH=$(npm bin):$PATH
4948
export NODE_OPTIONS="--max-old-space-size=8196 --experimental-worker ${NODE_OPTIONS:-}"
5049

5150
# Temporary log memory for long builds (this may mess with tests that check stderr)

‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.assets.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "21.0.0",
2+
"version": "32.0.0",
33
"files": {
4-
"14e034eeffbdd95a18b6c1a8c7a4876e1dfbedde51220bb1a196a337a6848c16": {
4+
"cf2d89a4eac2c90005b9a1e142f1cac80cf9cd29d1b8f98f002b9f3a1849454c": {
55
"source": {
66
"path": "cdk-backup.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "14e034eeffbdd95a18b6c1a8c7a4876e1dfbedde51220bb1a196a337a6848c16.json",
12+
"objectKey": "cf2d89a4eac2c90005b9a1e142f1cac80cf9cd29d1b8f98f002b9f3a1849454c.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.template.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@
111111
}
112112
}
113113
],
114+
"RecoveryPointTags": {
115+
"stage": "prod"
116+
},
114117
"RuleName": "PlanRule3",
115118
"TargetBackupVault": {
116119
"Fn::GetAtt": [

‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"21.0.0"}
1+
{"version":"32.0.0"}

‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/integ.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "21.0.0",
2+
"version": "32.0.0",
33
"testCases": {
44
"integ.backup": {
55
"stacks": [

‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/manifest.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
2-
"version": "21.0.0",
2+
"version": "32.0.0",
33
"artifacts": {
4-
"Tree": {
5-
"type": "cdk:tree",
6-
"properties": {
7-
"file": "tree.json"
8-
}
9-
},
104
"cdk-backup.assets": {
115
"type": "cdk:asset-manifest",
126
"properties": {
@@ -23,7 +17,7 @@
2317
"validateOnSynth": false,
2418
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
2519
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
26-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/14e034eeffbdd95a18b6c1a8c7a4876e1dfbedde51220bb1a196a337a6848c16.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cf2d89a4eac2c90005b9a1e142f1cac80cf9cd29d1b8f98f002b9f3a1849454c.json",
2721
"requiresBootstrapStackVersion": 6,
2822
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2923
"additionalDependencies": [
@@ -95,6 +89,12 @@
9589
]
9690
},
9791
"displayName": "cdk-backup"
92+
},
93+
"Tree": {
94+
"type": "cdk:tree",
95+
"properties": {
96+
"file": "tree.json"
97+
}
9898
}
9999
}
100100
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/tree.json‎

Lines changed: 52 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44
"id": "App",
55
"path": "",
66
"children": {
7-
"Tree": {
8-
"id": "Tree",
9-
"path": "Tree",
10-
"constructInfo": {
11-
"fqn": "constructs.Construct",
12-
"version": "10.1.102"
13-
}
14-
},
157
"cdk-backup": {
168
"id": "cdk-backup",
179
"path": "cdk-backup",
@@ -45,21 +37,21 @@
4537
}
4638
},
4739
"constructInfo": {
48-
"fqn": "@aws-cdk/aws-dynamodb.CfnTable",
40+
"fqn": "aws-cdk-lib.aws_dynamodb.CfnTable",
4941
"version": "0.0.0"
5042
}
5143
},
5244
"ScalingRole": {
5345
"id": "ScalingRole",
5446
"path": "cdk-backup/Table/ScalingRole",
5547
"constructInfo": {
56-
"fqn": "@aws-cdk/core.Resource",
48+
"fqn": "aws-cdk-lib.Resource",
5749
"version": "0.0.0"
5850
}
5951
}
6052
},
6153
"constructInfo": {
62-
"fqn": "@aws-cdk/aws-dynamodb.Table",
54+
"fqn": "aws-cdk-lib.aws_dynamodb.Table",
6355
"version": "0.0.0"
6456
}
6557
},
@@ -71,7 +63,7 @@
7163
"aws:cdk:cloudformation:props": {}
7264
},
7365
"constructInfo": {
74-
"fqn": "@aws-cdk/aws-efs.CfnFileSystem",
66+
"fqn": "aws-cdk-lib.aws_efs.CfnFileSystem",
7567
"version": "0.0.0"
7668
}
7769
},
@@ -92,13 +84,13 @@
9284
}
9385
},
9486
"constructInfo": {
95-
"fqn": "@aws-cdk/aws-backup.CfnBackupVault",
87+
"fqn": "aws-cdk-lib.aws_backup.CfnBackupVault",
9688
"version": "0.0.0"
9789
}
9890
}
9991
},
10092
"constructInfo": {
101-
"fqn": "@aws-cdk/aws-backup.BackupVault",
93+
"fqn": "aws-cdk-lib.aws_backup.BackupVault",
10294
"version": "0.0.0"
10395
}
10496
},
@@ -119,13 +111,13 @@
119111
}
120112
},
121113
"constructInfo": {
122-
"fqn": "@aws-cdk/aws-backup.CfnBackupVault",
114+
"fqn": "aws-cdk-lib.aws_backup.CfnBackupVault",
123115
"version": "0.0.0"
124116
}
125117
}
126118
},
127119
"constructInfo": {
128-
"fqn": "@aws-cdk/aws-backup.BackupVault",
120+
"fqn": "aws-cdk-lib.aws_backup.BackupVault",
129121
"version": "0.0.0"
130122
}
131123
},
@@ -203,14 +195,17 @@
203195
"moveToColdStorageAfterDays": 30
204196
}
205197
}
206-
]
198+
],
199+
"recoveryPointTags": {
200+
"stage": "prod"
201+
}
207202
}
208203
]
209204
}
210205
}
211206
},
212207
"constructInfo": {
213-
"fqn": "@aws-cdk/aws-backup.CfnBackupPlan",
208+
"fqn": "aws-cdk-lib.aws_backup.CfnBackupPlan",
214209
"version": "0.0.0"
215210
}
216211
},
@@ -222,6 +217,14 @@
222217
"id": "Role",
223218
"path": "cdk-backup/Plan/Selection/Role",
224219
"children": {
220+
"ImportRole": {
221+
"id": "ImportRole",
222+
"path": "cdk-backup/Plan/Selection/Role/ImportRole",
223+
"constructInfo": {
224+
"fqn": "aws-cdk-lib.Resource",
225+
"version": "0.0.0"
226+
}
227+
},
225228
"Resource": {
226229
"id": "Resource",
227230
"path": "cdk-backup/Plan/Selection/Role/Resource",
@@ -257,13 +260,13 @@
257260
}
258261
},
259262
"constructInfo": {
260-
"fqn": "@aws-cdk/aws-iam.CfnRole",
263+
"fqn": "aws-cdk-lib.aws_iam.CfnRole",
261264
"version": "0.0.0"
262265
}
263266
}
264267
},
265268
"constructInfo": {
266-
"fqn": "@aws-cdk/aws-iam.Role",
269+
"fqn": "aws-cdk-lib.aws_iam.Role",
267270
"version": "0.0.0"
268271
}
269272
},
@@ -346,31 +349,55 @@
346349
}
347350
},
348351
"constructInfo": {
349-
"fqn": "@aws-cdk/aws-backup.CfnBackupSelection",
352+
"fqn": "aws-cdk-lib.aws_backup.CfnBackupSelection",
350353
"version": "0.0.0"
351354
}
352355
}
353356
},
354357
"constructInfo": {
355-
"fqn": "@aws-cdk/aws-backup.BackupSelection",
358+
"fqn": "aws-cdk-lib.aws_backup.BackupSelection",
356359
"version": "0.0.0"
357360
}
358361
}
359362
},
360363
"constructInfo": {
361-
"fqn": "@aws-cdk/aws-backup.BackupPlan",
364+
"fqn": "aws-cdk-lib.aws_backup.BackupPlan",
365+
"version": "0.0.0"
366+
}
367+
},
368+
"BootstrapVersion": {
369+
"id": "BootstrapVersion",
370+
"path": "cdk-backup/BootstrapVersion",
371+
"constructInfo": {
372+
"fqn": "aws-cdk-lib.CfnParameter",
373+
"version": "0.0.0"
374+
}
375+
},
376+
"CheckBootstrapVersion": {
377+
"id": "CheckBootstrapVersion",
378+
"path": "cdk-backup/CheckBootstrapVersion",
379+
"constructInfo": {
380+
"fqn": "aws-cdk-lib.CfnRule",
362381
"version": "0.0.0"
363382
}
364383
}
365384
},
366385
"constructInfo": {
367-
"fqn": "@aws-cdk/core.Stack",
386+
"fqn": "aws-cdk-lib.Stack",
368387
"version": "0.0.0"
369388
}
389+
},
390+
"Tree": {
391+
"id": "Tree",
392+
"path": "Tree",
393+
"constructInfo": {
394+
"fqn": "constructs.Construct",
395+
"version": "10.2.26"
396+
}
370397
}
371398
},
372399
"constructInfo": {
373-
"fqn": "@aws-cdk/core.App",
400+
"fqn": "aws-cdk-lib.App",
374401
"version": "0.0.0"
375402
}
376403
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ class TestStack extends Stack {
4646
moveToColdStorageAfter: Duration.days(30),
4747
deleteAfter: Duration.days(120),
4848
}],
49+
recoveryPointTags: {
50+
stage: 'prod',
51+
},
4952
}));
5053
}
5154
}

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/asset.6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip renamed to packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/asset.10972873dd8a3bc33ae1cb91d834617be249fd84bed5bdbb6ffbb581650aea83.zip

14.9 MB
Binary file not shown.

‎packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/asset.75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)