sst 2.24.15 → 2.24.17

package/cli/commands/build.js

@@ -2,18 +2,24 @@ export const build = (program) => program.command("build", "Build your app", (ya
     type: "string",
     describe: "Output directory, defaults to .sst/dist",
 }), async (args) => {
+    const { exit, exitWithError } = await import("../program.js");
     const { useProject } = await import("../../project.js");
     const { Stacks } = await import("../../stacks/index.js");
     const { Colors } = await import("../colors.js");
     const path = await import("path");
-    const project = useProject();
-    const [_metafile, sstConfig] = await Stacks.load(project.paths.config);
-    const result = await Stacks.synth({
-        fn: sstConfig.stacks,
-        buildDir: args.to,
-        mode: "deploy",
-    });
-    Colors.line("");
-    Colors.line(Colors.success(`✔`), Colors.bold(" Built:"), `${result.stacks.length} stack${result.stacks.length > 1 ? "s" : ""} to ${path.relative(process.cwd(), result.directory)}`);
-    process.exit(0);
+    try {
+        const project = useProject();
+        const [_metafile, sstConfig] = await Stacks.load(project.paths.config);
+        const result = await Stacks.synth({
+            fn: sstConfig.stacks,
+            buildDir: args.to,
+            mode: "deploy",
+        });
+        Colors.line("");
+        Colors.line(Colors.success(`✔`), Colors.bold(" Built:"), `${result.stacks.length} stack${result.stacks.length > 1 ? "s" : ""} to ${path.relative(process.cwd(), result.directory)}`);
+        await exit();
+    }
+    catch (e) {
+        await exitWithError(e);
+    }
 });

package/cli/commands/connect.js

@@ -6,43 +6,50 @@ export const connect = (program) => program.command("connect", "Connect a stage
 }), async (args) => {
     if (!args.future)
         throw new Error("This command is not yet available.");
+    const { exit, exitWithError } = await import("../program.js");
     const { useAWSClient } = await import("../../credentials.js");
     const { useProject } = await import("../../project.js");
     const { useSTSIdentity } = await import("../../credentials.js");
     const { IAMClient, CreateRoleCommand, AttachRolePolicyCommand } = await import("@aws-sdk/client-iam");
-    const client = useAWSClient(IAMClient);
-    if (args.dev) {
-        Colors.line(Colors.warning("⚠"), Colors.bold(" Connecting to dev stage"));
-    }
-    await client
-        .send(new CreateRoleCommand({
-        RoleName: "sst",
-        AssumeRolePolicyDocument: JSON.stringify({
-            Version: "2012-10-17",
-            Statement: [
-                {
-                    Effect: "Allow",
-                    Principal: {
-                        AWS: `arn:aws:iam::${args.dev ? "917397401067" : "226609089145"}:root`,
+    try {
+        const client = useAWSClient(IAMClient);
+        if (args.dev) {
+            Colors.line(Colors.warning("⚠"), Colors.bold(" Connecting to dev stage"));
+        }
+        await client
+            .send(new CreateRoleCommand({
+            RoleName: "sst",
+            AssumeRolePolicyDocument: JSON.stringify({
+                Version: "2012-10-17",
+                Statement: [
+                    {
+                        Effect: "Allow",
+                        Principal: {
+                            AWS: `arn:aws:iam::${args.dev ? "917397401067" : "226609089145"}:root`,
+                        },
+                        Action: "sts:AssumeRole",
                     },
-                    Action: "sts:AssumeRole",
-                },
-            ],
-        }),
-    }))
-        .catch((e) => {
-        if (e.Error.Code === "EntityAlreadyExists")
-            return;
-        throw e;
-    });
-    await client.send(new AttachRolePolicyCommand({
-        RoleName: "sst",
-        PolicyArn: "arn:aws:iam::aws:policy/AdministratorAccess",
-    }));
-    const project = useProject();
-    const identity = await useSTSIdentity();
-    const host = args.dev
-        ? "http://localhost:3000"
-        : "https://console.production.sst.dev";
-    console.log(`${host}/connect?app=${project.config.name}&stage=${project.config.stage}&aws_account_id=${identity.Account}&region=${project.config.region}`);
+                ],
+            }),
+        }))
+            .catch((e) => {
+            if (e.Error.Code === "EntityAlreadyExists")
+                return;
+            throw e;
+        });
+        await client.send(new AttachRolePolicyCommand({
+            RoleName: "sst",
+            PolicyArn: "arn:aws:iam::aws:policy/AdministratorAccess",
+        }));
+        const project = useProject();
+        const identity = await useSTSIdentity();
+        const host = args.dev
+            ? "http://localhost:3000"
+            : "https://console.production.sst.dev";
+        console.log(`${host}/connect?app=${project.config.name}&stage=${project.config.stage}&aws_account_id=${identity.Account}&region=${project.config.region}`);
+        await exit();
+    }
+    catch (e) {
+        await exitWithError(e);
+    }
 });

