sst 2.23.2 → 2.23.3

package/constructs/Service.d.ts

@@ -4,7 +4,8 @@ import { SSTConstruct } from "./Construct.js";
 import { Permissions } from "./util/permission.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 import { ISecurityGroup, IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
-import { Cluster } from "aws-cdk-lib/aws-ecs";
+import { Cluster, ContainerDefinitionOptions } from "aws-cdk-lib/aws-ecs";
+import { RetentionDays } from "aws-cdk-lib/aws-logs";
 declare const supportedCpus: {
     "0.25 vCPU": number;
     "0.5 vCPU": number;
@@ -191,6 +192,28 @@ export interface ServiceProps {
      * ```
      */
     environment?: Record<string, string>;
+    /**
+     * The duration logs are kept in CloudWatch Logs.
+     * @default Logs retained indefinitely
+     * @example
+     * ```js
+     * {
+     *   logRetention: "one_week"
+     * }
+     * ```
+     */
+    logRetention?: Lowercase<keyof typeof RetentionDays>;
+    /**
+     * While deploying, SST waits for the CloudFront cache invalidation process to finish. This ensures that the new content will be served once the deploy command finishes. However, this process can sometimes take more than 5 mins. For non-prod environments it might make sense to pass in `false`. That'll skip waiting for the cache to invalidate and speed up the deploy process.
+     * @default false
+     * @example
+     * ```js
+     * {
+     *   waitForInvalidation: true
+     * }
+     * ```
+     */
+    waitForInvalidation?: boolean;
     dev?: {
         /**
          * When running `sst dev, site is not deployed. This is to ensure `sst dev` can start up quickly.
@@ -218,18 +241,23 @@ export interface ServiceProps {
          */
         url?: string;
     };
-    /**
-     * While deploying, SST waits for the CloudFront cache invalidation process to finish. This ensures that the new content will be served once the deploy command finishes. However, this process can sometimes take more than 5 mins. For non-prod environments it might make sense to pass in `false`. That'll skip waiting for the cache to invalidate and speed up the deploy process.
-     * @default false
-     * @example
-     * ```js
-     * {
-     *   waitForInvalidation: true
-     * }
-     * ```
-     */
-    waitForInvalidation?: boolean;
     cdk?: {
+        /**
+         * Customizing the container definition for the ECS task.
+         * @example
+         * ```js
+         * {
+         *   cdk: {
+         *     container: {
+         *       healthCheck: {
+         *         command: ["CMD-SHELL", "curl -f http://localhost/ || exit 1"],
+         *       },
+         *     }
+         *   }
+         * }
+         * ```
+         */
+        container?: Omit<ContainerDefinitionOptions, "image">;
         /**
          * Runs codebuild job in the specified VPC. Note this will only work once deployed.
          *
@@ -288,6 +316,7 @@ type ServiceNormalizedProps = ServiceProps & {
     cpu: Exclude<ServiceProps["cpu"], undefined>;
     memory: Exclude<ServiceProps["memory"], undefined>;
     port: Exclude<ServiceProps["port"], undefined>;
+    logRetention: Exclude<ServiceProps["logRetention"], undefined>;
     waitForInvalidation: Exclude<ServiceProps["waitForInvalidation"], undefined>;
 };
 /**

package/constructs/Service.js

@@ -153,10 +153,11 @@ export class Service extends Construct {
         this.id = id;
         this.props = {
             path: ".",
-            waitForInvalidation: false,
             cpu: props?.cpu || "0.25 vCPU",
             memory: props?.memory || "0.5 GB",
             port: props?.port || 3000,
+            logRetention: props?.logRetention || "infinite",
+            waitForInvalidation: false,
             ...props,
         };
         this.doNotDeploy =
@@ -363,12 +364,12 @@ export class Service extends Construct {
             }));
     }
     createService(vpc) {
-        const { cpu, memory, port } = this.props;
+        const { cpu, memory, port, logRetention, cdk } = this.props;
         const app = this.node.root;
         const clusterName = app.logicalPrefixedName(this.node.id);
         const logGroup = new LogGroup(this, "LogGroup", {
             logGroupName: `/sst/service/${clusterName}`,
-            retention: RetentionDays.INFINITE,
+            retention: RetentionDays[logRetention.toUpperCase()],
         });
         const cluster = new Cluster(this, "Cluster", {
             clusterName,
@@ -380,7 +381,6 @@ export class Service extends Construct {
             cpu: supportedCpus[cpu],
         });
         const container = taskDefinition.addContainer("Container", {
-            image: { bind: () => ({ imageName: "placeholder" }) },
             logging: new AwsLogDriver({
                 logGroup,
                 streamPrefix: "service",
@@ -391,6 +391,8 @@ export class Service extends Construct {
                 SST_STAGE: app.stage,
                 SST_SSM_PREFIX: useProject().config.ssmPrefix,
             },
+            ...cdk?.container,
+            image: { bind: () => ({ imageName: "placeholder" }) },
         });
         const service = new FargateService(this, "Service", {
             cluster,

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.23.2",
+  "version": "2.23.3",
   "bin": {
     "sst": "cli/sst.js"
   },