Skip to content

Commit ecc4caa

Browse files
camerondurhamcamerondurham
authored
Merge branch 'main' into feat/iam-sid-validation-flag-main
2 parents ea674a5 + 1b8b4e3 commit ecc4caa

File tree

256 files changed

+80802
-3462
lines changed

Some content is hidden

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

256 files changed

+80802
-3462
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ env:
143143
{"area":"@aws-cdk/aws-ecs-patterns","keywords":["aws-ecs-patterns","ecs-patterns"],"labels":["@aws-cdk/aws-ecs-patterns"]},
144144
{"area":"@aws-cdk/aws-efs","keywords":["aws-efs","efs","accesspoint"],"labels":["@aws-cdk/aws-efs"]},
145145
{"area":"@aws-cdk/aws-eks","keywords":["aws-eks","eks","fargateprofile","fargatecluster"],"labels":["@aws-cdk/aws-eks"]},
146+
{"area":"@aws-cdk/aws-eks-v2-alpha", "keywords":["aws-eks-v2", "eks-v2", "aws-eks-v2-alpha"],"labels":["@aws-cdk/aws-eks-v2-alpha"]},
146147
{"area":"@aws-cdk/aws-elasticache","keywords":["aws-elasticache","elastic-cache"],"labels":["@aws-cdk/aws-elasticache"]},
147148
{"area":"@aws-cdk/aws-elasticbeanstalk","keywords":["aws-elasticbeanstalk","elastic-beanstalk"],"labels":["@aws-cdk/aws-elasticbeanstalk"]},
148149
{"area":"@aws-cdk/aws-elasticloadbalancing","keywords":["aws-elasticloadbalancing","elastic-loadbalancing","elb"],"labels":["@aws-cdk/aws-elasticloadbalancing"]},
@@ -289,5 +290,8 @@ env:
289290
{"area":"@aws-cdk/aws-s3tables-alpha", "keywords":["aws-s3tables", "aws-s3tables-alpha"],"labels":["@aws-cdk/aws-s3tables-alpha"]},
290291
{"area":"@aws-cdk/aws-pipes-enrichments-alpha", "keywords":["aws-pipes-enrichments", "aws-pipes-enrichments-alpha"],"labels":["@aws-cdk/aws-pipes-enrichments-alpha"]},
291292
{"area":"@aws-cdk/aws-pipes-sources-alpha", "keywords":["aws-pipes-sources", "aws-pipes-sources-alpha"],"labels":["@aws-cdk/aws-pipes-sources-alpha"]},
292-
{"area":"@aws-cdk/aws-pipes-targets-alpha", "keywords":["aws-pipes-targets", "aws-pipes-targets-alpha"],"labels":["@aws-cdk/aws-pipes-targets-alpha"]}
293+
{"area":"@aws-cdk/aws-pipes-targets-alpha", "keywords":["aws-pipes-targets", "aws-pipes-targets-alpha"],"labels":["@aws-cdk/aws-pipes-targets-alpha"]},
294+
{"area":"@aws-cdk/aws-bedrock-alpha", "keywords":["aws-bedrock", "aws-bedrock-alpha"],"labels":["@aws-cdk/aws-bedrock-alpha"]},
295+
{"area":"@aws-cdk/aws-bedrock-agentcore-alpha", "keywords":["aws-bedrock-agentcore", "aws-bedrock-agentcore-alpha"],"labels":["@aws-cdk/aws-bedrock-agentcore-alpha"]},
296+
{"area":"@aws-cdk/aws-imagebuilder-alpha", "keywords":["aws-imagebuilder", "aws-imagebuilder-alpha"],"labels":["@aws-cdk/aws-imagebuilder-alpha"]}
293297
]

‎.github/workflows/security-guardian.yml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
- name: Checkout
2020
uses: actions/checkout@v6
2121
with:
22+
ref: ${{ github.event.pull_request.head.sha }}
2223
fetch-depth: 0
2324

2425
- name: Install cfn-guard
@@ -34,10 +35,21 @@ jobs:
3435
run: yarn install --frozen-lockfile && cd tools/@aws-cdk/security-guardian && yarn build
3536

