@gradientedge/cdk-utils 8.40.0 → 8.42.0

package/dist/src/lib/construct/site-with-ecs-backend/main.js

@@ -271,6 +271,31 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
         this.siteEcsLoadBalancer = fargateService.loadBalancer;
         this.siteEcsTargetGroup = fargateService.targetGroup;
         fargateService.loadBalancer.logAccessLogs(this.siteLogBucket, 'alb');
+        if (this.props.siteTask.siteScaling) {
+            const scalableTaskCount = this.siteEcsService.autoScaleTaskCount({
+                minCapacity: this.props.siteTask.siteScaling.minCapacity,
+                maxCapacity: this.props.siteTask.siteScaling.maxCapacity ?? 4,
+            });
+            if (this.props.siteTask.siteScaling.scaleOnCpuUtilization) {
+                scalableTaskCount.scaleOnCpuUtilization(`${this.id}-cpu-scaling`, {
+                    targetUtilizationPercent: this.props.siteTask.siteScaling.scaleOnCpuUtilization ?? 50,
+                });
+            }
+            if (this.props.siteTask.siteScaling.scaleOnMemoryUtilization) {
+                scalableTaskCount.scaleOnMemoryUtilization(`${this.id}-mem-scaling`, {
+                    targetUtilizationPercent: this.props.siteTask.siteScaling.scaleOnMemoryUtilization ?? 50,
+                });
+            }
+            if (this.props.siteTask.siteScaling.scaleOnRequestsPerTarget) {
+                scalableTaskCount.scaleOnRequestCount(`${this.id}-req-count`, {
+                    requestsPerTarget: this.props.siteTask.siteScaling.scaleOnRequestsPerTarget ?? 10000,
+                    targetGroup: this.siteEcsTargetGroup,
+                });
+            }
+            if (this.props.siteTask.siteScaling.scaleOnSchedule) {
+                scalableTaskCount.scaleOnSchedule(`${this.id}-schedule`, this.props.siteTask.siteScaling.scaleOnSchedule);
+            }
+        }
         /* if enabled, add efs with access point and mount */
         if (this.props.siteFileSystem) {
             this.siteFileSystem = this.efsManager.createFileSystem(`${this.id}-fs`, this, this.props.siteFileSystem, this.siteVpc, this.props.siteFileSystemAccessPoints);
@@ -287,6 +312,13 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
                     authorizationConfig: this.props.siteFileSystem.authorizationConfig,
                 },
             });
+            if (this.props.siteTask.mountPoints && this.props.siteTask.mountPoints.length > 0) {
+                this.props.siteTask.mountPoints.forEach(mountPoint => this.siteEcsTaskDefinition.defaultContainer?.addMountPoints({
+                    containerPath: mountPoint.containerPath,
+                    readOnly: mountPoint.readOnly,
+                    sourceVolume: `${this.id}-fs`,
+                }));
+            }
         }
         this.addCfnOutput(`${this.id}-loadBalancerArn`, this.siteEcsLoadBalancer.loadBalancerArn ?? '');
         this.addCfnOutput(`${this.id}-loadBalancerName`, this.siteEcsLoadBalancer.loadBalancerName ?? '');

package/dist/src/lib/types/aws/index.d.ts

@@ -28,6 +28,7 @@ import * as sfn from 'aws-cdk-lib/aws-stepfunctions';
 import * as tasks from 'aws-cdk-lib/aws-stepfunctions-tasks';
 import * as wafv2 from 'aws-cdk-lib/aws-wafv2';
 import * as types from '../index';