package/cli/commands/console.js

@@ -1,17 +1,23 @@
 export const consoleCommand = async (program) => program.command("console", "Start the SST Console", (yargs) => yargs, async () => {
-    const { blue } = await import("colorette");
+    const { exit, exitWithError } = await import("../program.js");
     const { useRuntimeServer } = await import("../../runtime/server.js");
     const { useLocalServer } = await import("../local/server.js");
     const { printHeader } = await import("../ui/header.js");
     const { clear } = await import("../terminal.js");
-    await Promise.all([
-        useRuntimeServer(),
-        useLocalServer({
-            key: "",
-            cert: "",
-            live: false,
-        }),
-    ]);
-    clear();
-    printHeader({ console: true, hint: "ready!" });
+    try {
+        await Promise.all([
+            useRuntimeServer(),
+            useLocalServer({
+                key: "",
+                cert: "",
+                live: false,
+            }),
+        ]);
+        clear();
+        printHeader({ console: true, hint: "ready!" });
+        await exit();
+    }
+    catch (e) {
+        await exitWithError(e);
+    }
 });

package/cli/commands/deploy.js

@@ -15,87 +15,98 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     const { printDeploymentResults } = await import("../ui/deploy.js");
     const { createSpinner } = await import("../spinner.js");
     const { dim, blue, bold } = await import("colorette");
+    const { exit, exitWithError } = await import("../program.js");
     const { useProject } = await import("../../project.js");
