Skip to content

Commit a479825

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into merge-back/2.79.1
2 parents 2e7f8b7 + cab8623 commit a479825

File tree

838 files changed

+2490
-1764
lines changed

Some content is hidden

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

838 files changed

+2490
-1764
lines changed

‎.github/ISSUE_TEMPLATE/notice.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
name: "❗ Notice"
3+
description: Post a notice for a high impact issue
4+
title: "❗ NOTICE (module name): (short notice description)"
5+
labels: [p0, management/tracking]
6+
body:
7+
- type: dropdown
8+
attributes:
9+
label: Status
10+
description: What is the current status of this issue?
11+
options:
12+
- Investigating (Default)
13+
- In-Progress
14+
- Resolved
15+
validations:
16+
required: true
17+
- type: textarea
18+
attributes:
19+
label: What is the issue?
20+
description: A clear and concise description of the issue you want customers to be aware of
21+
validations:
22+
required: true
23+
- type: textarea
24+
attributes:
25+
label: Error message
26+
description: If available, paste the error message users are seeing (no need to backticks)
27+
render: console
28+
- type: textarea
29+
attributes:
30+
label: What is the impact?
31+
description: |
32+
What can occur if this issue isn't addressed?
33+
validations:
34+
required: true
35+
- type: textarea
36+
attributes:
37+
label: Workaround
38+
description: |
39+
Please provide a detailed workaround outlining all steps required for implementation. If none exist yet, leave blank
40+
- type: textarea
41+
attributes:
42+
label: Who is affected?
43+
description: |
44+
What segment of customers are affected? Think about specific construct usage, version, feature toggles, etc...
45+
validations:
46+
required: true
47+
- type: textarea
48+
attributes:
49+
label: How do I resolve this?
50+
description: |
51+
What actions should customers take to resolve the issue. Also elaborate on any code changes the customer may need to do. If unknown yet, say TBD
52+
validations:
53+
required: true
54+
- type: textarea
55+
attributes:
56+
label: Related issues
57+
description: |
58+
List all related issues here. If none related, leave blank

‎.github/workflows/github-merit-badger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
1818
thresholds: '[0,3,6,13,25,50]'
1919
badge-type: 'achievement'
20-
ignore-usernames: '[RomainMuller,rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,ryparker,TheRealAmazonKendra,vinayak-kukreja,Naumel,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,pattasai,SankyRed,udaypant,colifran,aws-cdk-automation,dependabot[bot],mergify[bot]]'
20+
ignore-usernames: '[RomainMuller,rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,ryparker,TheRealAmazonKendra,vinayak-kukreja,Naumel,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,pattasai,SankyRed,udaypant,colifran,khushail,aws-cdk-automation,dependabot[bot],mergify[bot]]'

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@types/node": "18.11.19",
2121
"@types/prettier": "2.6.0",
2222
"@yarnpkg/lockfile": "^1.1.0",
23-
"cdk-generate-synthetic-examples": "^0.1.235",
23+
"cdk-generate-synthetic-examples": "^0.1.237",
2424
"conventional-changelog-cli": "^2.2.2",
2525
"fs-extra": "^9.1.0",
2626
"graceful-fs": "^4.2.11",

