Merge branch 'main' into merge-back/2.161.1

watany-dev · Oct 5, 2024 · 4e267ea · 4e267ea
2 parents 0a606c9 + 6e96234
commit 4e267ea
Show file tree

Hide file tree

Showing 270 changed files with 131,745 additions and 130,266 deletions.
diff --git a/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts b/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts
@@ -514,12 +514,16 @@ export class TestFixture extends ShellHelper {
 
     // Bootstrap stacks have buckets that need to be cleaned
     const bucketNames = stacksToDelete.map(stack => outputFromStack('BucketName', stack)).filter(defined);
+    // Parallelism will be reasonable
+    // eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
     await Promise.all(bucketNames.map(b => this.aws.emptyBucket(b)));
     // The bootstrap bucket has a removal policy of RETAIN by default, so add it to the buckets to be cleaned up.
     this.bucketsToDelete.push(...bucketNames);
 
     // Bootstrap stacks have ECR repositories with images which should be deleted
     const imageRepositoryNames = stacksToDelete.map(stack => outputFromStack('ImageRepositoryName', stack)).filter(defined);
+    // Parallelism will be reasonable
+    // eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
     await Promise.all(imageRepositoryNames.map(r => this.aws.deleteImageRepository(r)));
 
     await this.aws.deleteStacks(

diff --git a/packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts b/packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts
@@ -51,6 +51,7 @@ test('somewhat balance', async () => {
 
   const keys = Object.keys(counters) as Array<keyof typeof counters> ;
   const pool = ResourcePool.withResources(POOL_NAME, keys);
+  // eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
   await Promise.all(Array.from(range(N)).map(() =>
     pool.using(async (x) => {
       counters[x] += 1;

diff --git a/...js.snapshot/BatchManagedComputeEnvironmentTestDefaultTestDeployAssertD4528F80.assets.json b/...js.snapshot/BatchManagedComputeEnvironmentTestDefaultTestDeployAssertD4528F80.assets.json
diff --git a/...test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.assets.json b/...test/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.assets.json
diff --git a/...st/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.template.json b/...st/aws-batch/test/integ.managed-compute-environment.js.snapshot/batch-stack.template.json
@@ -986,112 +986,6 @@
     "UpdatePolicy": {}
    }
   },
-  "noOptimalInstancesForARMSecurityGroup7157B016": {
-   "Type": "AWS::EC2::SecurityGroup",
-   "Properties": {
-    "GroupDescription": "batch-stack/noOptimalInstancesForARM/SecurityGroup",
-    "SecurityGroupEgress": [
-     {
-      "CidrIp": "0.0.0.0/0",
-      "Description": "Allow all outbound traffic by default",
-      "IpProtocol": "-1"
-     }
-    ],
-    "VpcId": {
-     "Ref": "vpcA2121C38"
-    }
-   }
-  },
-  "noOptimalInstancesForARMInstanceProfileRole926AEEC5": {
-   "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"
-       ]
-      ]
-     }
-    ]
-   }
-  },
-  "noOptimalInstancesForARMInstanceProfile37BE9D32": {
-   "Type": "AWS::IAM::InstanceProfile",
-   "Properties": {
-    "Roles": [
-     {
-      "Ref": "noOptimalInstancesForARMInstanceProfileRole926AEEC5"
-     }
-    ]
-   }
-  },
-  "noOptimalInstancesForARMF146AA4D": {
-   "Type": "AWS::Batch::ComputeEnvironment",
-   "Properties": {
-    "ComputeResources": {
-     "AllocationStrategy": "BEST_FIT_PROGRESSIVE",
-     "Ec2Configuration": [
-      {
-       "ImageIdOverride": {
-        "Ref": "SsmParameterValueawsserviceamiamazonlinuxlatestamznamihvmx8664gp2C96584B6F00A464EAD1953AFF4B05118Parameter"
-       },
-       "ImageType": "ECS_AL2"
-      }
-     ],
-     "InstanceRole": {
-      "Fn::GetAtt": [
-       "noOptimalInstancesForARMInstanceProfile37BE9D32",
-       "Arn"
-      ]
-     },
-     "InstanceTypes": [
-      "a1.large",
-      "m6g"
-     ],
-     "MaxvCpus": 256,
-     "MinvCpus": 0,
-     "SecurityGroupIds": [
-      {
-       "Fn::GetAtt": [
-        "noOptimalInstancesForARMSecurityGroup7157B016",
-        "GroupId"
-       ]
-      }
-     ],
-     "Subnets": [
-      {
-       "Ref": "vpcPrivateSubnet1Subnet934893E8"
-      },
-      {
-       "Ref": "vpcPrivateSubnet2Subnet7031C2BA"
-      }
-     ],
-     "Type": "EC2"
-    },
-    "ReplaceComputeEnvironment": false,
-    "State": "ENABLED",
-    "Type": "managed",
-    "UpdatePolicy": {}
-   }
-  },
   "taggedCESecurityGroup82CCF59F": {
    "Type": "AWS::EC2::SecurityGroup",
    "Properties": {

diff --git a/...framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/cdk.out b/...framework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/cdk.out
diff --git a/...mework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/integ.json b/...mework-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/integ.json
diff --git a/...ork-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/manifest.json b/...ork-integ/test/aws-batch/test/integ.managed-compute-environment.js.snapshot/manifest.json