Skip to content

Commit 83ffd1e

Browse files
authored
Merge branch 'main' into ap-east-2
2 parents bea5d58 + 1c57d69 commit 83ffd1e

File tree

803 files changed

+159697
-9460
lines changed

Some content is hidden

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

803 files changed

+159697
-9460
lines changed
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Codebuild PR Build
2+
3+
on:
4+
workflow_dispatch: {}
5+
merge_group: {}
6+
push:
7+
branches:
8+
- main
9+
- v2-release
10+
pull_request:
11+
branches:
12+
- main
13+
- v2-release
14+
15+
# For every PR, cancel any previous builds in progress
16+
# ... but for all other builds we keep them running
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.pull_request.number || github.run_id }}
19+
cancel-in-progress: true
20+
21+
jobs:
22+
build:
23+
runs-on: codebuild-aws-cdk-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }}
24+
25+
env:
26+
PR_BUILD: true
27+
28+
steps:
29+
- name: Checkout code
30+
uses: actions/checkout@v4
31+
32+
- name: Setup Node.js
33+
uses: actions/setup-node@v4
34+
with:
35+
node-version: "18"
36+
cache: "yarn"
37+
38+
- name: Set up Docker
39+
uses: docker/setup-buildx-action@v3
40+
41+
- name: Load Docker images
42+
id: docker-cache
43+
uses: actions/cache/restore@v4
44+
with:
45+
path: |
46+
~/.docker-images.tar
47+
key: docker-cache-${{ runner.os }}
48+
49+
- name: Restore Docker images
50+
if: ${{ steps.docker-cache.outputs.cache-hit }}
51+
run: docker image load --input ~/.docker-images.tar
52+
53+
- name: Cache build artifacts
54+
uses: actions/cache@v4
55+
with:
56+
path: |
57+
~/.s3buildcache
58+
key: s3buildcache-${{ runner.os }}
59+
60+
- name: Configure system settings
61+
run: |
62+
(command -v sysctl || sudo apt-get update && sudo apt-get install -y procps) && \
63+
sudo sysctl -w vm.max_map_count=2251954
64+
65+
- name: Build
66+
run: /bin/bash ./build.sh --ci
67+
68+
- name: Run Rosetta
69+
run: /bin/bash ./scripts/run-rosetta.sh
70+
71+
- name: Check for uncommitted changes
72+
run: git diff-index --exit-code --ignore-space-at-eol --stat HEAD
73+
74+
- name: Export Docker images
75+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
76+
run: docker image save --output ~/.docker-images.tar $(docker image list --format '{{ if ne .Repository "<none>" }}{{ .Repository }}{{ if ne .Tag "<none>" }}:{{ .Tag }}{{ end }}{{ else }}{{ .ID }}{{ end }}')
77+
78+
- name: Cache Docker images
79+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
80+
uses: actions/cache/save@v4
81+
with:
82+
path: |
83+
~/.docker-images.tar
84+
key: docker-cache-${{ runner.os }}

.github/workflows/codecov-upload.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
github.event.workflow_run.conclusion == 'success'
2121
2222
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v4
2325
- name: Download Artifacts
2426
uses: actions/download-artifact@v4
2527
with:

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,5 +284,10 @@ env:
284284
{"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"]},
285285
{"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]},
286286
{"area":"@aws-cdk/aws-location-alpha", "keywords":["aws-location", "aws-location-alpha"],"labels":["@aws-cdk/aws-location-alpha"]},
287-
{"area":"@aws-cdk/cli-lib-alpha", "keywords":["cli-lib", "cli-lib-alpha"],"labels":["@aws-cdk/cli-lib-alpha"]}
287+
{"area":"@aws-cdk/cli-lib-alpha", "keywords":["cli-lib", "cli-lib-alpha"],"labels":["@aws-cdk/cli-lib-alpha"]},
288+
{"area":"@aws-cdk/aws-applicationsignals-alpha", "keywords":["aws-applicationsignals", "aws-applicationsignals-alpha"],"labels":["@aws-cdk/aws-applicationsignals-alpha"]},
289+
{"area":"@aws-cdk/aws-s3tables-alpha", "keywords":["aws-s3tables", "aws-s3tables-alpha"],"labels":["@aws-cdk/aws-s3tables-alpha"]},
290+
{"area":"@aws-cdk/aws-pipes-enrichments-alpha", "keywords":["aws-pipes-enrichments", "aws-pipes-enrichments-alpha"],"labels":["@aws-cdk/aws-pipes-enrichments-alpha"]},
291+
{"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"]}
288293
]

