sst 2.23.2 → 2.23.4

package/cli/commands/update.js

@@ -1,5 +1,6 @@
-const PACKAGE_MATCH = ["aws-cdk", "@aws-cdk"];
+import { VisibleError } from "../../error.js";
 const FIELDS = ["dependencies", "devDependencies"];
+const SST_PKGS = ["sst", "astro-sst", "svelte-kit-sst", "solid-start-sst"];
 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",
@@ -9,7 +10,42 @@ export const update = (program) => program.command("update [version]", "Update y
     const { fetch } = await import("undici");
     const { useProject } = await import("../../project.js");
     const { Colors } = await import("../colors.js");
-    async function find(dir) {
+    const project = useProject();
+    const files = await findAllPackageJson(project.paths.root);
+    const metadata = await fetch(`https://registry.npmjs.org/sst/${args.version || "latest"}`).then((resp) => resp.json());
+    const allChanges = new Map();
+    const allOldPackages = new Map();
+    // Update all package.json files
+    await Promise.all(files.map(updatePackageJson));
+    // Print status
+    if (allOldPackages.size > 0) {
+        for (const [file, pkgs] of allOldPackages.entries()) {
+            Colors.line(Colors.danger(`✖ `), Colors.bold.dim(path.relative(project.paths.root, file)));
+            for (const [pkg, version] of pkgs) {
+                Colors.line(Colors.dim(`   ${pkg}@${version}`));
+            }
+        }
+        Colors.gap();
+        throw new VisibleError("We've detected AWS CDK v1 dependencies in your package.json. SST requires CDK v2. Please update to CDK v2 dependencies, and then execute `sst update`. For guidance, refer to the official AWS CDK migration documentation — https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html#migrating-v2-v1-upgrade");
+    }
+    // Print status
+    if (allChanges.size === 0) {
+        Colors.line(Colors.success(`✔ `), `Already using v${metadata.version}`);
+        return;
+    }
+    for (const [file, pkgs] of allChanges.entries()) {
+        Colors.line(Colors.success(`✔ `), Colors.bold.dim(path.relative(project.paths.root, file)));
+        for (const [pkg, version] of pkgs) {
+            Colors.line(Colors.dim(`   ${pkg}@${version}`));
+        }
+    }
+    Colors.gap();
+    Colors.line(`${Colors.primary(`➜`)}  ${Colors.warning("Make sure to run: npm install (or pnpm install, or yarn)")}`);
+    process.exit(0);
+    /////////////
+    // Helpers
+    /////////////
+    async function findAllPackageJson(dir) {
         const children = await fs.readdir(dir);
         const tasks = children.map(async (item) => {
             if (item === "node_modules")
@@ -22,69 +58,53 @@ export const update = (program) => program.command("update [version]", "Update y
                 return [full];
             const stat = await fs.stat(full);
             if (stat.isDirectory())
-                return find(full);
+                return findAllPackageJson(full);
             return [];
         });
         return (await Promise.all(tasks)).flat();
     }
-    const project = useProject();
-    const files = await find(project.paths.root);
-    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) => {
+    async function updatePackageJson(file) {
+        const changes = new Set();
+        const oldPackages = new Set();
         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);
+        // Update versions
         for (const field of FIELDS) {
             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)) {
+                    if (SST_PKGS.includes(pkg)) {
                         return metadata.version;
                     }
                     else if (pkg === "constructs") {
                         return metadata.dependencies.constructs;
                     }
-                    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"];
+                    else if (pkg === "aws-cdk-lib") {
+                        return metadata.dependencies["aws-cdk-lib"];
+                    }
+                    else if (pkg.startsWith("@aws-cdk/aws-")) {
+                        if (!pkg.endsWith("-alpha")) {
+                            oldPackages.add([pkg, existing]);
+                            return;
+                        }
+                        return metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
                     }
                 })();
                 if (!desired || existing === desired)
                     continue;
-                let arr = results.get(file);
-                if (!arr) {
-                    arr = new Set();
-                    results.set(file, arr);
-                }
-                arr.add([pkg, desired]);
+                changes.add([pkg, desired]);
                 deps[pkg] = desired;
             }
         }
-        if (results.has(file)) {
+        // Write to package.json
+        if (changes.size > 0) {
+            // note: preserve ending new line characters in package.json
+            const tailingNewline = data.match(/\r?\n$/)?.[0];
             await fs.writeFile(file, `${JSON.stringify(json, null, 2)}${tailingNewline ?? ""}`);
+            allChanges.set(file, changes);
         }
-    });
-    await Promise.all(tasks);
-    if (results.size === 0) {
-        Colors.line(Colors.success(`✔ `), `Already using v${metadata.version}`);
-        return;
-    }
-    for (const [file, pkgs] of results.entries()) {
-        Colors.line(Colors.success(`✔ `), Colors.bold.dim(path.relative(project.paths.root, file)));
-        for (const [pkg, version] of pkgs) {
-            Colors.line(Colors.dim(`   ${pkg}@${version}`));
+        if (oldPackages.size > 0) {
+            allOldPackages.set(file, oldPackages);
         }
     }
-    Colors.gap();
-    Colors.line(`${Colors.primary(`➜`)}  ${Colors.warning("Make sure to run: npm install (or pnpm install, or yarn)")}`);
-    process.exit(0);
 });

