sst 2.0.0-rc.37 → 2.0.0-rc.38

package/bootstrap.js

@@ -68,7 +68,9 @@ export async function initBootstrap() {
                 }),
                 new PolicyStatement({
                     actions: ["iot:Publish"],
-                    resources: [`arn:${stack.partition}:iot:${stack.region}:${stack.account}:topic//sst/*`],
+                    resources: [
+                        `arn:${stack.partition}:iot:${stack.region}:${stack.account}:topic//sst/*`,
+                    ],
                 }),
             ],
         });

package/cli/commands/secrets/secrets.js

@@ -1,11 +1,14 @@
+import { get } from "./get.js";
+import { list } from "./list.js";
+import { remove } from "./remove.js";
 import { set } from "./set.js";
 export function secrets(program) {
     program.command("secrets", "Manage the secrets in your app", (yargs) => {
         yargs.demandCommand(1);
         set(yargs);
-        // get(yargs);
-        // list(yargs);
-        // remove(yargs);
+        get(yargs);
+        list(yargs);
+        remove(yargs);
         return yargs;
     });
 }

package/cli/program.js

@@ -22,7 +22,7 @@ export const program = yargs(hideBin(process.argv))
     type: "string",
     describe: "ARN of the IAM role to use when invoking AWS",
 })
