Skip to content

Commit fdd1058

Browse files
GavinZZGavinZZ
authored
Merge branch 'main' into update-eventpattern
2 parents 96c4053 + f803cf6 commit fdd1058

47 files changed

Lines changed: 6026 additions & 27 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/close-stale-prs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
pull-requests: write
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: rix0rrr/close-stale-prs@main
14+
- uses: cdklabs/close-stale-prs@main
1515
with:
1616
# Required
1717
# Must be PROJEN_GITHUB_TOKEN because the default GHA GitHub token will not have permissions to

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
permissions:
1111
pull-requests: write
1212
steps:
13-
- uses: aws-github-ops/github-merit-badger@main
13+
- uses: cdklabs/github-merit-badger@main
1414
id: merit-badger
1515
with:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}
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,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,aws-cdk-automation,dependabot[bot],mergify[bot]]'
20+
ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,shikha372,kirtishrinkhala,godwingrs22,aws-cdk-automation,dependabot[bot],mergify[bot]]'

‎.github/workflows/issue-reprioritization.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
repository-projects: write
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: kaizencc/issue-reprioritization-manager@main
14+
- uses: cdklabs/issue-reprioritization-manager@main
1515
id: reprioritization-manager
1616
with:
1717
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/pr-labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
permissions:
2525
pull-requests: write
2626
steps:
27-
- uses: kaizencc/pr-triage-manager@main
27+
- uses: cdklabs/pr-triage-manager@main
2828
with:
2929
github-token: ${{ secrets.GITHUB_TOKEN }}
3030

‎.github/workflows/pr-linter-exemption-labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
if: ${{ (github.event.issue.pull_request) && (github.event.issue.state == 'open') }}
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: TheRealAmazonKendra/pr-linter-exemption-labeler@main
15+
- uses: cdklabs/pr-linter-exemption-labeler@main
1616
with:
1717
github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }}

‎.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|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore)$
14+
- author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore|shikha372|kirtishrinkhala|godwingrs22)$
1515
- -label~="contribution/core"
1616
- name: automatic merge
1717
actions:

‎packages/@aws-cdk-testing/cli-integ/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ nyc.config.js
1717

1818
.DS_Store
1919

20-
junit.xml
20+
junit.xml

‎packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/sam_cdk_integ_app/lib/nested-stack.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class NestedStack1 extends NestedStack {
1010
constructor(scope, id, props) {
1111
super(scope, id, props);
1212
new Function(this, 'FunctionPythonRuntime', {
13-
runtime: Runtime.PYTHON_3_7,
13+
runtime: Runtime.PYTHON_3_12,
1414
code: Code.fromAsset('./src/python/Function'),
1515
handler: 'app.lambda_handler',
1616
});

‎packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/sam_cdk_integ_app/lib/test-stack.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ class CDKSupportDemoRootStack extends Stack{
2929
// Layers
3030
new PythonLayerVersion(this, 'PythonLayerVersion', {
3131
compatibleRuntimes: [
32-
Runtime.PYTHON_3_7,
32+
Runtime.PYTHON_3_12,
3333
],
3434
entry: './src/python/Layer',
3535
});
3636
new LayerVersion(this, 'LayerVersion', {
3737
compatibleRuntimes: [
38-
Runtime.PYTHON_3_7,
38+
Runtime.PYTHON_3_12,
3939
],
4040
code: Code.fromAsset('./src/python/Layer'),
4141
});
4242
new LayerVersion(this, 'BundledLayerVersionPythonRuntime', {
4343
compatibleRuntimes: [
44-
Runtime.PYTHON_3_7,
44+
Runtime.PYTHON_3_12,
4545
],
4646
code: Code.fromAsset('./src/python/Layer', {
4747
bundling: {
@@ -50,7 +50,7 @@ class CDKSupportDemoRootStack extends Stack{
5050
'-c',
5151
'rm -rf /tmp/asset-input && mkdir /tmp/asset-input && cp * /tmp/asset-input && cd /tmp/asset-input && pip install -r requirements.txt -t . && mkdir /asset-output/python && cp -R /tmp/asset-input/* /asset-output/python',
5252
],
53-
image: Runtime.PYTHON_3_7.bundlingImage,
53+
image: Runtime.PYTHON_3_12.bundlingImage,
5454
user: 'root',
5555
}
5656
}),
@@ -61,25 +61,25 @@ class CDKSupportDemoRootStack extends Stack{
6161
entry: './src/python/Function',
6262
index: 'app.py',
6363
handler: 'lambda_handler',
64-
runtime: Runtime.PYTHON_3_7,
64+
runtime: Runtime.PYTHON_3_12,
6565
functionName: 'pythonFunc',
6666
logRetention: RetentionDays.THREE_MONTHS,
6767
});
6868
new Function(this, 'FunctionPythonRuntime', {
69-
runtime: Runtime.PYTHON_3_7,
69+
runtime: Runtime.PYTHON_3_12,
7070
code: Code.fromAsset('./src/python/Function'),
7171
handler: 'app.lambda_handler',
7272
});
7373
new Function(this, 'BundledFunctionPythonRuntime', {
74-
runtime: Runtime.PYTHON_3_7,
74+
runtime: Runtime.PYTHON_3_12,
7575
code: Code.fromAsset('./src/python/Function/', {
7676
bundling: {
7777
command: [
7878
'/bin/sh',
7979
'-c',
8080
'rm -rf /tmp/asset-input && mkdir /tmp/asset-input && cp * /tmp/asset-input && cd /tmp/asset-input && pip install -r requirements.txt -t . && cp -R /tmp/asset-input/* /asset-output',
8181
],
82-
image: Runtime.PYTHON_3_7.bundlingImage,
82+
image: Runtime.PYTHON_3_12.bundlingImage,
8383
user: 'root',
8484
}
8585
}),

‎packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.130.0/NOTES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This patch brings the [fix](https://github.com/aws/aws-cdk/pull/29305) into the regression suite.

0 commit comments

Comments
 (0)