sst 2.10.4 → 2.11.1

package/sst.mjs

@@ -7168,14 +7168,22 @@ Are you sure you want to run this stage in dev mode? [y/N] `,
 // src/cli/commands/bind.ts
 init_error();
 import path18 from "path";
-var OutdatedMetadataError = class extends Error {
+var MetadataNotFoundError = class extends Error {
+};
+var MetadataOutdatedError = class extends Error {
 };
 var bind = (program2) => program2.command(
   ["bind <command..>", "env <command..>"],
   "Bind your app's resources to a command",
-  (yargs2) => yargs2.array("command").example(`sst bind "vitest run"`, "Bind your resources to your tests").example(
-    `sst bind "tsx scripts/myscript.ts"`,
-    "Bind your resources to a script"
+  (yargs2) => yargs2.option("site", {
+    type: "boolean",
+    describe: "Run in site mode"
+  }).option("script", {
+    type: "boolean",
+    describe: "Run in script mode"
+  }).array("command").example(`sst bind vitest run`, "Bind resources to your tests").example(`sst bind next dev`, "Bind resources to your site").example(
+    `sst bind --script next build`,
+    "Bind resources to your site before deployment"
   ),
   async (args) => {
     const { spawn: spawn7 } = await import("child_process");
@@ -7199,6 +7207,7 @@ var bind = (program2) => program2.command(
     const project = useProject2();
     const command = args.command?.join(" ");
     const isSite = await isRunningInSite();
+    const mode = args.site ? "site" : args.script ? "script" : "auto";
     let p;
     let timer;
     let siteConfigCache;
@@ -7207,23 +7216,11 @@ var bind = (program2) => program2.command(
         `Command is required, e.g. sst bind ${isSite ? "next dev" : "vitest run"}`
       );
     }
-    if (!isSite) {
+    if (args.script || !isSite && !args.site) {
       Logger2.debug("Running in script mode.");
       return await bindScript();
     }
-    try {
-      await bindSite("init");
-    } catch (e) {
-      if (e instanceof OutdatedMetadataError) {
-        Colors2.line(
-          Colors2.warning(
-            "Warning: This was deployed with an old version of SST. Run `sst dev` or `sst deploy` to update."
-          )
-        );
-        return await bindScript();
-      }
-      throw e;
-    }
+    await bindSite("init");
     bus.subscribe(
       "stacks.metadata.updated",
       () => bindSite("metadata_updated")
@@ -7282,7 +7279,22 @@ var bind = (program2) => program2.command(
       return results.some(Boolean);
     }
     async function bindSite(reason) {
-      const siteMetadata = await getSiteMetadataUntilAvailable();
+      let siteMetadata;
+      try {
+        siteMetadata = await getSiteMetadata();
+      } catch (e) {
+        if (!(e instanceof MetadataOutdatedError) && !(e instanceof MetadataNotFoundError)) {
+          throw e;
+        }
+        if (reason !== "init")
+          return;
+        Colors2.line(
+          Colors2.warning(
+            e instanceof MetadataOutdatedError ? "Warning: This was deployed with an old version of SST. Run `sst dev` or `sst deploy` to update." : "Warning: The site has not been deployed. Some resources might not be available."
+          )
+        );
+        return await bindScript();
+      }
       const siteConfig = await parseSiteMetadata(siteMetadata);
       if (reason === "metadata_updated") {
         if (areEnvsSame(siteConfig.envs, siteConfigCache?.envs || {}))
@@ -7294,58 +7306,23 @@ var bind = (program2) => program2.command(
         );
       }
       siteConfigCache = siteConfig;
-      if (siteConfig.role) {
-        const credentials = await assumeSsrRole(siteConfig.role);
-        if (credentials) {
-          const expireAt = credentials.Expiration.getTime() - 6e4;
-          clearTimeout(timer);
-          timer = setTimeout(() => {
-            Colors2.line(
-              `
-`,
-              `Your AWS session is about to expire. Creating a new session and restarting \`${command}\`...`
-            );
-            bindSite("iam_expired");
-          }, expireAt - Date.now());
-          await runCommand({
-            ...siteConfig.envs,
-            AWS_ACCESS_KEY_ID: credentials.AccessKeyId,
-            AWS_SECRET_ACCESS_KEY: credentials.SecretAccessKey,
-            AWS_SESSION_TOKEN: credentials.SessionToken
-          });
-          return;
-        }
-      }
+      const credentials = siteConfig.role && await getLiveIamCredentials(siteConfig.role) || await getLocalIamCredentials();
       await runCommand({
         ...siteConfig.envs,
-        ...await localIamCredentials()
+        ...credentials
       });
     }
     async function bindScript() {
       const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
       await runCommand({
         ...await Config2.env(),
-        ...await localIamCredentials()
+        ...await getLocalIamCredentials()
       });
     }
