@gradientedge/cdk-utils 7.8.0 → 7.9.1

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

@@ -24,9 +24,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SiteWithEcsBackend = void 0;
+const cdk = __importStar(require("aws-cdk-lib"));
 const cloudfront = __importStar(require("aws-cdk-lib/aws-cloudfront"));
 const origins = __importStar(require("aws-cdk-lib/aws-cloudfront-origins"));
 const ecs = __importStar(require("aws-cdk-lib/aws-ecs"));
+const ecsPatterns = __importStar(require("aws-cdk-lib/aws-ecs-patterns"));
 const iam = __importStar(require("aws-cdk-lib/aws-iam"));
 const common_1 = require("../../common");
 /**
@@ -219,22 +221,47 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
      * @protected
      */
     createEcsService() {
-        const fargateService = this.ecsManager.createLoadBalancedFargateService(this.id, this, {
-            ...this.props.siteTask,
-            ...{
-                domainName: this.siteInternalDomainName,
-                domainZone: this.siteHostedZone,
-                healthCheck: this.props.siteHealthCheck,
-                taskImageOptions: {
-                    ...this.props.siteTask.taskImageOptions,
-                    environment: this.siteEcsEnvironment,
-                    executionRole: this.siteEcsRole,
-                    taskRole: this.siteEcsRole,
-                    image: this.siteEcsContainerImage,
-                    secrets: this.siteSecrets,
-                },
+        const fargateService = new ecsPatterns.ApplicationLoadBalancedFargateService(this, `${this.id}-ecs-service`, {
+            cluster: this.siteEcsCluster,
+            desiredCount: this.props.siteTask.desiredCount,
+            enableECSManagedTags: true,
+            serviceName: `${this.id}-${this.props.stage}`,
+            cpu: this.props.siteTask.cpu,
+            loadBalancerName: `${this.id}-${this.props.stage}`,
+            domainName: this.siteInternalDomainName,
+            domainZone: this.siteHostedZone,
+            listenerPort: this.props.siteTask.listenerPort,
+            memoryLimitMiB: this.props.siteTask.memoryLimitMiB,
+            healthCheckGracePeriod: cdk.Duration.seconds(60),
+            assignPublicIp: true,
+            taskImageOptions: {
+                enableLogging: true,
+                logDriver: ecs.LogDriver.awsLogs({
+                    logGroup: this.siteEcsLogGroup,
+                    streamPrefix: `${this.id}-${this.props.stage}/ecs`,
+                }),
+                image: this.siteEcsContainerImage,
+                executionRole: this.siteEcsRole,
+                taskRole: this.siteEcsRole,
+                containerPort: this.props.siteTask.taskImageOptions?.containerPort,
+                environment: this.siteEcsEnvironment,
+                secrets: this.siteSecrets,
             },
-        }, this.siteEcsCluster, this.siteEcsLogGroup);
+        });
+        if (this.props.siteHealthCheck) {
+            fargateService.targetGroup.configureHealthCheck({
+                enabled: this.props.siteHealthCheck.enabled ?? true,
+                path: this.props.siteHealthCheck.path ?? '/',
+                port: this.props.siteHealthCheck.port,
+                interval: cdk.Duration.seconds(this.props.siteHealthCheck.intervalInSecs),
+                timeout: cdk.Duration.seconds(this.props.siteHealthCheck.timeoutInSecs),
+                healthyThresholdCount: this.props.siteHealthCheck.healthyThresholdCount,
+                unhealthyThresholdCount: this.props.siteHealthCheck.unhealthyThresholdCount,
+                healthyGrpcCodes: this.props.siteHealthCheck.healthyGrpcCodes,
+                healthyHttpCodes: this.props.siteHealthCheck.healthyHttpCodes,
+                protocol: this.props.siteHealthCheck.protocol,
+            });
+        }
         this.siteEcsService = fargateService.service;
         this.siteEcsTaskDefinition = fargateService.taskDefinition;
         this.siteEcsListener = fargateService.listener;

package/dist/src/lib/manager/aws/ecs-manager.js

@@ -102,7 +102,7 @@ class EcsManager {
             proxyConfiguration: props.proxyConfiguration,
             runtimePlatform: {
                 operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? ecs.OperatingSystemFamily.LINUX,
-                cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? ecs.CpuArchitecture.ARM64,
+                cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? ecs.CpuArchitecture.X86_64,
             },
             taskRole: role,
             volumes: props.volumes,
@@ -151,7 +151,7 @@ class EcsManager {
             memoryLimitMiB: props.memoryLimitMiB,
             runtimePlatform: {
                 operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? ecs.OperatingSystemFamily.LINUX,
-                cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? ecs.CpuArchitecture.ARM64,
+                cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? ecs.CpuArchitecture.X86_64,
             },
             serviceName: `${id}-${scope.props.stage}`,
             taskImageOptions: {

package/package.json

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

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

@@ -1,8 +1,10 @@
+import * as cdk from 'aws-cdk-lib'
 import * as certificateManager from 'aws-cdk-lib/aws-certificatemanager'
 import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'
 import * as origins from 'aws-cdk-lib/aws-cloudfront-origins'
 import * as ec2 from 'aws-cdk-lib/aws-ec2'
 import * as ecs from 'aws-cdk-lib/aws-ecs'
+import * as ecsPatterns from 'aws-cdk-lib/aws-ecs-patterns'
 import * as elb from 'aws-cdk-lib/aws-elasticloadbalancingv2'
 import * as iam from 'aws-cdk-lib/aws-iam'
 import * as logs from 'aws-cdk-lib/aws-logs'
@@ -241,28 +243,48 @@ export class SiteWithEcsBackend extends CommonConstruct {
    * @protected
    */
   protected createEcsService() {
-    const fargateService = this.ecsManager.createLoadBalancedFargateService(
-      this.id,
-      this,
-      {
-        ...this.props.siteTask,
-        ...{
-          domainName: this.siteInternalDomainName,
-          domainZone: this.siteHostedZone,
-          healthCheck: this.props.siteHealthCheck,
-          taskImageOptions: {
-            ...this.props.siteTask.taskImageOptions,
-            environment: this.siteEcsEnvironment,
-            executionRole: this.siteEcsRole,
-            taskRole: this.siteEcsRole,
-            image: this.siteEcsContainerImage,
-            secrets: this.siteSecrets,
-          },
-        },
+    const fargateService = new ecsPatterns.ApplicationLoadBalancedFargateService(this, `${this.id}-ecs-service`, {
+      cluster: this.siteEcsCluster,
+      desiredCount: this.props.siteTask.desiredCount,
+      enableECSManagedTags: true,
+      serviceName: `${this.id}-${this.props.stage}`,
+      cpu: this.props.siteTask.cpu,
+      loadBalancerName: `${this.id}-${this.props.stage}`,
+      domainName: this.siteInternalDomainName,
+      domainZone: this.siteHostedZone,
+      listenerPort: this.props.siteTask.listenerPort,
+      memoryLimitMiB: this.props.siteTask.memoryLimitMiB,
+      healthCheckGracePeriod: cdk.Duration.seconds(60),
+      assignPublicIp: true,
+      taskImageOptions: {
+        enableLogging: true,
+        logDriver: ecs.LogDriver.awsLogs({
+          logGroup: this.siteEcsLogGroup,
+          streamPrefix: `${this.id}-${this.props.stage}/ecs`,
+        }),
+        image: this.siteEcsContainerImage,
+        executionRole: this.siteEcsRole,
+        taskRole: this.siteEcsRole,
+        containerPort: this.props.siteTask.taskImageOptions?.containerPort,
+        environment: this.siteEcsEnvironment,
+        secrets: this.siteSecrets,
       },
-      this.siteEcsCluster,
-      this.siteEcsLogGroup
-    )
+    })
+
+    if (this.props.siteHealthCheck) {
+      fargateService.targetGroup.configureHealthCheck({
+        enabled: this.props.siteHealthCheck.enabled ?? true,
+        path: this.props.siteHealthCheck.path ?? '/',
+        port: this.props.siteHealthCheck.port,
+        interval: cdk.Duration.seconds(this.props.siteHealthCheck.intervalInSecs),
+        timeout: cdk.Duration.seconds(this.props.siteHealthCheck.timeoutInSecs),
+        healthyThresholdCount: this.props.siteHealthCheck.healthyThresholdCount,
+        unhealthyThresholdCount: this.props.siteHealthCheck.unhealthyThresholdCount,
+        healthyGrpcCodes: this.props.siteHealthCheck.healthyGrpcCodes,
+        healthyHttpCodes: this.props.siteHealthCheck.healthyHttpCodes,
+        protocol: this.props.siteHealthCheck.protocol,
+      })
+    }
 
     this.siteEcsService = fargateService.service
     this.siteEcsTaskDefinition = fargateService.taskDefinition

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

@@ -95,7 +95,7 @@ export class EcsManager {
       proxyConfiguration: props.proxyConfiguration,
       runtimePlatform: {
         operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? ecs.OperatingSystemFamily.LINUX,
-        cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? ecs.CpuArchitecture.ARM64,
+        cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? ecs.CpuArchitecture.X86_64,
       },
       taskRole: role,
       volumes: props.volumes,
@@ -153,7 +153,7 @@ export class EcsManager {
       memoryLimitMiB: props.memoryLimitMiB,
       runtimePlatform: {
         operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? ecs.OperatingSystemFamily.LINUX,
-        cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? ecs.CpuArchitecture.ARM64,
+        cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? ecs.CpuArchitecture.X86_64,
       },
       serviceName: `${id}-${scope.props.stage}`,
       taskImageOptions: {