sst 2.0.0-rc.35 → 2.0.0-rc.37

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 = "4";
+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
@@ -50,7 +56,7 @@ export const useBootstrap = Context.memo(async () => {
         const fn = new Function(stack, "MetadataHandler", {
             code: Code.fromAsset(path.resolve(__dirname, "support/bootstrap-metadata-function")),
             handler: "index.handler",
-            runtime: Runtime.NODEJS_16_X,
+            runtime: Runtime.NODEJS_18_X,
             initialPolicy: [
                 new PolicyStatement({
                     actions: ["cloudformation:DescribeStacks"],
@@ -60,6 +66,10 @@ export const useBootstrap = Context.memo(async () => {
                     actions: ["s3:PutObject", "s3:DeleteObject"],
                     resources: [bucket.bucketArn + "/*"],
                 }),
+                new PolicyStatement({
+                    actions: ["iot:Publish"],
+                    resources: [`arn:${stack.partition}:iot:${stack.region}:${stack.account}:topic//sst/*`],
+                }),
             ],
         });
         const queue = new Queue(stack, "MetadataQueue");
@@ -77,9 +87,9 @@ export const useBootstrap = Context.memo(async () => {
                             "ROLLBACK_COMPLETE",
                             "DELETE_COMPLETE",
                         ],
-                    }
-                }
-            }
+                    },
+                },
+            },
         });
         rule.addTarget(new SqsQueue(queue, {
             retryAttempts: 10,
@@ -95,15 +105,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;
@@ -113,8 +151,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/cdk/cloudformation-deployments-wrapper.d.ts

@@ -0,0 +1,2 @@
+import { CloudFormationDeployments, DeployStackOptions } from "./cloudformation-deployments.js";
+export declare function publishAssets(deployment: CloudFormationDeployments, options: DeployStackOptions): Promise<void>;

package/cdk/cloudformation-deployments-wrapper.js

@@ -0,0 +1,25 @@
+import { ToolkitInfo } from "aws-cdk/lib/api/toolkit-info.js";
+import { Context } from "../context/context.js";
+export async function publishAssets(deployment, options) {
+    const toolkitInfo = await useToolkitInfo().lookup(deployment, options);
+    await deployment.publishStackAssets(options.stack, toolkitInfo, {
+        buildAssets: options.buildAssets ?? true,
+        publishOptions: {
+            quiet: options.quiet,
+            parallel: options.assetParallelism,
+        },
+    });
+}
+const useToolkitInfo = Context.memo(() => {
+    const state = new Map();
+    return {
+        async lookup(deployment, options) {
+            if (state.has(deployment))
+                return state.get(deployment);
+            const { stackSdk, resolvedEnvironment } = await deployment.prepareSdkFor(options.stack, options.roleArn);
+            const toolkitInfo = await ToolkitInfo.lookup(resolvedEnvironment, stackSdk, options.toolkitStackName);
+            state.set(deployment, toolkitInfo);
+            return toolkitInfo;
+        }
+    };
+});

package/cdk/cloudformation-deployments.d.ts

@@ -1,9 +1,11 @@
 import * as cxapi from "@aws-cdk/cx-api";
 import { Tag } from "aws-cdk/lib/cdk-toolkit.js";
-import { BuildAssetsOptions } from "aws-cdk/lib/util/asset-publishing.js";
+import { BuildAssetsOptions, PublishAssetsOptions } from "aws-cdk/lib/util/asset-publishing.js";
+import { Mode } from "aws-cdk/lib/api/aws-auth/credentials.js";
 import { ISDK } from "aws-cdk/lib/api/aws-auth/sdk.js";
 import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
 import { DeployStackResult, DeploymentMethod } from "./deploy-stack.js";
+import { ToolkitInfo } from "aws-cdk/lib/api/toolkit-info.js";
 import { Template, ResourcesToImport, ResourceIdentifierSummaries } from "aws-cdk/lib/api/util/cloudformation.js";
 import { StackActivityProgress } from "aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
 /**
@@ -203,6 +205,18 @@ export interface BuildStackAssetsOptions {
      */
     readonly buildOptions?: BuildAssetsOptions;
 }
+interface PublishStackAssetsOptions {
+    /**
+     * Whether to build assets before publishing.
+     *
+     * @default true To remain backward compatible.
+     */
+    readonly buildAssets?: boolean;
+    /**
+     * Options to pass on to `publishAsests()` function
+     */
+    readonly publishOptions?: Omit<PublishAssetsOptions, "buildAssets">;
+}
 export interface DestroyStackOptions {
     stack: cxapi.CloudFormationStackArtifact;
     deployName?: string;
@@ -264,7 +278,7 @@ export declare class CloudFormationDeployments {
      * - SDK loaded with the right credentials for calling `CreateChangeSet`.
      * - The Execution Role that should be passed to CloudFormation.
      */
-    private prepareSdkFor;
+    prepareSdkFor(stack: cxapi.CloudFormationStackArtifact, roleArn?: string, mode?: Mode): Promise<PreparedSdkForEnvironment>;
     /**
      * Build a stack's assets.
      */
@@ -272,9 +286,10 @@ export declare class CloudFormationDeployments {
     /**
      * Publish all asset manifests that are referenced by the given stack
      */
-    private publishStackAssets;
+    publishStackAssets(stack: cxapi.CloudFormationStackArtifact, toolkitInfo: ToolkitInfo, options?: PublishStackAssetsOptions): Promise<void>;
     /**
      * Validate that the bootstrap stack has the right version for this stack
      */
     private validateBootstrapStackVersion;
 }
+export {};

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/deploy.js

@@ -10,10 +10,9 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     const React = await import("react");
     const { printDeploymentResults } = await import("../ui/deploy.js");
     const { createSpinner } = await import("../spinner.js");
-    const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     const { dim, blue, bold } = await import("colorette");
     const { useProject } = await import("../../project.js");
-    const { Stacks } = await import("../../stacks/index.js");
+    const { loadAssembly, Stacks } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
     const { Colors } = await import("../colors.js");
@@ -23,9 +22,12 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     console.log();
     console.log(`  ${Colors.primary(`➜`)}  ${bold(`Stage:`)}   ${dim(project.config.stage)}`);
     console.log();
+    // 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 = new CloudAssembly(args.from);
+            const result = await loadAssembly(args.from);
             return result;
         }
         const spinner = createSpinner({

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/remove.js

@@ -3,10 +3,9 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
     describe: "Optionally filter stacks to remove",
 }), async (args) => {
     const React = await import("react");
-    const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     const { dim, blue, bold } = await import("colorette");
     const { useProject } = await import("../../project.js");
-    const { Stacks } = await import("../../stacks/index.js");
+    const { loadAssembly, Stacks } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
     const { printDeploymentResults } = await import("../ui/deploy.js");
@@ -19,7 +18,7 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
     console.log();
     const assembly = await (async function () {
         if (args.from) {
-            const result = new CloudAssembly(args.from);
+            const result = await loadAssembly(args.from);
             return result;
         }
         return await Stacks.synth({

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/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

@@ -17,6 +17,10 @@ export const program = yargs(hideBin(process.argv))
     .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", "help"], "Global:")
     .middleware(async (argv) => {

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/config.d.ts

@@ -6,7 +6,7 @@ export declare namespace Config {
     function parameters(): Promise<({
         type: string;
         id: string;
-        prop: string[];
+        prop: string;
     } & {
         value: string;
     })[]>;

package/config.js

@@ -30,7 +30,7 @@ export var Config;
     }
     Config.parameters = parameters;
     function envFor(input) {
-        return `SST_${input.type}_${input.prop}_${input.id}`;
+        return `SST_${input.type}_${input.prop}_${normalizeID(input.id)}`;
     }
     Config.envFor = envFor;
     function pathFor(input) {
@@ -64,7 +64,7 @@ export var Config;
         const env = {
             SST_APP: project.config.name,
             SST_STAGE: project.config.stage,
-            ...pipe(parameters, map((p) => [`SST_${p.type}_${p.prop}_${p.id}`, p.value]), Object.fromEntries),
+            ...pipe(parameters, map((p) => [envFor(p), p.value]), Object.fromEntries),
         };
         return env;
     }
@@ -168,6 +168,6 @@ function parse(ssmName) {
     return {
         type: parts[4],
         id: parts[5],
-        prop: parts.slice(6),
+        prop: parts.slice(6).join("/"),
     };
 }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.35",
+  "version": "2.0.0-rc.37",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -32,6 +32,7 @@
     "@aws-cdk/region-info": "2.55.0",
     "@aws-sdk/client-cloudformation": "3.208.0",
     "@aws-sdk/client-iot": "3.208.0",
+    "@aws-sdk/client-iot-data-plane": "3.208.0",
     "@aws-sdk/client-lambda": "3.208.0",
     "@aws-sdk/client-rds-data": "3.208.0",
     "@aws-sdk/client-s3": "3.208.0",

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}`),
     });