sst 2.0.0-rc.35 → 2.0.0-rc.36

package/bootstrap.js

@@ -19,7 +19,7 @@ import { Stacks } from "./stacks/index.js";
 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 () => {
     Logger.debug("Initializing bootstrap context");
@@ -50,7 +50,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 +60,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");

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

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.35",
+  "version": "2.0.0-rc.36",
   "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/sst.mjs

@@ -2140,6 +2140,17 @@ var init_iot2 = __esm({
   }
 });
 
+// src/stacks/assembly.ts
+async function loadAssembly(from) {
+  const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
+  return new CloudAssembly(from);
+}
+var init_assembly = __esm({
+  "src/stacks/assembly.ts"() {
+    "use strict";
+  }
+});
+
 // src/stacks/monitor.ts
 import {
   CloudFormationClient,
@@ -3128,7 +3139,69 @@ var init_cloudformation_deployments = __esm({
   }
 });
 
+// src/cdk/cloudformation-deployments-wrapper.ts
+var cloudformation_deployments_wrapper_exports = {};
+__export(cloudformation_deployments_wrapper_exports, {
+  publishAssets: () => publishAssets3
+});
+import { ToolkitInfo as ToolkitInfo2 } from "aws-cdk/lib/api/toolkit-info.js";
+async function publishAssets3(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
+    }
+  });
+}
+var useToolkitInfo;
+var init_cloudformation_deployments_wrapper = __esm({
+  "src/cdk/cloudformation-deployments-wrapper.ts"() {
+    "use strict";
+    init_context();
+    useToolkitInfo = Context.memo(() => {
+      const state2 = /* @__PURE__ */ new Map();
+      return {
+        async lookup(deployment, options) {
+          if (state2.has(deployment))
+            return state2.get(deployment);
+          const { stackSdk, resolvedEnvironment } = await deployment.prepareSdkFor(options.stack, options.roleArn);
+          const toolkitInfo = await ToolkitInfo2.lookup(
+            resolvedEnvironment,
+            stackSdk,
+            options.toolkitStackName
+          );
+          state2.set(deployment, toolkitInfo);
+          return toolkitInfo;
+        }
+      };
+    });
+  }
+});
+
 // src/stacks/deploy.ts
