Skip to content

Commit e51b3a7

Browse files
authored
Merge branch 'main' into merge-back/2.152.0
2 parents faa7d79 + ad1b797 commit e51b3a7

File tree

370 files changed

+27750
-36109
lines changed

Some content is hidden

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

370 files changed

+27750
-36109
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,21 @@ body:
2020
description: What is the problem? A clear and concise description of the bug.
2121
validations:
2222
required: true
23+
- type: checkboxes
24+
id: regression
25+
attributes:
26+
label: Regression Issue
27+
description: What is a regression? If it worked in a previous version but doesn’t in the latest version, it’s considered a regression. In this case, please provide specific version number in the report.
28+
options:
29+
- label: Select this option if this issue appears to be a regression.
30+
required: false
31+
- type: input
32+
id: working-version
33+
attributes:
34+
label: Last Known Working CDK Version
35+
description: Specify the last known CDK version where this code was functioning as expected (if applicable).
36+
validations:
37+
required: false
2338
- type: textarea
2439
id: expected
2540
attributes:

.github/ISSUE_TEMPLATE/notice.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
name: "❗ Notice"
3-
description: Post a notice for a high impact issue
3+
description: Post a notice for a high impact issue. Internal CDK team use only.
44
title: "❗ NOTICE (module name): (short notice description)"
5-
labels: [p0, management/tracking]
5+
labels: [needs-triage, management/tracking]
66
body:
77
- type: dropdown
88
attributes:

.github/ISSUE_TEMPLATE/region.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: New Region
2-
description: Register a new region.
2+
description: Register a new region. Internal CDK team use only.
33
title: "Register new region: [region]"
4-
labels: ["@aws-cdk/region-info", "feature-request", "p1", "effort/medium"]
4+
labels: ["@aws-cdk/region-info", "feature-request", needs-triage, "effort/medium"]
55
body:
66
- type: input
77
id: ROUTE_53_BUCKET_WEBSITE_ZONE_IDS

.github/ISSUE_TEMPLATE/tracking.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Tracking Issue
2-
description: Add a module tracking issue (internal use only)
2+
description: Add a module tracking issue. Internal CDK team use only.
33
title: "Tracking: [service]"
4-
labels: [management/tracking]
4+
labels: [needs-triage, management/tracking]
55
body:
66
- type: markdown
77
attributes:
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Apply potential regression label on issues
2+
name: issue-regression-label
3+
on:
4+
issues:
5+
types: [opened, edited]
6+
jobs:
7+
add-regression-label:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
steps:
12+
- name: Fetch template body
13+
id: check_regression
14+
uses: actions/github-script@v7
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
TEMPLATE_BODY: ${{ github.event.issue.body }}
18+
with:
19+
script: |
20+
const regressionPattern = /\[x\] Select this option if this issue appears to be a regression\./i;
21+
const template = `${process.env.TEMPLATE_BODY}`
22+
const match = regressionPattern.test(template);
23+
core.setOutput('is_regression', match);
24+
- name: Manage regression label
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
run: |
28+
if [ "${{ steps.check_regression.outputs.is_regression }}" == "true" ]; then
29+
gh issue edit ${{ github.event.issue.number }} --add-label "potential-regression" -R ${{ github.repository }}
30+
else
31+
gh issue edit ${{ github.event.issue.number }} --remove-label "potential-regression" -R ${{ github.repository }}
32+
fi