package/constructs/Function.js

@@ -18,7 +18,7 @@ import { createAppContext } from "./context.js";
 import { useWarning } from "./util/warning.js";
 import { Architecture, AssetCode, Code, Function as CDKFunction, FunctionUrlAuthType, Handler as CDKHandler, LayerVersion, Runtime as CDKRuntime, Tracing, } from "aws-cdk-lib/aws-lambda";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
-import { Token, Size as CDKSize, Duration as CDKDuration, } from "aws-cdk-lib/core";
+import { Token, Size as CDKSize, Duration as CDKDuration, IgnoreMode, } from "aws-cdk-lib/core";
 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";
@@ -202,6 +202,8 @@ export class Function extends CDKFunction {
                             ...(props.container?.file
                                 ? { file: props.container.file }
                                 : {}),
+                            exclude: [".sst"],
+                            ignoreMode: IgnoreMode.GLOB,
                         }),
                         handler: CDKHandler.FROM_IMAGE,
                         runtime: CDKRuntime.FROM_IMAGE,

package/constructs/Job.js

@@ -2,7 +2,7 @@ import url from "url";
 import path from "path";
 import fs from "fs/promises";
 import { Construct } from "constructs";
-import { Duration as CdkDuration } from "aws-cdk-lib/core";
+import { Duration as CdkDuration, IgnoreMode } 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";
@@ -213,6 +213,8 @@ export class Job extends Construct {
                         ? Platform.custom("linux/arm64")
                         : Platform.custom("linux/amd64"),
                     file: container?.file,
+                    exclude: [".sst"],
+                    ignoreMode: IgnoreMode.GLOB,
                 });
                 image.repository?.grantPull(this.job.role);
                 const project = this.job.node.defaultChild;

package/constructs/Service.d.ts

@@ -3,8 +3,9 @@ import { DistributionDomainProps } from "./Distribution.js";
 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 { IVpc } from "aws-cdk-lib/aws-ec2";
