@codedazur/cdk-docker-cluster 1.1.2 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @codedazur/cdk-docker-cluster
 
+## 2.1.0
+
+### Minor Changes
+
+- [`f361c4c`](https://github.com/codedazur/toolkit/commit/f361c4cbf2974360c9eeec0feb04c9c2cc33b730) Thanks [@thijsdaniels](https://github.com/thijsdaniels)! - Add support for Container Insights on ECS clusters (`cluster.containerInsights`) and custom health checks on ALB target groups (`service.healthCheck`).
+
+## 2.0.0
+
+### Major Changes
+
+- [`4f12708`](https://github.com/codedazur/toolkit/commit/4f12708f7b35ce7e96af62c10a6f637e347c3c69) Thanks [@thijsdaniels](https://github.com/thijsdaniels)! - Custom domain names with external DNS registry are now supported. A HostedZone will no longer be looked up and must be provided instead if needed.
+
+### Patch Changes
+
+- Updated dependencies [[`4f12708`](https://github.com/codedazur/toolkit/commit/4f12708f7b35ce7e96af62c10a6f637e347c3c69)]:
+  - @codedazur/cdk-site-distribution@2.0.0
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -4,12 +4,21 @@ import { ContainerImage, Secret, ScalableTaskCount } from 'aws-cdk-lib/aws-ecs';
 import { SiteDistributionProps, SiteDistribution } from '@codedazur/cdk-site-distribution';
 import { Duration } from 'aws-cdk-lib';
 import { ApplicationLoadBalancedFargateServiceProps, ApplicationLoadBalancedFargateService } from 'aws-cdk-lib/aws-ecs-patterns';
+import { HealthCheck } from 'aws-cdk-lib/aws-elasticloadbalancingv2';
 import { Construct } from 'constructs';
 
+interface ClusterConfig {
+    /**
+     * Enable CloudWatch Container Insights for the ECS Cluster.
+     * @default false
+     */
+    readonly containerInsights?: boolean;
+}
 interface DockerClusterProps {
     readonly source: string | SourceProps | ContainerImage;
     readonly service?: ServiceProps;
     readonly distribution?: Omit<SiteDistributionProps, "origin">;
+    readonly cluster?: ClusterConfig;
 }
 interface ServiceProps {
     readonly port?: number;
@@ -18,6 +27,10 @@ interface ServiceProps {
     readonly memory?: ApplicationLoadBalancedFargateServiceProps["memoryLimitMiB"];
     readonly environment?: Record<string, string>;
     readonly secrets?: Record<string, Secret>;
+    /**
+     * Health check configuration for the Application Load Balancer target group.
+     */
+    readonly healthCheck?: HealthCheck;
 }
 interface AutoScalingConfig {
     /**
@@ -96,4 +109,4 @@ declare class DockerCluster extends Construct {
     protected getOutputDirectory(): string;
 }
 
-export { DockerCluster, type DockerClusterProps, type ServiceProps };
+export { type ClusterConfig, DockerCluster, type DockerClusterProps, type ServiceProps };

package/dist/index.js

@@ -1,43 +1,29 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var index_exports = {};
-__export(index_exports, {
-  DockerCluster: () => DockerCluster
-});
-module.exports = __toCommonJS(index_exports);
-
 // src/constructs/DockerCluster.ts
-var import_cdk_site_distribution = require("@codedazur/cdk-site-distribution");
-var import_aws_cdk_lib = require("aws-cdk-lib");
-var import_aws_cloudfront = require("aws-cdk-lib/aws-cloudfront");
-var import_aws_cloudfront_origins = require("aws-cdk-lib/aws-cloudfront-origins");
-var import_aws_ecr_assets = require("aws-cdk-lib/aws-ecr-assets");
-var import_aws_ecs = require("aws-cdk-lib/aws-ecs");
-var import_aws_ecs_patterns = require("aws-cdk-lib/aws-ecs-patterns");
-var import_constructs = require("constructs");
-var DockerCluster = class extends import_constructs.Construct {
+import {
+  SiteDistribution
+} from "@codedazur/cdk-site-distribution";
+import { App } from "aws-cdk-lib";
+import {
+  AllowedMethods,
+  CachePolicy,
+  OriginProtocolPolicy,
+  OriginRequestPolicy
+} from "aws-cdk-lib/aws-cloudfront";
+import { LoadBalancerV2Origin } from "aws-cdk-lib/aws-cloudfront-origins";
+import { Platform } from "aws-cdk-lib/aws-ecr-assets";
+import {
+  Cluster,
+  ContainerImage
+} from "aws-cdk-lib/aws-ecs";
+import {
+  ApplicationLoadBalancedFargateService
+} from "aws-cdk-lib/aws-ecs-patterns";
+import { Construct } from "constructs";
+var DockerCluster = class extends Construct {
   constructor(scope, id, props) {
     super(scope, id);
     this.props = props;
-    this.image = this.props.source instanceof import_aws_ecs.ContainerImage ? this.props.source : this.createImage(this.props.source);
+    this.image = this.props.source instanceof ContainerImage ? this.props.source : this.createImage(this.props.source);
     this.service = this.createService();
     this.autoScaling = this.createAutoScaling(this.service);
     this.siteDistribution = this.createSiteDistribution();
@@ -45,14 +31,14 @@ var DockerCluster = class extends import_constructs.Construct {
   createImage(source) {
     const props = {
       exclude: [`**/${this.getOutputDirectory()}`],
-      platform: import_aws_ecr_assets.Platform.LINUX_AMD64
+      platform: Platform.LINUX_AMD64
       // networkMode: NetworkMode.HOST, // @todo Use the host network mode.
       // cacheFrom: [], // @todo Use the previously built image as a cache.
     };
     if (typeof source === "string") {
-      return import_aws_ecs.ContainerImage.fromAsset(source, props);
+      return ContainerImage.fromAsset(source, props);
     }
-    return import_aws_ecs.ContainerImage.fromAsset(source.directory, {
+    return ContainerImage.fromAsset(source.directory, {
       ...props,
       file: source.file,
       buildArgs: source.arguments,
@@ -61,8 +47,10 @@ var DockerCluster = class extends import_constructs.Construct {
   }
   createService() {
     const desiredTasks = typeof this.props.service?.tasks === "number" ? this.props.service?.tasks : this.props.service?.tasks?.minimum;
-    const service = new import_aws_ecs_patterns.ApplicationLoadBalancedFargateService(this, "Service", {
-      cluster: new import_aws_ecs.Cluster(this, "Cluster"),
+    const service = new ApplicationLoadBalancedFargateService(this, "Service", {
+      cluster: new Cluster(this, "Cluster", {
+        containerInsights: this.props.cluster?.containerInsights
+      }),
       cpu: this.props.service?.cpu,
       memoryLimitMiB: this.props.service?.memory,
       desiredCount: desiredTasks,
@@ -77,6 +65,9 @@ var DockerCluster = class extends import_constructs.Construct {
         rollback: true
       }
     });
+    if (this.props.service?.healthCheck) {
+      service.targetGroup.configureHealthCheck(this.props.service.healthCheck);
+    }
     return service;
   }
   createAutoScaling(service) {
@@ -101,13 +92,13 @@ var DockerCluster = class extends import_constructs.Construct {
   }
   createSiteDistribution() {
     const { cachePolicy, originRequestPolicy, ...distribution } = this.props.distribution ?? {};
-    return new import_cdk_site_distribution.SiteDistribution(this, "Distribution", {
-      allowedMethods: import_aws_cloudfront.AllowedMethods.ALLOW_ALL,
+    return new SiteDistribution(this, "Distribution", {
+      allowedMethods: AllowedMethods.ALLOW_ALL,
       cachePolicy: cachePolicy ?? this.createCachePolicy(),
       originRequestPolicy: originRequestPolicy ?? this.createOriginRequestPolicy(),
       ...distribution,
-      origin: new import_aws_cloudfront_origins.LoadBalancerV2Origin(this.service.loadBalancer, {
-        protocolPolicy: import_aws_cloudfront.OriginProtocolPolicy.HTTP_ONLY
+      origin: new LoadBalancerV2Origin(this.service.loadBalancer, {
+        protocolPolicy: OriginProtocolPolicy.HTTP_ONLY
       })
     });
   }
@@ -119,7 +110,7 @@ var DockerCluster = class extends import_constructs.Construct {
    * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html#managed-cache-policy-origin-cache-headers-query-strings
    */
   createCachePolicy() {
-    return import_aws_cloudfront.CachePolicy.fromCachePolicyId(
+    return CachePolicy.fromCachePolicyId(
       this,
       "CachePolicy",
       "4cc15a8a-d715-48a4-82b8-cc0b614638fe" /* UseOriginCacheControlHeadersQueryStrings */
@@ -132,17 +123,16 @@ var DockerCluster = class extends import_constructs.Construct {
    * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-origin-request-policies.html#managed-origin-request-policy-all-viewer
    */
   createOriginRequestPolicy() {
-    return import_aws_cloudfront.OriginRequestPolicy.fromOriginRequestPolicyId(
+    return OriginRequestPolicy.fromOriginRequestPolicyId(
       this,
       "OriginRequestPolicy",
       "216adef6-5c7f-47e4-b989-5492eafa07d3" /* AllViewer */
     );
   }
   getOutputDirectory() {
-    return import_aws_cdk_lib.App.of(this)?.outdir ?? "cdk.out";
+    return App.of(this)?.outdir ?? "cdk.out";
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   DockerCluster
-});
+};

package/eslint.config.ts

@@ -1,4 +1,5 @@
-import { cdk, distribution } from "@codedazur/eslint-config";
+import { distribution } from "@codedazur/eslint-config";
+import { cdk } from "@codedazur/eslint-config/cdk";
 import { defineConfig } from "eslint/config";
 import root from "../../eslint.config";
 

package/package.json

@@ -1,23 +1,18 @@
 {
   "name": "@codedazur/cdk-docker-cluster",
-  "version": "1.1.2",
-  "main": ".dist/index.js",
-  "module": "./dist/index.mjs",
+  "version": "2.1.0",
+  "type": "module",
+  "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
-    }
-  },
+  "exports": "./dist/index.js",
   "publishConfig": {
     "access": "public"
   },
   "license": "MIT",
   "sideEffects": false,
   "scripts": {
-    "develop": "tsup src/index.ts --format esm,cjs --dts --watch",
-    "build": "tsup src/index.ts --format esm,cjs --dts",
+    "develop": "tsup src/index.ts --clean --format esm --dts --watch",
+    "build": "tsup src/index.ts --clean --format esm --dts",
     "audit": "npm audit --omit dev --audit-level high",
     "lint": "eslint .",
     "types": "tsc --noEmit",
@@ -28,12 +23,12 @@
     "constructs": ">=10"
   },
   "dependencies": {
-    "@codedazur/cdk-site-distribution": "^1.0.2"
+    "@codedazur/cdk-site-distribution": "~2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^25.0.3",
-    "aws-cdk-lib": "^2.233.0",
-    "constructs": "^10.4.4",
-    "esbuild": "^0.27.2"
+    "@types/node": "^25.9.1",
+    "aws-cdk-lib": "^2.268.0",
+    "constructs": "^10.8.1",
+    "esbuild": "^0.28.2"
   }
 }

package/dist/index.d.mts

@@ -1,99 +0,0 @@
-import * as aws_cdk_lib_aws_cloudfront from 'aws-cdk-lib/aws-cloudfront';
-import * as aws_cdk_lib_aws_ecs from 'aws-cdk-lib/aws-ecs';
-import { ContainerImage, Secret, ScalableTaskCount } from 'aws-cdk-lib/aws-ecs';
-import { SiteDistributionProps, SiteDistribution } from '@codedazur/cdk-site-distribution';
-import { Duration } from 'aws-cdk-lib';
-import { ApplicationLoadBalancedFargateServiceProps, ApplicationLoadBalancedFargateService } from 'aws-cdk-lib/aws-ecs-patterns';
-import { Construct } from 'constructs';
-
-interface DockerClusterProps {
-    readonly source: string | SourceProps | ContainerImage;
-    readonly service?: ServiceProps;
-    readonly distribution?: Omit<SiteDistributionProps, "origin">;
-}
-interface ServiceProps {
-    readonly port?: number;
-    readonly tasks?: number | AutoScalingConfig;
-    readonly cpu?: ApplicationLoadBalancedFargateServiceProps["cpu"];
-    readonly memory?: ApplicationLoadBalancedFargateServiceProps["memoryLimitMiB"];
-    readonly environment?: Record<string, string>;
-    readonly secrets?: Record<string, Secret>;
-}
-interface AutoScalingConfig {
-    /**
-     * The minimum number of tasks to scale out to.
-     */
-    minimum: number;
-    /**
-     * The maximum number of tasks to scale out to.
-     */
-    maximum: number;
-    threshold?: {
-        /**
-         * The memory utilization percentage above which the service will scale out.
-         * @default 75
-         */
-        memory?: number;
-        /**
-         * The CPU utilization percentage above which the service will scale out.
-         * @default 75
-         */
-        cpu?: number;
-    };
-    cooldown?: {
-        /**
-         * The cooldown period for scaling in.
-         * @default Duration.seconds(300)
-         */
-        in?: Duration;
-        /**
-         * The cooldown period for scaling out.
-         * @default Duration.seconds(300)
-         */
-        out?: Duration;
-    };
-}
-interface SourceProps {
-    readonly directory: string;
-    readonly exclude?: string[];
-    readonly file?: string;
-    readonly arguments?: Record<string, string>;
-    readonly secrets?: Record<string, string>;
-}
-/**
- * An Docker cluster on a load balanced Fargate service on EC2, using an image
- * built from a Dockerfile in a directory and pushed to ECR.
- * @todo Make the distribution and load balancer optional, to reduce cost and
- * increase deployment speed for development environments.
- */
-declare class DockerCluster extends Construct {
-    protected readonly props: DockerClusterProps;
-    readonly domain?: string;
-    readonly image: ContainerImage;
-    readonly service: ApplicationLoadBalancedFargateService;
-    readonly autoScaling?: ScalableTaskCount;
-    readonly siteDistribution: SiteDistribution;
-    constructor(scope: Construct, id: string, props: DockerClusterProps);
-    protected createImage(source: string | SourceProps): aws_cdk_lib_aws_ecs.AssetImage;
-    protected createService(): ApplicationLoadBalancedFargateService;
-    protected createAutoScaling(service: ApplicationLoadBalancedFargateService): ScalableTaskCount | undefined;
-    protected createSiteDistribution(): SiteDistribution;
-    /**
-     * The managed "UseOriginCacheControlHeaders-QueryStrings" cache policy, which
-     * is designed for use with an origin that sends Cache-Control headers with
-     * the object, which is recommended for use with an Application Load Balancer,
-     * and includes query strings in the cache key.
-     * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html#managed-cache-policy-origin-cache-headers-query-strings
-     */
-    protected createCachePolicy(): aws_cdk_lib_aws_cloudfront.ICachePolicy;
-    /**
-     * The managed "AllViewer" origin request policy, which includes all values
-     * (query strings, headers, and cookies) in the viewer request, which is
-     * recommended for use with an Application Load Balancer endpoint.
-     * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-origin-request-policies.html#managed-origin-request-policy-all-viewer
-     */
-    protected createOriginRequestPolicy(): aws_cdk_lib_aws_cloudfront.IOriginRequestPolicy;
-    protected getOutputDirectory(): string;
-}
-
-export { DockerCluster, type DockerClusterProps, type ServiceProps };

package/dist/index.mjs

@@ -1,133 +0,0 @@
-// src/constructs/DockerCluster.ts
-import {
-  SiteDistribution
-} from "@codedazur/cdk-site-distribution";
-import { App } from "aws-cdk-lib";
-import {
-  AllowedMethods,
-  CachePolicy,
-  OriginProtocolPolicy,
-  OriginRequestPolicy
-} from "aws-cdk-lib/aws-cloudfront";
-import { LoadBalancerV2Origin } from "aws-cdk-lib/aws-cloudfront-origins";
-import { Platform } from "aws-cdk-lib/aws-ecr-assets";
-import {
-  Cluster,
-  ContainerImage
-} from "aws-cdk-lib/aws-ecs";
-import {
-  ApplicationLoadBalancedFargateService
-} from "aws-cdk-lib/aws-ecs-patterns";
-import { Construct } from "constructs";
-var DockerCluster = class extends Construct {
-  constructor(scope, id, props) {
-    super(scope, id);
-    this.props = props;
-    this.image = this.props.source instanceof ContainerImage ? this.props.source : this.createImage(this.props.source);
-    this.service = this.createService();
-    this.autoScaling = this.createAutoScaling(this.service);
-    this.siteDistribution = this.createSiteDistribution();
-  }
-  createImage(source) {
-    const props = {
-      exclude: [`**/${this.getOutputDirectory()}`],
-      platform: Platform.LINUX_AMD64
-      // networkMode: NetworkMode.HOST, // @todo Use the host network mode.
-      // cacheFrom: [], // @todo Use the previously built image as a cache.
-    };
-    if (typeof source === "string") {
-      return ContainerImage.fromAsset(source, props);
-    }
-    return ContainerImage.fromAsset(source.directory, {
-      ...props,
-      file: source.file,
-      buildArgs: source.arguments,
-      buildSecrets: source.secrets
-    });
-  }
-  createService() {
-    const desiredTasks = typeof this.props.service?.tasks === "number" ? this.props.service?.tasks : this.props.service?.tasks?.minimum;
-    const service = new ApplicationLoadBalancedFargateService(this, "Service", {
-      cluster: new Cluster(this, "Cluster"),
-      cpu: this.props.service?.cpu,
-      memoryLimitMiB: this.props.service?.memory,
-      desiredCount: desiredTasks,
-      taskImageOptions: {
-        image: this.image,
-        containerPort: this.props.service?.port,
-        environment: this.props.service?.environment,
-        secrets: this.props.service?.secrets
-      },
-      circuitBreaker: {
-        enable: true,
-        rollback: true
-      }
-    });
-    return service;
-  }
-  createAutoScaling(service) {
-    if (typeof this.props.service?.tasks !== "object") {
-      return;
-    }
-    const autoScaling = service.service.autoScaleTaskCount({
-      minCapacity: this.props.service?.tasks.minimum,
-      maxCapacity: this.props.service?.tasks.maximum
-    });
-    autoScaling.scaleOnMemoryUtilization("MemoryScaling", {
-      targetUtilizationPercent: this.props.service?.tasks.threshold?.memory ?? 75,
-      scaleInCooldown: this.props.service?.tasks.cooldown?.in,
-      scaleOutCooldown: this.props.service?.tasks.cooldown?.out
-    });
-    autoScaling.scaleOnCpuUtilization("CpuScaling", {
-      targetUtilizationPercent: this.props.service?.tasks.threshold?.cpu ?? 75,
-      scaleInCooldown: this.props.service?.tasks.cooldown?.in,
-      scaleOutCooldown: this.props.service?.tasks.cooldown?.out
-    });
-    return autoScaling;
-  }
-  createSiteDistribution() {
-    const { cachePolicy, originRequestPolicy, ...distribution } = this.props.distribution ?? {};
-    return new SiteDistribution(this, "Distribution", {
-      allowedMethods: AllowedMethods.ALLOW_ALL,
-      cachePolicy: cachePolicy ?? this.createCachePolicy(),
-      originRequestPolicy: originRequestPolicy ?? this.createOriginRequestPolicy(),
-      ...distribution,
-      origin: new LoadBalancerV2Origin(this.service.loadBalancer, {
-        protocolPolicy: OriginProtocolPolicy.HTTP_ONLY
-      })
-    });
-  }
-  /**
-   * The managed "UseOriginCacheControlHeaders-QueryStrings" cache policy, which
-   * is designed for use with an origin that sends Cache-Control headers with
-   * the object, which is recommended for use with an Application Load Balancer,
-   * and includes query strings in the cache key.
-   * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html#managed-cache-policy-origin-cache-headers-query-strings
-   */
-  createCachePolicy() {
-    return CachePolicy.fromCachePolicyId(
-      this,
-      "CachePolicy",
-      "4cc15a8a-d715-48a4-82b8-cc0b614638fe" /* UseOriginCacheControlHeadersQueryStrings */
-    );
-  }
-  /**
-   * The managed "AllViewer" origin request policy, which includes all values
-   * (query strings, headers, and cookies) in the viewer request, which is
-   * recommended for use with an Application Load Balancer endpoint.
-   * @see https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-origin-request-policies.html#managed-origin-request-policy-all-viewer
-   */
-  createOriginRequestPolicy() {
-    return OriginRequestPolicy.fromOriginRequestPolicyId(
-      this,
-      "OriginRequestPolicy",
-      "216adef6-5c7f-47e4-b989-5492eafa07d3" /* AllViewer */
-    );
-  }
-  getOutputDirectory() {
-    return App.of(this)?.outdir ?? "cdk.out";
-  }
-};
-export {
-  DockerCluster
-};