Skip to content

Commit f359c12

Browse files
authored
Merge branch 'main' into fix/secret-hosted-schedule-from-method
2 parents e6911ab + 7264121 commit f359c12

751 files changed

Lines changed: 84705 additions & 18544 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.

.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: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,aws-cdk-automation,dependabot[bot],mergify[bot]]'
20+
ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,aws-cdk-automation,dependabot[bot],mergify[bot]]'

.github/workflows/pr-linter-trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
mkdir -p ./pr
1818
echo $PR_NUMBER > ./pr/pr_number
1919
echo $PR_SHA > ./pr/pr_sha
20-
- uses: actions/upload-artifact@v3
20+
- uses: actions/upload-artifact@v4
2121
with:
2222
name: pr_info
2323
path: pr/

.github/workflows/spec-update.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
# Upload the current db to be used later
3333
- name: Upload base database
34-
uses: actions/upload-artifact@v3
34+
uses: actions/upload-artifact@v4
3535
with:
3636
name: db.base.json.gz
3737
path: node_modules/@aws-cdk/aws-service-spec/db.json.gz
@@ -49,7 +49,7 @@ jobs:
4949

5050
# Now that we have updated the database, upload the new candidate db
5151
- name: Upload head database
52-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
5353
with:
5454
name: db.head.json.gz
5555
path: node_modules/@aws-cdk/aws-service-spec/db.json.gz
@@ -69,7 +69,7 @@ jobs:
6969
git add .
7070
git diff --patch --staged > ${{ runner.temp }}/update-spec.patch
7171
- name: Upload Patch
72-
uses: actions/upload-artifact@v3
72+
uses: actions/upload-artifact@v4
7373
with:
7474
name: update-spec.patch
7575
path: ${{ runner.temp }}/update-spec.patch
@@ -85,12 +85,12 @@ jobs:
8585
CI: "true"
8686
steps:
8787
- name: Download base database
88-
uses: actions/download-artifact@v3
88+
uses: actions/download-artifact@v4
8989
with:
9090
name: db.base.json.gz
9191
path: base
9292
- name: Download head database
93-
uses: actions/download-artifact@v3
93+
uses: actions/download-artifact@v4
9494
with:
9595
name: db.head.json.gz
9696
path: head
@@ -100,17 +100,17 @@ jobs:
100100
continue-on-error: true
101101
- name: Create PR body file
102102
run: |-
103-
echo 'Update AWS Service Spec packages to latest versions' >> PR.md
103+
echo 'Updates the L1 CloudFormation resource definitions with the latest changes from `@aws-cdk/aws-service-spec`' >> PR.md
104104
- name: Add model changelog to PR body file
105105
if: steps.diff-db.outputs.diff-result
106106
run: |-
107107
echo '' >> PR.md
108-
echo '**@aws-cdk/aws-service-spec changes:**' >> PR.md
108+
echo '**L1 CloudFormation resource definition changes:**' >> PR.md
109109
echo '```' >> PR.md
110110
cat DIFF >> PR.md
111111
echo '```' >> PR.md
112112
- name: Upload PR body file
113-
uses: actions/upload-artifact@v3
113+
uses: actions/upload-artifact@v4
114114
with:
115115
name: PR.md
116116
path: PR.md
@@ -128,7 +128,7 @@ jobs:
128128
uses: actions/checkout@v4
129129

130130
- name: Download patch
131-
uses: actions/download-artifact@v3
131+
uses: actions/download-artifact@v4
132132
with:
133133
name: update-spec.patch
134134
path: ${{ runner.temp }}
@@ -137,7 +137,7 @@ jobs:
137137
run: '[ -s ${{ runner.temp }}/update-spec.patch ] && git apply ${{ runner.temp }}/update-spec.patch || echo "Empty patch. Skipping."'
138138

139139
- name: Download PR body file
140-
uses: actions/download-artifact@v3
140+
uses: actions/download-artifact@v4
141141
with:
142142
name: PR.md
143143
path: ${{ runner.temp }}
@@ -149,10 +149,10 @@ jobs:
149149
branch: automation/spec-update
150150
author: aws-cdk-automation <aws-cdk-automation@users.noreply.github.com>
151151
commit-message: |-
152-
feat: update AWS Service Spec
153-
Update AWS Service Spec packages to latest versions
152+
feat: update L1 CloudFormation resource definitions
153+
Updates the L1 CloudFormation resource definitions with the latest changes from `@aws-cdk/aws-service-spec`
154154
# Pull Request details
155-
title: "feat: update AWS Service Spec"
155+
title: "feat: update L1 CloudFormation resource definitions"
156156
body-path: ${{ runner.temp }}/PR.md
157157
labels: contribution/core,dependencies,auto-approve,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test
158158
team-reviewers: aws-cdk-team