+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,69 +241,40 @@ 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?: {
         /**
-         * Runs codebuild job in the specified VPC. Note this will only work once deployed.
-         *
+         * Customizing the container definition for the ECS task.
          * @example
          * ```js
-         * import { Vpc } from "aws-cdk-lib/aws-ec2";
-         *
          * {
          *   cdk: {
-         *     vpc: Vpc.fromLookup(stack, "VPC", {
-         *       vpcId: "vpc-xxxxxxxxxx",
-         *     }),
+         *     container: {
+         *       healthCheck: {
+         *         command: ["CMD-SHELL", "curl -f http://localhost/ || exit 1"],
+         *       },
+         *     }
          *   }
          * }
          * ```
          */
-        vpc?: IVpc;
+        container?: Omit<ContainerDefinitionOptions, "image">;
         /**
-         * Where to place the network interfaces within the VPC.
-         * @default All private subnets.
-         * @example
-         * ```js
-         * import { SubnetType } from "aws-cdk-lib/aws-ec2";
+         * Runs codebuild job in the specified VPC. Note this will only work once deployed.
          *
-         * {
-         *   cdk: {
-         *     vpc,
-         *     vpcSubnets: { subnetType: SubnetType.PRIVATE_WITH_EGRESS }
-         *   }
-         * }
-         * ```
-         */
-        vpcSubnets?: SubnetSelection;
-        /**
-         * The list of security groups to associate with the Job's network interfaces.
-         * @default A new security group is created.
          * @example
          * ```js
-         * import { SecurityGroup } from "aws-cdk-lib/aws-ec2";
+         * import { Vpc } from "aws-cdk-lib/aws-ec2";
          *
          * {
          *   cdk: {
-         *     vpc,
-         *     securityGroups: [
-         *       new SecurityGroup(stack, "MyJobSG", { vpc })
-         *     ]
+         *     vpc: Vpc.fromLookup(stack, "VPC", {
+         *       vpcId: "vpc-xxxxxxxxxx",
+         *     }),
          *   }
          * }
          * ```
          */
-        securityGroups?: ISecurityGroup[];
+        vpc?: IVpc;
     };
 }
 type ServiceNormalizedProps = ServiceProps & {
@@ -288,6 +282,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

@@ -6,7 +6,7 @@ import { execAsync } from "../util/process.js";
 import { existsAsync } from "../util/fs.js";
 import { Colors } from "../cli/colors.js";
 import { Construct } from "constructs";
-import { Duration as CdkDuration } from "aws-cdk-lib/core";
+import { Duration as CdkDuration, IgnoreMode } from "aws-cdk-lib/core";
 import { Role, Effect, PolicyStatement, AccountPrincipal, ServicePrincipal, CompositePrincipal, } from "aws-cdk-lib/aws-iam";
 import { ViewerProtocolPolicy, AllowedMethods, CachedMethods, CachePolicy, CacheQueryStringBehavior, CacheHeaderBehavior, CacheCookieBehavior, OriginProtocolPolicy, OriginRequestPolicy, } from "aws-cdk-lib/aws-cloudfront";
 import { HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
@@ -20,7 +20,7 @@ import { bindEnvironment, bindPermissions, getParameterPath, getReferencedSecret
 import { useProject } from "../project.js";
 import { Vpc, } from "aws-cdk-lib/aws-ec2";
 import { AwsLogDriver, Cluster, FargateTaskDefinition, ContainerImage, FargateService, } from "aws-cdk-lib/aws-ecs";
-import { LogGroup, RetentionDays } from "aws-cdk-lib/aws-logs";
+import { LogGroup, LogRetention, RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Platform } from "aws-cdk-lib/aws-ecr-assets";
 import { ApplicationLoadBalancer, } from "aws-cdk-lib/aws-elasticloadbalancingv2";
 import { createAppContext } from "./context.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 =
@@ -359,16 +360,19 @@ export class Service extends Construct {
         const { cdk } = this.props;
         return (cdk?.vpc ??
             new Vpc(this, "Vpc", {
-                natGateways: 0,
+                natGateways: 1,
             }));
     }
     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", {
+        const logGroup = new LogRetention(this, "LogRetention", {
             logGroupName: `/sst/service/${clusterName}`,
-            retention: RetentionDays.INFINITE,
+            retention: RetentionDays[logRetention.toUpperCase()],
+            logRetentionRetryOptions: {
+                maxRetries: 100,
+            },
         });
         const cluster = new Cluster(this, "Cluster", {
             clusterName,
@@ -380,9 +384,8 @@ export class Service extends Construct {
             cpu: supportedCpus[cpu],
         });
         const container = taskDefinition.addContainer("Container", {
-            image: { bind: () => ({ imageName: "placeholder" }) },
             logging: new AwsLogDriver({
-                logGroup,
+                logGroup: LogGroup.fromLogGroupArn(this, "LogGroup", logGroup.logGroupArn),
                 streamPrefix: "service",
             }),
             portMappings: [{ containerPort: port }],
@@ -391,6 +394,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,
@@ -578,6 +583,8 @@ export class Service extends Construct {
         const image = ContainerImage.fromAsset(this.props.path, {
             platform: Platform.LINUX_AMD64,
             file: dockerfile,
+            exclude: [".sst"],
+            ignoreMode: IgnoreMode.GLOB,
         });
         const cfnTask = taskDefinition.node.defaultChild;
         cfnTask.addPropertyOverride("ContainerDefinitions.0.Image", image.bind(this, container).imageName);

package/package.json

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

package/sst.mjs

@@ -8852,7 +8852,9 @@ function secrets(program2) {
 }
 
 // src/cli/commands/update.ts
+init_error();
 var FIELDS = ["dependencies", "devDependencies"];
+var SST_PKGS = ["sst", "astro-sst", "svelte-kit-sst", "solid-start-sst"];
 var update = (program2) => program2.command(
   "update [version]",
   "Update your SST and CDK packages",
@@ -8866,9 +8868,52 @@ var update = (program2) => program2.command(
     const { fetch } = await import("undici");
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
-    async function find2(dir) {
+    const project = useProject2();
+    const files = await findAllPackageJson(project.paths.root);
+    const metadata3 = await fetch(
+      `https://registry.npmjs.org/sst/${args.version || "latest"}`
+    ).then((resp) => resp.json());
+    const allChanges = /* @__PURE__ */ new Map();
+    const allOldPackages = /* @__PURE__ */ new Map();
+    await Promise.all(files.map(updatePackageJson));
+    if (allOldPackages.size > 0) {
+      for (const [file, pkgs] of allOldPackages.entries()) {
+        Colors2.line(
+          Colors2.danger(`\u2716 `),
+          Colors2.bold.dim(path22.relative(project.paths.root, file))
+        );
+        for (const [pkg, version2] of pkgs) {
+          Colors2.line(Colors2.dim(`   ${pkg}@${version2}`));
+        }
+      }
+      Colors2.gap();
+      throw new VisibleError(
+        "We've detected AWS CDK v1 dependencies in your package.json. SST requires CDK v2. Please update to CDK v2 dependencies, and then execute `sst update`. For guidance, refer to the official AWS CDK migration documentation \u2014 https://docs.aws.amazon.com/cdk/v2/guide/migrating-v2.html#migrating-v2-v1-upgrade"
+      );
+    }
+    if (allChanges.size === 0) {
+      Colors2.line(Colors2.success(`\u2714 `), `Already using v${metadata3.version}`);
+      return;
+    }
+    for (const [file, pkgs] of allChanges.entries()) {
+      Colors2.line(
+        Colors2.success(`\u2714 `),
+        Colors2.bold.dim(path22.relative(project.paths.root, file))
+      );
+      for (const [pkg, version2] of pkgs) {
+        Colors2.line(Colors2.dim(`   ${pkg}@${version2}`));
+      }
+    }
+    Colors2.gap();
+    Colors2.line(
+      `${Colors2.primary(`\u279C`)}  ${Colors2.warning(
+        "Make sure to run: npm install (or pnpm install, or yarn)"
+      )}`
+    );
+    process.exit(0);
+    async function findAllPackageJson(dir) {
       const children = await fs19.readdir(dir);
-      const tasks2 = children.map(async (item) => {
+      const tasks = children.map(async (item) => {
         if (item === "node_modules")
           return [];
         if (/(^|\/)\.[^\/\.]/g.test(item))
@@ -8878,77 +8923,52 @@ var update = (program2) => program2.command(
           return [full];
         const stat = await fs19.stat(full);
         if (stat.isDirectory())
-          return find2(full);
+          return findAllPackageJson(full);
         return [];
       });
-      return (await Promise.all(tasks2)).flat();
+      return (await Promise.all(tasks)).flat();
     }
-    const project = useProject2();
-    const files = await find2(project.paths.root);
-    const metadata3 = await fetch(
-      `https://registry.npmjs.org/sst/${args.version || "latest"}`
-    ).then((resp) => resp.json());
-    const results = /* @__PURE__ */ new Map();
-    const tasks = files.map(async (file) => {
+    async function updatePackageJson(file) {
+      const changes = /* @__PURE__ */ new Set();
+      const oldPackages = /* @__PURE__ */ new Set();
       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 = json[field];
         for (const [pkg, existing] of Object.entries(deps || {})) {
           const desired = (() => {
-            if ([
-              "sst",
-              "astro-sst",
-              "svelte-kit-sst",
-              "solid-start-sst"
-            ].includes(pkg)) {
+            if (SST_PKGS.includes(pkg)) {
               return metadata3.version;
             } else if (pkg === "constructs") {
               return metadata3.dependencies.constructs;
-            } 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"];
+            } else if (pkg === "aws-cdk-lib") {
+              return metadata3.dependencies["aws-cdk-lib"];
+            } else if (pkg.startsWith("@aws-cdk/aws-")) {
+              if (!pkg.endsWith("-alpha")) {
+                oldPackages.add([pkg, existing]);
+                return;
+              }
+              return metadata3.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
             }
           })();
           if (!desired || existing === desired)
             continue;
-          let arr = results.get(file);
-          if (!arr) {
-            arr = /* @__PURE__ */ new Set();
-            results.set(file, arr);
-          }
-          arr.add([pkg, desired]);
+          changes.add([pkg, desired]);
           deps[pkg] = desired;
         }
       }
-      if (results.has(file)) {
+      if (changes.size > 0) {
+        const tailingNewline = data2.match(/\r?\n$/)?.[0];
         await fs19.writeFile(
           file,
           `${JSON.stringify(json, null, 2)}${tailingNewline ?? ""}`
         );
+        allChanges.set(file, changes);
       }
-    });
-    await Promise.all(tasks);
-    if (results.size === 0) {
-      Colors2.line(Colors2.success(`\u2714 `), `Already using v${metadata3.version}`);
-      return;
-    }
-    for (const [file, pkgs] of results.entries()) {
-      Colors2.line(
-        Colors2.success(`\u2714 `),
-        Colors2.bold.dim(path22.relative(project.paths.root, file))
-      );
-      for (const [pkg, version2] of pkgs) {
-        Colors2.line(Colors2.dim(`   ${pkg}@${version2}`));
+      if (oldPackages.size > 0) {
+        allOldPackages.set(file, oldPackages);
       }
     }
-    Colors2.gap();
-    Colors2.line(
-      `${Colors2.primary(`\u279C`)}  ${Colors2.warning(
-        "Make sure to run: npm install (or pnpm install, or yarn)"
-      )}`
-    );
-    process.exit(0);
   }
 );