sst 2.0.0-rc.8 → 2.0.0

package/cli/commands/transform.js

@@ -0,0 +1,55 @@
+export const transform = (program) => program.command("transform <mod>", "Apply a transform to your SST app", (yargs) => yargs.positional("mod", {
+    type: "string",
+    describe: "Name of the transform",
+    demandOption: true,
+}), async (args) => {
+    const { Colors } = await import("../colors.js");
+    if (args.mod === "resource-binding-secrets") {
+        await handleSecretsMigration();
+        Colors.line(Colors.success(`✔ `), `Transform "${args.mod}" applied successfully!`);
+        return;
+    }
+    Colors.line(Colors.danger(`✖ `), `Transform "${args.mod}" not found`);
+});
+async function handleSecretsMigration() {
+    const { useProject } = await import("../../project.js");
+    const { useAWSClient } = await import("../../credentials.js");
+    const { SSMClient, GetParametersByPathCommand, PutParameterCommand } = await import("@aws-sdk/client-ssm");
+    const project = useProject();
+    const { name: app, stage } = project.config;
+    const ssm = useAWSClient(SSMClient);
+    async function* getAllPrametersByPath(prefix) {
+        let token;
+        while (true) {
+            const results = await ssm.send(new GetParametersByPathCommand({
+                Path: prefix,
+                WithDecryption: true,
+                Recursive: true,
+                NextToken: token,
+            }));
+            yield* results.Parameters || [];
+            if (!results.NextToken)
+                break;
+            token = results.NextToken;
+        }
+    }
+    async function migrateSecretsSSMPath(stage) {
+        const oldPrefix = `/sst/${app}/${stage}/secrets/`;
+        const newPrefix = `/sst/${app}/${stage}/Secret/`;
+        for await (const secret of getAllPrametersByPath(oldPrefix)) {
+            const name = secret.Name.split("/")[5];
+            // Do not migrate SST Auth secrets b/c they are no longer secrets in v1.16.
+            if (name === "SST_AUTH_PRIVATE" || name === "SST_AUTH_PUBLIC") {
+                continue;
+            }
+            await ssm.send(new PutParameterCommand({
+                Name: `${newPrefix}${name}/value`,
+                Value: secret.Value,
+                Type: secret.Type,
+                Overwrite: true,
+            }));
+        }
+    }
+    await migrateSecretsSSMPath(stage);
+    await migrateSecretsSSMPath(".fallback");
+}