-    .group(["stage", "profile", "region", "help"], "Global:")
+    .group(["stage", "profile", "region", "help", "verbose", "role"], "Global:")
     .middleware(async (argv) => {
     if (argv.verbose) {
         process.env.SST_VERBOSE = "1";

package/iot.js

@@ -37,6 +37,10 @@ export const useIOT = Context.memo(async () => {
     });
     device.on("message", (_topic, buffer) => {
         const fragment = JSON.parse(buffer.toString());
+        if (!fragment.id) {
+            bus.publish(fragment.type, fragment.properties);
+            return;
+        }
         let pending = fragments.get(fragment.id);
         if (!pending) {
             pending = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.37",
+  "version": "2.0.0-rc.38",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -2352,7 +2352,7 @@ async function metadata() {
     credentials
   });
   const key = `stackMetadata/app.${project.config.name}/stage.${project.config.stage}/`;
-  const list = await s3.send(
+  const list2 = await s3.send(
     new ListObjectsV2Command({
       Prefix: key,
       Bucket: bootstrap.bucket
@@ -2360,7 +2360,7 @@ async function metadata() {
   );
   const result = Object.fromEntries(
     await Promise.all(
-      list.Contents?.map(async (obj) => {
+      list2.Contents?.map(async (obj) => {
         const stackID = obj.Key?.split("/").pop();
         const result2 = await s3.send(
           new GetObjectCommand({
@@ -2372,7 +2372,7 @@ async function metadata() {
       }) || []
     )
   );
-  Logger.debug("Fetched metadata from", list.KeyCount, "stacks");
+  Logger.debug("Fetched metadata from", list2.KeyCount, "stacks");
   return result;
 }
 async function metadataForStack(stackID) {
@@ -2409,22 +2409,23 @@ var init_metadata = __esm({
     init_cache();
     init_context();
     init_bus();
-    init_stacks();
     init_logger();
     init_project();
     MetadataContext = Context.create(async () => {
       const bus = useBus();
       const cache = await useCache();
       const data2 = await metadata();
-      bus.subscribe("stack.status", async (evt) => {
-        if (!stacks_exports.isSuccess(evt.properties.status))
-          return;
-        const meta = await metadataForStack(evt.properties.stackID);
-        Logger.debug("Got metadata", meta);
-        data2[evt.properties.stackID] = meta;
-        await cache.write(`metadata.json`, JSON.stringify(data2));
-        bus.publish("stacks.metadata", data2);
-        MetadataContext.provide(Promise.resolve(data2));
+      bus.subscribe("stacks.metadata.updated", async () => {
+        const data3 = await metadata();
+        await cache.write(`metadata.json`, JSON.stringify(data3));
+        bus.publish("stacks.metadata", data3);
+        MetadataContext.provide(Promise.resolve(data3));
+      });
+      bus.subscribe("stacks.metadata.deleted", async () => {
+        const data3 = await metadata();
+        await cache.write(`metadata.json`, JSON.stringify(data3));
+        bus.publish("stacks.metadata", data3);
+        MetadataContext.provide(Promise.resolve(data3));
       });
       return data2;
     });
@@ -3851,7 +3852,9 @@ async function initBootstrap() {
         }),
         new PolicyStatement({
           actions: ["iot:Publish"],
-          resources: [`arn:${stack.partition}:iot:${stack.region}:${stack.account}:topic//sst/*`]
+          resources: [
+            `arn:${stack.partition}:iot:${stack.region}:${stack.account}:topic//sst/*`
+          ]
         })
       ]
     });
@@ -4484,6 +4487,10 @@ var init_iot = __esm({
       });
       device.on("message", (_topic, buffer) => {
         const fragment = JSON.parse(buffer.toString());
+        if (!fragment.id) {
+          bus.publish(fragment.type, fragment.properties);
+          return;
+        }
         let pending = fragments.get(fragment.id);
         if (!pending) {
           pending = /* @__PURE__ */ new Map();
@@ -5706,7 +5713,7 @@ var program = yargs(hideBin(process.argv)).scriptName("sst").option("stage", {
 }).option("role", {
   type: "string",
   describe: "ARN of the IAM role to use when invoking AWS"
-}).group(["stage", "profile", "region", "help"], "Global:").middleware(async (argv) => {
+}).group(["stage", "profile", "region", "help", "verbose", "role"], "Global:").middleware(async (argv) => {
   if (argv.verbose) {
     process.env.SST_VERBOSE = "1";
   }
@@ -6181,6 +6188,108 @@ var consoleCommand = async (program2) => program2.command(
   }
 );
 
+// src/cli/commands/secrets/get.ts
+var get = (program2) => program2.command(
+  "get <name>",
+  "Get the value of a secret",
+  (yargs2) => yargs2.positional("name", {
+    type: "string",
+    describe: "Name of the secret",
+    demandOption: true
+  }).option("fallback", {
+    type: "boolean",
+    describe: "Get the fallback value"
+  }),
+  async (args) => {
+    const { red: red3 } = await import("colorette");
+    const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+    const { bold: bold2 } = await import("colorette");
+    try {
+      const result = await Config2.getSecret({
+        key: args.name,
+        fallback: args.fallback === true
+      });
+      console.log(bold2(result));
+    } catch {
+      console.log(red3(`${bold2(args.name)} is not set`));
+    }
+  }
+);
+
+// src/cli/commands/secrets/list.ts
+var list = (program2) => program2.command(
+  "list [format]",
+  "Fetch all the secrets",
+  (yargs2) => yargs2.positional("format", {
+    type: "string",
+    choices: ["table", "env"]
+  }),
+  async (args) => {
+    const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+    const { gray } = await import("colorette");
+    const secrets2 = await Config2.secrets();
+    switch (args.format || "table") {
+      case "env":
+        for (const [key, value] of Object.entries(secrets2)) {
+          console.log(`${key}=${value.value || value.fallback}`);
+        }
+        break;
+      case "table":
+        const keys2 = Object.keys(secrets2);
+        const keyLen = Math.max(
+          "Secrets".length,
+          ...keys2.map((key) => key.length)
+        );
+        const valueLen = Math.max(
+          "Values".length,
+          ...keys2.map(
+            (key) => secrets2[key].value ? secrets2[key].value.length : `${secrets2[key].fallback} (fallback)`.length
+          )
+        );
+        console.log(
+          "\u250C".padEnd(keyLen + 3, "\u2500") + "\u252C" + "".padEnd(valueLen + 2, "\u2500") + "\u2510"
+        );
+        console.log(
+          `\u2502 ${"Secrets".padEnd(keyLen)} \u2502 ${"Values".padEnd(valueLen)} \u2502`
+        );
+        console.log(
+          "\u251C".padEnd(keyLen + 3, "\u2500") + "\u253C" + "".padEnd(valueLen + 2, "\u2500") + "\u2524"
+        );
+        keys2.sort().forEach((key) => {
+          const value = secrets2[key].value ? secrets2[key].value : `${secrets2[key].fallback} ${gray("(fallback)")}`;
+          console.log(
+            `\u2502 ${key.padEnd(keyLen)} \u2502 ${value.padEnd(valueLen)} \u2502`
+          );
+        });
+        console.log(
+          "\u2514".padEnd(keyLen + 3, "\u2500") + "\u2534" + "".padEnd(valueLen + 2, "\u2500") + "\u2518"
+        );
+        break;
+    }
+  }
+);
+
+// src/cli/commands/secrets/remove.ts
+var remove3 = (program2) => program2.command(
+  "remove <name>",
+  "Remove a secret",
+  (yargs2) => yargs2.positional("name", {
+    describe: "Name of the secret",
+    type: "string",
+    demandOption: true
+  }).option("fallback", {
+    type: "boolean",
+    describe: "Remove the fallback value"
+  }),
+  async (args) => {
+    const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+    await Config2.removeSecret({
+      key: args.name,
+      fallback: args.fallback === true
+    });
+  }
+);
+
 // src/cli/commands/secrets/set.ts
 var set = (program2) => program2.command(
   "set <name> <value>",
@@ -6223,6 +6332,9 @@ function secrets(program2) {
   program2.command("secrets", "Manage the secrets in your app", (yargs2) => {
     yargs2.demandCommand(1);
     set(yargs2);
+    get(yargs2);
+    list(yargs2);
+    remove3(yargs2);
     return yargs2;
   });
 }

package/stacks/metadata.js

@@ -5,7 +5,6 @@ import { json } from "stream/consumers";
 import { useCache } from "../cache.js";
 import { Context } from "../context/context.js";
 import { useBus } from "../bus.js";
-import { Stacks } from "./index.js";
 import { Logger } from "../logger.js";
 import { useProject } from "../project.js";
 export async function metadata() {
@@ -67,12 +66,14 @@ const MetadataContext = Context.create(async () => {
     const bus = useBus();
     const cache = await useCache();
     const data = await metadata();
-    bus.subscribe("stack.status", async (evt) => {
-        if (!Stacks.isSuccess(evt.properties.status))
-            return;
-        const meta = await metadataForStack(evt.properties.stackID);
-        Logger.debug("Got metadata", meta);
-        data[evt.properties.stackID] = meta;
+    bus.subscribe("stacks.metadata.updated", async () => {
+        const data = await metadata();
+        await cache.write(`metadata.json`, JSON.stringify(data));
+        bus.publish("stacks.metadata", data);
+        MetadataContext.provide(Promise.resolve(data));
+    });
+    bus.subscribe("stacks.metadata.deleted", async () => {
+        const data = await metadata();
         await cache.write(`metadata.json`, JSON.stringify(data));
         bus.publish("stacks.metadata", data);
         MetadataContext.provide(Promise.resolve(data));