feat(batch): Stabilize Batch

packages/@aws-cdk-testing/framework-integ/package.json

@@ -29,7 +29,6 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@aws-cdk/aws-batch-alpha": "0.0.0",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/integ-runner": "^0.0.0",
     "@aws-cdk/pkglint": "0.0.0",

packages/@aws-cdk/aws-batch-alpha/test/integ.batch-unique-name.ts → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.batch-unique-name.ts

@@ -1,9 +1,9 @@
+import * as integ from '@aws-cdk/integ-tests-alpha';
 import { ContainerImage } from 'aws-cdk-lib/aws-ecs';
-import { App, Size, Stack } from 'aws-cdk-lib';
 import * as events from 'aws-cdk-lib/aws-events';
 import * as targets from 'aws-cdk-lib/aws-events-targets';
-import * as integ from '@aws-cdk/integ-tests-alpha';
-import * as batch from '../lib';
+import { App, Size, Stack } from 'aws-cdk-lib/core';
+import * as batch from 'aws-cdk-lib/aws-batch';
 
 const app = new App();
 const stack = new Stack(app, 'stack');

packages/@aws-cdk/aws-batch-alpha/test/integ.ecs-job-definition.ts → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.ecs-job-definition.ts

@@ -1,14 +1,14 @@
+import * as path from 'path';
 import { Vpc } from 'aws-cdk-lib/aws-ec2';
+import { DockerImageAsset } from 'aws-cdk-lib/aws-ecr-assets';
 import { ContainerImage, FargatePlatformVersion } from 'aws-cdk-lib/aws-ecs';
-import * as efs from 'aws-cdk-lib/aws-efs';
 import * as ecs from 'aws-cdk-lib/aws-ecs';
+import * as efs from 'aws-cdk-lib/aws-efs';
+import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
 import * as ssm from 'aws-cdk-lib/aws-ssm';
 import { App, Duration, Size, Stack } from 'aws-cdk-lib';
 import * as integ from '@aws-cdk/integ-tests-alpha';
-import * as batch from '../lib';
-import { DockerImageAsset } from 'aws-cdk-lib/aws-ecr-assets';
-import * as path from 'path';
-import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
+import * as batch from 'aws-cdk-lib/aws-batch';
 
 const app = new App();
 const stack = new Stack(app, 'stack');

packages/@aws-cdk/aws-batch-alpha/test/integ.eks-job-definition.ts → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.eks-job-definition.ts

@@ -1,7 +1,7 @@
 import { ContainerImage } from 'aws-cdk-lib/aws-ecs';
 import { App, Stack, Size } from 'aws-cdk-lib';
 import * as integ from '@aws-cdk/integ-tests-alpha';
-import * as batch from '../lib';
+import * as batch from 'aws-cdk-lib/aws-batch';
 
 const app = new App();
 const stack = new Stack(app, 'stack');

packages/@aws-cdk/aws-batch-alpha/test/integ.job-queue.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json

@@ -1,5 +1,5 @@
 {
-  "version": "31.0.0",
+  "version": "34.0.0",
   "files": {
     "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
       "source": {

packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/cdk.out

@@ -0,0 +1 @@
+{"version":"34.0.0"}

packages/@aws-cdk/aws-batch-alpha/test/integ.eks-job-definition.js.snapshot/integ.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/integ.json

@@ -1,5 +1,5 @@
 {
-  "version": "32.0.0",
+  "version": "34.0.0",
   "testCases": {
     "BatchEcsJobDefinitionTest/DefaultTest": {
       "stacks": [

packages/@aws-cdk/aws-batch-alpha/test/integ.grants.js.snapshot/manifest.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "33.0.0",
+  "version": "34.0.0",
   "artifacts": {
     "stack.assets": {
       "type": "cdk:asset-manifest",
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0c8afaea64b37b6c143f96d8a69d57de3f487324a501b01a76df82b8f8bfee8d.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4aa63dc2410e527912a2abc501a3d3eff66d21949c7a314e7818bb8eb4a2cc40.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

packages/@aws-cdk/aws-batch-alpha/test/integ.job-queue.js.snapshot/stack.assets.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.assets.json

@@ -1,15 +1,15 @@
 {
-  "version": "31.0.0",
+  "version": "34.0.0",
   "files": {
-    "4a0a98d3e8629d563b0464b76023b8dc9615456348101d364437f8ae463676cf": {
+    "4aa63dc2410e527912a2abc501a3d3eff66d21949c7a314e7818bb8eb4a2cc40": {
       "source": {
         "path": "stack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "4a0a98d3e8629d563b0464b76023b8dc9615456348101d364437f8ae463676cf.json",
+          "objectKey": "4aa63dc2410e527912a2abc501a3d3eff66d21949c7a314e7818bb8eb4a2cc40.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

packages/@aws-cdk/aws-batch-alpha/test/integ.grants.js.snapshot/stack.template.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/stack.template.json

@@ -480,8 +480,7 @@
        "Ref": "vpcPrivateSubnet2Subnet7031C2BA"
       }
      ],
-     "Type": "EC2",
-     "UpdateToLatestImageVersion": true
+     "Type": "EC2"
     },
     "ReplaceComputeEnvironment": false,
     "State": "ENABLED",

packages/@aws-cdk/aws-batch-alpha/test/integ.grants.js.snapshot/tree.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.js.snapshot/tree.json

@@ -773,7 +773,6 @@
                     "computeResources": {
                       "maxvCpus": 256,
                       "type": "EC2",
-                      "updateToLatestImageVersion": true,
                       "securityGroupIds": [
                         {
                           "Fn::GetAtt": [
@@ -815,7 +814,7 @@
               }
             },
             "constructInfo": {
-              "fqn": "@aws-cdk/aws-batch-alpha.ManagedEc2EcsComputeEnvironment",
+              "fqn": "aws-cdk-lib.aws_batch.ManagedEc2EcsComputeEnvironment",
               "version": "0.0.0"
             }
           },
@@ -851,7 +850,7 @@
               }
             },
             "constructInfo": {
-              "fqn": "@aws-cdk/aws-batch-alpha.JobQueue",
+              "fqn": "aws-cdk-lib.aws_batch.JobQueue",
               "version": "0.0.0"
             }
           },
@@ -973,7 +972,7 @@
               }
             },
             "constructInfo": {
-              "fqn": "@aws-cdk/aws-batch-alpha.EcsEc2ContainerDefinition",
+              "fqn": "aws-cdk-lib.aws_batch.EcsEc2ContainerDefinition",
               "version": "0.0.0"
             }
           },
@@ -1023,7 +1022,7 @@
               }
             },
             "constructInfo": {
-              "fqn": "@aws-cdk/aws-batch-alpha.EcsJobDefinition",
+              "fqn": "aws-cdk-lib.aws_batch.EcsJobDefinition",
               "version": "0.0.0"
             }
           },
@@ -1133,7 +1132,7 @@
                 "path": "BatchEcsJobDefinitionTest/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.69"
+                  "version": "10.2.70"
                 }
               },
               "DeployAssert": {
@@ -1179,7 +1178,7 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.2.69"
+          "version": "10.2.70"
         }
       }
     },