+    const { SilentError } = await import("../../error.js");
     const { loadAssembly, useAppMetadata, saveAppMetadata, Stacks } = await import("../../stacks/index.js");
     const { getCiInfo } = await import("../ci-info.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
     const { mapValues } = await import("remeda");
-    const project = useProject();
-    const [identity, appMetadata] = await Promise.all([
-        useSTSIdentity(),
-        useAppMetadata(),
-    ]);
-    async function promptChangeMode() {
-        const readline = await import("readline");
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
-        return new Promise((resolve) => {
-            console.log("");
-            rl.question(`You were previously running the stage "${project.config.stage}" in dev mode. It is recommended that you use a different stage for production. Read more here — https://docs.sst.dev/live-lambda-development\n\nAre you sure you want to deploy to this stage? (y/N) `, async (input) => {
-                rl.close();
-                resolve(input.trim() === "y");
+    try {
+        const project = useProject();
+        const [identity, appMetadata] = await Promise.all([
+            useSTSIdentity(),
+            useAppMetadata(),
+        ]);
+        async function promptChangeMode() {
+            const readline = await import("readline");
+            const rl = readline.createInterface({
+                input: process.stdin,
+                output: process.stdout,
+            });
+            return new Promise((resolve) => {
+                console.log("");
+                rl.question(`You were previously running the stage "${project.config.stage}" in dev mode. It is recommended that you use a different stage for production. Read more here — https://docs.sst.dev/live-lambda-development\n\nAre you sure you want to deploy to this stage? (y/N) `, async (input) => {
+                    rl.close();
+                    resolve(input.trim() === "y");
+                });
             });
-        });
-    }
-    // Check app mode changed
-    if (!project.config.advanced?.disableAppModeCheck &&
-        !getCiInfo().isCI &&
-        appMetadata &&
-        appMetadata.mode !== "deploy") {
-        if (!(await promptChangeMode())) {
-            process.exit(0);
         }
-    }
-    Colors.line(`${Colors.primary.bold(`SST v${project.version}`)}`);
-    Colors.gap();
-    Colors.line(`${Colors.primary(`➜`)}  ${Colors.bold("App:")}     ${project.config.name}`);
-    Colors.line(`   ${Colors.bold("Stage:")}   ${project.config.stage}`);
-    Colors.line(`   ${Colors.bold("Region:")}  ${project.config.region}`);
-    Colors.line(`   ${Colors.bold("Account:")} ${identity.Account}`);
-    Colors.gap();
-    const isActiveStack = (stackId) => !args.filter ||
-        stackId
-            .toLowerCase()
-            .replace(project.config.name.toLowerCase(), "")
-            .replace(project.config.stage.toLowerCase(), "")
-            .includes(args.filter.toLowerCase());
-    // Generate cloud assembly
-    // - if --from is specified, we will use the existing cloud assembly
-    // - if --from is not specified, we will call synth to generate
-    const assembly = await (async function () {
-        if (args.from) {
-            const result = await loadAssembly(args.from);
+        // Check app mode changed
+        if (!project.config.advanced?.disableAppModeCheck &&
+            !getCiInfo().isCI &&
+            appMetadata &&
+            appMetadata.mode !== "deploy") {
+            if (!(await promptChangeMode())) {
+                await exit();
+            }
+        }
+        Colors.line(`${Colors.primary.bold(`SST v${project.version}`)}`);
+        Colors.gap();
+        Colors.line(`${Colors.primary(`➜`)}  ${Colors.bold("App:")}     ${project.config.name}`);
+        Colors.line(`   ${Colors.bold("Stage:")}   ${project.config.stage}`);
+        Colors.line(`   ${Colors.bold("Region:")}  ${project.config.region}`);
+        Colors.line(`   ${Colors.bold("Account:")} ${identity.Account}`);
+        Colors.gap();
+        const isActiveStack = (stackId) => !args.filter ||
+            stackId
+                .toLowerCase()
+                .replace(project.config.name.toLowerCase(), "")
+                .replace(project.config.stage.toLowerCase(), "")
+                .includes(args.filter.toLowerCase());
+        // Generate cloud assembly
+        // - if --from is specified, we will use the existing cloud assembly
+        // - if --from is not specified, we will call synth to generate
+        const assembly = await (async function () {
+            if (args.from) {
+                const result = await loadAssembly(args.from);
+                return result;
+            }
+            const spinner = createSpinner({
+                text: " Building...",
+            });
+            const [_metafile, sstConfig] = await Stacks.load(project.paths.config);
+            const result = await Stacks.synth({
+                fn: sstConfig.stacks,
+                mode: "deploy",
+                isActiveStack,
+            });
+            spinner.succeed();
             return result;
+        })();
+        const target = assembly.stacks.filter((s) => isActiveStack(s.id));
+        if (!target.length) {
+            Colors.line(`No stacks found matching ${blue(args.filter)}`);
+            throw new SilentError(`No stacks found matching ${args.filter}`);
         }
-        const spinner = createSpinner({
-            text: " Building...",
-        });
-        const [_metafile, sstConfig] = await Stacks.load(project.paths.config);
-        const result = await Stacks.synth({
-            fn: sstConfig.stacks,
-            mode: "deploy",
-            isActiveStack,
-        });
-        spinner.succeed();
-        return result;
-    })();
-    const target = assembly.stacks.filter((s) => isActiveStack(s.id));
-    if (!target.length) {
-        Colors.line(`No stacks found matching ${blue(args.filter)}`);
-        process.exit(1);
+        const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
+        const results = await Stacks.deployMany(target);
+        component.clear();
+        component.unmount();
+        printDeploymentResults(assembly, results);
+        // Check failed stacks
+        const failed = Object.values(results).find((result) => Stacks.isFailed(result.status));
+        if (failed) {
+            throw new SilentError(`CloudFormation status ${failed.status}`);
+        }
+        fs.writeFile(project.config.outputs ||
+            path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
+        // Update app state
+        await saveAppMetadata({ mode: "deploy" });
+        await exit();
+    }
+    catch (e) {
+        await exitWithError(e);
     }
-    const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
-    const results = await Stacks.deployMany(target);
-    component.clear();
-    component.unmount();
-    printDeploymentResults(assembly, results);
-    if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
-        process.exit(1);
-    fs.writeFile(project.config.outputs || path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
-    // Update app state
-    await saveAppMetadata({ mode: "deploy" });
-    process.exit(0);
 });