sst 2.0.0-rc.36 → 2.0.0-rc.38

package/bootstrap.d.ts

@@ -1,4 +1,5 @@
-export declare const useBootstrap: () => Promise<{
-    version: never;
-    bucket: never;
-}>;
+export declare const useBootstrap: () => {
+    version: string;
+    bucket: string;
+};
+export declare function initBootstrap(): Promise<void>;

package/bootstrap.js

@@ -12,19 +12,25 @@ import { BlockPublicAccess, Bucket, BucketEncryption, } from "aws-cdk-lib/aws-s3
 import { useProject } from "./project.js";
 import { createSpinner } from "./cli/spinner.js";
 import { Context } from "./context/context.js";
-import { useAWSClient } from "./credentials.js";
+import { useAWSClient, useAWSCredentials, useSTSIdentity, } from "./credentials.js";
 import { VisibleError } from "./error.js";
 import { Logger } from "./logger.js";
 import { Stacks } from "./stacks/index.js";
+import { spawnSync } from "child_process";
 const STACK_NAME = "SSTBootstrap";
 const OUTPUT_VERSION = "Version";
 const OUTPUT_BUCKET = "BucketName";
 const LATEST_VERSION = "5";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
-export const useBootstrap = Context.memo(async () => {
+const BootstrapContext = Context.create();
+export const useBootstrap = BootstrapContext.use;
+export async function initBootstrap() {
     Logger.debug("Initializing bootstrap context");
-    let status = await loadBootstrapStatus();
-    if (!status || status.version !== LATEST_VERSION) {
+    await assertCDKToolkit();
+    const status = await (async () => {
+        const status = await load();
+        if (status && status.version === LATEST_VERSION)
+            return status;
         const project = useProject();
         const spinner = createSpinner("Deploying bootstrap stack, this only needs to happen once").start();
         // Create bootstrap stack
@@ -62,7 +68,9 @@ export const useBootstrap = Context.memo(async () => {
                 }),
                 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/*`,
+                    ],
                 }),
             ],
         });
@@ -81,9 +89,9 @@ export const useBootstrap = Context.memo(async () => {
                             "ROLLBACK_COMPLETE",
                             "DELETE_COMPLETE",
                         ],
-                    }
-                }
-            }
+                    },
+                },
+            },
         });
         rule.addTarget(new SqsQueue(queue, {
             retryAttempts: 10,
@@ -99,15 +107,43 @@ export const useBootstrap = Context.memo(async () => {
         }
         spinner.succeed();
         // Fetch bootstrap status
-        status = await loadBootstrapStatus();
-        if (!status) {
-            throw new VisibleError("Failed to deploy bootstrap stack");
-        }
+        const ret = await load();
+        if (!ret)
+            throw new VisibleError("Failed to load bootstrap stack status");
+        return ret;
+    })();
+    BootstrapContext.provide(status);
+    Logger.debug("Bootstrap context initialized", status);
+}
+async function assertCDKToolkit() {
+    const client = useAWSClient(CloudFormationClient);
+    const { Stacks: stacks } = await client.send(new DescribeStacksCommand({
+        StackName: "CDKToolkit",
+    }));
+    if (!stacks || stacks.length === 0) {
+        const identity = await useSTSIdentity();
+        const credentials = await useAWSCredentials();
+        const project = useProject();
+        spawnSync([
+            "npx",
+            "cdk",
+            "bootstrap",
+            `aws://${identity.Account}/${useProject().config.region}`,
+        ].join(" "), {
+            env: {
+                ...process.env,
+                AWS_ACCESS_KEY_ID: credentials.accessKeyId,
+                AWS_SECRET_ACCESS_KEY: credentials.secretAccessKey,
+                AWS_SESSION_TOKEN: credentials.sessionToken,
+                AWS_REGION: project.config.region,
+                AWS_PROFILE: project.config.profile,
+            },
+            stdio: "inherit",
+            shell: process.env.SHELL || true,
+        });
     }
-    Logger.debug("Loaded bootstrap info: ", JSON.stringify(status));
-    return status;
-});
-async function loadBootstrapStatus() {
+}
+async function load() {
     // Get bootstrap CloudFormation stack
     const cf = useAWSClient(CloudFormationClient);
     let result;
@@ -117,8 +153,8 @@ async function loadBootstrapStatus() {
         }));
     }
     catch (e) {
-        if (e.Code === "ValidationError"
-            && e.message === `Stack with id ${STACK_NAME} does not exist`) {
+        if (e.Code === "ValidationError" &&
+            e.message === `Stack with id ${STACK_NAME} does not exist`) {
             return null;
         }
         throw e;

package/cli/commands/bind.d.ts

@@ -8,6 +8,8 @@ export declare const bind: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     command: string;
 }>;

package/cli/commands/build.d.ts

@@ -8,6 +8,8 @@ export declare const build: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     to: string | undefined;
 }>;

package/cli/commands/console.d.ts

@@ -8,4 +8,6 @@ export declare const consoleCommand: (program: Program) => Promise<import("yargs
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 }>>;

package/cli/commands/deploy.d.ts

@@ -8,6 +8,8 @@ export declare const deploy: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     from: string | undefined;
 } & {

package/cli/commands/dev.d.ts

@@ -8,4 +8,6 @@ export declare const dev: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 }>;

package/cli/commands/dev.js

@@ -1,6 +1,5 @@
 import chalk from "chalk";
 import { Colors } from "../colors.js";
-import { Functions } from "../ui/functions.js";
 export const dev = (program) => program.command(["dev", "start"], "Work on your app locally", (yargs) => yargs, async (args) => {
     const { useRuntimeWorkers } = await import("../../runtime/workers.js");
     const { useIOTBridge } = await import("../../runtime/iot.js");
@@ -28,6 +27,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { useRDSWarmer } = await import("./plugins/warmer.js");
     const { useProject } = await import("../../project.js");
     const { useMetadata } = await import("../../stacks/metadata.js");
+    const { Functions } = await import("../ui/functions.js");
     if (args._[0] === "start") {
         console.log(yellow(`Warning: ${bold(`sst start`)} has been renamed to ${bold(`sst dev`)}`));
     }

package/cli/commands/diff.d.ts

@@ -8,6 +8,8 @@ export declare const diff: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     dev: boolean | undefined;
 }>;

package/cli/commands/env.d.ts

@@ -8,6 +8,8 @@ export declare const env: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     command: string;
 }>;

package/cli/commands/remove.d.ts

@@ -8,6 +8,8 @@ export declare const remove: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     from: string | undefined;
 } & {

package/cli/commands/secrets/get.d.ts

@@ -8,6 +8,8 @@ export declare const get: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     name: string;
 } & {

package/cli/commands/secrets/list.d.ts

@@ -8,6 +8,8 @@ export declare const list: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     format: string | undefined;
 }>;

package/cli/commands/secrets/remove.d.ts

@@ -8,6 +8,8 @@ export declare const remove: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     name: string;
 } & {

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/commands/secrets/set.d.ts

@@ -8,6 +8,8 @@ export declare const set: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     name: string;
 } & {

package/cli/commands/update.d.ts

@@ -8,6 +8,8 @@ export declare const update: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     version: string | undefined;
 }>;

package/cli/commands/version.d.ts

@@ -8,6 +8,8 @@ export declare const env: (program: Program) => import("yargs").Argv<{
     region: string | undefined;
 } & {
     verbose: boolean | undefined;
+} & {
+    role: string | undefined;
 } & {
     command: string;
 }>;

package/cli/program.d.ts

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

package/cli/program.js

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

package/cli/sst.js

@@ -3,8 +3,9 @@ import { blue, red } from "colorette";
 import { program } from "./program.js";
 import { VisibleError } from "../error.js";
 import { useSpinners } from "./spinner.js";
-import dotenv from "dotenv";
 import { Logger } from "../logger.js";
+import dotenv from "dotenv";
+dotenv.config();
 import { env } from "./commands/env.js";
 import { dev } from "./commands/dev.js";
 import { bind } from "./commands/bind.js";
@@ -15,7 +16,6 @@ import { consoleCommand } from "./commands/console.js";
 import { secrets } from "./commands/secrets/secrets.js";
 import { update } from "./commands/update.js";
 import { diff } from "./commands/diff.js";
-dotenv.config();
 dev(program);
 deploy(program);
 build(program);

package/cli/ui/functions.js

@@ -60,6 +60,8 @@ export function Functions() {
             }
             setFunctions((functions) => {
                 const { [evt.properties.requestID]: existing, ...next } = functions;
+                if (!existing)
+                    return functions;
                 const diff = Date.now() - existing.started;
                 if (diff > 500 && diff < 1500) {
                     setTimeout(() => {
@@ -91,6 +93,8 @@ export function Functions() {
             }
             setFunctions((functions) => {
                 const { [evt.properties.requestID]: existing, ...next } = functions;
+                if (!existing)
+                    return functions;
                 const diff = Date.now() - existing.started;
                 if (diff > 500 && diff < 1500) {
                     setTimeout(() => {

package/constructs/App.d.ts

@@ -7,7 +7,6 @@ import * as Config from "./Config.js";
 import { Permissions } from "./util/permission.js";
 import { StackProps } from "./Stack.js";
 import { FunctionalStack } from "./FunctionalStack.js";
-import { useBootstrap } from "../bootstrap.js";
 /**
  * @internal
  */
@@ -40,7 +39,6 @@ export interface AppDeployProps {
     readonly debugBridge?: string;
     readonly debugIncreaseTimeout?: boolean;
     readonly mode: "deploy" | "dev" | "remove";
-    readonly bootstrap: Awaited<ReturnType<typeof useBootstrap>>;
 }
 type AppRemovalPolicy = Lowercase<keyof typeof cdk.RemovalPolicy>;
 export type AppProps = cdk.AppProps;
@@ -87,8 +85,6 @@ export declare class App extends cdk.App {
     /** @internal */
     readonly appPath: string;
     /** @internal */
-    readonly bootstrap: AppDeployProps["bootstrap"];
-    /** @internal */
     defaultFunctionProps: (FunctionProps | ((stack: cdk.Stack) => FunctionProps))[];
     private _defaultRemovalPolicy?;
     /** @internal */

package/constructs/App.js

@@ -14,6 +14,7 @@ import { createRequire } from "module";
 import { Auth } from "./Auth.js";
 import { useDeferredTasks } from "./deferred_task.js";
 import { AppContext } from "./context.js";
+import { useBootstrap } from "../bootstrap.js";
 import { useProject } from "../project.js";
 import { Logger } from "../logger.js";
 import { SiteEnv } from "../site-env.js";
@@ -65,8 +66,6 @@ export class App extends cdk.App {
     /** @internal */
     appPath;
     /** @internal */
-    bootstrap;
-    /** @internal */
     defaultFunctionProps;
     _defaultRemovalPolicy;
     /** @internal */
@@ -93,7 +92,6 @@ export class App extends cdk.App {
         super(props);
         AppContext.provide(this);
         SiteEnv.reset();
-        this.bootstrap = deployProps.bootstrap;
         this.appPath = process.cwd();
         this.mode = deployProps.mode;
         this.local = this.mode === "dev";
@@ -309,7 +307,7 @@ export class App extends cdk.App {
                         app: this.name,
                         stage: this.stage,
                         version: useProject().version,
-                        bootstrapBucket: this.bootstrap.bucket,
+                        bootstrapBucket: useBootstrap().bucket,
                         metadata: byStack[stackName] || [],
                     }),
                 });

package/credentials.js

@@ -10,6 +10,7 @@ export const useAWSCredentialsProvider = Context.memo(() => {
     Logger.debug("Using AWS profile", project.config.profile);
     const provider = fromNodeProviderChain({
         profile: project.config.profile,
+        roleArn: project.config.role,
     });
     return provider;
 });

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.36",
+  "version": "2.0.0-rc.38",
   "bin": {
     "sst": "cli/sst.js"
   },

package/project.d.ts

@@ -9,6 +9,7 @@ export interface ConfigOptions {
     region?: string;
     stage?: string;
     profile?: string;
+    role?: string;
     ssmPrefix?: string;
 }
 declare const DEFAULTS: {
@@ -36,6 +37,7 @@ export declare const ProjectContext: {
 export declare function useProject(): Project;
 interface GlobalOptions {
     profile?: string;
+    role?: string;
     stage?: string;
     root?: string;
     region?: string;

package/project.js

@@ -64,6 +64,7 @@ export async function initProject(globals) {
             stage,
             profile: config.profile || globals.profile,
             region: config.region || globals.region,
+            role: config.role || globals.role,
             ssmPrefix: config.ssmPrefix || `/sst/${config.name}/${stage}/`,
         },
         stacks: sstConfig.stacks,
@@ -76,6 +77,8 @@ export async function initProject(globals) {
         },
     };
     ProjectContext.provide(project);
+    const { initBootstrap } = await import("./bootstrap.js");
+    await initBootstrap();
     dotenv.config({
         path: path.join(project.paths.root, `.env.${project.config.stage}`),
     });