feat: add public property in FargetTaskDefinition

ren-yamanashi · ren-yamanashi · commit 40fb61fa2cdc · 2025-02-01T12:02:23.000+09:00
diff --git a/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-load-balanced-fargate-service.ts b/packages/aws-cdk-lib/aws-ecs-patterns/lib/fargate/application-load-balanced-fargate-service.ts
@@ -103,8 +103,8 @@ export class ApplicationLoadBalancedFargateService extends ApplicationLoadBalanc
         ? taskImageOptions.logDriver : enableLogging
           ? this.createAWSLogDriver(this.node.id) : undefined;
 
-      this.validateContainerCpu(props.containerCpu, props.cpu);
-      this.validateContainerMemoryLimitMiB(props.containerMemoryLimitMiB, props.memoryLimitMiB);
+      this.validateContainerCpu(this.taskDefinition.cpu, props.containerCpu);
+      this.validateContainerMemoryLimitMiB(this.taskDefinition.memoryMiB, props.containerMemoryLimitMiB);
 
       const containerName = taskImageOptions.containerName ?? 'web';
       const container = this.taskDefinition.addContainer(containerName, {
@@ -174,7 +174,7 @@ export class ApplicationLoadBalancedFargateService extends ApplicationLoadBalanc
     }
   }
 
-  private validateContainerCpu(containerCpu?: number, cpu: number = 256) { // default value for cpu is 256
+  private validateContainerCpu(cpu: number, containerCpu?: number) {
     if (containerCpu === undefined || Token.isUnresolved(containerCpu) || Token.isUnresolved(cpu)) {
       return;
     }
@@ -187,7 +187,7 @@ export class ApplicationLoadBalancedFargateService extends ApplicationLoadBalanc
     }
   }
 
-  private validateContainerMemoryLimitMiB(containerMemoryLimitMiB?: number, memoryLimitMiB: number = 512) { // default value for memoryLimitMiB is 512
+  private validateContainerMemoryLimitMiB(memoryLimitMiB: number, containerMemoryLimitMiB?: number) {
     if (containerMemoryLimitMiB === undefined || Token.isUnresolved(containerMemoryLimitMiB) || Token.isUnresolved(memoryLimitMiB)) {
       return;
     }
diff --git a/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-task-definition.ts b/packages/aws-cdk-lib/aws-ecs/lib/fargate/fargate-task-definition.ts
@@ -152,21 +152,37 @@ export class FargateTaskDefinition extends TaskDefinition implements IFargateTas
    */
   public readonly ephemeralStorageGiB?: number;
 
+  /**
+   * The number of cpu units used by the task.
+   */
+  public readonly cpu: number;
+
+  /**
+   * The amount (in MiB) of memory used by the task.
+   */
+  public readonly memoryMiB: number;
+
   /**
    * Constructs a new instance of the FargateTaskDefinition class.
    */
   constructor(scope: Construct, id: string, props: FargateTaskDefinitionProps = {}) {
+    const cpu = props.cpu ?? 256;
+    const memoryMiB = props.memoryLimitMiB ?? 512;
+
     super(scope, id, {
       ...props,
-      cpu: props.cpu !== undefined ? Tokenization.stringifyNumber(props.cpu) : '256',
-      memoryMiB: props.memoryLimitMiB !== undefined ? Tokenization.stringifyNumber(props.memoryLimitMiB) : '512',
+      cpu: Tokenization.stringifyNumber(cpu),
+      memoryMiB: Tokenization.stringifyNumber(memoryMiB),
       compatibility: Compatibility.FARGATE,
       networkMode: NetworkMode.AWS_VPC,
       pidMode: props.pidMode,
     });
     // Enhanced CDK Analytics Telemetry
     addConstructMetadata(this, props);
 
+    this.cpu = cpu;
+    this.memoryMiB = memoryMiB;
+
     // eslint-disable-next-line max-len
     if (props.ephemeralStorageGiB && !Token.isUnresolved(props.ephemeralStorageGiB) && (props.ephemeralStorageGiB < 21 || props.ephemeralStorageGiB > 200)) {
       throw new Error('Ephemeral storage size must be between 21GiB and 200GiB');

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ export class ApplicationLoadBalancedFargateService extends ApplicationLoadBalanc`
`103`	`103`	`? taskImageOptions.logDriver : enableLogging`
`104`	`104`	`? this.createAWSLogDriver(this.node.id) : undefined;`
`105`	`105`
`106`		`- this.validateContainerCpu(props.containerCpu, props.cpu);`
`107`		`- this.validateContainerMemoryLimitMiB(props.containerMemoryLimitMiB, props.memoryLimitMiB);`
	`106`	`+ this.validateContainerCpu(this.taskDefinition.cpu, props.containerCpu);`
	`107`	`+ this.validateContainerMemoryLimitMiB(this.taskDefinition.memoryMiB, props.containerMemoryLimitMiB);`
`108`	`108`
`109`	`109`	`const containerName = taskImageOptions.containerName ?? 'web';`
`110`	`110`	`const container = this.taskDefinition.addContainer(containerName, {`
`@@ -174,7 +174,7 @@ export class ApplicationLoadBalancedFargateService extends ApplicationLoadBalanc`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`177`		`- private validateContainerCpu(containerCpu?: number, cpu: number = 256) { // default value for cpu is 256`
	`177`	`+ private validateContainerCpu(cpu: number, containerCpu?: number) {`
`178`	`178`	`if (containerCpu === undefined \|\| Token.isUnresolved(containerCpu) \|\| Token.isUnresolved(cpu)) {`
`179`	`179`	`return;`
`180`	`180`	`}`
`@@ -187,7 +187,7 @@ export class ApplicationLoadBalancedFargateService extends ApplicationLoadBalanc`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`190`		`- private validateContainerMemoryLimitMiB(containerMemoryLimitMiB?: number, memoryLimitMiB: number = 512) { // default value for memoryLimitMiB is 512`
	`190`	`+ private validateContainerMemoryLimitMiB(memoryLimitMiB: number, containerMemoryLimitMiB?: number) {`
`191`	`191`	`if (containerMemoryLimitMiB === undefined \|\| Token.isUnresolved(containerMemoryLimitMiB) \|\| Token.isUnresolved(memoryLimitMiB)) {`
`192`	`192`	`return;`
`193`	`193`	`}`