sst 2.0.17 → 2.0.18

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.17",
+  "version": "2.0.18",
   "bin": {
     "sst": "cli/sst.js"
   },

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();
@@ -2884,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([
@@ -2902,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");
   }
@@ -4477,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();
@@ -4505,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)];
       }) || []
     )
   );
@@ -4531,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 [];
@@ -4874,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] || "*"])
                     )
                   })
                 );
@@ -7068,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`
+    );
   }
 );
 

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);