@gradientedge/cdk-utils 8.41.0 → 8.43.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);

package/dist/src/lib/manager/aws/s3-manager.d.ts

@@ -51,7 +51,7 @@ export declare class S3Manager {
      * @param {string} bucketName the bucket name
      * @private
      */
-    protected static determineBucketName(scope: common.CommonConstruct, bucketName: string): string;
+    static determineBucketName(scope: common.CommonConstruct, bucketName: string): string;
     /**
      * @summary Method to create a s3 bucket
      * @param {string} id scoped id of the resource

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
@@ -629,6 +638,7 @@ export interface EcsApplicationLoadBalancedFargateServiceProps extends ecsPatter
     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.41.0",
+  "version": "8.43.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -36,7 +36,7 @@
     "prettier": "npx prettier --cache --check \"**/*.{ts,json,md}\"",
     "prettify": "npx prettier --cache --write \"**/*.{ts,json,md}\"",
     "test": "npx rimraf coverage && npx jest --ci --maxWorkers=100%",
-    "update:deps": "ncu -u --deep",
+    "update:deps": "ncu -u --deep --reject react,react-dom",
     "validate": "pnpm prettier && pnpm test"
   },
   "husky": {
@@ -48,9 +48,9 @@
     "@types/lodash": "^4.14.192",
     "@types/node": "^18.15.11",
     "app-root-path": "^3.1.0",
-    "aws-cdk-lib": "^2.72.0",
-    "@aws-sdk/client-secrets-manager": "^3.301.0",
-    "constructs": "^10.1.296",
+    "aws-cdk-lib": "^2.72.1",
+    "@aws-sdk/client-secrets-manager": "^3.303.0",
+    "constructs": "^10.1.300",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",
@@ -58,12 +58,13 @@
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
+    "@babel/core": "^7.21.4",
+    "@babel/eslint-parser": "^7.21.3",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@types/jest": "^29.5.0",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
-    "aws-cdk": "^2.72.0",
-    "babel-eslint": "^10.1.0",
+    "aws-cdk": "^2.72.1",
     "better-docs": "^2.7.2",
     "codecov": "^3.8.3",
     "commitizen": "^4.3.0",
@@ -81,14 +82,13 @@
     "prettier": "^2.8.7",
     "prettier-plugin-organize-imports": "^3.2.2",
     "rimraf": "^4.4.1",
-    "semantic-release": "^21.0.0",
+    "semantic-release": "^21.0.1",
     "taffydb": "^2.7.3",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "5.0.2"
+    "typescript": "5.0.3"
   },
   "optionalDependencies": {
-    "@babel/core": "^7.21.00",
     "prop-types": "^15.8.1",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"

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(

package/src/lib/manager/aws/s3-manager.ts

@@ -86,7 +86,7 @@ export class S3Manager {
    * @param {string} bucketName the bucket name
    * @private
    */
-  protected static determineBucketName(scope: common.CommonConstruct, bucketName: string) {
+  public static determineBucketName(scope: common.CommonConstruct, bucketName: string) {
     const sanitisedBucketName = scope.props.excludeDomainNameForBuckets
       ? S3Manager.determineBucketNameByAccountAndRegion(scope, bucketName)
       : S3Manager.determineBucketNameByDomainName(scope, bucketName)

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
@@ -668,6 +678,7 @@ export interface EcsApplicationLoadBalancedFargateServiceProps
   healthCheck?: HealthCheck
   logging?: ecs.AwsLogDriverProps
   mountPoints?: ecs.MountPoint[]
+  siteScaling?: EcsScalingProps
 }
 
 /**