3637
- name: Run Security Guardian
38+
id: security-guardian
3739
uses: ./tools/@aws-cdk/security-guardian
3840
with:
3941
base_sha: ${{ github.event.pull_request.base.sha }}
4042
head_sha: ${{ github.event.pull_request.head.sha }}
4143
rule_set_path: './tools/@aws-cdk/security-guardian/rules'
42-
show_summary: 'fail'
43-
output_format: 'json'
44+
- name: Save PR info for security-report
45+
if: always()
46+
run: |
47+
echo "${{ github.event.pull_request.number }}" > ./test-results/pr_number
48+
echo "${{ github.event.pull_request.head.sha }}" > ./test-results/pr_sha
49+
50+
- name: Upload Security Guardian XML Reports
51+
uses: actions/upload-artifact@v5
52+
if: always()
53+
with:
54+
name: security-guardian-reports
55+
path: test-results/

‎.github/workflows/security-report.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Security Report
2+
on:
3+
workflow_run:
4+
workflows: ["Security Guardian"]
5+
types: [completed]
6+
7+
jobs:
8+
report:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
checks: write
12+
pull-requests: write
13+
actions: read
14+
steps:
15+
- name: Download artifacts
16+
uses: actions/download-artifact@v6
17+
with:
18+
name: security-guardian-reports
19+
path: test-results/
20+
github-token: ${{ secrets.GITHUB_TOKEN }}
21+
run-id: ${{ github.event.workflow_run.id }}
22+
repository: ${{ github.repository }}
23+
24+
- name: Get PR info
25+
id: pr_info
26+
run: |
27+
echo "pr_number=$(cat test-results/pr_number)" >> "$GITHUB_OUTPUT"
28+
echo "pr_sha=$(cat test-results/pr_sha)" >> "$GITHUB_OUTPUT"
29+
echo "PR: $(cat test-results/pr_number), SHA: $(cat test-results/pr_sha)"
30+
- name: Publish Security Test Results
31+
uses: mikepenz/action-junit-report@v6
32+
if: always()
33+
with:
34+
report_paths: 'test-results/**/cfn-guard-static.xml'
35+
check_name: 'Security Guardian Results'
36+
exclude_sources: 'node_modules,dist'
37+
commit: ${{ steps.pr_info.outputs.pr_sha }}
38+
check_annotations: true
39+
comment: true
40+
pr_id: ${{ steps.pr_info.outputs.pr_number }}
41+
detailed_summary: true
42+
include_passed: false
43+
fail_on_failure: false
44+
group_suite: true
45+
include_skipped: false
46+
check_title_template: '{{TEST_NAME}}'
47+
include_empty_in_summary: false
48+
49+
- name: Publish Security Test Results for resolved templates
50+
uses: mikepenz/action-junit-report@v6
51+
if: always()
52+
with:
53+
report_paths: 'test-results/**/cfn-guard-resolved.xml'
54+
check_name: 'Security Guardian Results with resolved templates'
55+
exclude_sources: 'node_modules,dist'
56+
commit: ${{ steps.pr_info.outputs.pr_sha }}
57+
check_annotations: true
58+
comment: true
59+
pr_id: ${{ steps.pr_info.outputs.pr_number }}
60+
detailed_summary: true
61+
include_passed: false
62+
fail_on_failure: false
63+
group_suite: true
64+
include_skipped: false
65+
check_title_template: '{{TEST_NAME}}'
66+
include_empty_in_summary: false

‎.github/workflows/spec-update.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ jobs:
5858
# Build @aws-cdk/spec2cdk and run L1 gen script to generate base files for new modules
5959
- name: Build @aws-cdk/spec2cdk
6060
run: lerna run build --stream --no-progress --skip-nx-cache --scope @aws-cdk/spec2cdk
61-
- name: Generate L1s
62-
working-directory: packages/aws-cdk-lib
61+
- name: Generate code
6362
run: yarn gen
63+
run: lerna run gen --stream --no-progress --skip-nx-cache --scope aws-cdk-lib --scope @aws-cdk/mixins-preview
6464

6565
# Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
6666
# Creating a pull request requires write permissions and it's best to keep write privileges isolated.

