sst 2.5.5 → 2.5.6

package/config.js

@@ -10,7 +10,7 @@ export var Config;
     async function parameters() {
         const result = [];
         for await (const p of scan(PREFIX.FALLBACK)) {
-            const parsed = parse(p.Name);
+            const parsed = parse(p.Name, PREFIX.FALLBACK);
             if (parsed.type === "secrets")
                 continue;
             result.push({
@@ -19,7 +19,7 @@ export var Config;
             });
         }
         for await (const p of scan(PREFIX.STAGE)) {
-            const parsed = parse(p.Name);
+            const parsed = parse(p.Name, PREFIX.STAGE);
             if (parsed.type === "secrets")
                 continue;
             result.push({
@@ -45,13 +45,13 @@ export var Config;
     async function secrets() {
         const result = {};
         for await (const p of scan(PREFIX.STAGE + "Secret")) {
-            const parsed = parse(p.Name);
+            const parsed = parse(p.Name, PREFIX.STAGE);
             if (!result[parsed.id])
                 result[parsed.id] = {};
             result[parsed.id].value = p.Value;
         }
         for await (const p of scan(PREFIX.FALLBACK + "Secret")) {
-            const parsed = parse(p.Name);
+            const parsed = parse(p.Name, PREFIX.FALLBACK);
             if (!result[parsed.id])
                 result[parsed.id] = {};
             result[parsed.id].fallback = p.Value;
@@ -178,19 +178,19 @@ const SECRET_UPDATED_AT_ENV = "SST_ADMIN_SECRET_UPDATED_AT";
 const PREFIX = {
     get STAGE() {
         const project = useProject();
-        return `/sst/${project.config.name}/${project.config.stage}/`;
+        return project.config.ssmPrefix;
     },
     get FALLBACK() {
         const project = useProject();
         return `/sst/${project.config.name}/${FALLBACK_STAGE}/`;
     },
 };
-function parse(ssmName) {
-    const parts = ssmName.split("/");
+function parse(ssmName, prefix) {
+    const parts = ssmName.substring(prefix.length).split("/");
     return {
-        type: parts[4],
-        id: parts[5],
-        prop: parts.slice(6).join("/"),
+        type: parts[0],
+        id: parts[1],
+        prop: parts.slice(2).join("/"),
     };
 }
 async function restartFunction(arn) {

package/constructs/SsrSite.js

@@ -165,10 +165,11 @@ export class SsrSite extends Construct {
      * ```
      */
     attachPermissions(permissions) {
+        this.serverLambdaForDev?.attachPermissions(permissions);
+        this.serverLambdaForEdge?.attachPermissions(permissions);
         if (this.serverLambdaForRegional) {
             attachPermissionsToRole(this.serverLambdaForRegional.role, permissions);
         }
-        this.serverLambdaForEdge?.attachPermissions(permissions);
     }
     /** @internal */
     getConstructMetadata() {
@@ -432,6 +433,9 @@ export class SsrSite extends Construct {
             environment,
             permissions,
             role,
+            // Force enable live dev to prevent the function handler to be built
+            // in the case user set "enableLiveDev: false" on the app or stack.
+            enableLiveDev: true,
         });
         fn._doNotAllowOthersToBind = true;
         return fn;

package/package.json

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

package/project.d.ts

@@ -56,4 +56,10 @@ interface GlobalOptions {
     region?: string;
 }
 export declare function initProject(globals: GlobalOptions): Promise<void>;
+declare function sanitizeStageName(stage: string): string;
+declare function isValidStageName(stage: string): boolean;
+export declare const exportedForTesting: {
+    sanitizeStageName: typeof sanitizeStageName;
+    isValidStageName: typeof isValidStageName;
+};
 export {};

package/project.js

@@ -117,21 +117,29 @@ async function usePersonalStage(out) {
         return;
     }
 }
-async function promptPersonalStage(out) {
+async function promptPersonalStage(out, isRetry) {
     const readline = await import("readline");
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
     });
-    return new Promise((resolve) => {
-        const suggested = os.userInfo().username;
-        rl.question(`Please enter a name you’d like to use for your personal stage. Or hit enter to use ${blue(suggested)}: `, async (input) => {
+    const stage = await new Promise((resolve) => {
+        const suggested = sanitizeStageName(os.userInfo().username) || "local";
+        const instruction = !isRetry
+            ? `Please enter a name you’d like to use for your personal stage.`
+            : `Please enter a name that starts with a letter, followed by letters, numbers, or hyphens.`;
+        rl.question(`${instruction} Or hit enter to use ${blue(suggested)}: `, async (input) => {
             rl.close();
-            const result = input || suggested;
-            await fs.writeFile(path.join(out, "stage"), result);
+            const result = input === "" ? suggested : input;
             resolve(result);
         });
     });
+    // Validate stage name
+    if (isValidStageName(stage)) {
+        await fs.writeFile(path.join(out, "stage"), stage);
+        return stage;
+    }
+    return await promptPersonalStage(out, true);
 }
 async function findRoot() {
     async function find(dir) {
@@ -148,3 +156,17 @@ async function findRoot() {
     const result = await find(process.cwd());
     return result;
 }
+function sanitizeStageName(stage) {
+    return (stage
+        .replace(/[^A-Za-z0-9-]/g, "-")
+        .replace(/--+/g, "-")
+        .replace(/^[^A-Za-z]/, "")
+        .replace(/-$/, "") || "local");
+}
+function isValidStageName(stage) {
+    return Boolean(stage.match(/^[A-Za-z][A-Za-z0-9-]*$/));
+}
+export const exportedForTesting = {
+    sanitizeStageName,
+    isValidStageName,
+};

package/sst.mjs

@@ -317,6 +317,7 @@ var init_build = __esm({
 var project_exports = {};
 __export(project_exports, {
   ProjectContext: () => ProjectContext,
+  exportedForTesting: () => exportedForTesting,
   initProject: () => initProject,
   useProject: () => useProject
 });
@@ -420,26 +421,29 @@ async function usePersonalStage(out) {
     return;
   }
 }
-async function promptPersonalStage(out) {
+async function promptPersonalStage(out, isRetry) {
   const readline = await import("readline");
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve) => {
-    const suggested = os.userInfo().username;
+  const stage = await new Promise((resolve) => {
+    const suggested = sanitizeStageName(os.userInfo().username) || "local";
+    const instruction = !isRetry ? `Please enter a name you\u2019d like to use for your personal stage.` : `Please enter a name that starts with a letter, followed by letters, numbers, or hyphens.`;
     rl.question(
-      `Please enter a name you\u2019d like to use for your personal stage. Or hit enter to use ${blue(
-        suggested
-      )}: `,
+      `${instruction} Or hit enter to use ${blue(suggested)}: `,
       async (input) => {
         rl.close();
-        const result = input || suggested;
-        await fs4.writeFile(path4.join(out, "stage"), result);
+        const result = input === "" ? suggested : input;
         resolve(result);
       }
     );
   });
+  if (isValidStageName(stage)) {
+    await fs4.writeFile(path4.join(out, "stage"), stage);
+    return stage;
+  }
+  return await promptPersonalStage(out, true);
 }
 async function findRoot() {
   async function find2(dir) {
@@ -460,7 +464,13 @@ async function findRoot() {
   const result = await find2(process.cwd());
   return result;
 }
-var ProjectContext, CONFIG_EXTENSIONS;
+function sanitizeStageName(stage) {
+  return stage.replace(/[^A-Za-z0-9-]/g, "-").replace(/--+/g, "-").replace(/^[^A-Za-z]/, "").replace(/-$/, "") || "local";
+}
+function isValidStageName(stage) {
+  return Boolean(stage.match(/^[A-Za-z][A-Za-z0-9-]*$/));
+}
+var ProjectContext, CONFIG_EXTENSIONS, exportedForTesting;
 var init_project = __esm({
   "src/project.ts"() {
     "use strict";
@@ -477,6 +487,10 @@ var init_project = __esm({
       ".config.mjs",
       ".config.js"
     ];
+    exportedForTesting = {
+      sanitizeStageName,
+      isValidStageName
+    };
   }
 });
 
@@ -6523,12 +6537,12 @@ async function* scan(prefix) {
     token = results.NextToken;
   }
 }
-function parse(ssmName) {
-  const parts = ssmName.split("/");
+function parse(ssmName, prefix) {
+  const parts = ssmName.substring(prefix.length).split("/");
   return {
-    type: parts[4],
-    id: parts[5],
-    prop: parts.slice(6).join("/")
+    type: parts[0],
+    id: parts[1],
+    prop: parts.slice(2).join("/")
   };
 }
 async function restartFunction(arn) {
@@ -6569,7 +6583,7 @@ var init_config = __esm({
       async function parameters() {
         const result = [];
         for await (const p of scan(PREFIX.FALLBACK)) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.FALLBACK);
           if (parsed.type === "secrets")
             continue;
           result.push({
@@ -6578,7 +6592,7 @@ var init_config = __esm({
           });
         }
         for await (const p of scan(PREFIX.STAGE)) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.STAGE);
           if (parsed.type === "secrets")
             continue;
           result.push({
@@ -6604,13 +6618,13 @@ var init_config = __esm({
       async function secrets2() {
         const result = {};
         for await (const p of scan(PREFIX.STAGE + "Secret")) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.STAGE);
           if (!result[parsed.id])
             result[parsed.id] = {};
           result[parsed.id].value = p.Value;
         }
         for await (const p of scan(PREFIX.FALLBACK + "Secret")) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.FALLBACK);
           if (!result[parsed.id])
             result[parsed.id] = {};
           result[parsed.id].fallback = p.Value;
@@ -6721,7 +6735,7 @@ var init_config = __esm({
     PREFIX = {
       get STAGE() {
         const project = useProject();
-        return `/sst/${project.config.name}/${project.config.stage}/`;
+        return project.config.ssmPrefix;
       },
       get FALLBACK() {
         const project = useProject();