sst 2.47.3 → 2.48.0

package/cdk/deploy-stack.d.ts

@@ -1,31 +1,13 @@
 import * as cxapi from "@aws-cdk/cx-api";
 import type { Tag } from "@aws-sdk/client-cloudformation";
+import { ResourcesToImport } from "sst-aws-cdk/lib/api/deployments/cloudformation.js";
+import { DeploymentMethod } from "sst-aws-cdk/lib/api/deployments/deployment-method.js";
+import { DeployStackResult } from "sst-aws-cdk/lib/api/deployments/deployment-result.js";
 import type { SDK, SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/index.js";
 import type { EnvironmentResources } from "sst-aws-cdk/lib/api/environment-resources.js";
 import { HotswapMode, HotswapPropertyOverrides } from "sst-aws-cdk/lib/api/hotswap/common.js";
-import { ResourcesToImport } from "sst-aws-cdk/lib/api/util/cloudformation.js";
 import { type StackActivityProgress } from "sst-aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
 import { StringWithoutPlaceholders } from "sst-aws-cdk/lib/api/util/placeholders.js";
-export type DeployStackResult = SuccessfulDeployStackResult | NeedRollbackFirstDeployStackResult | ReplacementRequiresNoRollbackStackResult;
-/** Successfully deployed a stack */
-export interface SuccessfulDeployStackResult {
-    readonly type: "did-deploy-stack";
-    readonly noOp: boolean;
-    readonly outputs: {
-        [name: string]: string;
-    };
-    readonly stackArn: string;
-}
-/** The stack is currently in a failpaused state, and needs to be rolled back before the deployment */
-export interface NeedRollbackFirstDeployStackResult {
-    readonly type: "failpaused-need-rollback-first";
-    readonly reason: "not-norollback" | "replacement";
-}
-/** The upcoming change has a replacement, which requires deploying without --no-rollback */
-export interface ReplacementRequiresNoRollbackStackResult {
-    readonly type: "replacement-requires-norollback";
-}
-export declare function assertIsSuccessfulDeployStackResult(x: DeployStackResult): asserts x is SuccessfulDeployStackResult;
 export interface DeployStackOptions {
     /**
      * The stack to be deployed
@@ -183,24 +165,6 @@ export interface DeployStackOptions {
      */
     readonly assetParallelism?: boolean;
 }
-export type DeploymentMethod = DirectDeploymentMethod | ChangeSetDeploymentMethod;
-export interface DirectDeploymentMethod {
-    readonly method: "direct";
-}
-export interface ChangeSetDeploymentMethod {
-    readonly method: "change-set";
-    /**
-     * Whether to execute the changeset or leave it in review.
-     *
-     * @default true
-     */
-    readonly execute?: boolean;
-    /**
-     * Optional name to use for the CloudFormation change set.
-     * If not provided, a name will be generated automatically.
-     */
-    readonly changeSetName?: string;
-}
 export declare function deployStack(options: DeployStackOptions): Promise<DeployStackResult | undefined>;
 export interface DestroyStackOptions {
     /**

package/cdk/deploy-stack.js

@@ -1,20 +1,17 @@
 import * as uuid from "uuid";
-import { addMetadataAssetsToManifest } from "sst-aws-cdk/lib/assets.js";
-import { debug, print, warning } from "sst-aws-cdk/lib/logging.js";
+import { AssetManifestBuilder } from "sst-aws-cdk/lib/api/deployments/asset-manifest-builder.js";
+import { publishAssets } from "sst-aws-cdk/lib/api/deployments/asset-publishing.js";
+import { addMetadataAssetsToManifest } from "sst-aws-cdk/lib/api/deployments/assets.js";
+import { determineAllowCrossAccountAssetPublishing } from "sst-aws-cdk/lib/api/deployments/checks.js";
+import { changeSetHasNoChanges, CloudFormationStack, TemplateParameters, waitForChangeSet, waitForStackDeploy, waitForStackDelete, } from "sst-aws-cdk/lib/api/deployments/cloudformation.js";
+import { tryHotswapDeployment } from "sst-aws-cdk/lib/api/deployments/hotswap-deployments.js";
+import { debug, info, warning } from "sst-aws-cdk/lib/logging.js";
+import { ToolkitError } from "sst-aws-cdk/lib/toolkit/error.js";
+import { formatErrorMessage } from "sst-aws-cdk/lib/util/error.js";
 import { CfnEvaluationException } from "sst-aws-cdk/lib/api/evaluate-cloudformation-template.js";
 import { HotswapMode, HotswapPropertyOverrides, } from "sst-aws-cdk/lib/api/hotswap/common.js";
-import { tryHotswapDeployment } from "sst-aws-cdk/lib/api/hotswap-deployments.js";
-import { changeSetHasNoChanges, CloudFormationStack, TemplateParameters, waitForChangeSet, waitForStackDeploy, waitForStackDelete, } from "sst-aws-cdk/lib/api/util/cloudformation.js";
 import { makeBodyParameter, } from "sst-aws-cdk/lib/api/util/template-body-parameter.js";
-import { AssetManifestBuilder } from "sst-aws-cdk/lib/util/asset-manifest-builder.js";
-import { determineAllowCrossAccountAssetPublishing } from "sst-aws-cdk/lib/api/util/checks.js";
-import { publishAssets } from "sst-aws-cdk/lib/util/asset-publishing.js";
 import { callWithRetry } from "./util.js";
-export function assertIsSuccessfulDeployStackResult(x) {
-    if (x.type !== "did-deploy-stack") {
-        throw new Error(`Unexpected deployStack result. This should not happen: ${JSON.stringify(x)}. If you are seeing this error, please report it at https://github.com/aws/aws-cdk/issues/new/choose.`);
-    }
-}
 export async function deployStack(options) {
     const stackArtifact = options.stack;
     const stackEnv = options.resolvedEnvironment;
@@ -27,7 +24,7 @@ export async function deployStack(options) {
         await cfn.deleteStack({ StackName: deployName });
         const deletedStack = await waitForStackDelete(cfn, deployName);
         if (deletedStack && deletedStack.stackStatus.name !== "DELETE_COMPLETE") {
-            throw new Error(`Failed deleting stack ${deployName} that had previously failed creation (current state: ${deletedStack.stackStatus})`);
+            throw new ToolkitError(`Failed deleting stack ${deployName} that had previously failed creation (current state: ${deletedStack.stackStatus})`);
         }
         // Update variable to mark that the stack does not exist anymore, but avoid
         // doing an actual lookup in CloudFormation (which would be silly to do if
@@ -81,16 +78,16 @@ export async function deployStack(options) {
             if (hotswapDeploymentResult) {
                 return hotswapDeploymentResult;
             }
-            print("Could not perform a hotswap deployment, as the stack %s contains non-Asset changes", stackArtifact.displayName);
+            info("Could not perform a hotswap deployment, as the stack %s contains non-Asset changes", stackArtifact.displayName);
         }
         catch (e) {
             if (!(e instanceof CfnEvaluationException)) {
                 throw e;
             }
-            print("Could not perform a hotswap deployment, because the CloudFormation template could not be resolved: %s", e.message);
+            info("Could not perform a hotswap deployment, because the CloudFormation template could not be resolved: %s", formatErrorMessage(e));
         }
         if (hotswapMode === HotswapMode.FALL_BACK) {
-            print("Falling back to doing a full deployment");
+            info("Falling back to doing a full deployment");
             options.sdk.appendCustomUserAgent("cdk-hotswap/fallback");
         }
         else {
@@ -140,7 +137,7 @@ class FullCloudFormationDeployment {
         };
         if (deploymentMethod.method === "direct" &&
             this.options.resourcesToImport) {
-            throw new Error("Importing resources requires a changeset deployment");
+            throw new ToolkitError("Importing resources requires a changeset deployment");
         }
         switch (deploymentMethod.method) {
             case "change-set":
@@ -152,7 +149,8 @@ class FullCloudFormationDeployment {
     async changeSetDeployment(deploymentMethod) {
         const changeSetName = deploymentMethod.changeSetName ?? "cdk-deploy-change-set";
         const execute = deploymentMethod.execute ?? true;
-        const changeSetDescription = await this.createChangeSet(changeSetName, execute);
+        const importExistingResources = deploymentMethod.importExistingResources ?? false;
+        const changeSetDescription = await this.createChangeSet(changeSetName, execute, importExistingResources);
         await this.updateTerminationProtection();
         if (changeSetHasNoChanges(changeSetDescription)) {
             debug("No changes are to be performed on %s.", this.stackName);
@@ -180,7 +178,7 @@ class FullCloudFormationDeployment {
             };
         }
         if (!execute) {
-            print("Changeset %s created and waiting in review for manual execution (--no-execute)", changeSetDescription.ChangeSetId);
+            info("Changeset %s created and waiting in review for manual execution (--no-execute)", changeSetDescription.ChangeSetId);
             return {
                 type: "did-deploy-stack",
                 noOp: false,
@@ -193,20 +191,25 @@ class FullCloudFormationDeployment {
         const isPausedFailState = this.cloudFormationStack.stackStatus.isRollbackable;
         const rollback = this.options.rollback ?? true;
         if (isPausedFailState && replacement) {
-            return { type: "failpaused-need-rollback-first", reason: "replacement" };
+            return {
+                type: "failpaused-need-rollback-first",
+                reason: "replacement",
+                status: this.cloudFormationStack.stackStatus.name,
+            };
         }
-        if (isPausedFailState && !rollback) {
+        if (isPausedFailState && rollback) {
             return {
                 type: "failpaused-need-rollback-first",
                 reason: "not-norollback",
+                status: this.cloudFormationStack.stackStatus.name,
             };
         }
         if (!rollback && replacement) {
-            return { type: "replacement-requires-norollback" };
+            return { type: "replacement-requires-rollback" };
         }
         return this.executeChangeSet(changeSetDescription);
     }
-    async createChangeSet(changeSetName, willExecute) {
+    async createChangeSet(changeSetName, willExecute, importExistingResources) {
         await this.cleanupOldChangeset(changeSetName);
         debug(`Attempting to create ChangeSet with name ${changeSetName} to ${this.verb} stack ${this.stackName}`);
         const changeSet = await this.cfn.createChangeSet({
@@ -220,6 +223,7 @@ class FullCloudFormationDeployment {
             ResourcesToImport: this.options.resourcesToImport,
             Description: `CDK Changeset for execution ${this.uuid}`,
             ClientToken: `create${this.uuid}`,
+            ImportExistingResources: importExistingResources,
             ...this.commonPrepareOptions(),
         });
         debug("Initiated creation of changeset: %s; waiting for it to finish creating...", changeSet.Id);
@@ -328,12 +332,12 @@ class FullCloudFormationDeployment {
             const successStack = await waitForStackDeploy(this.cfn, this.stackName);
             // This shouldn't really happen, but catch it anyway. You never know.
             if (!successStack) {
-                throw new Error("Stack deploy failed (the stack disappeared while we were deploying it)");
+                throw new ToolkitError("Stack deploy failed (the stack disappeared while we were deploying it)");
             }
             finalState = successStack;
         }
         catch (e) {
-            throw new Error(suffixWithErrors(e.message /*, monitor?.errors*/));
+            throw new ToolkitError(suffixWithErrors(formatErrorMessage(e) /*, monitor?.errors*/));
         }
         finally {
             // await monitor?.stop();
@@ -397,11 +401,11 @@ export async function destroyStack(options) {
         const destroyedStack = await waitForStackDelete(cfn, deployName);
         if (destroyedStack &&
             destroyedStack.stackStatus.name !== "DELETE_COMPLETE") {
-            throw new Error(`Failed to destroy ${deployName}: ${destroyedStack.stackStatus}`);
+            throw new ToolkitError(`Failed to destroy ${deployName}: ${destroyedStack.stackStatus}`);
         }
     }
     catch (e) {
-        throw new Error(suffixWithErrors(e.message /* , monitor?.errors */));
+        throw new ToolkitError(suffixWithErrors(formatErrorMessage(e) /* , monitor?.errors */));
     }
     finally {
         /*

package/cdk/deployments-wrapper.js

@@ -1,12 +1,11 @@
 import * as cxapi from "@aws-cdk/cx-api";
+import { AssetManifestBuilder } from "sst-aws-cdk/lib/api/deployments/asset-manifest-builder.js";
 import { AssetManifest } from "cdk-assets";
 import { debug } from "sst-aws-cdk/lib/logging.js";
-import { CloudFormationStack, TemplateParameters, waitForStackDelete, } from "sst-aws-cdk/lib/api/util/cloudformation.js";
-import { addMetadataAssetsToManifest } from "sst-aws-cdk/lib/assets.js";
-import { publishAssets } from "sst-aws-cdk/lib/util/asset-publishing.js";
-import { AssetManifestBuilder } from "sst-aws-cdk/lib/util/asset-manifest-builder.js";
+import { CloudFormationStack, TemplateParameters, waitForStackDelete, } from "sst-aws-cdk/lib/api/deployments/cloudformation.js";
+import { addMetadataAssetsToManifest } from "sst-aws-cdk/lib/api/deployments/assets.js";
 import { makeBodyParameter } from "sst-aws-cdk/lib/api/util/template-body-parameter.js";
-import { Deployments, } from "./deployments.js";
+import { publishAssets, Deployments, } from "./deployments.js";
 import { lazy } from "../util/lazy.js";
 export async function publishDeployAssets(sdkProvider, options) {
     const { deployment, envResources, stackSdk, resolvedEnvironment, executionRoleArn, } = await useDeployment().get(sdkProvider, options);
@@ -14,10 +13,7 @@ export async function publishDeployAssets(sdkProvider, options) {
     for (const asset of assetArtifacts) {
         const manifest = AssetManifest.fromFile(asset.file);
         await publishAssets(manifest, sdkProvider, resolvedEnvironment, {
-            buildAssets: true,
-            allowCrossAccount: true,
             quiet: options.quiet,
-            parallel: options.assetParallelism,
         });
     }
     return deployStack({
@@ -101,10 +97,7 @@ async function deployStack(options) {
         ? templateParams.updateExisting(finalParameterValues, cloudFormationStack.parameters)
         : templateParams.supplyAll(finalParameterValues);
     const bodyParameter = await makeBodyParameter(stackArtifact, options.resolvedEnvironment, legacyAssets, options.envResources, options.overrideTemplate);
-    await publishAssets(legacyAssets.toManifest(stackArtifact.assembly.directory), options.sdkProvider, stackEnv, {
-        parallel: options.assetParallelism,
-        allowCrossAccount: true,
-    });
+    await publishAssets(legacyAssets.toManifest(stackArtifact.assembly.directory), options.sdkProvider, stackEnv, { quiet: options.quiet });
     return {
         isUpdate: cloudFormationStack.exists &&
             cloudFormationStack.stackStatus.name !== "REVIEW_IN_PROGRESS",

package/cdk/deployments.d.ts

@@ -1,16 +1,16 @@
 import * as cxapi from "@aws-cdk/cx-api";
 import * as cdk_assets from "cdk-assets";
-import { AssetManifest, IManifestEntry } from "cdk-assets";
-import type { Tag } from "sst-aws-cdk/lib/cdk-toolkit.js";
-import { EnvironmentAccess } from "sst-aws-cdk/lib/api/environment-access.js";
+import { type ResourceIdentifierSummaries, ResourcesToImport, Template } from "sst-aws-cdk/lib/api/deployments/cloudformation.js";
+import { DeploymentMethod } from "sst-aws-cdk/lib/api/deployments/deployment-method.js";
+import { DeployStackResult } from "sst-aws-cdk/lib/api/deployments/deployment-result.js";
+import { type RootTemplateWithNestedStacks } from "sst-aws-cdk/lib/api/deployments/nested-stack-helpers.js";
 import type { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
-import { type DeploymentMethod, DeployStackResult } from "./deploy-stack.js";
+import { EnvironmentAccess } from "sst-aws-cdk/lib/api/environment-access.js";
 import { type EnvironmentResources } from "sst-aws-cdk/lib/api/environment-resources.js";
 import { HotswapMode, HotswapPropertyOverrides } from "sst-aws-cdk/lib/api/hotswap/common.js";
-import { type RootTemplateWithNestedStacks } from "sst-aws-cdk/lib/api/nested-stack-helpers.js";
-import { type ResourceIdentifierSummaries, ResourcesToImport, Template } from "sst-aws-cdk/lib/api/util/cloudformation.js";
+import type { Tag } from "sst-aws-cdk/lib/api/tags.js";
 import { StackActivityProgress } from "sst-aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
-import { type BuildAssetsOptions, type PublishAssetsOptions } from "sst-aws-cdk/lib/util/asset-publishing.js";
+import { AssetManifest } from "cdk-assets";
 export interface DeployStackOptions {
     /**
      * Stack to deploy
@@ -223,20 +223,12 @@ interface AssetOptions {
     readonly roleArn?: string;
 }
 export interface BuildStackAssetsOptions extends AssetOptions {
-    /**
-     * Options to pass on to `buildAsests()` function
-     */
-    readonly buildOptions?: BuildAssetsOptions;
     /**
      * Stack name this asset is for
      */
     readonly stackName?: string;
 }
 interface PublishStackAssetsOptions extends AssetOptions {
-    /**
-     * Options to pass on to `publishAsests()` function
-     */
-    readonly publishOptions?: Omit<PublishAssetsOptions, "buildAssets">;
     /**
      * Stack name this asset is for
      */
@@ -300,22 +292,6 @@ export declare class Deployments {
     rollbackStack(options: RollbackStackOptions): Promise<RollbackStackResult>;
     destroyStack(options: DestroyStackOptions): Promise<void>;
     stackExists(options: StackExistsOptions): Promise<boolean>;
-    prepareAndValidateAssets(asset: cxapi.AssetManifestArtifact, options: AssetOptions): Promise<{
-        manifest: cdk_assets.AssetManifest;
-        stackEnv: cxapi.Environment;
-    }>;
-    /**
-     * Build all assets in a manifest
-     *
-     * @deprecated Use `buildSingleAsset` instead
-     */
-    buildAssets(asset: cxapi.AssetManifestArtifact, options: BuildStackAssetsOptions): Promise<void>;
-    /**
-     * Publish all assets in a manifest
-     *
-     * @deprecated Use `publishSingleAsset` instead
-     */
-    publishAssets(asset: cxapi.AssetManifestArtifact, options: PublishStackAssetsOptions): Promise<void>;
     /**
      * Build a single asset from an asset manifest
      *
@@ -323,16 +299,16 @@ export declare class Deployments {
      * will be validated according to the constraints in that manifest artifact.
      * If that is not necessary, `'no-version-validation'` can be passed.
      */
-    buildSingleAsset(assetArtifact: cxapi.AssetManifestArtifact | "no-version-validation", assetManifest: AssetManifest, asset: IManifestEntry, options: BuildStackAssetsOptions): Promise<void>;
+    buildSingleAsset(assetArtifact: cxapi.AssetManifestArtifact | "no-version-validation", assetManifest: cdk_assets.AssetManifest, asset: cdk_assets.IManifestEntry, options: BuildStackAssetsOptions): Promise<void>;
     /**
      * Publish a single asset from an asset manifest
      */
-    publishSingleAsset(assetManifest: AssetManifest, asset: IManifestEntry, options: PublishStackAssetsOptions): Promise<void>;
+    publishSingleAsset(assetManifest: cdk_assets.AssetManifest, asset: cdk_assets.IManifestEntry, options: PublishStackAssetsOptions): Promise<void>;
     private allowCrossAccountAssetPublishingForEnv;
     /**
      * Return whether a single asset has been published already
      */
-    isSingleAssetPublished(assetManifest: AssetManifest, asset: IManifestEntry, options: PublishStackAssetsOptions): Promise<boolean>;
+    isSingleAssetPublished(assetManifest: cdk_assets.AssetManifest, asset: cdk_assets.IManifestEntry, options: PublishStackAssetsOptions): Promise<boolean>;
     /**
      * Validate that the bootstrap stack has the right version for this stack
      *
@@ -341,4 +317,7 @@ export declare class Deployments {
     validateBootstrapStackVersion(stackName: string, requiresBootstrapStackVersion: number | undefined, bootstrapStackVersionSsmParameter: string | undefined, envResources: EnvironmentResources): Promise<void>;
     private cachedPublisher;
 }
+export declare function publishAssets(manifest: AssetManifest, sdk: SdkProvider, targetEnv: cxapi.Environment, options: {
+    quiet?: boolean;
+}): Promise<void>;
 export {};

package/cdk/deployments.js

@@ -2,20 +2,22 @@
 import { randomUUID } from "crypto";
 import * as cxapi from "@aws-cdk/cx-api";
 import * as cdk_assets from "cdk-assets";
-import { AssetManifest } from "cdk-assets";
+import { AssetManifestBuilder } from "sst-aws-cdk/lib/api/deployments/asset-manifest-builder.js";
+import { EVENT_TO_LOGGER, PublishingAws, } from "sst-aws-cdk/lib/api/deployments/asset-publishing.js";
+import { determineAllowCrossAccountAssetPublishing } from "sst-aws-cdk/lib/api/deployments/checks.js";
+import { CloudFormationStack, stabilizeStack, uploadStackTemplateAssets, } from "sst-aws-cdk/lib/api/deployments/cloudformation.js";
+import { deployStack, destroyStack } from "./deploy-stack.js";
+import { loadCurrentTemplate, loadCurrentTemplateWithNestedStacks, } from "sst-aws-cdk/lib/api/deployments/nested-stack-helpers.js";
 import { debug, warning } from "sst-aws-cdk/lib/logging.js";
+import { ToolkitError } from "sst-aws-cdk/lib/toolkit/error.js";
+import { formatErrorMessage } from "sst-aws-cdk/lib/util/error.js";
 import { EnvironmentAccess } from "sst-aws-cdk/lib/api/environment-access.js";
-import { deployStack, destroyStack, } from "./deploy-stack.js";
-import { loadCurrentTemplateWithNestedStacks, loadCurrentTemplate, } from "sst-aws-cdk/lib/api/nested-stack-helpers.js";
 import { DEFAULT_TOOLKIT_STACK_NAME } from "sst-aws-cdk/lib/api/toolkit-info.js";
-import { determineAllowCrossAccountAssetPublishing } from "sst-aws-cdk/lib/api/util/checks.js";
-import { CloudFormationStack, stabilizeStack, uploadStackTemplateAssets, } from "sst-aws-cdk/lib/api/util/cloudformation.js";
 import { StackActivityMonitor, } from "sst-aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
 import { StackEventPoller } from "sst-aws-cdk/lib/api/util/cloudformation/stack-event-poller.js";
 import { RollbackChoice } from "sst-aws-cdk/lib/api/util/cloudformation/stack-status.js";
 import { makeBodyParameter } from "sst-aws-cdk/lib/api/util/template-body-parameter.js";
-import { AssetManifestBuilder } from "sst-aws-cdk/lib/util/asset-manifest-builder.js";
-import { buildAssets, EVENT_TO_LOGGER, publishAssets, PublishingAws, } from "sst-aws-cdk/lib/util/asset-publishing.js";
+import { AssetManifest } from "cdk-assets";
 const BOOTSTRAP_STACK_VERSION_FOR_ROLLBACK = 23;
 /**
  * Scope for a single set of deployments from a set of Cloud Assembly Artifacts
@@ -98,7 +100,7 @@ export class Deployments {
         let deploymentMethod = options.deploymentMethod;
         if (options.changeSetName || options.execute !== undefined) {
             if (deploymentMethod) {
-                throw new Error("You cannot supply both 'deploymentMethod' and 'changeSetName/execute'. Supply one or the other.");
+                throw new ToolkitError("You cannot supply both 'deploymentMethod' and 'changeSetName/execute'. Supply one or the other.");
             }
             deploymentMethod = {
                 method: "change-set",
@@ -114,12 +116,7 @@ export class Deployments {
         const assetArtifacts = options.stack.dependencies.filter(cxapi.AssetManifestArtifact.isAssetManifestArtifact);
         for (const asset of assetArtifacts) {
             const manifest = AssetManifest.fromFile(asset.file);
-            await publishAssets(manifest, this.deployStackSdkProvider, env.resolvedEnvironment, {
-                buildAssets: true,
-                allowCrossAccount: true,
-                quiet: options.quiet,
-                parallel: options.assetParallelism,
-            });
+            await publishAssets(manifest, this.deployStackSdkProvider, env.resolvedEnvironment, { quiet: options.quiet });
         }
         return deployStack({
             stack: options.stack,
@@ -152,7 +149,7 @@ export class Deployments {
     async rollbackStack(options) {
         let resourcesToSkip = options.orphanLogicalIds ?? [];
         if (options.force && resourcesToSkip.length > 0) {
-            throw new Error("Cannot combine --force with --orphan");
+            throw new ToolkitError("Cannot combine --force with --orphan");
         }
         const env = await this.envs.accessStackForMutableStackOperations(options.stack);
         if (options.validateBootstrapStackVersion ?? true) {
@@ -212,7 +209,7 @@ export class Deployments {
                     warning(`Stack ${deployName} failed creation and rollback. This state cannot be rolled back. You can recreate this stack by running 'cdk deploy'.`);
                     return { notInRollbackableState: true };
                 default:
-                    throw new Error(`Unexpected rollback choice: ${cloudFormationStack.stackStatus.rollbackChoice}`);
+                    throw new ToolkitError(`Unexpected rollback choice: ${cloudFormationStack.stackStatus.rollbackChoice}`);
             }
             const monitor = options.quiet
                 ? undefined
@@ -225,7 +222,7 @@ export class Deployments {
                 const successStack = await stabilizeStack(cfn, deployName);
                 // This shouldn't really happen, but catch it anyway. You never know.
                 if (!successStack) {
-                    throw new Error("Stack deploy failed (the stack disappeared while we were rolling it back)");
+                    throw new ToolkitError("Stack deploy failed (the stack disappeared while we were rolling it back)");
                 }
                 finalStackState = successStack;
                 const errors = monitor?.errors?.join(", ");
@@ -234,7 +231,7 @@ export class Deployments {
                 }
             }
             catch (e) {
-                stackErrorMessage = suffixWithErrors(e.message, monitor?.errors);
+                stackErrorMessage = suffixWithErrors(formatErrorMessage(e), monitor?.errors);
             }
             finally {
                 await monitor?.stop();
@@ -249,9 +246,9 @@ export class Deployments {
                 // Do another loop-de-loop
                 continue;
             }
-            throw new Error(`${stackErrorMessage} (fix problem and retry, or orphan these resources using --orphan or --force)`);
+            throw new ToolkitError(`${stackErrorMessage} (fix problem and retry, or orphan these resources using --orphan or --force)`);
         }
-        throw new Error("Rollback did not finish after a large number of iterations; stopping because it looks like we're not making progress anymore. You can retry if rollback was progressing as expected.");
+        throw new ToolkitError("Rollback did not finish after a large number of iterations; stopping because it looks like we're not making progress anymore. You can retry if rollback was progressing as expected.");
     }
     async destroyStack(options) {
         const env = await this.envs.accessStackForMutableStackOperations(options.stack);
@@ -276,33 +273,6 @@ export class Deployments {
         const stack = await CloudFormationStack.lookup(env.sdk.cloudFormation(), options.deployName ?? options.stack.stackName);
         return stack.exists;
     }
-    async prepareAndValidateAssets(asset, options) {
-        const env = await this.envs.accessStackForMutableStackOperations(options.stack);
-        await this.validateBootstrapStackVersion(options.stack.stackName, asset.requiresBootstrapStackVersion, asset.bootstrapStackVersionSsmParameter, env.resources);
-        const manifest = AssetManifest.fromFile(asset.file);
-        return { manifest, stackEnv: env.resolvedEnvironment };
-    }
-    /**
-     * Build all assets in a manifest
-     *
-     * @deprecated Use `buildSingleAsset` instead
-     */
-    async buildAssets(asset, options) {
-        const { manifest, stackEnv } = await this.prepareAndValidateAssets(asset, options);
-        await buildAssets(manifest, this.assetSdkProvider, stackEnv, options.buildOptions);
-    }
-    /**
-     * Publish all assets in a manifest
-     *
-     * @deprecated Use `publishSingleAsset` instead
-     */
-    async publishAssets(asset, options) {
-        const { manifest, stackEnv } = await this.prepareAndValidateAssets(asset, options);
-        await publishAssets(manifest, this.assetSdkProvider, stackEnv, {
-            ...options.publishOptions,
-            allowCrossAccount: await this.allowCrossAccountAssetPublishingForEnv(options.stack),
-        });
-    }
     /**
      * Build a single asset from an asset manifest
      *
@@ -323,17 +293,15 @@ export class Deployments {
     /**
      * Publish a single asset from an asset manifest
      */
-    // eslint-disable-next-line max-len
     async publishSingleAsset(assetManifest, asset, options) {
         const stackEnv = await this.envs.resolveStackEnvironment(options.stack);
         // No need to validate anymore, we already did that during build
         const publisher = this.cachedPublisher(assetManifest, stackEnv, options.stackName);
-        // eslint-disable-next-line no-console
         await publisher.publishEntry(asset, {
             allowCrossAccount: await this.allowCrossAccountAssetPublishingForEnv(options.stack),
         });
         if (publisher.hasFailures) {
-            throw new Error(`Failed to publish asset ${asset.id}`);
+            throw new ToolkitError(`Failed to publish asset ${asset.id}`);
         }
     }
     async allowCrossAccountAssetPublishingForEnv(stack) {
@@ -362,7 +330,7 @@ export class Deployments {
             await envResources.validateVersion(requiresBootstrapStackVersion, bootstrapStackVersionSsmParameter);
         }
         catch (e) {
-            throw new Error(`${stackName}: ${e.message}`);
+            throw new ToolkitError(`${stackName}: ${formatErrorMessage(e)}`);
         }
     }
     cachedPublisher(assetManifest, env, stackName) {
@@ -399,3 +367,42 @@ class ParallelSafeAssetProgress {
 function suffixWithErrors(msg, errors) {
     return errors && errors.length > 0 ? `${msg}: ${errors.join(", ")}` : msg;
 }
+//////////////////////
+// Manually copied over functions
+//////////////////////
+/*
+ * Copy over deprecated `publishAssets` from `lib/api/deployments/asset-publishing.ts`
+ * to be used in `deployments-wrapper.ts`
+ */
+class PublishingProgressListener {
+    constructor() { }
+    onPublishEvent(type, event) {
+        const handler = EVENT_TO_LOGGER[type];
+        handler(`[${event.percentComplete}%] ${type}: ${event.message}`);
+    }
+}
+export async function publishAssets(manifest, sdk, targetEnv, options) {
+    // This shouldn't really happen (it's a programming error), but we don't have
+    // the types here to guide us. Do an runtime validation to be super super sure.
+    if (targetEnv.account === undefined ||
+        targetEnv.account === cxapi.UNKNOWN_ACCOUNT ||
+        targetEnv.region === undefined ||
+        targetEnv.account === cxapi.UNKNOWN_REGION) {
+        throw new ToolkitError(`Asset publishing requires resolved account and region, got ${JSON.stringify(targetEnv)}`);
+    }
+    const publisher = new cdk_assets.AssetPublishing(manifest, {
+        aws: new PublishingAws(sdk, targetEnv),
+        progressListener: options.quiet
+            ? undefined
+            : new PublishingProgressListener(),
+        throwOnError: false,
+        publishInParallel: true,
+        buildAssets: true,
+        publishAssets: true,
+        quiet: options.quiet,
+    });
+    await publisher.publish({ allowCrossAccount: true });
+    if (publisher.hasFailures) {
+        throw new ToolkitError("Failed to publish one or more assets. See the error messages above for more information.");
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.47.3",
+  "version": "2.48.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -25,10 +25,10 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "2.171.1-alpha.0",
-    "@aws-cdk/cloud-assembly-schema": "38.0.1",
-    "@aws-cdk/cloudformation-diff": "2.171.1",
-    "@aws-cdk/cx-api": "2.171.1",
+    "@aws-cdk/aws-lambda-python-alpha": "2.179.0-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "39.2.20",
+    "@aws-cdk/cloudformation-diff": "2.179.0",
+    "@aws-cdk/cx-api": "2.179.0",
     "@aws-crypto/sha256-js": "^5.2.0",
     "@aws-sdk/client-cloudformation": "^3.454.0",
     "@aws-sdk/client-ecs": "^3.454.0",
@@ -53,7 +53,7 @@
     "@smithy/signature-v4": "^2.0.16",
     "@trpc/server": "9.16.0",
     "adm-zip": "0.5.14",
-    "aws-cdk-lib": "2.171.1",
+    "aws-cdk-lib": "2.179.0",
     "aws-iot-device-sdk": "^2.2.13",
     "aws-sdk": "^2.1501.0",
     "builtin-modules": "3.2.0",
@@ -85,7 +85,7 @@
     "ora": "^6.1.2",
     "react": "^18.0.0",
     "remeda": "^1.3.0",
-    "sst-aws-cdk": "2.171.1-4",
+    "sst-aws-cdk": "2.179.0-3",
     "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",

package/package.json.bak

@@ -5,7 +5,7 @@
   },
   "sideEffects": false,
   "name": "sst",
-  "version": "2.47.3",
+  "version": "2.48.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -35,10 +35,10 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "2.171.1-alpha.0",
-    "@aws-cdk/cloud-assembly-schema": "38.0.1",
-    "@aws-cdk/cloudformation-diff": "2.171.1",
-    "@aws-cdk/cx-api": "2.171.1",
+    "@aws-cdk/aws-lambda-python-alpha": "2.179.0-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "39.2.20",
+    "@aws-cdk/cloudformation-diff": "2.179.0",
+    "@aws-cdk/cx-api": "2.179.0",
     "@aws-crypto/sha256-js": "^5.2.0",
     "@aws-sdk/client-cloudformation": "^3.454.0",
     "@aws-sdk/client-ecs": "^3.454.0",
@@ -63,7 +63,7 @@
     "@smithy/signature-v4": "^2.0.16",
     "@trpc/server": "9.16.0",
     "adm-zip": "0.5.14",
-    "aws-cdk-lib": "2.171.1",
+    "aws-cdk-lib": "2.179.0",
     "aws-iot-device-sdk": "^2.2.13",
     "aws-sdk": "^2.1501.0",
     "builtin-modules": "3.2.0",
@@ -95,7 +95,7 @@
     "ora": "^6.1.2",
     "react": "^18.0.0",
     "remeda": "^1.3.0",
-    "sst-aws-cdk": "2.171.1-4",
+    "sst-aws-cdk": "2.179.0-3",
     "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",

package/stacks/synth.js

@@ -10,7 +10,7 @@ export async function synth(opts) {
     Logger.debug("Synthesizing stacks...");
     const { App } = await import("../constructs/App.js");
     const cxapi = await import("@aws-cdk/cx-api");
-    const { Configuration } = await import("sst-aws-cdk/lib/settings.js");
+    const { Configuration } = await import("sst-aws-cdk/lib/cli/user-configuration.js");
     const project = useProject();
     const cwd = process.cwd();
     process.chdir(project.paths.root);