CONTRIBUTORS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ Shout out to our top contributors!
1212
- [shivlaks](https://github.com/shivlaks)
1313
- [otaviomacedo](https://github.com/otaviomacedo)
1414
- [mrgrain](https://github.com/mrgrain)
15-
- [madeline-k](https://github.com/madeline-k)
1615
- [pahud](https://github.com/pahud)
16+
- [madeline-k](https://github.com/madeline-k)
1717
- [comcalvi](https://github.com/comcalvi)
18-
- [NetaNir](https://github.com/NetaNir)
1918
- [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
19+
- [NetaNir](https://github.com/NetaNir)
2020
- [robertd](https://github.com/robertd)
2121
- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
2222
- [go-to-k](https://github.com/go-to-k)
2323
- [lpizzinidev](https://github.com/lpizzinidev)
2424
- [peterwoodworth](https://github.com/peterwoodworth)
2525
- [colifran](https://github.com/colifran)
2626
- [msambol](https://github.com/msambol)
27-
- [nija-at](https://github.com/nija-at)
2827
- [watany-dev](https://github.com/watany-dev)
28+
- [nija-at](https://github.com/nija-at)
2929
- [hoegertn](https://github.com/hoegertn)
3030

3131

32-
_Last updated: Mon, 01 Jul 24 00:11:02 +0000_
32+
_Last updated: Thu, 01 Aug 24 00:10:57 +0000_

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"fs-extra": "^9.1.0",
2626
"graceful-fs": "^4.2.11",
2727
"jest-junit": "^13.2.0",
28-
"jsii-diff": "1.101.0",
29-
"jsii-pacmak": "1.101.0",
30-
"jsii-reflect": "1.101.0",
28+
"jsii-diff": "1.102.0",
29+
"jsii-pacmak": "1.102.0",
30+
"jsii-reflect": "1.102.0",
3131
"lerna": "^8.1.5",
3232
"nx": "^19.4.0",
3333
"patch-package": "^6.5.1",
@@ -177,4 +177,4 @@
177177
"dependencies": {
178178
"string-width": "^4.2.3"
179179
}
180-
}
180+
}

packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/BatchManagedComputeEnvironmentTestDefaultTestDeployAssertD4528F80.assets.json

Lines changed: 1 addition & 1 deletion
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-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.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.

packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.template.json

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,108 @@
11181118
"Type": "managed",
11191119
"UpdatePolicy": {}
11201120
}
1121+
},
1122+
"ECSAL2023SecurityGroup7AE4A1D4": {
1123+
"Type": "AWS::EC2::SecurityGroup",
1124+
"Properties": {
1125+
"GroupDescription": "batch-stack/ECS_AL2023/SecurityGroup",
1126+
"SecurityGroupEgress": [
1127+
{
1128+
"CidrIp": "0.0.0.0/0",
1129+
"Description": "Allow all outbound traffic by default",
1130+
"IpProtocol": "-1"
1131+
}
1132+
],
1133+
"VpcId": {
1134+
"Ref": "vpcA2121C38"
1135+
}
1136+
}
1137+
},
1138+
"ECSAL2023InstanceProfileRoleEBA7FF23": {
1139+
"Type": "AWS::IAM::Role",
1140+
"Properties": {
1141+
"AssumeRolePolicyDocument": {
1142+
"Statement": [
1143+
{
1144+
"Action": "sts:AssumeRole",
1145+
"Effect": "Allow",
1146+
"Principal": {
1147+
"Service": "ec2.amazonaws.com"
1148+
}
1149+
}
1150+
],
1151+
"Version": "2012-10-17"
1152+
},
1153+
"ManagedPolicyArns": [
1154+
{
1155+
"Fn::Join": [
1156+
"",
1157+
[
1158+
"arn:",
1159+
{
1160+
"Ref": "AWS::Partition"
1161+
},
1162+
":iam::aws:policy/service-role/AmazonEC2ContainerServiceforEC2Role"
1163+
]
1164+
]
1165+
}
1166+
]
1167+
}
1168+
},
1169+
"ECSAL2023InstanceProfile14B35A51": {
1170+
"Type": "AWS::IAM::InstanceProfile",
1171+
"Properties": {
1172+
"Roles": [
1173+
{
1174+
"Ref": "ECSAL2023InstanceProfileRoleEBA7FF23"
1175+
}
1176+
]
1177+
}
1178+
},
1179+
"ECSAL20239DA0188B": {
1180+
"Type": "AWS::Batch::ComputeEnvironment",
1181+
"Properties": {
1182+
"ComputeResources": {
1183+
"AllocationStrategy": "BEST_FIT_PROGRESSIVE",
1184+
"Ec2Configuration": [
1185+
{
1186+
"ImageType": "ECS_AL2023"
1187+
}
1188+
],
1189+
"InstanceRole": {
1190+
"Fn::GetAtt": [
1191+
"ECSAL2023InstanceProfile14B35A51",
1192+
"Arn"
1193+
]
1194+
},
1195+
"InstanceTypes": [
1196+
"optimal"
1197+
],
1198+
"MaxvCpus": 256,
1199+
"MinvCpus": 0,
1200+
"SecurityGroupIds": [
1201+
{
1202+
"Fn::GetAtt": [
1203+
"ECSAL2023SecurityGroup7AE4A1D4",
1204+
"GroupId"
1205+
]
1206+
}
1207+
],
1208+
"Subnets": [
1209+
{
1210+
"Ref": "vpcPrivateSubnet1Subnet934893E8"
1211+
},
1212+
{
1213+
"Ref": "vpcPrivateSubnet2Subnet7031C2BA"
1214+
}
1215+
],
1216+
"Type": "EC2"
1217+
},
1218+
"ReplaceComputeEnvironment": false,
1219+
"State": "ENABLED",
1220+
"Type": "managed",
1221+
"UpdatePolicy": {}
1222+
}
11211223
}
11221224
},
11231225
"Parameters": {

packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
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-batch/test/integ.managed-compute-environment.js.snapshot/integ.json

Lines changed: 1 addition & 1 deletion
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-batch/test/integ.managed-compute-environment.js.snapshot/manifest.json

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

0 commit comments

Comments
 (0)