Merge branch 'main' into fix-ecs-hotswap-lowercase

.github/workflows/auto-approve.yml

@@ -12,6 +12,6 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-    - uses: hmarr/auto-approve-action@v2.2.1
+    - uses: hmarr/auto-approve-action@v2.4.0
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/issue-label-assign.yml

@@ -146,7 +146,6 @@ env:
            {"area":"@aws-cdk/aws-ecs-patterns","keywords":["aws-ecs-patterns","ecs-patterns"],"labels":["@aws-cdk/aws-ecs-patterns"],"assignees":["madeline-k"]},
            {"area":"@aws-cdk/aws-efs","keywords":["aws-efs","efs","accesspoint"],"labels":["@aws-cdk/aws-efs"],"assignees":["corymhall"]},
            {"area":"@aws-cdk/aws-eks","keywords":["aws-eks","eks","fargateprofile","fargatecluster"],"labels":["@aws-cdk/aws-eks"],"assignees":["otaviomacedo"]},
-           {"area":"@aws-cdk/aws-eks-legacy","keywords":["aws-eks-legacy","eks-legacy"],"labels":["@aws-cdk/aws-eks-legacy"],"assignees":["otaviomacedo"]},
            {"area":"@aws-cdk/aws-elasticache","keywords":["aws-elasticache","elastic-cache"],"labels":["@aws-cdk/aws-elasticache"],"assignees":["otaviomacedo"]},
            {"area":"@aws-cdk/aws-elasticbeanstalk","keywords":["aws-elasticbeanstalk","elastic-beanstalk"],"labels":["@aws-cdk/aws-elasticbeanstalk"],"assignees":["Naumel"]},
            {"area":"@aws-cdk/aws-elasticloadbalancing","keywords":["aws-elasticloadbalancing","elastic-loadbalancing","elb"],"labels":["@aws-cdk/aws-elasticloadbalancing"],"assignees":["corymhall"]},

CHANGELOG.v2.alpha.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.38.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.38.0-alpha.0...v2.38.1-alpha.0) (2022-08-18)
+
 ## [2.38.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.37.1-alpha.0...v2.38.0-alpha.0) (2022-08-17)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.38.1](https://github.com/aws/aws-cdk/compare/v2.38.0...v2.38.1) (2022-08-18)
+
+### Reverts
+
+* cli: revert "feat(cli): --concurrency option" ([#21664](https://github.com/aws/aws-cdk/pull/21664)) ([2ad2163b](https://github.com/aws/aws-cdk/commit/2ad2163b96254f9715dff405100a047d6c2c5958))
+* cli: revert "feat(cli): cdk watch --concurrency" ([#21665](https://github.com/aws/aws-cdk/pull/21665)) ([6048d4fc](https://github.com/aws/aws-cdk/commit/6048d4fc37239bcd5193d5487464590c786bf56b))
+
 ## [2.38.0](https://github.com/aws/aws-cdk/compare/v2.37.1...v2.38.0) (2022-08-17)
 
 

package.json

@@ -18,15 +18,15 @@
   "devDependencies": {
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
-    "cdk-generate-synthetic-examples": "^0.1.15",
+    "cdk-generate-synthetic-examples": "^0.1.16",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.10",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "^1.64.0",
-    "jsii-pacmak": "^1.64.0",
-    "jsii-reflect": "^1.64.0",
-    "jsii-rosetta": "^1.64.0",
+    "jsii-diff": "^1.65.0",
+    "jsii-pacmak": "^1.65.0",
+    "jsii-reflect": "^1.65.0",
+    "jsii-rosetta": "^1.65.0",
     "lerna": "^4.0.0",
     "patch-package": "^6.4.7",
     "semver": "^6.3.0",

packages/@aws-cdk-containers/ecs-service-extensions/test/all-service-addons.integ.snapshot/aws-ecs-integ.assets.json

@@ -1,19 +1,19 @@
 {
-  "version": "17.0.0",
+  "version": "20.0.0",
   "files": {
-    "9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b": {
+    "ad006ddc477f947f0d63b6eb67b02371ef18c9f3cb86353a3cab3704778a8be1": {
       "source": {
         "path": "aws-ecs-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b.json",
+          "objectKey": "ad006ddc477f947f0d63b6eb67b02371ef18c9f3cb86353a3cab3704778a8be1.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     }
   },
   "dockerImages": {}
-}
+}

packages/@aws-cdk-containers/ecs-service-extensions/test/all-service-addons.integ.snapshot/aws-ecs-integ.template.json

@@ -124,7 +124,11 @@
       "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet1"
      }
     ]
-   }
+   },
+   "DependsOn": [
+    "productionenvironmentvpcPublicSubnet1DefaultRoute524C894D",
+    "productionenvironmentvpcPublicSubnet1RouteTableAssociationA8117374"
+   ]
   },
   "productionenvironmentvpcPublicSubnet2Subnet298E6C31": {
    "Type": "AWS::EC2::Subnet",
@@ -228,7 +232,11 @@
       "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet2"
      }
     ]
-   }
+   },
+   "DependsOn": [
+    "productionenvironmentvpcPublicSubnet2DefaultRoute92CD697D",
+    "productionenvironmentvpcPublicSubnet2RouteTableAssociation0A7549F3"
+   ]
   },
   "productionenvironmentvpcPrivateSubnet1Subnet53F632E6": {
    "Type": "AWS::EC2::Subnet",
@@ -2133,7 +2141,9 @@
    },
    "DependsOn": [
     "productionenvironmentvpcPublicSubnet1DefaultRoute524C894D",
-    "productionenvironmentvpcPublicSubnet2DefaultRoute92CD697D"
+    "productionenvironmentvpcPublicSubnet1RouteTableAssociationA8117374",
+    "productionenvironmentvpcPublicSubnet2DefaultRoute92CD697D",
+    "productionenvironmentvpcPublicSubnet2RouteTableAssociation0A7549F3"
    ]
   },
   "greeterloadbalancerSecurityGroupEE1B20F3": {

packages/@aws-cdk-containers/ecs-service-extensions/test/all-service-addons.integ.snapshot/cdk.out

@@ -1 +1 @@
-{"version":"17.0.0"}
+{"version":"20.0.0"}

packages/@aws-cdk/aws-eks-legacy/test/eks-spot.integ.snapshot/integ.json → packages/@aws-cdk-containers/ecs-service-extensions/test/all-service-addons.integ.snapshot/integ.json

@@ -1,14 +1,14 @@
 {
   "version": "20.0.0",
   "testCases": {
-    "integ.eks-spot": {
+    "integ.all-service-addons": {
       "stacks": [
-        "integ-eks-spot"
+        "aws-ecs-integ"
       ],
       "diffAssets": false,
       "stackUpdateWorkflow": true
     }
   },
   "synthContext": {},
-  "enableLookups": true
+  "enableLookups": false
 }

packages/@aws-cdk-containers/ecs-service-extensions/test/all-service-addons.integ.snapshot/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "17.0.0",
+  "version": "20.0.0",
   "artifacts": {
     "Tree": {
       "type": "cdk:tree",