feat(batch): ephemeralStorage property on job definitions

packages/@aws-cdk/aws-batch-alpha/lib/ecs-container-definition.ts

@@ -896,6 +896,13 @@ export interface IEcsFargateContainerDefinition extends IEcsContainerDefinition
    * @default LATEST
    */
   readonly fargatePlatformVersion?: ecs.FargatePlatformVersion;
+
+  /**
+   * The size for ephemeral storage. Service default is 20 GiB.
+   *
+   * @default - undefined
+   */
+  readonly ephemeralStorageSize?: Size;
 }
 
 /**
@@ -928,6 +935,13 @@ export interface EcsFargateContainerDefinitionProps extends EcsContainerDefiniti
    * @default - a Role will be created
    */
   readonly executionRole?: iam.IRole;
+
+  /**
+   * The size for ephemeral storage. Service default is 20 GiB.
+   *
+   * @default - undefined
+   */
+  readonly ephemeralStorageSize?: Size;
 }
 
 /**
@@ -936,6 +950,7 @@ export interface EcsFargateContainerDefinitionProps extends EcsContainerDefiniti
 export class EcsFargateContainerDefinition extends EcsContainerDefinitionBase implements IEcsFargateContainerDefinition {
   public readonly fargatePlatformVersion?: ecs.FargatePlatformVersion;
   public readonly assignPublicIp?: boolean;
+  public readonly ephemeralStorageSize?: Size;
 
   /**
    * The role used by Amazon ECS container and AWS Fargate agents to make AWS API calls on your behalf.
@@ -950,7 +965,22 @@ export class EcsFargateContainerDefinition extends EcsContainerDefinitionBase im
     super(scope, id, props);
     this.assignPublicIp = props.assignPublicIp;
     this.fargatePlatformVersion = props.fargatePlatformVersion;
+    this.ephemeralStorageSize = props.ephemeralStorageSize;
     this.executionRole = props.executionRole ?? createExecutionRole(this, 'ExecutionRole');
+
+    // validates ephemeralStorageSize is within limits
+    if (props.ephemeralStorageSize) {
+      this.node.addValidation({
+        validate() {
+          if (props.ephemeralStorageSize!.toGibibytes() > 200) {
+            return ['Ephemeral Storage must be at most 200 GiB.'];
+          } else if (props.ephemeralStorageSize!.toGibibytes() < 21) {
+            return ['Ephemeral Storage must be minimum 21 GiB.'];
+          }
+          return [];
+        },
+      });
+    }
   }
 
   /**
@@ -959,6 +989,9 @@ export class EcsFargateContainerDefinition extends EcsContainerDefinitionBase im
   public _renderContainerDefinition(): CfnJobDefinition.ContainerPropertiesProperty {
     return {
       ...super._renderContainerDefinition(),
+      ephemeralStorage: this.ephemeralStorageSize? {
+        sizeInGiB: this.ephemeralStorageSize?.toGibibytes(),
+      } : undefined,
       fargatePlatformConfiguration: {
         platformVersion: this.fargatePlatformVersion?.toString(),
       },

packages/@aws-cdk/aws-batch-alpha/test/ecs-container-definition.test.ts

@@ -7,7 +7,7 @@ import * as efs from 'aws-cdk-lib/aws-efs';
 import { ArnPrincipal, Role } from 'aws-cdk-lib/aws-iam';
 import * as logs from 'aws-cdk-lib/aws-logs';
 import { Secret } from 'aws-cdk-lib/aws-secretsmanager';
-import { Size, Stack } from 'aws-cdk-lib';
+import { Size, Stack, App } from 'aws-cdk-lib';
 import { EcsContainerDefinitionProps, EcsEc2ContainerDefinition, EcsFargateContainerDefinition, EcsJobDefinition, EcsVolume, IEcsEc2ContainerDefinition, LinuxParameters, UlimitName } from '../lib';
 import { CfnJobDefinitionProps } from 'aws-cdk-lib/aws-batch';
 import { capitalizePropertyNames } from './utils';
@@ -36,6 +36,7 @@ const defaultExpectedProps: CfnJobDefinitionProps = {
   },
 };
 
+let app: App;
 let stack: Stack;
 let pascalCaseExpectedProps: any;
 
@@ -677,7 +678,8 @@ describe('EC2 containers', () => {
 describe('Fargate containers', () => {
   // GIVEN
   beforeEach(() => {
-    stack = new Stack();
+    app = new App();
+    stack = new Stack(app);
     pascalCaseExpectedProps = capitalizePropertyNames(stack, defaultExpectedProps);
   });
 
@@ -711,4 +713,50 @@ describe('Fargate containers', () => {
       },
     });
   });
+
+  test('can set ephemeralStorage', () => {
+    // WHEN
+    new EcsJobDefinition(stack, 'ECSJobDefn', {
+      container: new EcsFargateContainerDefinition(stack, 'EcsFargateContainer', {
+        ...defaultContainerProps,
+        fargatePlatformVersion: ecs.FargatePlatformVersion.LATEST,
+        ephemeralStorageSize: Size.gibibytes(100),
+      }),
+    });
+
+    // THEN
+    Template.fromStack(stack).hasResourceProperties('AWS::Batch::JobDefinition', {
+      ...pascalCaseExpectedProps,
+      ContainerProperties: {
+        ...pascalCaseExpectedProps.ContainerProperties,
+        ExecutionRoleArn: {
+          'Fn::GetAtt': ['EcsFargateContainerExecutionRole3286EAFE', 'Arn'],
+        },
+        EphemeralStorage: {
+          SizeInGiB: Size.gibibytes(100).toGibibytes(),
+        },
+      },
+    });
+  });
+
+  test('ephemeralStorage validation', () => {
+    // WHEN
+    new EcsJobDefinition(stack, 'ECSJobDefn', {
+      container: new EcsFargateContainerDefinition(stack, 'EcsFargateContainer', {
+        ...defaultContainerProps,
+        fargatePlatformVersion: ecs.FargatePlatformVersion.LATEST,
+        ephemeralStorageSize: Size.gibibytes(19),
+      }),
+    });
+
+    new EcsJobDefinition(stack, 'ECSJobDefn2', {
+      container: new EcsFargateContainerDefinition(stack, 'EcsFargateContainer2', {
+        ...defaultContainerProps,
+        fargatePlatformVersion: ecs.FargatePlatformVersion.LATEST,
+        ephemeralStorageSize: Size.gibibytes(201),
+      }),
+    });
+
+    expect(() => app.synth()).toThrow('Validation failed with the following errors:\n  [Default/EcsFargateContainer] Ephemeral Storage must be minimum 21 GiB.\n  [Default/EcsFargateContainer2] Ephemeral Storage must be at most 200 GiB.');
+  });
 });

packages/@aws-cdk/aws-batch-alpha/test/integ.ecs-job-definition.js.snapshot/BatchEcsJobDefinitionTestDefaultTestDeployAssertE5BAAC9B.assets.json

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

packages/@aws-cdk/aws-batch-alpha/test/integ.ecs-job-definition.js.snapshot/cdk.out

@@ -1 +1 @@
-{"version":"30.1.0"}
+{"version":"31.0.0"}

packages/@aws-cdk/aws-batch-alpha/test/integ.ecs-job-definition.js.snapshot/integ.json

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

packages/@aws-cdk/aws-batch-alpha/test/integ.ecs-job-definition.js.snapshot/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "30.1.0",
+  "version": "31.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}/c292a4e3a2a62cd3f3134971757eb866dc5224bc69f7109ec27d12ab882f2345.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7eabaa659955f076359ed72f88d929cfe7651a904b6038ae0f3b3215ab36ac6c.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

packages/@aws-cdk/aws-batch-alpha/test/integ.ecs-job-definition.js.snapshot/stack.assets.json

@@ -1,15 +1,15 @@
 {
-  "version": "30.1.0",
+  "version": "31.0.0",
   "files": {
-    "c292a4e3a2a62cd3f3134971757eb866dc5224bc69f7109ec27d12ab882f2345": {
+    "7eabaa659955f076359ed72f88d929cfe7651a904b6038ae0f3b3215ab36ac6c": {
       "source": {
         "path": "stack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "c292a4e3a2a62cd3f3134971757eb866dc5224bc69f7109ec27d12ab882f2345.json",
+          "objectKey": "7eabaa659955f076359ed72f88d929cfe7651a904b6038ae0f3b3215ab36ac6c.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.ecs-job-definition.js.snapshot/stack.template.json

@@ -579,6 +579,9 @@
     "Type": "container",
     "ContainerProperties": {
      "Environment": [],
+     "EphemeralStorage": {
+      "SizeInGiB": 100
+     },
      "ExecutionRoleArn": {
       "Fn::GetAtt": [
        "myFargateContainerExecutionRoleB9EB79EA",