sst 2.23.1 → 2.23.3

package/cli/commands/update.js

@@ -1,18 +1,9 @@
-const PACKAGE_MATCH = [
-    "sst",
-    "astro-sst",
-    "aws-cdk",
-    "@aws-cdk",
-    "constructs",
-    "svelte-kit-sst",
-    "solid-start-sst",
-];
+const PACKAGE_MATCH = ["aws-cdk", "@aws-cdk"];
 const FIELDS = ["dependencies", "devDependencies"];
 export const update = (program) => program.command("update [version]", "Update your SST and CDK packages", (yargs) => yargs.positional("version", {
     type: "string",
     describe: "Optionally specify a version to update to",
 }), async (args) => {
-    const { green, yellow } = await import("colorette");
     const fs = await import("fs/promises");
     const path = await import("path");
     const { fetch } = await import("undici");
@@ -41,33 +32,33 @@ export const update = (program) => program.command("update [version]", "Update y
     const metadata = await fetch(`https://registry.npmjs.org/sst/${args.version || "latest"}`).then((resp) => resp.json());
     const results = new Map();
     const tasks = files.map(async (file) => {
-        const data = await fs
-            .readFile(file)
-            .then((x) => x.toString())
-            .then(JSON.parse);
+        const data = await fs.readFile(file).then((x) => x.toString());
+        // Note: preserve ending new line characters in package.json
+        const tailingNewline = data.match(/\r?\n$/)?.[0];
+        const json = JSON.parse(data);
         for (const field of FIELDS) {
-            const deps = data[field];
-            if (!deps)
-                continue;
-            for (const [pkg, existing] of Object.entries(deps)) {
-                if (!PACKAGE_MATCH.some((x) => pkg.startsWith(x)))
-                    continue;
+            const deps = json[field];
+            for (const [pkg, existing] of Object.entries(deps || {})) {
                 const desired = (() => {
-                    // Both sst and astro-sst should be sharing the same version
                     if ([
                         "sst",
                         "astro-sst",
                         "svelte-kit-sst",
                         "solid-start-sst",
-                    ].includes(pkg))
+                    ].includes(pkg)) {
                         return metadata.version;
-                    if (pkg === "constructs")
+                    }
+                    else if (pkg === "constructs") {
                         return metadata.dependencies.constructs;
-                    if (pkg.endsWith("alpha"))
-                        return metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
-                    return metadata.dependencies["aws-cdk-lib"];
+                    }
+                    else if (pkg.startsWith("aws-cdk") ||
+                        pkg.startsWith("@aws-cdk")) {
+                        return pkg.endsWith("alpha")
+                            ? metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"]
+                            : metadata.dependencies["aws-cdk-lib"];
+                    }
                 })();
-                if (existing === desired)
+                if (!desired || existing === desired)
                     continue;
                 let arr = results.get(file);
                 if (!arr) {
@@ -79,7 +70,7 @@ export const update = (program) => program.command("update [version]", "Update y
             }
         }
         if (results.has(file)) {
-            await fs.writeFile(file, JSON.stringify(data, null, 2));
+            await fs.writeFile(file, `${JSON.stringify(json, null, 2)}${tailingNewline ?? ""}`);
         }
     });
     await Promise.all(tasks);

package/constructs/Function.js

@@ -23,6 +23,7 @@ import { Effect, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { StringParameter } from "aws-cdk-lib/aws-ssm";
 import { Platform } from "aws-cdk-lib/aws-ecr-assets";
 import { useBootstrap } from "../bootstrap.js";
+import { Colors } from "../cli/colors.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const supportedRuntimes = {
     container: CDKRuntime.FROM_IMAGE,
@@ -223,6 +224,8 @@ export class Function extends CDKFunction {
                 logRetentionRetryOptions: logRetention && { maxRetries: 100 },
             });
             useDeferredTasks().add(async () => {
+                if (props.runtime === "container")
+                    Colors.line(`➜  Building the container image for the "${this.node.id}" function...`);
                 // Build function
                 const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
                 if (result.type === "error") {

package/constructs/Job.js

@@ -3,6 +3,7 @@ import path from "path";
 import fs from "fs/promises";
 import { Construct } from "constructs";
 import { Duration as CdkDuration } from "aws-cdk-lib/core";
+import { Platform } from "aws-cdk-lib/aws-ecr-assets";
 import { PolicyStatement, Effect } from "aws-cdk-lib/aws-iam";
 import { AssetCode, Code, Runtime, Function as CdkFunction, } from "aws-cdk-lib/aws-lambda";
 import { Project, LinuxBuildImage, BuildSpec, ComputeType, } from "aws-cdk-lib/aws-codebuild";
@@ -15,7 +16,7 @@ import { bindEnvironment, bindPermissions, getReferencedSecrets, } from "./util/
 import { useDeferredTasks } from "./deferred_task.js";
 import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
-import { Platform } from "aws-cdk-lib/aws-ecr-assets";
+import { Colors } from "../cli/colors.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /////////////////////
 // Construct
@@ -194,6 +195,8 @@ export class Job extends Construct {
     buildCodeBuildProjectCode() {
         const { handler, architecture, runtime, container } = this.props;
         useDeferredTasks().add(async () => {
+            if (runtime === "container")
+                Colors.line(`➜  Building the container image for the "${this.node.id}" job...`);
             // Build function
             const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
             if (result.type === "error") {

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;
@@ -22,6 +23,11 @@ export interface ServiceProps {
      * @default "."
      */
     path?: string;
+    /**
+     * Path to Dockerfile relative to the defined "path".
+     * @default "Dockerfile"
+     */
+    file?: string;
     /**
      * The amount of cpu allocated.
      * @default "0.25 vCPU"
@@ -186,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.
@@ -213,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.
          *
@@ -283,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 =
@@ -188,10 +189,16 @@ export class Service extends Construct {
         Object.entries(props?.environment || {}).map(([key, value]) => this.addEnvironmentForService(key, value));
         useDeferredTasks().add(async () => {
             if (!app.isRunningSSTTest()) {
-                Colors.line(`➜  Building container image for the "${this.node.id}" service`);
+                Colors.line(`➜  Building the container image for the "${this.node.id}" service...`);
                 // Build app
-                let dockerfile = "Dockerfile";
-                if (!(await existsAsync(path.join(this.props.path, dockerfile)))) {
+                let dockerfile;
+                if (this.props.file) {
+                    dockerfile = this.props.file;
+                }
+                else if (await existsAsync(path.join(this.props.path, "Dockerfile"))) {
+                    dockerfile = "Dockerfile";
+                }
+                else {
                     await this.createNixpacksBuilder();
                     dockerfile = await this.runNixpacksBuild();
                 }
@@ -328,10 +335,16 @@ export class Service extends Construct {
     // Bundle Cluster
     /////////////////////
     validateServiceExists() {
-        const { path: servicePath } = this.props;
+        const { path: servicePath, file } = this.props;
         if (!fs.existsSync(servicePath)) {
             throw new Error(`No service found at "${path.resolve(servicePath)}"`);
         }
+        if (file) {
+            const dockerfilePath = path.join(servicePath, file);
+            if (!fs.existsSync(dockerfilePath)) {
+                throw new Error(`No Dockerfile found at "${dockerfilePath}". Make sure to set the "file" property to the path of the Dockerfile relative to "${servicePath}".`);
+            }
+        }
     }
     validateMemoryAndCpu() {
         const { memory, cpu } = this.props;
@@ -351,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,
@@ -368,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",
@@ -379,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.1",
+  "version": "2.23.3",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/java.js

@@ -17,7 +17,7 @@ export const useJavaHandler = Context.memo(async () => {
     const handlers = useRuntimeHandlers();
     const processes = new Map();
     const sources = new Map();
-    const handlerName = process.platform === "win32" ? `handler.exe` : `handler`;
+    const runningBuilds = new Map();
     handlers.register({
         shouldBuild: (input) => {
             if (!input.file.endsWith(".java"))
@@ -68,13 +68,26 @@ export const useJavaHandler = Context.memo(async () => {
             const buildTask = input.props.java?.buildTask || "build";
             const outputDir = input.props.java?.buildOutputDir || "distributions";
             sources.set(input.functionID, srcPath);
-            try {
+            async function build() {
+                // build
                 await execAsync(`${buildBinary} ${buildTask} -Dorg.gradle.logging.level=${process.env.DEBUG ? "debug" : "lifecycle"}`, {
                     cwd: srcPath,
                 });
+                // unzip
                 const buildOutput = path.join(srcPath, "build", outputDir);
                 const zip = (await fs.readdir(buildOutput)).find((f) => f.endsWith(".zip"));
-                new AdmZip(path.join(buildOutput, zip)).extractAllTo(input.out);
+                await new Promise((resolve, reject) => {
+                    const zipper = new AdmZip(path.join(buildOutput, zip));
+                    zipper.extractAllToAsync(input.out, false, false, (err) => err ? reject(err) : resolve(undefined));
+                });
+            }
+            try {
+                // Run gradle build once per directory. Otherwise they'll interfere
+                // with one another
+                const buildPromise = runningBuilds.get(buildBinary) ?? build();
+                runningBuilds.set(buildBinary, buildPromise);
+                await buildPromise;
+                runningBuilds.delete(buildBinary);
                 return {
                     type: "success",
                     handler: input.props.handler,

package/sst.mjs

@@ -5522,7 +5522,7 @@ var init_java = __esm({
       const handlers = useRuntimeHandlers();
       const processes = /* @__PURE__ */ new Map();
       const sources = /* @__PURE__ */ new Map();
-      const handlerName = process.platform === "win32" ? `handler.exe` : `handler`;
+      const runningBuilds = /* @__PURE__ */ new Map();
       handlers.register({
         shouldBuild: (input) => {
           if (!input.file.endsWith(".java"))
@@ -5579,7 +5579,7 @@ var init_java = __esm({
           const buildTask = input.props.java?.buildTask || "build";
           const outputDir = input.props.java?.buildOutputDir || "distributions";
           sources.set(input.functionID, srcPath);
-          try {
+          async function build2() {
             await execAsync(
               `${buildBinary} ${buildTask} -Dorg.gradle.logging.level=${process.env.DEBUG ? "debug" : "lifecycle"}`,
               {
@@ -5590,7 +5590,21 @@ var init_java = __esm({
             const zip = (await fs13.readdir(buildOutput)).find(
               (f) => f.endsWith(".zip")
             );
-            new AdmZip(path15.join(buildOutput, zip)).extractAllTo(input.out);
+            await new Promise((resolve2, reject) => {
+              const zipper = new AdmZip(path15.join(buildOutput, zip));
+              zipper.extractAllToAsync(
+                input.out,
+                false,
+                false,
+                (err) => err ? reject(err) : resolve2(void 0)
+              );
+            });
+          }
+          try {
+            const buildPromise = runningBuilds.get(buildBinary) ?? build2();
+            runningBuilds.set(buildBinary, buildPromise);
+            await buildPromise;
+            runningBuilds.delete(buildBinary);
             return {
               type: "success",
               handler: input.props.handler
@@ -8838,15 +8852,6 @@ function secrets(program2) {
 }
 
 // src/cli/commands/update.ts
-var PACKAGE_MATCH = [
-  "sst",
-  "astro-sst",
-  "aws-cdk",
-  "@aws-cdk",
-  "constructs",
-  "svelte-kit-sst",
-  "solid-start-sst"
-];
 var FIELDS = ["dependencies", "devDependencies"];
 var update = (program2) => program2.command(
   "update [version]",
@@ -8856,7 +8861,6 @@ var update = (program2) => program2.command(
     describe: "Optionally specify a version to update to"
   }),
   async (args) => {
-    const { green, yellow } = await import("colorette");
     const fs19 = await import("fs/promises");
     const path22 = await import("path");
     const { fetch } = await import("undici");
@@ -8886,29 +8890,27 @@ var update = (program2) => program2.command(
     ).then((resp) => resp.json());
     const results = /* @__PURE__ */ new Map();
     const tasks = files.map(async (file) => {
-      const data2 = await fs19.readFile(file).then((x) => x.toString()).then(JSON.parse);
+      const data2 = await fs19.readFile(file).then((x) => x.toString());
+      const tailingNewline = data2.match(/\r?\n$/)?.[0];
+      const json = JSON.parse(data2);
       for (const field of FIELDS) {
-        const deps = data2[field];
-        if (!deps)
-          continue;
-        for (const [pkg, existing] of Object.entries(deps)) {
-          if (!PACKAGE_MATCH.some((x) => pkg.startsWith(x)))
-            continue;
+        const deps = json[field];
+        for (const [pkg, existing] of Object.entries(deps || {})) {
           const desired = (() => {
             if ([
               "sst",
               "astro-sst",
               "svelte-kit-sst",
               "solid-start-sst"
-            ].includes(pkg))
+            ].includes(pkg)) {
               return metadata3.version;
-            if (pkg === "constructs")
+            } else if (pkg === "constructs") {
               return metadata3.dependencies.constructs;
-            if (pkg.endsWith("alpha"))
-              return metadata3.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
-            return metadata3.dependencies["aws-cdk-lib"];
+            } else if (pkg.startsWith("aws-cdk") || pkg.startsWith("@aws-cdk")) {
+              return pkg.endsWith("alpha") ? metadata3.dependencies["@aws-cdk/aws-apigatewayv2-alpha"] : metadata3.dependencies["aws-cdk-lib"];
+            }
           })();
-          if (existing === desired)
+          if (!desired || existing === desired)
             continue;
           let arr = results.get(file);
           if (!arr) {
@@ -8920,7 +8922,10 @@ var update = (program2) => program2.command(
         }
       }
       if (results.has(file)) {
-        await fs19.writeFile(file, JSON.stringify(data2, null, 2));
+        await fs19.writeFile(
+          file,
+          `${JSON.stringify(json, null, 2)}${tailingNewline ?? ""}`
+        );
       }
     });
     await Promise.all(tasks);