+import * as appAutoscaling from 'aws-cdk-lib/aws-applicationautoscaling';
 /**
  * @category cdk-utils.app-config-manager
  * @subcategory Properties
@@ -621,6 +622,14 @@ export interface EcsClusterProps extends ecs.ClusterProps {
 export interface EcsTaskProps extends ecs.TaskDefinitionProps {
     logging?: ecs.AwsLogDriverProps;
 }
+export interface EcsScalingProps {
+    minCapacity?: number;
+    maxCapacity?: number;
+    scaleOnCpuUtilization?: number;
+    scaleOnMemoryUtilization?: number;
+    scaleOnRequestsPerTarget?: number;
+    scaleOnSchedule?: appAutoscaling.ScalingSchedule;
+}
 /**
  * @category cdk-utils.ecs-manager
  * @subcategory Properties
@@ -628,6 +637,8 @@ export interface EcsTaskProps extends ecs.TaskDefinitionProps {
 export interface EcsApplicationLoadBalancedFargateServiceProps extends ecsPatterns.ApplicationLoadBalancedFargateServiceProps {
     healthCheck?: HealthCheck;
     logging?: ecs.AwsLogDriverProps;
+    mountPoints?: ecs.MountPoint[];
+    siteScaling?: EcsScalingProps;
 }
 /**
  * @category cdk-utils.eks-manager

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "8.40.0",
+  "version": "8.42.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

package/src/lib/construct/site-with-ecs-backend/main.ts

@@ -298,6 +298,36 @@ export class SiteWithEcsBackend extends CommonConstruct {
 
     fargateService.loadBalancer.logAccessLogs(this.siteLogBucket, 'alb')
 
+    if (this.props.siteTask.siteScaling) {
+      const scalableTaskCount = this.siteEcsService.autoScaleTaskCount({
+        minCapacity: this.props.siteTask.siteScaling.minCapacity,
+        maxCapacity: this.props.siteTask.siteScaling.maxCapacity ?? 4,
+      })
+
+      if (this.props.siteTask.siteScaling.scaleOnCpuUtilization) {
+        scalableTaskCount.scaleOnCpuUtilization(`${this.id}-cpu-scaling`, {
+          targetUtilizationPercent: this.props.siteTask.siteScaling.scaleOnCpuUtilization ?? 50,
+        })
+      }
+
+      if (this.props.siteTask.siteScaling.scaleOnMemoryUtilization) {
+        scalableTaskCount.scaleOnMemoryUtilization(`${this.id}-mem-scaling`, {
+          targetUtilizationPercent: this.props.siteTask.siteScaling.scaleOnMemoryUtilization ?? 50,
+        })
+      }
+
+      if (this.props.siteTask.siteScaling.scaleOnRequestsPerTarget) {
+        scalableTaskCount.scaleOnRequestCount(`${this.id}-req-count`, {
+          requestsPerTarget: this.props.siteTask.siteScaling.scaleOnRequestsPerTarget ?? 10000,
+          targetGroup: this.siteEcsTargetGroup,
+        })
+      }
+
+      if (this.props.siteTask.siteScaling.scaleOnSchedule) {
+        scalableTaskCount.scaleOnSchedule(`${this.id}-schedule`, this.props.siteTask.siteScaling.scaleOnSchedule)
+      }
+    }
+
     /* if enabled, add efs with access point and mount */
     if (this.props.siteFileSystem) {
       this.siteFileSystem = this.efsManager.createFileSystem(
@@ -322,6 +352,16 @@ export class SiteWithEcsBackend extends CommonConstruct {
           authorizationConfig: this.props.siteFileSystem.authorizationConfig,
         },
       })
+
+      if (this.props.siteTask.mountPoints && this.props.siteTask.mountPoints.length > 0) {
+        this.props.siteTask.mountPoints.forEach(mountPoint =>
+          this.siteEcsTaskDefinition.defaultContainer?.addMountPoints({
+            containerPath: mountPoint.containerPath,
+            readOnly: mountPoint.readOnly,
+            sourceVolume: `${this.id}-fs`,
+          })
+        )
+      }
     }
 
     this.addCfnOutput(`${this.id}-loadBalancerArn`, this.siteEcsLoadBalancer.loadBalancerArn ?? '')

package/src/lib/types/aws/index.ts

@@ -28,6 +28,7 @@ import * as sfn from 'aws-cdk-lib/aws-stepfunctions'
 import * as tasks from 'aws-cdk-lib/aws-stepfunctions-tasks'
 import * as wafv2 from 'aws-cdk-lib/aws-wafv2'
 import * as types from '../index'
+import * as appAutoscaling from 'aws-cdk-lib/aws-applicationautoscaling'
 
 /**
  * @category cdk-utils.app-config-manager
@@ -659,6 +660,15 @@ export interface EcsTaskProps extends ecs.TaskDefinitionProps {
   logging?: ecs.AwsLogDriverProps
 }
 
+export interface EcsScalingProps {
+  minCapacity?: number
+  maxCapacity?: number
+  scaleOnCpuUtilization?: number
+  scaleOnMemoryUtilization?: number
+  scaleOnRequestsPerTarget?: number
+  scaleOnSchedule?: appAutoscaling.ScalingSchedule
+}
+
 /**
  * @category cdk-utils.ecs-manager
  * @subcategory Properties
@@ -667,6 +677,8 @@ export interface EcsApplicationLoadBalancedFargateServiceProps
   extends ecsPatterns.ApplicationLoadBalancedFargateServiceProps {
   healthCheck?: HealthCheck
   logging?: ecs.AwsLogDriverProps
+  mountPoints?: ecs.MountPoint[]
+  siteScaling?: EcsScalingProps
 }
 
 /**