Skip to content

Commit 5fc707a

Browse files
authored
feat(batch): Stabilize Batch (#27059)
graduates the alpha module. All users of any `ManagedComputeEnvironment` who left `updateToLatestImageVersion` unspecified will see it default to `undefined` instead of `true`. *If you use `FargateComputeEnvironment`, this upgrade may cause deployment errors; destroy the Fargate CE and recreate it to resolve this, if encountered.* Related: #27054. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent c3a4b7b commit 5fc707a

156 files changed

Lines changed: 1660 additions & 4739 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
},
3030
"license": "Apache-2.0",
3131
"devDependencies": {
32-
"@aws-cdk/aws-batch-alpha": "0.0.0",
3332
"@aws-cdk/cdk-build-tools": "0.0.0",
3433
"@aws-cdk/integ-runner": "^0.0.0",
3534
"@aws-cdk/pkglint": "0.0.0",

packages/@aws-cdk/aws-batch-alpha/test/batchjob-image/Dockerfile renamed to packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/batchjob-image/Dockerfile

File renamed without changes.

packages/@aws-cdk/aws-batch-alpha/test/batchjob-image/index.py renamed to packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/batchjob-image/index.py

File renamed without changes.

packages/@aws-cdk/aws-batch-alpha/test/integ.batch-unique-name.js.snapshot/BatchUniqueNameTestDefaultTestDeployAssertA3886AB9.assets.json renamed to packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.batch-unique-name.js.snapshot/BatchUniqueNameTestDefaultTestDeployAssertA3886AB9.assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "32.0.0",
2+
"version": "34.0.0",
33
"files": {
44
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
55
"source": {

packages/@aws-cdk/aws-batch-alpha/test/integ.batch-unique-name.js.snapshot/BatchUniqueNameTestDefaultTestDeployAssertA3886AB9.template.json renamed to packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.batch-unique-name.js.snapshot/BatchUniqueNameTestDefaultTestDeployAssertA3886AB9.template.json

File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"34.0.0"}

packages/@aws-cdk/aws-batch-alpha/test/integ.batch-unique-name.js.snapshot/integ.json renamed to packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.batch-unique-name.js.snapshot/integ.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "32.0.0",
2+
"version": "34.0.0",
33
"testCases": {
44
"BatchUniqueNameTest/DefaultTest": {
55
"stacks": [

packages/@aws-cdk/aws-batch-alpha/test/integ.batch-unique-name.js.snapshot/manifest.json renamed to packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.batch-unique-name.js.snapshot/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "32.0.0",
2+
"version": "34.0.0",
33
"artifacts": {
44
"stack.assets": {
55
"type": "cdk:asset-manifest",
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dcf58b3d7fe509c8815682983476ddf759ae76a3c8a96611f347f5d93c687a68.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e2eaf0fb41de8615776ee9813c04181a22a8f86834fa954df1a3194806486725.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [

packages/@aws-cdk/aws-batch-alpha/test/integ.batch-unique-name.js.snapshot/stack.assets.json renamed to packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.batch-unique-name.js.snapshot/stack.assets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "32.0.0",
2+
"version": "34.0.0",
33
"files": {
4-
"dcf58b3d7fe509c8815682983476ddf759ae76a3c8a96611f347f5d93c687a68": {
4+
"e2eaf0fb41de8615776ee9813c04181a22a8f86834fa954df1a3194806486725": {
55
"source": {
66
"path": "stack.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "dcf58b3d7fe509c8815682983476ddf759ae76a3c8a96611f347f5d93c687a68.json",
12+
"objectKey": "e2eaf0fb41de8615776ee9813c04181a22a8f86834fa954df1a3194806486725.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

packages/@aws-cdk/aws-batch-alpha/test/integ.batch-unique-name.js.snapshot/stack.template.json renamed to packages/@aws-cdk-testing/framework-integ/test/aws-batch/test/integ.batch-unique-name.js.snapshot/stack.template.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
"ComputeEnvironmentC570994D": {
3535
"Type": "AWS::Batch::ComputeEnvironment",
3636
"Properties": {
37-
"Type": "unmanaged",
3837
"ServiceRole": {
3938
"Fn::GetAtt": [
4039
"ComputeEnvironmentBatchServiceRole3533BE31",
4140
"Arn"
4241
]
4342
},
44-
"State": "ENABLED"
43+
"State": "ENABLED",
44+
"Type": "unmanaged"
4545
}
4646
},
4747
"MyQueueE6CA6235": {
@@ -125,7 +125,6 @@
125125
"MyJob8719E923": {
126126
"Type": "AWS::Batch::JobDefinition",
127127
"Properties": {
128-
"Type": "container",
129128
"ContainerProperties": {
130129
"Environment": [],
131130
"ExecutionRoleArn": {
@@ -151,7 +150,8 @@
151150
"EC2"
152151
],
153152
"RetryStrategy": {},
154-
"Timeout": {}
153+
"Timeout": {},
154+
"Type": "container"
155155
}
156156
},
157157
"MyJobEventsRoleCF43C336": {

0 commit comments

Comments
 (0)