sst 2.0.16 → 2.0.18

package/bootstrap.js

@@ -3,7 +3,7 @@ import path from "path";
 import { bold, dim } from "colorette";
 import { spawn } from "child_process";
 import { DescribeStacksCommand, CloudFormationClient, } from "@aws-sdk/client-cloudformation";
-import { Tags, Stack, RemovalPolicy, App, CfnOutput } from "aws-cdk-lib";
+import { Duration, Tags, Stack, RemovalPolicy, App, CfnOutput, } from "aws-cdk-lib";
 import { Function, Runtime, Code } from "aws-cdk-lib/aws-lambda";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
@@ -21,7 +21,7 @@ import { Stacks } from "./stacks/index.js";
 const STACK_NAME = "SSTBootstrap";
 const OUTPUT_VERSION = "Version";
 const OUTPUT_BUCKET = "BucketName";
-const LATEST_VERSION = "6";
+const LATEST_VERSION = "7";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 export const useBootstrap = Context.memo(async () => {
     Logger.debug("Initializing bootstrap context");
@@ -80,7 +80,6 @@ async function loadCDKStatus() {
             throw e;
         }
     }
-    return false;
 }
 export async function bootstrapSST(tags) {
     // Create bootstrap stack
@@ -127,7 +126,10 @@ export async function bootstrapSST(tags) {
             }),
         ],
     });