package/cli/commands/update.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="yargs" />
-import { Program } from "../program.js";
+import type { Program } from "../program.js";
 export declare const update: (program: Program) => import("yargs").Argv<{
     stage: string | undefined;
 } & {
@@ -7,5 +7,9 @@ export declare const update: (program: Program) => import("yargs").Argv<{
 } & {
     region: string | undefined;
 } & {
-    ver: string | undefined;
+    verbose: boolean | undefined;
+} & {
+    role: string | undefined;
+} & {
+    version: string | undefined;
 }>;

package/cli/commands/update.js

@@ -1,17 +1,36 @@
-import { green, yellow } from "colorette";
-import fs from "fs/promises";
-import path from "path";
-const PACKAGE_MATCH = ["sst", "aws-cdk", "@aws-cdk"];
+const PACKAGE_MATCH = ["sst", "aws-cdk", "@aws-cdk", "constructs"];
 const FIELDS = ["dependencies", "devDependencies"];
-export const update = (program) => program.command("update [ver]", "Update SST and CDK packages to another version", (yargs) => yargs.positional("ver", {
+export const update = (program) => program.command("update [version]", "Update your SST and CDK packages", (yargs) => yargs.positional("version", {
     type: "string",
-    describe: "Optional SST version to update to",
+    describe: "Optionally specify a version to update to",
 }), async (args) => {
+    const { green, yellow } = await import("colorette");
+    const fs = await import("fs/promises");
+    const path = await import("path");
     const { fetch } = await import("undici");
-    const { useProject } = await import("../../app.js");
+    const { useProject } = await import("../../project.js");
+    const { Colors } = await import("../colors.js");
+    async function find(dir) {
+        const children = await fs.readdir(dir);
+        const tasks = children.map(async (item) => {
+            if (item === "node_modules")
+                return [];
+            // Ignore hidden paths
+            if (/(^|\/)\.[^\/\.]/g.test(item))
+                return [];
+            const full = path.join(dir, item);
+            if (item === "package.json")
+                return [full];
+            const stat = await fs.stat(full);
+            if (stat.isDirectory())
+                return find(full);
+            return [];
+        });
+        return (await Promise.all(tasks)).flat();
+    }
     const project = useProject();
     const files = await find(project.paths.root);
-    const metadata = await fetch(`https://registry.npmjs.org/sst/${args.ver || "latest"}`).then((resp) => resp.json());
+    const metadata = await fetch(`https://registry.npmjs.org/sst/${args.version || "latest"}`).then((resp) => resp.json());
     const results = new Map();
     const tasks = files.map(async (file) => {
         const data = await fs
@@ -25,9 +44,15 @@ export const update = (program) => program.command("update [ver]", "Update SST a
             for (const [pkg, existing] of Object.entries(deps)) {
                 if (!PACKAGE_MATCH.some((x) => pkg.startsWith(x)))
                     continue;
-                const desired = pkg === "sst"
-                    ? metadata.version
-                    : metadata.dependencies["aws-cdk-lib"];
+                const desired = (() => {
+                    if (pkg === "sst")
+                        return metadata.version;
+                    if (pkg === "constructs")
+                        return metadata.dependencies.constructs;
+                    if (pkg.endsWith("alpha"))
+                        return metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
+                    return metadata.dependencies["aws-cdk-lib"];
+                })();
                 if (existing === desired)
                     continue;
                 let arr = results.get(file);
@@ -43,32 +68,15 @@ export const update = (program) => program.command("update [ver]", "Update SST a
     });
     await Promise.all(tasks);
     if (results.size === 0) {
-        console.log(green(`All packages already match version ${metadata.version}`));
+        Colors.line(Colors.success(`✔ `), `Already using v${metadata.version}`);
         return;
     }
     for (const [file, pkgs] of results.entries()) {
-        console.log(green(`✅ ${path.relative(project.paths.root, file)}`));
+        Colors.line(Colors.success(`✔ `), Colors.bold.dim(path.relative(project.paths.root, file)));
         for (const [pkg, version] of pkgs) {
-            console.log(green(`     ${pkg}@${version}`));
+            Colors.line(Colors.dim(`   ${pkg}@${version}`));
         }
     }
-    console.log(yellow("Don't forget to run your package manager to install the packages"));
+    Colors.gap();
+    Colors.line(`${Colors.primary(`➜`)}  ${Colors.warning("Make sure to run: npm install (or pnpm install, or yarn)")}`);
 });
-async function find(dir) {
-    const children = await fs.readdir(dir);
-    const tasks = children.map(async (item) => {
-        if (item === "node_modules")
-            return [];
-        // Ignore hidden paths
-        if (/(^|\/)\.[^\/\.]/g.test(item))
-            return [];
-        const full = path.join(dir, item);
-        if (item === "package.json")
-            return [full];
-        const stat = await fs.stat(full);
-        if (stat.isDirectory())
-            return find(full);
-        return [];
-    });
-    return (await Promise.all(tasks)).flat();
-}

package/cli/commands/version.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="yargs" />
+import type { Program } from "../program.js";
+export declare const version: (program: Program) => import("yargs").Argv<{
+    stage: string | undefined;
+} & {
+    profile: string | undefined;
+} & {
+    region: string | undefined;
+} & {
+    verbose: boolean | undefined;
+} & {
+    role: string | undefined;
+}>;

package/cli/commands/version.js

@@ -0,0 +1,7 @@
+export const version = (program) => program.command("version", "Print SST and CDK version", (yargs) => yargs, async (args) => {
+    const { Colors } = await import("../colors.js");
+    const { useProject } = await import("../../project.js");
+    const project = useProject();
+    Colors.line(Colors.bold(`SST:`), `v${project.version}`);
+    Colors.line(Colors.bold(`CDK:`), `v${project.cdkVersion}`);
+});

package/cli/local/router.d.ts

@@ -1,6 +1,6 @@
 import * as trpc from "@trpc/server";
 import { DendriformPatch } from "dendriform-immer-patch-optimiser";
-export declare type State = {
+export type State = {
     app: string;
     stage: string;
     functions: Record<string, FunctionState>;
@@ -9,13 +9,13 @@ export declare type State = {
         status: any;
     };
 };
-export declare type FunctionState = {
+export type FunctionState = {
     state: "idle" | "building" | "checking";
     invocations: Invocation[];
     issues: Record<string, any[]>;
     warm: boolean;
 };
-export declare type Invocation = {
+export type Invocation = {
     id: string;
     request: any;
     response?: any;
@@ -28,15 +28,15 @@ export declare type Invocation = {
         timestamp: number;
     }[];
 };
-export declare type Context = {
+export type Context = {
     state: State;
 };
 export declare const router: import("@trpc/server/dist/declarations/src/router.js").Router<Context, Context, Record<"getCredentials", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, {
-    region: string;
+    region: string | undefined;
     credentials: {
         accessKeyId: string;
         secretAccessKey: string;
         sessionToken: string | undefined;
     };
 }>> & Record<"getState", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, State>>, Record<"deploy", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, void>>, Record<"onStateChange", import("@trpc/server/dist/declarations/src/internals/procedure.js").Procedure<Context, Context, undefined, undefined, trpc.Subscription<DendriformPatch[]>>>, trpc.DefaultErrorShape>;
-export declare type Router = typeof router;
+export type Router = typeof router;

package/cli/local/router.js

@@ -1,5 +1,5 @@
 import * as trpc from "@trpc/server";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { useBus } from "../../bus.js";
 import { useAWSCredentials } from "../../credentials.js";
 export const router = trpc
@@ -9,7 +9,7 @@ export const router = trpc
         const project = useProject();
         const credentials = await useAWSCredentials();
         return {
-            region: project.region,
+            region: project.config.region,
             credentials: {
                 accessKeyId: credentials.accessKeyId,
                 secretAccessKey: credentials.secretAccessKey,
@@ -24,7 +24,7 @@ export const router = trpc
     },
 })
     .mutation("deploy", {
-    async resolve({ ctx }) {
+    async resolve() {
         return;
     },
 })

package/cli/local/server.d.ts

@@ -1,8 +1,7 @@
 import { FunctionState, State } from "./router.js";
 import { WritableDraft } from "immer/dist/internal.js";
 import { DendriformPatch } from "dendriform-immer-patch-optimiser";
-declare type Opts = {
-    port: number;
+type Opts = {
     key: any;
     cert: any;
     live: boolean;
@@ -12,8 +11,11 @@ declare module "../../bus.js" {
         "local.patches": DendriformPatch[];
     }
 }
-export declare function useLocalServer(opts: Opts): Promise<{
+export declare const useLocalServerConfig: () => Promise<{
     port: number;
+    url: string;
+}>;
+export declare function useLocalServer(opts: Opts): Promise<{
     updateState: (cb: (draft: WritableDraft<State>) => void) => void;
     updateFunction: (id: string, cb: (draft: WritableDraft<FunctionState>) => void) => void;
 }>;

package/cli/local/server.js

@@ -9,13 +9,26 @@ import { applyWSSHandler } from "@trpc/server/adapters/ws/dist/trpc-server-adapt
 import { router } from "./router.js";
 import { optimise } from "dendriform-immer-patch-optimiser";
 import { sync } from "cross-spawn";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 import { useBus } from "../../bus.js";
+import getPort from "get-port";
+import { Context } from "../../context/context.js";
+export const useLocalServerConfig = Context.memo(async () => {
+    const project = useProject();
+    const port = await getPort({
+        port: 13557,
+    });
+    return {
+        port,
+        url: `https://console.sst.dev/${project.config.name}/${project.config.stage}${port !== 13557 ? `?_port=${port}` : ""}`,
+    };
+});
 export async function useLocalServer(opts) {
+    const cfg = await useLocalServerConfig();
     const project = useProject();
     let state = {
-        app: project.name,
-        stage: project.stage,
+        app: project.config.name,
+        stage: project.config.stage,
         live: opts.live,
         stacks: {
             status: "idle",
@@ -23,17 +36,12 @@ export async function useLocalServer(opts) {
         functions: {},
     };
     const rest = express();
-    /*
     rest.all(`/ping`, (req, res) => {
-      res.header("Access-Control-Allow-Origin", "*");
-      res.header("Access-Control-Allow-Methods", "GET, PUT, PATCH, POST, DELETE");
-      res.header(
-        "Access-Control-Allow-Headers",
-        req.header("access-control-request-headers")
-      );
-      res.sendStatus(200);
+        res.header("Access-Control-Allow-Origin", "*");
+        res.header("Access-Control-Allow-Methods", "GET, PUT, PATCH, POST, DELETE");
+        res.header("Access-Control-Allow-Headers", req.header("access-control-request-headers"));
+        res.sendStatus(200);
     });
-    */
     rest.all(`/proxy*`, express.raw({
         type: "*/*",
         limit: "1024mb",
@@ -107,7 +115,7 @@ export async function useLocalServer(opts) {
         console.log("Rejecting unauthorized connection from " + req.headers.origin);
         socket.terminate();
     });
-    server.listen(opts.port);
+    server.listen(cfg.port);
     const handler = applyWSSHandler({
         wss,
         router,
@@ -204,7 +212,6 @@ export async function useLocalServer(opts) {
         });
     });
     const result = {
-        port: opts.port,
         updateState,
         updateFunction,
     };

package/cli/program.d.ts

@@ -5,5 +5,9 @@ export declare const program: import("yargs").Argv<{
     profile: string | undefined;
 } & {
     region: string | undefined;
+} & {
+    verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 }>;
-export declare type Program = typeof program;
+export type Program = typeof program;

package/cli/program.js

@@ -1,7 +1,5 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { initProject } from "../app.js";
-import { trackCli } from "./telemetry/telemetry.js";
 export const program = yargs(hideBin(process.argv))
     .scriptName("sst")
     .option("stage", {
@@ -16,9 +14,35 @@ export const program = yargs(hideBin(process.argv))
     type: "string",
     describe: "The AWS region to use",
 })
+    .option("verbose", {
+    type: "boolean",
+    describe: "Print verbose logs",
+})
+    .option("role", {
+    type: "string",
+    describe: "ARN of the IAM role to use when invoking AWS",
+})
+    .group(["stage", "profile", "region", "role", "verbose", "help"], "Global:")
     .middleware(async (argv) => {
-    await initProject(argv);
-    trackCli(argv._[0]);
+    if (argv.verbose) {
+        process.env.SST_VERBOSE = "1";
+    }
+    if (argv._.length > 0) {
+        const { initProject } = await import("../project.js");
+        await initProject(argv);
+        const { trackCli } = await import("./telemetry/telemetry.js");
+        trackCli(argv._[0]);
+    }
 })
+    .version(false)
+    .epilogue(`Join the SST community on Discord https://sst.dev/discord`)
+    .recommendCommands()
+    .demandCommand()
     .strict()
-    .demandCommand(1);
+    .fail((_, error, yargs) => {
+    if (!error) {
+        yargs.showHelp();
+        process.exit(1);
+    }
+    throw error;
+});

package/cli/spinner.js

@@ -1,5 +1,6 @@
 import { Context } from "../context/context.js";
 import ora from "ora";
+import { Colors } from "./colors.js";
 export const useSpinners = Context.memo(() => {
     const spinners = [];
     return spinners;
@@ -8,5 +9,6 @@ export function createSpinner(options) {
     const spinners = useSpinners();
     const next = ora(options);
     spinners.push(next);
+    Colors.mode("line");
     return next;
 }

package/cli/sst.js

@@ -1,29 +1,49 @@
 #!/usr/bin/env node
 import { blue, red } from "colorette";
 import { program } from "./program.js";
-import { secrets } from "./commands/secrets/secrets.js";
-import { update } from "./commands/update.js";
+import { VisibleError } from "../error.js";
+import { useSpinners } from "./spinner.js";
+import { Logger } from "../logger.js";
+import dotenv from "dotenv";
+dotenv.config({
+    override: true,
+});
+dotenv.config({
+    path: ".env.local",
+    override: true,
+});
+import { env } from "./commands/env.js";
 import { dev } from "./commands/dev.js";
 import { bind } from "./commands/bind.js";
 import { build } from "./commands/build.js";
-import { VisibleError } from "../error.js";
-import { useSpinners } from "./spinner.js";
 import { deploy } from "./commands/deploy.js";
 import { remove } from "./commands/remove.js";
-import dotenv from "dotenv";
-import { env } from "./commands/env.js";
-import { Logger } from "../logger.js";
 import { consoleCommand } from "./commands/console.js";
-dotenv.config();
-secrets(program);
-update(program);
+import { secrets } from "./commands/secrets/secrets.js";
+import { update } from "./commands/update.js";
+import { transform } from "./commands/transform.js";
+import { diff } from "./commands/diff.js";
+import { version } from "./commands/version.js";
+import { telemetry } from "./commands/telemetry.js";
+import { bootstrap } from "./commands/bootstrap.js";
 dev(program);
-bind(program);
-build(program);
 deploy(program);
-remove(program);
+build(program);
+bind(program);
 env(program);
+secrets(program);
+remove(program);
+update(program);
+transform(program);
 consoleCommand(program);
+diff(program);
+version(program);
+telemetry(program);
+bootstrap(program);
+if ("setSourceMapsEnabled" in process) {
+    // @ts-expect-error
+    process.setSourceMapsEnabled(true);
+}
 process.removeAllListeners("uncaughtException");
 process.on("uncaughtException", (err) => {
     Logger.debug(err);
@@ -38,16 +58,8 @@ process.on("uncaughtException", (err) => {
         console.trace(err.stack);
     }
     console.log();
-    console.log(`Need help with this error? Join our discord ${blue(`https://discord.gg/sst`)} and talk to the team`);
+    console.log(`Need help with this error? Join the SST community on Discord ${blue(`https://sst.dev/discord`)}`);
     process.exit(1);
 });
 process.on("beforeExit", () => { });
-program
-    .fail((msg, error) => {
-    if (!error) {
-        console.log(msg);
-        return;
-    }
-    throw error;
-})
-    .parse();
+program.parse();

package/cli/telemetry/environment.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-declare type EnvironmentData = {
+type EnvironmentData = {
     systemPlatform: NodeJS.Platform;
     systemRelease: string;
     systemArchitecture: string;

package/cli/telemetry/environment.js

@@ -1,6 +1,6 @@
 import os from "os";
 import ciInfo from "ci-info";
-import { useProject } from "../../app.js";
+import { useProject } from "../../project.js";
 let data;
 export function getEnvironmentData() {
     if (data) {

package/cli/terminal.d.ts

@@ -0,0 +1 @@
+export declare function clear(): void;

package/cli/terminal.js

@@ -0,0 +1,8 @@
+export function clear() {
+    // console.clear() removes the content in the viewport in VSCode
+    // and on Windows. This is a workaround to preserve the viewport.
+    for (let i = 0, l = process.stdout.rows; i < l - 1; i++) {
+        console.log("");
+    }
+    console.clear();
+}

package/cli/ui/deploy.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="react" resolution-mode="require"/>
 import { Stacks } from "../../stacks/index.js";
+import type { CloudAssembly } from "aws-cdk-lib/cx-api";
 interface Props {
-    stacks: string[];
+    assembly: CloudAssembly;
 }
 export declare const DeploymentUI: (props: Props) => JSX.Element;
-export declare function printDeploymentResults(results: Awaited<ReturnType<typeof Stacks.deployMany>>): void;
+export declare function printDeploymentResults(assembly: CloudAssembly, results: Awaited<ReturnType<typeof Stacks.deployMany>>, remove?: boolean): void;
 export {};