‎CHANGELOG.v2.alpha.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [2.232.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.232.0-alpha.0...v2.232.1-alpha.0) (2025-12-05)
6+
7+
## [2.232.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.231.0-alpha.0...v2.232.0-alpha.0) (2025-12-04)
8+
9+
10+
### Bug Fixes
11+
12+
* **bedrock-agentcore-alpha:** use static construct ID for asset-based runtime artifacts ([#36241](https://github.com/aws/aws-cdk/issues/36241)) ([e2bdddd](https://github.com/aws/aws-cdk/commit/e2bdddd82f3e04f1cb2aebb187c580563bae453f)), closes [#35968](https://github.com/aws/aws-cdk/issues/35968)
13+
* **mixins-preview:** service exports are different then in `aws-cdk-lib` ([#36201](https://github.com/aws/aws-cdk/issues/36201)) ([5858006](https://github.com/aws/aws-cdk/commit/585800660b65a3a87d2b358054c7b5e162faabcf)), closes [#36210](https://github.com/aws/aws-cdk/issues/36210)
14+
* **mixins-preview:** strongly-typed ConstructSelector interface ([#36266](https://github.com/aws/aws-cdk/issues/36266)) ([1d2f473](https://github.com/aws/aws-cdk/commit/1d2f4730cc4358d35198980957e4fc01a21e9daf))
15+
516
## [2.231.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.230.0-alpha.0...v2.231.0-alpha.0) (2025-12-01)
617

718

‎CHANGELOG.v2.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,28 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [2.232.1](https://github.com/aws/aws-cdk/compare/v2.232.0...v2.232.1) (2025-12-05)
6+
7+
8+
### Bug Fixes
9+
10+
* **core:** TypeScript properties missing for types which extend internal interfaces ([#36313](https://github.com/aws/aws-cdk/issues/36313)) ([3e7e17c](https://github.com/aws/aws-cdk/commit/3e7e17c0def24567610a541e39195596f5d83387)), closes [#36310](https://github.com/aws/aws-cdk/issues/36310)
11+
12+
## [2.232.0](https://github.com/aws/aws-cdk/compare/v2.231.0...v2.232.0) (2025-12-04)
13+
14+
15+
### Features
16+
17+
* update L1 CloudFormation resource definitions ([#36299](https://github.com/aws/aws-cdk/issues/36299)) ([0945692](https://github.com/aws/aws-cdk/commit/0945692b91b01b6a8c69e844cffe7629cc52695a))
18+
* **bedrock-agentcore:** add fromImageUri method to AgentRuntimeArtifact ([#36263](https://github.com/aws/aws-cdk/issues/36263)) ([ad25aba](https://github.com/aws/aws-cdk/commit/ad25aba9785c6801085525da4d6adcc8c3204a70))
19+
* **lambda:** add support for durable functions ([#36282](https://github.com/aws/aws-cdk/issues/36282)) ([599a1d3](https://github.com/aws/aws-cdk/commit/599a1d3b26a1a9edf22f1cde41da323e560145fb))
20+
* update L1 CloudFormation resource definitions ([#36277](https://github.com/aws/aws-cdk/issues/36277)) ([c4fa99b](https://github.com/aws/aws-cdk/commit/c4fa99b9149b512494c9ae94b8d4aebba4436eb0))
21+
22+
23+
### Bug Fixes
24+
25+
* **core:** temp cleanup does not work with jest ([#36238](https://github.com/aws/aws-cdk/issues/36238)) ([1f4a224](https://github.com/aws/aws-cdk/commit/1f4a2249b2651115cf02a26fd4bba09b151f426e)), closes [#36226](https://github.com/aws/aws-cdk/issues/36226)
26+
527
## [2.231.0](https://github.com/aws/aws-cdk/compare/v2.230.0...v2.231.0) (2025-12-01)
628

729

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
"fs-extra": "^9.1.0",
2929
"graceful-fs": "^4.2.11",
3030
"jest-junit": "^13.2.0",
31-
"jsii-diff": "1.120.0",
32-
"jsii-pacmak": "1.120.0",
33-
"jsii-reflect": "1.120.0",
31+
"jsii-diff": "1.121.0",
32+
"jsii-pacmak": "1.121.0",
33+
"jsii-reflect": "1.121.0",
3434
"lerna": "^8.2.4",
3535
"nx": "^20",
3636
"semver": "^7.7.3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@aws-cdk/lambda-layer-kubectl-v34": "^2.0.0",
5151
"@aws-cdk/region-info": "0.0.0",
5252
"aws-cdk-lib": "0.0.0",
53-
"cdk8s": "2.70.30",
53+
"cdk8s": "2.70.31",
5454
"cdk8s-plus-27": "2.9.5",
5555
"constructs": "^10.0.0"
5656
},

‎packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base14.js.snapshot/MacOsProjectIntegTestDefaultTestDeployAssertB425ECC4.assets.json‎

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)