-    async function getSiteMetadataUntilAvailable() {
-      const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
-      const spinner = createSpinner2({});
-      while (true) {
-        const data2 = await getSiteMetadata();
-        if (!data2) {
-          spinner.start("Make sure `sst dev` is running...");
-          await new Promise((resolve) => setTimeout(resolve, 1e3));
-          continue;
-        }
-        spinner.isSpinning && spinner.stop().clear();
-        return data2;
-      }
-    }
     async function getSiteMetadata() {
       const { metadata: metadata3 } = await Promise.resolve().then(() => (init_metadata(), metadata_exports));
       const metadataData = await metadata3();
-      return Object.values(metadataData).flat().filter(
+      const data2 = Object.values(metadataData).flat().filter(
         (c) => [
           "StaticSite",
           "NextjsSite",
@@ -7358,10 +7335,14 @@ var bind = (program2) => program2.command(
       ).find((c) => {
         const isSsr = c.type !== "StaticSite" && c.type !== "SlsNextjsSite";
         if (!c.data.path || isSsr && !c.data.server || !isSsr && !c.data.environment) {
-          throw new OutdatedMetadataError();
+          throw new MetadataOutdatedError();
         }
         return path18.resolve(project.paths.root, c.data.path) === process.cwd();
       });
+      if (!data2) {
+        throw new MetadataNotFoundError();
+      }
+      return data2;
     }
     async function parseSiteMetadata(metadata3) {
       const { LambdaClient: LambdaClient2, GetFunctionCommand } = await import("@aws-sdk/client-lambda");
@@ -7382,39 +7363,27 @@ var bind = (program2) => program2.command(
         secrets: metadata3.data.secrets
       };
     }
-    async function assumeSsrRole(roleArn) {
-      const { STSClient: STSClient2, AssumeRoleCommand } = await import("@aws-sdk/client-sts");
-      const { useAWSClient: useAWSClient2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
-      const sts = useAWSClient2(STSClient2);
-      const assumeRole = async (duration) => {
-        const { Credentials: credentials } = await sts.send(
-          new AssumeRoleCommand({
-            RoleArn: roleArn,
-            RoleSessionName: "dev-session",
-            DurationSeconds: duration
-          })
+    async function getLiveIamCredentials(roleArn) {
+      const credentials = await assumeSsrRole(roleArn);
+      if (!credentials)
+        return;
+      const expireAt = credentials.Expiration.getTime() - 6e4;
+      clearTimeout(timer);
+      timer = setTimeout(() => {
+        Colors2.line(
+          `
+`,
+          `Your AWS session is about to expire. Creating a new session and restarting \`${command}\`...`
         );
-        return credentials;
+        bindSite("iam_expired");
+      }, expireAt - Date.now());
+      return {
+        AWS_ACCESS_KEY_ID: credentials.AccessKeyId,
+        AWS_SECRET_ACCESS_KEY: credentials.SecretAccessKey,
+        AWS_SESSION_TOKEN: credentials.SessionToken
       };
-      let err;
-      try {
-        return await assumeRole(43200);
-      } catch (e) {
-        err = e;
-      }
-      if (err.name === "ValidationError" && err.message.startsWith("The requested DurationSeconds exceeds")) {
-        try {
-          return await assumeRole(3600);
-        } catch (e) {
-          err = e;
-        }
-      }
-      Colors2.line(
-        "Using local IAM credentials since `sst dev` is not running."
-      );
-      Logger2.debug(`Failed to assume ${roleArn}.`, err);
     }
-    async function localIamCredentials() {
+    async function getLocalIamCredentials() {
       const { useAWSCredentials: useAWSCredentials2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
       const credentials = await useAWSCredentials2();
       return {
@@ -7452,6 +7421,38 @@ var bind = (program2) => program2.command(
     function areEnvsSame(envs1, envs2) {
       return Object.keys(envs1).length === Object.keys(envs2).length && Object.keys(envs1).every((key) => envs1[key] === envs2[key]);
     }
+    async function assumeSsrRole(roleArn) {
+      const { STSClient: STSClient2, AssumeRoleCommand } = await import("@aws-sdk/client-sts");
+      const { useAWSClient: useAWSClient2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
+      const sts = useAWSClient2(STSClient2);
+      const assumeRole = async (duration) => {
+        const { Credentials: credentials } = await sts.send(
+          new AssumeRoleCommand({
+            RoleArn: roleArn,
+            RoleSessionName: "dev-session",
+            DurationSeconds: duration
+          })
+        );
+        return credentials;
+      };
+      let err;
+      try {
+        return await assumeRole(43200);
+      } catch (e) {
+        err = e;
+      }
+      if (err.name === "ValidationError" && err.message.startsWith("The requested DurationSeconds exceeds")) {
+        try {
+          return await assumeRole(3600);
+        } catch (e) {
+          err = e;
+        }
+      }
+      Colors2.line(
+        "Using local IAM credentials since `sst dev` is not running."
+      );
+      Logger2.debug(`Failed to assume ${roleArn}.`, err);
+    }
   }
 ).strict(false);
 
@@ -7707,12 +7708,19 @@ var list = (program2) => program2.command(
   (yargs2) => yargs2.positional("format", {
     type: "string",
     choices: ["table", "env", "json"]
-  }),
+  }).boolean("fallback"),
   async (args) => {
     const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
     const { gray } = await import("colorette");
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
-    const secrets2 = await Config2.secrets();
+    const configSecrets = await Config2.secrets();
+    const secrets2 = !args.fallback ? configSecrets : Object.entries(configSecrets).reduce(
+      (carry, [key, value]) => ({
+        ...carry,
+        ...!value.value && !!value.fallback ? { [key]: value } : {}
+      }),
+      {}
+    );
     if (Object.entries(secrets2).length === 0) {
       Colors2.line("No secrets set");
       return;
@@ -7729,7 +7737,9 @@ var list = (program2) => program2.command(
         break;
       case "env":
         for (const [key, value] of Object.entries(secrets2)) {
-          console.log(`${key}=${value.value || value.fallback}`);
+          console.log(
+            `${key}=${value.value || `${value.fallback} #fallback`}`
+          );
         }
         break;
       case "table":
@@ -7755,8 +7765,11 @@ var list = (program2) => program2.command(
         );
         keys.sort().forEach((key) => {
           const value = secrets2[key].value ? secrets2[key].value : `${secrets2[key].fallback} ${gray("(fallback)")}`;
+          const colourPadding = secrets2[key].value ? 0 : gray("").length;
           console.log(
-            `\u2502 ${key.padEnd(keyLen)} \u2502 ${value.padEnd(valueLen)} \u2502`
+            `\u2502 ${key.padEnd(keyLen)} \u2502 ${value.padEnd(
+              valueLen + colourPadding
+            )} \u2502`
           );
         });
         console.log(