.github/workflows/pr-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ concurrency:
2020

2121
jobs:
2222
build:
23+
if: github.repository != 'aws/aws-cdk'
2324
runs-on: aws-cdk_ubuntu-latest_32-core
2425

2526
env:

.mergify.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# See https://doc.mergify.io
2+
merge_queue:
3+
# Hopefully this gets Mergify to stop creating PRs just to test merges (it both messes with statistics and our automatic validations)
4+
max_parallel_checks: 1
25
queue_rules:
36
- name: default-merge
47
update_method: merge
@@ -16,7 +19,6 @@ queue_rules:
1619
- "#changes-requested-reviews-by=0"
1720
- status-success~=AWS CodeBuild us-east-1
1821
- status-success=validate-pr
19-
- status-success=build
2022
commit_message_template: |-
2123
{{ title }} (#{{ number }})
2224
{{ body }}
@@ -37,7 +39,6 @@ queue_rules:
3739
- "#changes-requested-reviews-by=0"
3840
- status-success~=AWS CodeBuild us-east-1
3941
- status-success=validate-pr
40-
- status-success=build
4142
commit_message_template: |-
4243
{{ title }} (#{{ number }})
4344
{{ body }}
@@ -57,7 +58,6 @@ queue_rules:
5758
- "#changes-requested-reviews-by=0"
5859
- status-success~=AWS CodeBuild us-east-1
5960
- status-success=validate-pr
60-
- status-success=build
6161
commit_message_template: |-
6262
{{ title }} (#{{ number }})
6363
{{ body }}
@@ -90,7 +90,6 @@ pull_request_rules:
9090
- "#changes-requested-reviews-by=0"
9191
- status-success~=AWS CodeBuild us-east-1
9292
- status-success=validate-pr
93-
- status-success=build
9493
- name: automatic priority merge
9594
actions:
9695
comment:
@@ -112,7 +111,6 @@ pull_request_rules:
112111
- "#changes-requested-reviews-by=0"
113112
- status-success~=AWS CodeBuild us-east-1
114113
- status-success=validate-pr
115-
- status-success=build
116114
- name: automatic merge (2+ approvers)
117115
actions:
118116
comment:
@@ -134,7 +132,6 @@ pull_request_rules:
134132
- "#changes-requested-reviews-by=0"
135133
- status-success~=AWS CodeBuild us-east-1
136134
- status-success=validate-pr
137-
- status-success=build
138135
- name: automatic merge (no-squash)
139136
actions:
140137
comment:
@@ -156,7 +153,6 @@ pull_request_rules:
156153
- "#changes-requested-reviews-by=0"
157154
- status-success~=AWS CodeBuild us-east-1
158155
- status-success=validate-pr
159-
- status-success=build
160156
- name: remove stale reviews
161157
actions:
162158
dismiss_reviews:
@@ -197,7 +193,6 @@ pull_request_rules:
197193
- "#changes-requested-reviews-by=0"
198194
- status-success~=AWS CodeBuild us-east-1
199195
- status-success=validate-pr
200-
- status-success=build
201196
priority_rules:
202197
- name: priority for queue `default-merge`
203198
conditions:

CHANGELOG.v2.alpha.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
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.206.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.205.0-alpha.0...v2.206.0-alpha.0) (2025-07-16)
6+
7+
## [2.205.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.204.0-alpha.0...v2.205.0-alpha.0) (2025-07-15)
8+
59
## [2.204.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.203.1-alpha.0...v2.204.0-alpha.0) (2025-07-04)
610

711

CHANGELOG.v2.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,46 @@
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.206.0](https://github.com/aws/aws-cdk/compare/v2.205.0...v2.206.0) (2025-07-16)
6+
7+
8+
### Features
9+
10+
* **custom-resource:** Added async custom resource provider framework logging off by default ([1302e3d](https://github.com/aws/aws-cdk/commit/1302e3d81a2df8e5976c9a10603efb238dcf35ae))
11+
* **ecs:** add L1 native blue/green deployment support for ECS services ([3ef87e4](https://github.com/aws/aws-cdk/commit/3ef87e496965dc9c8efec6d5924658f45719134e))
12+
13+
## [2.205.0](https://github.com/aws/aws-cdk/compare/v2.204.0...v2.205.0) (2025-07-15)
14+
15+
16+
### Features
17+
18+
* **kinesisfirehose:** support custom time zone settings for S3 destination ([#34738](https://github.com/aws/aws-cdk/issues/34738)) ([2bbe762](https://github.com/aws/aws-cdk/commit/2bbe7629ef6a7bf89001501037a988385a94f926)), closes [#34737](https://github.com/aws/aws-cdk/issues/34737)
19+
* update L1 CloudFormation resource definitions ([#34979](https://github.com/aws/aws-cdk/issues/34979)) ([2e0e536](https://github.com/aws/aws-cdk/commit/2e0e5362826449410210e82e17e052d384b37f36))
20+
* **codebuild:** cache sharing of CodeBuild projects ([#34257](https://github.com/aws/aws-cdk/issues/34257)) ([21e2d1e](https://github.com/aws/aws-cdk/commit/21e2d1e73ed8ba0d1f7bc2683dec7d5fe0fec25f)), closes [/docs.aws.amazon.com/codebuild/latest/userguide/caching-s3.html#caching-s3](https://github.com/aws//docs.aws.amazon.com/codebuild/latest/userguide/caching-s3.html/issues/caching-s3)
21+
* update L1 CloudFormation resource definitions ([#34915](https://github.com/aws/aws-cdk/issues/34915)) ([748d03c](https://github.com/aws/aws-cdk/commit/748d03c99de6242e0b9bed91d8c015249106fdca))
22+
* **cloudwatch-dashboards:** add support for queryLanguage property ([#34547](https://github.com/aws/aws-cdk/issues/34547)) ([8a77828](https://github.com/aws/aws-cdk/commit/8a77828ab14f635953af27a1b00174d988e85303)), closes [#34482](https://github.com/aws/aws-cdk/issues/34482) [/github.com/aws/aws-cdk/issues/34482#issuecomment-2887841701](https://github.com/aws//github.com/aws/aws-cdk/issues/34482/issues/issuecomment-2887841701)
23+
* **ec2:** add c8gn instance class ([#34866](https://github.com/aws/aws-cdk/issues/34866)) ([aaf442b](https://github.com/aws/aws-cdk/commit/aaf442b87ec64576ddb9dc88919134665cee3fa7))
24+
* **events:** add `arnForPolicy` attribute for api destination ([#34315](https://github.com/aws/aws-cdk/issues/34315)) ([e0ac9f8](https://github.com/aws/aws-cdk/commit/e0ac9f8ee3394f666bf84066b89eb83be9b7361e))
25+
* **rds:** add `fromLookup` method for Amazon Aurora Database Cluster ([#34849](https://github.com/aws/aws-cdk/issues/34849)) ([23ca6fc](https://github.com/aws/aws-cdk/commit/23ca6fca7a0d029aa76dbdedb99770e8069024ca)), closes [#34848](https://github.com/aws/aws-cdk/issues/34848) [#33258](https://github.com/aws/aws-cdk/issues/33258)
26+
* **synthetics:** add `maxRetries` prop to configure automatic retries on canary runs ([#34541](https://github.com/aws/aws-cdk/issues/34541)) ([54d8a84](https://github.com/aws/aws-cdk/commit/54d8a84b88c1bbde4937cc1b28e27d11aa813b0b)), closes [#34511](https://github.com/aws/aws-cdk/issues/34511)
27+
* **synthetics:** add support for tag replication for aws synthetics ([#34830](https://github.com/aws/aws-cdk/issues/34830)) ([5ff59d9](https://github.com/aws/aws-cdk/commit/5ff59d9c7e4959b9de8754b5a8d838810335240a))
28+
* **core:** report feature flag info into Cloud Assembly ([#34919](https://github.com/aws/aws-cdk/issues/34919)) ([72733ea](https://github.com/aws/aws-cdk/commit/72733ea4528911a11fb0d0411e7641ddd47fc60a))
29+
30+
31+
### Bug Fixes
32+
33+
* **codecov:** update codecov-upload.yml with a git checkout step ([#34929](https://github.com/aws/aws-cdk/issues/34929)) ([0a0adf7](https://github.com/aws/aws-cdk/commit/0a0adf7ce2f06b13d8cf5150810214ae5b9ffb69))
34+
* **lambda:** handle token resolution issues in addToRolePolicy ([#34904](https://github.com/aws/aws-cdk/issues/34904)) ([6cd1802](https://github.com/aws/aws-cdk/commit/6cd1802d7fbfb5896a7c194099247eb4e05f4c5f)), closes [#34894](https://github.com/aws/aws-cdk/issues/34894)
35+
* **pipelines:** ensure assets with same hash but different destinations are published separately ([#34790](https://github.com/aws/aws-cdk/issues/34790)) ([05afab3](https://github.com/aws/aws-cdk/commit/05afab30b9c6071307f38ecc54c0594bec14f2b3)), closes [#31070](https://github.com/aws/aws-cdk/issues/31070) [#31070](https://github.com/aws/aws-cdk/issues/31070)
36+
* **region-info:** integ use standalone package ([#34782](https://github.com/aws/aws-cdk/issues/34782)) ([6d1bcb3](https://github.com/aws/aws-cdk/commit/6d1bcb3cc66490afb3c707cf3f3fd63d88d0a08b)), closes [#34692](https://github.com/aws/aws-cdk/issues/34692) [/github.com/aws/aws-cdk/blob/1ae14635cbbc8ba0f2dab8cbeb72c4af0fddce7a/packages/aws-cdk-lib/package.json#L507-L511](https://github.com/aws//github.com/aws/aws-cdk/blob/1ae14635cbbc8ba0f2dab8cbeb72c4af0fddce7a/packages/aws-cdk-lib/package.json/issues/L507-L511)
37+
* **tags:** excludeResourceTypes does not work for tags applied at stack level (under feature flag) ([#31443](https://github.com/aws/aws-cdk/issues/31443)) ([4c7d9f4](https://github.com/aws/aws-cdk/commit/4c7d9f41090992dbd91aa8c783cbfd4da4571fa7)), closes [#28017](https://github.com/aws/aws-cdk/issues/28017) [#33945](https://github.com/aws/aws-cdk/issues/33945) [#30055](https://github.com/aws/aws-cdk/issues/30055)
38+
39+
### ⚠ CHANGES TO L1 RESOURCES
40+
L1 resources are automatically generated from public CloudFormation Resource Schemas. They are build to closely reflect the real state of CloudFormation. Sometimes these updates can contain changes that are incompatible with previous types, but more accurately reflect reality. In this release we have changed:
41+
* ***aws-cdk-lib.aws_ec2.CfnTrafficMirrorFilterRule***: `Id` attribute was removed
42+
* ***aws-cdk-lib.aws_kinesis.StreamConsumer***: `Id` attribute was removed
43+
* ***aws-cdk-lib.aws_neptune.DBInstance***: `Id` attribute was removed
44+
545
## [2.204.0](https://github.com/aws/aws-cdk/compare/v2.203.1...v2.204.0) (2025-07-04)
646

747

deprecated_apis.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,8 @@ aws-cdk-lib.aws_cloudwatch.IMetric#toAlarmConfig
418418
aws-cdk-lib.aws_cloudwatch.IMetric#toGraphConfig
419419
aws-cdk-lib.aws_cloudwatch.MathExpression#toAlarmConfig
420420
aws-cdk-lib.aws_cloudwatch.MathExpression#toGraphConfig
421+
aws-cdk-lib.aws_cloudwatch.SearchExpression#toAlarmConfig
422+
aws-cdk-lib.aws_cloudwatch.SearchExpression#toGraphConfig
421423
aws-cdk-lib.aws_cloudwatch.Metric#toAlarmConfig
422424
aws-cdk-lib.aws_cloudwatch.Metric#toGraphConfig
423425
aws-cdk-lib.aws_cloudwatch.MetricAlarmConfig

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"@aws-cdk/lambda-layer-kubectl-v31": "^2.1.0",
4848
"@aws-cdk/lambda-layer-kubectl-v32": "^2.1.0",
4949
"@aws-cdk/lambda-layer-kubectl-v33": "^2.0.0",
50+
"@aws-cdk/region-info": "0.0.0",
5051
"aws-cdk-lib": "0.0.0",
5152
"cdk8s": "2.69.74",
5253
"cdk8s-plus-27": "2.9.5",

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-eventapi-opensearch.js.snapshot/EventApiOpenSearchStack.assets.json

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

0 commit comments

Comments
 (0)