+async function publishAssets4(stacks) {
+  Logger.debug("Publishing assets");
+  const provider = await useAWSProvider();
+  const { CloudFormationDeployments: CloudFormationDeployments2 } = await Promise.resolve().then(() => (init_cloudformation_deployments(), cloudformation_deployments_exports));
+  const { publishAssets: publishAssets5 } = await Promise.resolve().then(() => (init_cloudformation_deployments_wrapper(), cloudformation_deployments_wrapper_exports));
+  const deployment = new CloudFormationDeployments2({
+    sdkProvider: provider
+  });
+  for (const stack of stacks) {
+    await publishAssets5(
+      deployment,
+      {
+        stack,
+        quiet: true,
+        deploymentMethod: {
+          method: "direct"
+        }
+      }
+    );
+  }
+}
 async function deployMany(stacks) {
   Logger.debug(
     "Deploying stacks",
@@ -3139,11 +3212,7 @@ async function deployMany(stacks) {
   const bus = useBus();
   const complete = /* @__PURE__ */ new Set();
   const todo = new Set(stacks.map((s) => s.id));
-  const pending = /* @__PURE__ */ new Set();
   const results = {};
-  bus.subscribe("stack.updated", (evt) => {
-    pending.add(evt.properties.stackID);
-  });
   return new Promise((resolve) => {
     async function trigger() {
       for (const stack of stacks) {
@@ -3303,7 +3372,7 @@ var init_bootstrap = __esm({
     STACK_NAME = "SSTBootstrap";
     OUTPUT_VERSION = "Version";
     OUTPUT_BUCKET = "BucketName";
-    LATEST_VERSION = "4";
+    LATEST_VERSION = "5";
     __dirname = url3.fileURLToPath(new URL(".", import.meta.url));
     useBootstrap = Context.memo(async () => {
       Logger.debug("Initializing bootstrap context");
@@ -3332,7 +3401,7 @@ var init_bootstrap = __esm({
         const fn = new Function(stack, "MetadataHandler", {
           code: Code.fromAsset(path8.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"],
@@ -3341,6 +3410,10 @@ var init_bootstrap = __esm({
             new PolicyStatement({
               actions: ["s3:PutObject", "s3:DeleteObject"],
               resources: [bucket.bucketArn + "/*"]
+            }),
+            new PolicyStatement({
+              actions: ["iot:Publish"],
+              resources: [`arn:${stack.partition}:iot:${stack.region}:${stack.account}:topic//sst/*`]
             })
           ]
         });
@@ -4311,11 +4384,7 @@ async function removeMany(stacks) {
   const bus = useBus();
   const complete = /* @__PURE__ */ new Set();
   const todo = new Set(stacks.map((s) => s.id));
-  const pending = /* @__PURE__ */ new Set();
   const results = {};
-  bus.subscribe("stack.updated", (evt) => {
-    pending.add(evt.properties.stackID);
-  });
   return new Promise((resolve) => {
     async function trigger() {
       for (const stack of stacks) {
@@ -4407,9 +4476,11 @@ __export(stacks_exports, {
   isPending: () => isPending,
   isSuccess: () => isSuccess,
   load: () => load,
+  loadAssembly: () => loadAssembly,
   metadata: () => metadata,
   metadataForStack: () => metadataForStack,
   monitor: () => monitor,
+  publishAssets: () => publishAssets4,
   remove: () => remove,
   removeMany: () => removeMany,
   synth: () => synth,
@@ -4418,6 +4489,7 @@ __export(stacks_exports, {
 var init_stacks = __esm({
   "src/stacks/index.ts"() {
     "use strict";
+    init_assembly();
     init_build();
     init_deploy();
     init_metadata();
@@ -5255,7 +5327,7 @@ function parse(ssmName) {
   return {
     type: parts[4],
     id: parts[5],
-    prop: parts.slice(6)
+    prop: parts.slice(6).join("/")
   };
 }
 var Config, FALLBACK_STAGE, SECRET_UPDATED_AT_ENV, PREFIX;
@@ -5290,7 +5362,7 @@ var init_config = __esm({
       }
       Config2.parameters = parameters;
       function envFor(input) {
-        return `SST_${input.type}_${input.prop}_${input.id}`;
+        return `SST_${input.type}_${input.prop}_${normalizeID(input.id)}`;
       }
       Config2.envFor = envFor;
       function pathFor(input) {
@@ -5326,7 +5398,7 @@ var init_config = __esm({
           SST_STAGE: project.config.stage,
           ...pipe(
             parameters2,
-            map((p) => [`SST_${p.type}_${p.prop}_${p.id}`, p.value]),
+            map((p) => [envFor(p), p.value]),
             Object.fromEntries
           )
         };
@@ -5914,10 +5986,9 @@ var deploy2 = (program2) => program2.command(
     const React3 = await import("react");
     const { printDeploymentResults: printDeploymentResults2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
     const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
-    const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     const { dim: dim3, blue: blue5, bold: bold2 } = await import("colorette");
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
-    const { Stacks } = await Promise.resolve().then(() => (init_stacks(), stacks_exports));
+    const { loadAssembly: loadAssembly2, Stacks } = await Promise.resolve().then(() => (init_stacks(), stacks_exports));
     const { render } = await import("ink");
     const { DeploymentUI: DeploymentUI2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
@@ -5933,7 +6004,7 @@ var deploy2 = (program2) => program2.command(
     console.log();
     const assembly = await async function() {
       if (args.from) {
-        const result2 = new CloudAssembly(args.from);
+        const result2 = await loadAssembly2(args.from);
         return result2;
       }
       const spinner = createSpinner2({
@@ -5978,10 +6049,9 @@ var remove2 = (program2) => program2.command(
   }),
   async (args) => {
     const React3 = await import("react");
-    const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     const { dim: dim3, blue: blue5, bold: bold2 } = await import("colorette");
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
-    const { Stacks } = await Promise.resolve().then(() => (init_stacks(), stacks_exports));
+    const { loadAssembly: loadAssembly2, Stacks } = await Promise.resolve().then(() => (init_stacks(), stacks_exports));
     const { render } = await import("ink");
     const { DeploymentUI: DeploymentUI2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
     const { printDeploymentResults: printDeploymentResults2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
@@ -5998,7 +6068,7 @@ var remove2 = (program2) => program2.command(
     console.log();
     const assembly = await async function() {
       if (args.from) {
-        const result = new CloudAssembly(args.from);
+        const result = await loadAssembly2(args.from);
         return result;
       }
       return await Stacks.synth({

package/stacks/assembly.d.ts

@@ -0,0 +1 @@
+export declare function loadAssembly(from: string): Promise<import("aws-cdk-lib/cx-api").CloudAssembly>;

package/stacks/assembly.js

@@ -0,0 +1,4 @@
+export async function loadAssembly(from) {
+    const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
+    return new CloudAssembly(from);
+}

package/stacks/deploy.d.ts

@@ -1,5 +1,6 @@
 import type { CloudFormationStackArtifact } from "aws-cdk-lib/cx-api";
 import { StackDeploymentResult } from "./monitor.js";
+export declare function publishAssets(stacks: CloudFormationStackArtifact[]): Promise<void>;
 export declare function deployMany(stacks: CloudFormationStackArtifact[]): Promise<Record<string, {
     status: string;
     outputs: Record<string, string>;

package/stacks/deploy.js

@@ -2,6 +2,25 @@ import { useBus } from "../bus.js";
 import { useAWSProvider } from "../credentials.js";
 import { Logger } from "../logger.js";
 import { isFailed, monitor } from "./monitor.js";
+export async function publishAssets(stacks) {
+    // TODO: use memo in cloudformation-deployments.ts
+    Logger.debug("Publishing assets");
+    const provider = await useAWSProvider();
+    const { CloudFormationDeployments } = await import("../cdk/cloudformation-deployments.js");
+    const { publishAssets } = await import("../cdk/cloudformation-deployments-wrapper.js");
+    const deployment = new CloudFormationDeployments({
+        sdkProvider: provider,
+    });
+    for (const stack of stacks) {
+        await publishAssets(deployment, {
+            stack: stack,
+            quiet: true,
+            deploymentMethod: {
+                method: "direct",
+            },
+        });
+    }
+}
 export async function deployMany(stacks) {
     Logger.debug("Deploying stacks", stacks.map((s) => s.stackName));
     const { CloudFormationStackArtifact } = await import("aws-cdk-lib/cx-api");
@@ -9,11 +28,7 @@ export async function deployMany(stacks) {
     const bus = useBus();
     const complete = new Set();
     const todo = new Set(stacks.map((s) => s.id));
-    const pending = new Set();
     const results = {};
-    bus.subscribe("stack.updated", (evt) => {
-        pending.add(evt.properties.stackID);
-    });
     return new Promise((resolve) => {
         async function trigger() {
             for (const stack of stacks) {

package/stacks/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./assembly.js";
 export * from "./build.js";
 export * from "./deploy.js";
 export * from "./metadata.js";

package/stacks/index.js

@@ -1,3 +1,4 @@
+export * from "./assembly.js";
 export * from "./build.js";
 export * from "./deploy.js";
 export * from "./metadata.js";

package/stacks/metadata.d.ts

@@ -2,6 +2,8 @@ import type { Metadata } from "../constructs/Metadata.js";
 declare module "../bus.js" {
     interface Events {
         "stacks.metadata": Awaited<ReturnType<typeof metadata>>;
+        "stacks.metadata.updated": {};
+        "stacks.metadata.deleted": {};
     }
 }
 export declare function metadata(): Promise<Record<string, Metadata[]>>;

package/stacks/remove.js

@@ -8,11 +8,7 @@ export async function removeMany(stacks) {
     const bus = useBus();
     const complete = new Set();
     const todo = new Set(stacks.map((s) => s.id));
-    const pending = new Set();
     const results = {};
-    bus.subscribe("stack.updated", (evt) => {
-        pending.add(evt.properties.stackID);
-    });
     return new Promise((resolve) => {
         async function trigger() {
             for (const stack of stacks) {