.github/workflows/update-metadata-regions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
git add .
3434
git diff --patch --staged > ${{ runner.temp }}/update-spec.patch
3535
- name: Upload Patch
36-
uses: actions/upload-artifact@v3
36+
uses: actions/upload-artifact@v4
3737
with:
3838
name: update-spec.patch
3939
path: ${{ runner.temp }}/update-spec.patch
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/checkout@v4
5151

5252
- name: Download patch
53-
uses: actions/download-artifact@v3
53+
uses: actions/download-artifact@v4
5454
with:
5555
name: update-spec.patch
5656
path: ${{ runner.temp }}

.github/workflows/yarn-upgrade.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
git add .
9090
git diff --patch --staged > ${{ runner.temp }}/upgrade.patch
9191
- name: Upload Patch
92-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
9393
with:
9494
name: upgrade.patch
9595
path: ${{ runner.temp }}/upgrade.patch
@@ -106,7 +106,7 @@ jobs:
106106
uses: actions/checkout@v4
107107

108108
- name: Download patch
109-
uses: actions/download-artifact@v3
109+
uses: actions/download-artifact@v4
110110
with:
111111
name: upgrade.patch
112112
path: ${{ runner.temp }}

.mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pull_request_rules:
1111
label:
1212
add: [ contribution/core ]
1313
conditions:
14-
- author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs)$
14+
- author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka)$
1515
- -label~="contribution/core"
1616
- name: automatic merge
1717
actions:

ROADMAP.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Security and stability of the CDK is a top priority. If you think you’ve found
3333
* 🚀 [App Staging Synthesizer for Resource Isolation](https://aws.amazon.com/blogs/devops/enhancing-resource-isolation-in-aws-cdk-with-the-app-staging-synthesizer/) - This feature enhances resource isolation and cleanup control by creating separate staging resources for each application
3434
* 👂🏽 [CDK Refactoring](https://github.com/aws/aws-cdk-rfcs/issues/162) - We’re looking into providing built-in support for builder refactoring work.
3535
* 🛠️ [Understand deployment progress within CloudFormation](https://github.com/aws/aws-cdk-rfcs/issues/586) - This will help builders understand what CloudFormation is doing as deployments are in progress.
36+
* 🔍 [Garbage Collection for Assets](https://github.com/aws/aws-cdk-rfcs/issues/64) - Assets which are uploaded to the CDK's S3 bucket and ECR repository are never deleted.
3637

3738
### Speed up development and testing
3839
* 🚀 [Enable CloudFormation builders to migrate existing infrastructure to CDK](https://github.com/aws/aws-cdk/blob/6004a17c593728e36ad4f5c3dcdd578ff46fa9bb/packages/aws-cdk/README.md#cdk-migrate) - CloudFormation builders can now generate a CDK application using an existing CloudFormation template in JSON or YAML format using cdk migrate!
@@ -49,6 +50,7 @@ Security and stability of the CDK is a top priority. If you think you’ve found
4950
### L2 Abstractions
5051
* 🔍 [CloudFront Origin Access Control L2](https://github.com/aws/aws-cdk-rfcs/issues/491)
5152
* 🛠️ [Enabling IPv6 on Resources and VPCs](https://github.com/aws/aws-cdk/pull/28366)
53+
* 🔍 [Rewrite EKS L2](https://github.com/aws/aws-cdk-rfcs/issues/605) - drop the custom resource implementation in favor of the native L1.
5254

5355
We are currently investigating other L2s to build out next. Feel free to create an RFC to request.
5456

packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/simple-app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class SimpleStack extends cdk.Stack {
1414
visibilityTimeout: cdk.Duration.seconds(300),
1515
});
1616
const role = new iam.Role(this, 'role', {
17-
assumedBy: new iam.AnyPrincipal(),
17+
assumedBy: new iam.AccountRootPrincipal(),
1818
});
1919
queue.grantConsumeMessages(role);
2020
}

packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.assets.json

Lines changed: 5 additions & 5 deletions
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-dynamodb/test/integ.global-replicas-provisioned.js.snapshot/aws-cdk-dynamodb-global-replicas-provisioned.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
{
292292
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
293293
},
294-
"/fac70c98815617bfec29fd3dc3b0a9295dba41bc56daf65deb4ecd6b3a35873d.json"
294+
"/21276ea69a4912841ecedfb3a8e1b30a5f4c6414c47885941a6d7b73ba42b5a0.json"
295295
]
296296
]
297297
}

0 commit comments

Comments
 (0)