Skip to content

Commit

Permalink
Merge branch 'main' into fix-typos-cloudfront-web-distribution
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Aug 12, 2024
2 parents 7fe33c2 + 7d2e9d0 commit 6cdf7c9
Show file tree
Hide file tree
Showing 204 changed files with 23,807 additions and 2,565 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/notice.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: "❗ Notice"
description: Post a notice for a high impact issue
description: Post a notice for a high impact issue. Internal CDK team use only.
title: "❗ NOTICE (module name): (short notice description)"
labels: [p0, management/tracking]
labels: [needs-triage, management/tracking]
body:
- type: dropdown
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/region.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: New Region
description: Register a new region.
description: Register a new region. Internal CDK team use only.
title: "Register new region: [region]"
labels: ["@aws-cdk/region-info", "feature-request", "p1", "effort/medium"]
labels: ["@aws-cdk/region-info", "feature-request", needs-triage, "effort/medium"]
body:
- type: input
id: ROUTE_53_BUCKET_WEBSITE_ZONE_IDS
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/tracking.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Tracking Issue
description: Add a module tracking issue (internal use only)
description: Add a module tracking issue. Internal CDK team use only.
title: "Tracking: [service]"
labels: [management/tracking]
labels: [needs-triage, management/tracking]
body:
- type: markdown
attributes:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,108 @@
"Type": "managed",
"UpdatePolicy": {}
}
},
"ECSAL2023SecurityGroup7AE4A1D4": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"GroupDescription": "batch-stack/ECS_AL2023/SecurityGroup",
"SecurityGroupEgress": [
{
"CidrIp": "0.0.0.0/0",
"Description": "Allow all outbound traffic by default",
"IpProtocol": "-1"
}
],
"VpcId": {
"Ref": "vpcA2121C38"
}
}
},
"ECSAL2023InstanceProfileRoleEBA7FF23": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ec2.amazonaws.com"
}
}
],
"Version": "2012-10-17"
},
"ManagedPolicyArns": [
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/service-role/AmazonEC2ContainerServiceforEC2Role"
]
]
}
]
}
},
"ECSAL2023InstanceProfile14B35A51": {
"Type": "AWS::IAM::InstanceProfile",
"Properties": {
"Roles": [
{
"Ref": "ECSAL2023InstanceProfileRoleEBA7FF23"
}
]
}
},
"ECSAL20239DA0188B": {
"Type": "AWS::Batch::ComputeEnvironment",
"Properties": {
"ComputeResources": {
"AllocationStrategy": "BEST_FIT_PROGRESSIVE",
"Ec2Configuration": [
{
"ImageType": "ECS_AL2023"
}
],
"InstanceRole": {
"Fn::GetAtt": [
"ECSAL2023InstanceProfile14B35A51",
"Arn"
]
},
"InstanceTypes": [
"optimal"
],
"MaxvCpus": 256,
"MinvCpus": 0,
"SecurityGroupIds": [
{
"Fn::GetAtt": [
"ECSAL2023SecurityGroup7AE4A1D4",
"GroupId"
]
}
],
"Subnets": [
{
"Ref": "vpcPrivateSubnet1Subnet934893E8"
},
{
"Ref": "vpcPrivateSubnet2Subnet7031C2BA"
}
],
"Type": "EC2"
},
"ReplaceComputeEnvironment": false,
"State": "ENABLED",
"Type": "managed",
"UpdatePolicy": {}
}
}
},
"Parameters": {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6cdf7c9

Please sign in to comment.