-    const queue = new Queue(stack, "MetadataQueue");
+    const queue = new Queue(stack, "MetadataQueue", {
+        visibilityTimeout: Duration.seconds(30),
+        retentionPeriod: Duration.minutes(2),
+    });
     fn.addEventSource(new SqsEventSource(queue));
     const rule = new Rule(stack, "MetadataRule", {
         eventPattern: {

package/cli/commands/secrets/set.js

@@ -25,5 +25,7 @@ export const set = (program) => program.command("set <name> <value>", "Set the v
     setting.succeed();
     const restarting = createSpinner(` Restarting all functions using ${blue(args.name)}...`).start();
     const count = await Config.restart(args.name);
-    restarting.succeed(` Restarted ${count} functions`);
+    restarting.succeed(count === 1
+        ? ` Restarted ${count} function`
+        : ` Restarted ${count} functions`);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/python.js

@@ -78,6 +78,7 @@ export const usePythonHandler = Context.memo(async () => {
             const src = await findAbove(input.props.handler, "requirements.txt");
             await fs.cp(src, input.out, {
                 recursive: true,
+                filter: (src) => !src.includes(".sst"),
             });
             if (input.props.python?.installCommands) {
                 for (const cmd of input.props.python.installCommands) {

package/sst.mjs

@@ -2488,8 +2488,8 @@ var init_workers = __esm({
 import { IoTClient, DescribeEndpointCommand } from "@aws-sdk/client-iot";
 import iot from "aws-iot-device-sdk";
 function encode(input) {
-  const json3 = JSON.stringify(input);
-  const parts = json3.match(/.{1,100000}/g);
+  const json = JSON.stringify(input);
+  const parts = json.match(/.{1,100000}/g);
   if (!parts)
     return [];
   const id = Math.random().toString();
@@ -2627,7 +2627,14 @@ import {
   DescribeStacksCommand,
   CloudFormationClient
 } from "@aws-sdk/client-cloudformation";
-import { Tags, Stack, RemovalPolicy, App, CfnOutput } from "aws-cdk-lib";
+import {
+  Duration,
+  Tags,
+  Stack,
+  RemovalPolicy,
+  App,
+  CfnOutput
+} from "aws-cdk-lib";
 import { Function, Runtime, Code } from "aws-cdk-lib/aws-lambda";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
@@ -2665,7 +2672,6 @@ async function loadCDKStatus() {
       throw e;
     }
   }
-  return false;
 }
 async function bootstrapSST(tags) {
   const project = useProject();
@@ -2710,7 +2716,10 @@ async function bootstrapSST(tags) {
       })
     ]
   });
-  const queue = new Queue(stack, "MetadataQueue");
+  const queue = new Queue(stack, "MetadataQueue", {
+    visibilityTimeout: Duration.seconds(30),
+    retentionPeriod: Duration.minutes(2)
+  });
   fn.addEventSource(new SqsEventSource(queue));
   const rule = new Rule(stack, "MetadataRule", {
     eventPattern: {
@@ -2836,7 +2845,7 @@ var init_bootstrap = __esm({
     STACK_NAME = "SSTBootstrap";
     OUTPUT_VERSION = "Version";
     OUTPUT_BUCKET = "BucketName";
-    LATEST_VERSION = "6";
+    LATEST_VERSION = "7";
     __dirname = url3.fileURLToPath(new URL(".", import.meta.url));
     useBootstrap = Context.memo(async () => {
       Logger.debug("Initializing bootstrap context");
@@ -2875,7 +2884,6 @@ import {
   PutObjectCommand,
   DeleteObjectCommand
 } from "@aws-sdk/client-s3";
-import { json } from "stream/consumers";
 async function metadata() {
   Logger.debug("Fetching app metadata");
   const [project, credentials, bootstrap2] = await Promise.all([
@@ -2893,8 +2901,9 @@ async function metadata() {
         Key: useS3Key(),
         Bucket: bootstrap2.bucket
       })
-    ).then((result2) => json(result2.Body));
-    return result;
+    );
+    const body = await result.Body.transformToString();
+    return JSON.parse(body);
   } catch (ex) {
     Logger.debug("Fetching app metadata: not found");
   }
@@ -4468,7 +4477,6 @@ import {
   GetObjectCommand as GetObjectCommand2,
   ListObjectsV2Command
 } from "@aws-sdk/client-s3";
-import { json as json2 } from "stream/consumers";
 async function metadata2() {
   Logger.debug("Fetching all metadata");
   const project = useProject();
@@ -4496,8 +4504,9 @@ async function metadata2() {
             Key: obj.Key,
             Bucket: bootstrap2.bucket
           })
-        ).then((result3) => json2(result3.Body));
-        return [stackID, result2];
+        );
+        const body = await result2.Body.transformToString();
+        return [stackID, JSON.parse(body)];
       }) || []
     )
   );
@@ -4522,8 +4531,9 @@ async function metadataForStack(stackID) {
         Key: key,
         Bucket: bootstrap2.bucket
       })
-    ).then((result2) => json2(result2.Body));
-    return result;
+    );
+    const body = await result.Body.transformToString();
+    return JSON.parse(body);
   } catch (ex) {
     console.error(ex);
     return [];
@@ -4865,14 +4875,14 @@ var init_node = __esm({
               }
               if (input.mode === "deploy" && nodejs.install) {
                 const src = await find2(parsed.dir, "package.json");
-                const json3 = JSON.parse(
+                const json = JSON.parse(
                   await fs10.readFile(path10.join(src, "package.json")).then((x) => x.toString())
                 );
                 fs10.writeFile(
                   path10.join(input.out, "package.json"),
                   JSON.stringify({
                     dependencies: Object.fromEntries(
-                      nodejs.install?.map((x) => [x, json3.dependencies?.[x] || "*"])
+                      nodejs.install?.map((x) => [x, json.dependencies?.[x] || "*"])
                     )
                   })
                 );
@@ -5132,7 +5142,8 @@ var init_python = __esm({
             };
           const src = await findAbove(input.props.handler, "requirements.txt");
           await fs12.cp(src, input.out, {
-            recursive: true
+            recursive: true,
+            filter: (src2) => !src2.includes(".sst")
           });
           if (input.props.python?.installCommands) {
             for (const cmd of input.props.python.installCommands) {
@@ -6260,7 +6271,7 @@ var init_config = __esm({
 });
 
 // src/cli/sst.ts
-import { blue as blue3, red as red2 } from "colorette";
+import { blue as blue3, red } from "colorette";
 
 // src/cli/program.ts
 import yargs from "yargs";
@@ -6927,7 +6938,7 @@ var get = (program2) => program2.command(
     describe: "Get the fallback value"
   }),
   async (args) => {
-    const { red: red3 } = await import("colorette");
+    const { red: red2 } = await import("colorette");
     const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
     try {
@@ -7058,7 +7069,9 @@ var set = (program2) => program2.command(
       ` Restarting all functions using ${blue4(args.name)}...`
     ).start();
     const count = await Config2.restart(args.name);
-    restarting.succeed(` Restarted ${count} functions`);
+    restarting.succeed(
+      count === 1 ? ` Restarted ${count} function` : ` Restarted ${count} functions`
+    );
   }
 );
 
@@ -7428,7 +7441,7 @@ process.on("uncaughtException", (err) => {
     if (spinner.isSpinning)
       spinner.fail(spinner.text);
   }
-  console.log(red2("Error:"), err.message);
+  console.log(red("Error:"), err.message);
   if (!(err instanceof VisibleError)) {
     console.log();
     console.trace(err.stack);

package/stacks/app-metadata.js

@@ -1,7 +1,6 @@
 import { useBootstrap } from "../bootstrap.js";
 import { useAWSCredentials } from "../credentials.js";
 import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand, } from "@aws-sdk/client-s3";
-import { json } from "stream/consumers";
 import { Context } from "../context/context.js";
 import { Logger } from "../logger.js";
 import { useProject } from "../project.js";
@@ -17,13 +16,12 @@ async function metadata() {
         credentials,
     });
     try {
-        const result = await s3
-            .send(new GetObjectCommand({
+        const result = await s3.send(new GetObjectCommand({
             Key: useS3Key(),
             Bucket: bootstrap.bucket,
-        }))
-            .then((result) => json(result.Body));
-        return result;
+        }));
+        const body = await result.Body.transformToString();
+        return JSON.parse(body);
     }
     catch (ex) {
         Logger.debug("Fetching app metadata: not found");

package/stacks/metadata.js

@@ -1,7 +1,6 @@
 import { useBootstrap } from "../bootstrap.js";
 import { useAWSCredentials, useAWSCredentialsProvider, } from "../credentials.js";
 import { S3Client, GetObjectCommand, ListObjectsV2Command, } from "@aws-sdk/client-s3";
-import { json } from "stream/consumers";
 import { useCache } from "../cache.js";
 import { Context } from "../context/context.js";
 import { useBus } from "../bus.js";
@@ -25,13 +24,12 @@ export async function metadata() {
     }));
     const result = Object.fromEntries(await Promise.all(list.Contents?.map(async (obj) => {
         const stackID = obj.Key?.split("/").pop();
-        const result = await s3
-            .send(new GetObjectCommand({
+        const result = await s3.send(new GetObjectCommand({
             Key: obj.Key,
             Bucket: bootstrap.bucket,
-        }))
-            .then((result) => json(result.Body));
-        return [stackID, result];
+        }));
+        const body = await result.Body.transformToString();
+        return [stackID, JSON.parse(body)];
     }) || []));
     Logger.debug("Fetched metadata from", list.KeyCount, "stacks");
     return result;
@@ -49,13 +47,12 @@ export async function metadataForStack(stackID) {
     const key = `stackMetadata/app.${project.config.name}/stage.${project.config.stage}/stack.${stackID}.json`;
     Logger.debug("Getting metadata", key, "from", bootstrap.bucket);
     try {
-        const result = await s3
-            .send(new GetObjectCommand({
+        const result = await s3.send(new GetObjectCommand({
             Key: key,
             Bucket: bootstrap.bucket,
-        }))
-            .then((result) => json(result.Body));
-        return result;
+        }));
+        const body = await result.Body.transformToString();
+        return JSON.parse(body);
     }
     catch (ex) {
         console.error(ex);