packages/@aws-cdk/aws-batch-alpha/test/integ.grants.ts → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.grants.ts

@@ -1,9 +1,8 @@
 import { Vpc } from 'aws-cdk-lib/aws-ec2';
-import { App, Stack, Size } from 'aws-cdk-lib';
+import { App, Stack, Size } from 'aws-cdk-lib/core';
 import * as integ from '@aws-cdk/integ-tests-alpha';
 import * as iam from 'aws-cdk-lib/aws-iam';
-import * as batch from '../lib';
-import { ManagedEc2EcsComputeEnvironment } from '../lib';
+import * as batch from 'aws-cdk-lib/aws-batch';
 import * as ecs from 'aws-cdk-lib/aws-ecs';
 
 const app = new App();
@@ -12,7 +11,7 @@ const vpc = new Vpc(stack, 'vpc', { restrictDefaultSecurityGroup: false });
 
 const queue = new batch.JobQueue(stack, 'joBBQ', {
   computeEnvironments: [{
-    computeEnvironment: new ManagedEc2EcsComputeEnvironment(stack, 'managedEc2CE', {
+    computeEnvironment: new batch.ManagedEc2EcsComputeEnvironment(stack, 'managedEc2CE', {
       vpc,
     }),
     order: 1,

packages/@aws-cdk/aws-batch-alpha/test/integ.eks-job-definition.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json

@@ -1,5 +1,5 @@
 {
-  "version": "32.0.0",
+  "version": "34.0.0",
   "files": {
     "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
       "source": {

packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/cdk.out

@@ -0,0 +1 @@
+{"version":"34.0.0"}

packages/@aws-cdk/aws-batch-alpha/test/integ.grants.js.snapshot/integ.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/integ.json

@@ -1,5 +1,5 @@
 {
-  "version": "33.0.0",
+  "version": "34.0.0",
   "testCases": {
     "BatchEcsJobDefinitionTest/DefaultTest": {
       "stacks": [

packages/@aws-cdk/aws-batch-alpha/test/integ.job-queue.js.snapshot/manifest.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "31.0.0",
+  "version": "34.0.0",
   "artifacts": {
     "stack.assets": {
       "type": "cdk:asset-manifest",
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4a0a98d3e8629d563b0464b76023b8dc9615456348101d364437f8ae463676cf.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/26ff3a1acb8c49e883cdd6bf8a787702f31ead398a7ad6a26d37b18264ff6bed.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -242,24 +242,6 @@
             "type": "aws:cdk:logicalId",
             "data": "CheckBootstrapVersion"
           }
-        ],
-        "fairshareA0BDD877": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "fairshareA0BDD877",
-            "trace": [
-              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
-            ]
-          }
-        ],
-        "joBBQ74605869": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "joBBQ74605869",
-            "trace": [
-              "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
-            ]
-          }
         ]
       },
       "displayName": "stack"

packages/@aws-cdk/aws-batch-alpha/test/integ.grants.js.snapshot/stack.assets.json → packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.job-queue.js.snapshot/stack.assets.json

@@ -1,15 +1,15 @@
 {
-  "version": "33.0.0",
+  "version": "34.0.0",
   "files": {
-    "0c8afaea64b37b6c143f96d8a69d57de3f487324a501b01a76df82b8f8bfee8d": {
+    "26ff3a1acb8c49e883cdd6bf8a787702f31ead398a7ad6a26d37b18264ff6bed": {
       "source": {
         "path": "stack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "0c8afaea64b37b6c143f96d8a69d57de3f487324a501b01a76df82b8f8bfee8d.json",
+          "objectKey": "26ff3a1acb8c49e883cdd6bf8a787702f31ead398a7ad6a26d37b18264ff6bed.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }