Merge branch 'main' into merge-back/2.153.0

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -20,6 +20,21 @@ body:
  description: What is the problem? A clear and concise description of the bug.
  validations:
  required: true
+ - type: checkboxes
+ id: regression
+ attributes:
+ label: Regression Issue
+ 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.
+ options:
+ - label: Select this option if this issue appears to be a regression.
+ required: false
+ - type: input
+ id: working-version
+ attributes:
+ label: Last Known Working CDK Version
+ description: Specify the last known CDK version where this code was functioning as expected (if applicable).
+ validations:
+ required: false
  - type: textarea
  id: expected
  attributes:

.github/ISSUE_TEMPLATE/notice.yml

@@ -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:

.github/ISSUE_TEMPLATE/region.yml

@@ -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

.github/ISSUE_TEMPLATE/tracking.yml

@@ -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:

.github/workflows/issue-regression-labeler.yml

@@ -0,0 +1,32 @@
+# Apply potential regression label on issues
+name: issue-regression-label
+on:
+ issues:
+ types: [opened, edited]
+jobs:
+ add-regression-label:
+ runs-on: ubuntu-latest
+ permissions:
+ issues: write
+ steps:
+ - name: Fetch template body
+ id: check_regression
+ uses: actions/github-script@v7
+ env: 
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ TEMPLATE_BODY: ${{ github.event.issue.body }}
+ with:
+ script: |
+ const regressionPattern = /\[x\] Select this option if this issue appears to be a regression\./i;
+ const template = `${process.env.TEMPLATE_BODY}`
+ const match = regressionPattern.test(template);
+ core.setOutput('is_regression', match);
+ - name: Manage regression label
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: |
+ if [ "${{ steps.check_regression.outputs.is_regression }}" == "true" ]; then
+ gh issue edit ${{ github.event.issue.number }} --add-label "potential-regression" -R ${{ github.repository }}
+ else
+ gh issue edit ${{ github.event.issue.number }} --remove-label "potential-regression" -R ${{ github.repository }}
+ fi

.github/workflows/request-cli-integ-test.yml

@@ -19,21 +19,14 @@ jobs:
  persist-credentials: false
  - name: Find changed cli files
  id: changed-cli-files
- uses: tj-actions/changed-files@6b2903bdce6310cfbddd87c418f253cf29b2dec9
+ uses: tj-actions/changed-files@c65cd883420fd2eb864698a825fc4162dd94482c
  with:
  base_sha: ${{ github.event.pull_request.base.sha }}
  files_yaml: |
  cli:
  - packages/aws-cdk/bin/**
  - packages/aws-cdk/lib/**
  - packages/aws-cdk/test/**
- - packages/cdk-assets/bin/**
- - packages/cdk-assets/lib/**
- - packages/cdk-assets/test/**
- - packages/aws-cdk-lib/cloud-assembly-schema/lib/**
- - packages/aws-cdk-lib/cloud-assembly-schema/schema/**
- - packages/aws-cdk-lib/cloud-assembly-schema/scripts/**
- - packages/aws-cdk-lib/cloud-assembly-schema/test/**
  - packages/@aws-cdk/cloudformation-diff/lib/**
  - packages/@aws-cdk/cloudformation-diff/test/**
  - packages/@aws-cdk-testing/cli-integ/bin/**

CONTRIBUTORS.md

@@ -12,21 +12,21 @@ Shout out to our top contributors!
 - [shivlaks](https://github.com/shivlaks)
 - [otaviomacedo](https://github.com/otaviomacedo)
 - [mrgrain](https://github.com/mrgrain)
-- [madeline-k](https://github.com/madeline-k)
 - [pahud](https://github.com/pahud)
+- [madeline-k](https://github.com/madeline-k)
 - [comcalvi](https://github.com/comcalvi)
-- [NetaNir](https://github.com/NetaNir)
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
+- [NetaNir](https://github.com/NetaNir)
 - [robertd](https://github.com/robertd)
 - [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
 - [go-to-k](https://github.com/go-to-k)
 - [lpizzinidev](https://github.com/lpizzinidev)
 - [peterwoodworth](https://github.com/peterwoodworth)
 - [colifran](https://github.com/colifran)
 - [msambol](https://github.com/msambol)
-- [nija-at](https://github.com/nija-at)
 - [watany-dev](https://github.com/watany-dev)
+- [nija-at](https://github.com/nija-at)
 - [hoegertn](https://github.com/hoegertn)
 
 
-_Last updated: Mon, 01 Jul 24 00:11:02 +0000_
+_Last updated: Thu, 01 Aug 24 00:10:57 +0000_

lerna.json

@@ -2,7 +2,6 @@
  "npmClient": "yarn",
  "packages": [
  "packages/aws-cdk-lib",
- "packages/cdk-assets",
  "packages/aws-cdk",
  "packages/cdk",
  "packages/@aws-cdk/*",
@@ -25,4 +24,4 @@
  "rejectCycles": true,
  "version": "0.0.0",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
-}
+}

package.json

@@ -25,9 +25,9 @@
  "fs-extra": "^9.1.0",
  "graceful-fs": "^4.2.11",
  "jest-junit": "^13.2.0",
- "jsii-diff": "1.101.0",
- "jsii-pacmak": "1.101.0",
- "jsii-reflect": "1.101.0",
+ "jsii-diff": "1.102.0",
+ "jsii-pacmak": "1.102.0",
+ "jsii-reflect": "1.102.0",
  "lerna": "^8.1.5",
  "nx": "^19.4.0",
  "patch-package": "^6.5.1",
@@ -72,7 +72,6 @@
  "packages/aws-cdk-lib",
  "packages/aws-cdk",
  "packages/cdk",
- "packages/cdk-assets",
  "packages/@aws-cdk/*",
  "packages/awslint",
  "packages/@aws-cdk-testing/*",

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -102,6 +102,12 @@ integTest('cdk synth', withDefaultFixture(async (fixture) => {
  },
  }));
 
+ expect(await fixture.cdkSynth({
+ options: [fixture.fullStackName('test-1')],
+ })).not.toEqual(expect.stringContaining(`
+Rules:
+ CheckBootstrapVersion:`));
+
  await fixture.cdk(['synth', fixture.fullStackName('test-2')], { verbose: false });
  expect(fixture.template('test-2')).toEqual(expect.objectContaining({
  Resources: {

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

@@ -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": {