‎packages/@aws-cdk-testing/cli-integ/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"license": "Apache-2.0",
3131
"devDependencies": {
3232
"@aws-cdk/cdk-build-tools": "0.0.0",
33-
"@types/semver": "^7.3.13",
33+
"@types/semver": "^7.5.0",
3434
"@types/yargs": "^15.0.15",
3535
"@types/fs-extra": "^9.0.13",
3636
"@types/glob": "^7.2.0",
@@ -39,7 +39,7 @@
3939
},
4040
"dependencies": {
4141
"@octokit/rest": "^18.12.0",
42-
"aws-sdk": "^2.1373.0",
42+
"aws-sdk": "^2.1375.0",
4343
"axios": "^0.27.2",
4444
"fs-extra": "^9.1.0",
4545
"glob": "^7.2.3",

‎packages/@aws-cdk-testing/framework-integ/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
},
3838
"dependencies": {
3939
"@aws-cdk/integ-tests-alpha": "0.0.0",
40-
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.186",
40+
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.188",
4141
"aws-cdk-lib": "0.0.0",
42-
"aws-sdk": "^2.1373.0",
42+
"aws-sdk": "^2.1375.0",
4343
"aws-sdk-mock": "5.6.0",
4444
"cdk8s": "^2.7.56",
45-
"cdk8s-plus-24": "2.7.22",
45+
"cdk8s-plus-24": "2.7.24",
4646
"constructs": "^10.0.0"
4747
},
4848
"repository": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e22d0f948e4b9a0aac11f68f048f52c09eeb7d8fef79972eb7e6f957111955bb.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/66ab683818060e1118fc673956ded609e269963fadf52391a2f080831d022402.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "31.0.0",
33
"files": {
4-
"e22d0f948e4b9a0aac11f68f048f52c09eeb7d8fef79972eb7e6f957111955bb": {
4+
"66ab683818060e1118fc673956ded609e269963fadf52391a2f080831d022402": {
55
"source": {
66
"path": "mesh-stack.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "e22d0f948e4b9a0aac11f68f048f52c09eeb7d8fef79972eb7e6f957111955bb.json",
12+
"objectKey": "66ab683818060e1118fc673956ded609e269963fadf52391a2f080831d022402.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-appmesh/test/integ.mesh.js.snapshot/mesh-stack.template.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,9 @@
10801080
"Logging": {
10811081
"AccessLog": {
10821082
"File": {
1083+
"Format": {
1084+
"Text": "test_pattern"
1085+
},
10831086
"Path": "/dev/stdout"
10841087
}
10851088
}
@@ -1178,6 +1181,18 @@
11781181
"Logging": {
11791182
"AccessLog": {
11801183
"File": {
1184+
"Format": {
1185+
"Json": [
1186+
{
1187+
"Key": "testKey1",
1188+
"Value": "testValue1"
1189+
},
1190+
{
1191+
"Key": "testKey2",
1192+
"Value": "testValue2"
1193+
}
1194+
]
1195+
},
11811196
"Path": "/dev/stdout"
11821197
}
11831198
}

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,10 @@
16041604
"logging": {
16051605
"accessLog": {
16061606
"file": {
1607-
"path": "/dev/stdout"
1607+
"path": "/dev/stdout",
1608+
"format": {
1609+
"text": "test_pattern"
1610+
}
16081611
}
16091612
}
16101613
}
@@ -1721,7 +1724,19 @@
17211724
"logging": {
17221725
"accessLog": {
17231726
"file": {
1724-
"path": "/dev/stdout"
1727+
"path": "/dev/stdout",
1728+
"format": {
1729+
"json": [
1730+
{
1731+
"key": "testKey1",
1732+
"value": "testValue1"
1733+
},
1734+
{
1735+
"key": "testKey2",
1736+
"value": "testValue2"
1737+
}
1738+
]
1739+
}
17251740
}
17261741
}
17271742
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const node3 = mesh.addVirtualNode('node3', {
114114
},
115115
},
116116
},
117-
accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout'),
117+
accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout', appmesh.LoggingFormat.fromText('test_pattern')),
118118
});
119119

120120
const node4 = mesh.addVirtualNode('node4', {
@@ -145,7 +145,9 @@ const node4 = mesh.addVirtualNode('node4', {
145145
},
146146
},
147147
},
148-
accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout'),
148+
accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout',
149+
appmesh.LoggingFormat.fromJson(
150+
{ testKey1: 'testValue1', testKey2: 'testValue2' })),
149151
});
150152

151153
node4.addBackend(appmesh.Backend.virtualService(

‎packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
}
1515
}
1616
},
17-
"68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a": {
17+
"6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054": {
1818
"source": {
19-
"path": "asset.68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip",
19+
"path": "asset.6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip",
2020
"packaging": "file"
2121
},
2222
"destinations": {
2323
"current_account-current_region": {
2424
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
25-
"objectKey": "68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip",
25+
"objectKey": "6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip",
2626
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
2727
}
2828
}
@@ -53,15 +53,15 @@
5353
}
5454
}
5555
},
56-
"700b33b613fbd899489f08c591ff8e002d433573bc48eca4a106e66109f3087f": {
56+
"533487c9e5a2cc1009e664662485074855ae58bca4728d59bdebc81acf8e7e3b": {
5757
"source": {
5858
"path": "aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json",
5959
"packaging": "file"
6060
},
6161
"destinations": {
6262
"current_account-current_region": {
6363
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
64-
"objectKey": "700b33b613fbd899489f08c591ff8e002d433573bc48eca4a106e66109f3087f.json",
64+
"objectKey": "533487c9e5a2cc1009e664662485074855ae58bca4728d59bdebc81acf8e7e3b.json",
6565
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
6666
}
6767
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
"S3Bucket": {
156156
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
157157
},
158-
"S3Key": "68b22621fff135f9e3f225bad7ff80fdf2f45c3d9910af601206a0d9b279933a.zip"
158+
"S3Key": "6a28458f7bc3d04e4d2b17f9c3da0709bf456e34b06ea7c96111eecb2fddd054.zip"
159159
},
160160
"Description": "/opt/awscli/aws"
161161
}
@@ -440,7 +440,7 @@
440440
"Value": "AWSServiceRoleForElasticBeanstalkManagedUpdates"
441441
}
442442
],
443-
"SolutionStackName": "64bit Amazon Linux 2 v5.5.6 running Node.js 16"
443+
"SolutionStackName": "64bit Amazon Linux 2 v5.8.1 running Node.js 16"
444444
},
445445
"DependsOn": [
446446
"beastalkapp",
@@ -784,7 +784,18 @@
784784
"Version": "2012-10-17"
785785
},
786786
"ManagedPolicyArns": [
787-
"arn:aws:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk"
787+
{
788+
"Fn::Join": [
789+
"",
790+
[
791+
"arn:",
792+
{
793+
"Ref": "AWS::Partition"
794+
},
795+
":iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk"
796+
]
797+
]
798+
}
788799
]
789800
}
790801
},

‎packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeilne-elastic-beanstalk-deploy.js.snapshot/manifest.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/700b33b613fbd899489f08c591ff8e002d433573bc48eca4a106e66109f3087f.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/533487c9e5a2cc1009e664662485074855ae58bca4728d59bdebc81acf8e7e3b.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [
@@ -126,7 +126,10 @@
126126
"/aws-cdk-codepipeline-elastic-beanstalk-deploy/beanstlk-env": [
127127
{
128128
"type": "aws:cdk:logicalId",
129-
"data": "beanstlkenv"
129+
"data": "beanstlkenv",
130+
"trace": [
131+
"!!DESTRUCTIVE_CHANGES: WILL_REPLACE"
132+
]
130133
}
131134
],
132135
"/aws-cdk-codepipeline-elastic-beanstalk-deploy/Pipeline/Role/Resource": [

0 commit comments

Comments
 (0)