Skip to content

Commit cc974e8

Browse files
authored
Merge branch 'main' into merge-back/2.173.2
2 parents f8e6207 + 87e21d6 commit cc974e8

File tree

249 files changed

+8024
-3835
lines changed

Some content is hidden

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

249 files changed

+8024
-3835
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ Closes #<issue number here>.
88

99
### Description of changes
1010

11-
<!--What code changes did you make? Have you made any important design decisions?-->
11+
<!--
12+
What code changes did you make?
13+
Have you made any important design decisions?
14+
What AWS use cases does this change enable? To enable the use cases, which AWS service features are utilized?
15+
-->
16+
17+
### Describe any new or updated permissions being added
18+
19+
<!— What new or updated IAM permissions are needed to support the changes being introduced ? -->
20+
1221

1322
### Description of how you validated changes
1423

.github/workflows/request-cli-integ-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@4edd678ac3f81e2dc578756871e4d00c19191daf
22+
uses: tj-actions/changed-files@bab30c2299617f6615ec02a68b9a40d10bd21366
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

aws-cdk.code-workspace

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
{
3131
"name": "aws-custom-resource-sdk-adapter",
3232
"rootPath": "packages/@aws-cdk/aws-custom-resource-sdk-adapter"
33-
}
33+
},
34+
{ "name": "yargs-gen", "rootPath": "tools/@aws-cdk/yargs-gen" }
3435
]
3536
},
3637
"extensions": {

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.extension.js.snapshot/aws-appconfig-extension.assets.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.extension.js.snapshot/aws-appconfig-extension.template.json

+17
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,23 @@
318318
]
319319
}
320320
}
321+
],
322+
"AT_DEPLOYMENT_TICK": [
323+
{
324+
"Name": "awsappconfigextension-MyLambdaExtension-68C15290-0",
325+
"Uri": {
326+
"Fn::GetAtt": [
327+
"MyFunction3BAA72D1",
328+
"Arn"
329+
]
330+
},
331+
"RoleArn": {
332+
"Fn::GetAtt": [
333+
"MyLambdaExtensionRoleBC958D3F13B04",
334+
"Arn"
335+
]
336+
}
337+
}
321338
]
322339
},
323340
"Name": "awsappconfigextension-MyLambdaExtension-68C15290"

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.extension.js.snapshot/awsappconfigextensionMyApplicationappconfigextensionDefaultTestDeployAssert64BA6C4E.assets.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.extension.js.snapshot/cdk.out

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.extension.js.snapshot/integ.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.extension.js.snapshot/manifest.json

+2-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.extension.js.snapshot/tree.json

+27-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.extension.ts

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const lambdaExtension = new Extension(stack, 'MyLambdaExtension', {
3939
actionPoints: [
4040
ActionPoint.PRE_CREATE_HOSTED_CONFIGURATION_VERSION,
4141
ActionPoint.ON_DEPLOYMENT_START,
42+
ActionPoint.AT_DEPLOYMENT_TICK,
4243
],
4344
eventDestination: new LambdaDestination(lambda),
4445
}),

packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-auto-retry-limit.js.snapshot/AutoRetryLimitDefaultTestDeployAssertF296FC2B.assets.json

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-auto-retry-limit.js.snapshot/AutoRetryLimitDefaultTestDeployAssertF296FC2B.template.json

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-auto-retry-limit.js.snapshot/cdk.out

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-auto-retry-limit.js.snapshot/codebuild-auto-retry-limit.assets.json

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)