sst 2.48.4 → 2.49.0

package/credentials.d.ts

@@ -1,7 +1,7 @@
-import { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
+import type { AwsCredentialIdentityProvider } from "@aws-sdk/types";
 export type {} from "@smithy/types";
-export declare const useAWSCredentialsProvider: () => import("@smithy/types").AwsCredentialIdentityProvider;
-export declare const useAWSCredentials: () => Promise<import("@smithy/types").AwsCredentialIdentity>;
+export declare const useAWSCredentialsProvider: () => AwsCredentialIdentityProvider;
+export declare const useAWSCredentials: () => Promise<import("@aws-sdk/types").AwsCredentialIdentity>;
 export declare const useSTSIdentity: () => Promise<import("@aws-sdk/client-sts").GetCallerIdentityCommandOutput>;
 export declare function useAWSClient<C extends any>(client: new (config: any) => C, force?: boolean): C;
-export declare const useAWSProvider: () => Promise<SdkProvider>;
+export declare const useAWSProvider: () => Promise<any>;

package/credentials.js

@@ -1,7 +1,7 @@
+import path from "path";
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
 import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
 import { Logger } from "./logger.js";
-import { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
 import { StandardRetryStrategy } from "@aws-sdk/middleware-retry";
 // @ts-expect-error
 import stupid from "aws-sdk/lib/maintenance_mode_message.js";
@@ -12,7 +12,7 @@ export const useAWSCredentialsProvider = lazy(() => {
     const project = useProject();
     Logger.debug("Using AWS profile", project.config.profile);
     const provider = fromNodeProviderChain({
-        parentClientConfig: { region: project.config.region },
+        clientConfig: { region: project.config.region },
         profile: project.config.profile,
         roleArn: project.config.role,
         mfaCodeProvider: async (serialArn) => {
@@ -120,6 +120,17 @@ export function useAWSClient(client, force = false) {
     return result;
 }
 export const useAWSProvider = lazy(async () => {
+    const cdkToolkitUrl = await import.meta.resolve("@aws-cdk/toolkit-lib");
+    const cdkToolkitPath = new URL(cdkToolkitUrl).pathname;
+    const { SdkProvider } = await import(path.resolve(cdkToolkitPath, "..", "api", "aws-auth", "sdk-provider.js"));
+    const { IoHelper } = await import(path.resolve(cdkToolkitPath, "..", "api", "io", "private", "io-helper.js"));
     const project = useProject();
-    return new SdkProvider(useAWSCredentialsProvider(), project.config.region);
+    return new SdkProvider(useAWSCredentialsProvider(), project.config.region, {
+        ioHelper: IoHelper.fromActionAwareIoHost({
+            //notify: (msg: IoMessage<unknown>) => console.log("!@#!@#! NOTIFY", msg),
+            notify: (msg) => { },
+            //requestResponse: <T>(msg: IoRequest<unknown, T>) => ioHost.requestResponse({ ...msg }),
+            requestResponse: (msg) => { },
+        }),
+    });
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.48.4",
+  "version": "2.49.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -25,39 +25,40 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@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-cdk/aws-lambda-python-alpha": "2.201.0-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "44.5.0",
+    "@aws-cdk/cloudformation-diff": "2.182.0",
+    "@aws-cdk/cx-api": "2.201.0",
+    "@aws-cdk/toolkit-lib": "1.1.1",
     "@aws-crypto/sha256-js": "^5.2.0",
-    "@aws-sdk/client-cloudformation": "^3.454.0",
-    "@aws-sdk/client-ecs": "^3.454.0",
-    "@aws-sdk/client-eventbridge": "^3.454.0",
-    "@aws-sdk/client-iam": "^3.454.0",
-    "@aws-sdk/client-iot": "^3.454.0",
-    "@aws-sdk/client-iot-data-plane": "^3.454.0",
-    "@aws-sdk/client-lambda": "^3.454.0",
-    "@aws-sdk/client-rds-data": "^3.454.0",
-    "@aws-sdk/client-s3": "^3.454.0",
-    "@aws-sdk/client-ssm": "^3.454.0",
-    "@aws-sdk/client-sts": "^3.454.0",
-    "@aws-sdk/config-resolver": "^3.374.0",
-    "@aws-sdk/credential-providers": "^3.454.0",
-    "@aws-sdk/middleware-retry": "^3.374.0",
-    "@aws-sdk/middleware-signing": "^3.451.0",
-    "@aws-sdk/signature-v4-crt": "^3.451.0",
-    "@aws-sdk/smithy-client": "^3.374.0",
+    "@aws-sdk/client-cloudformation": "3.699.0",
+    "@aws-sdk/client-ecs": "3.699.0",
+    "@aws-sdk/client-eventbridge": "3.699.0",
+    "@aws-sdk/client-iam": "3.699.0",
+    "@aws-sdk/client-iot": "3.699.0",
+    "@aws-sdk/client-iot-data-plane": "3.699.0",
+    "@aws-sdk/client-lambda": "3.699.0",
+    "@aws-sdk/client-rds-data": "3.699.0",
+    "@aws-sdk/client-s3": "3.699.0",
+    "@aws-sdk/client-ssm": "3.699.0",
+    "@aws-sdk/client-sts": "3.699.0",
+    "@aws-sdk/config-resolver": "3.374.0",
+    "@aws-sdk/credential-providers": "3.699.0",
+    "@aws-sdk/middleware-retry": "3.374.0",
+    "@aws-sdk/middleware-signing": "3.451.0",
+    "@aws-sdk/signature-v4-crt": "3.451.0",
+    "@aws-sdk/smithy-client": "3.374.0",
     "@babel/core": "^7.0.0-0",
     "@babel/generator": "^7.20.5",
     "@babel/plugin-syntax-typescript": "^7.21.4",
-    "@smithy/signature-v4": "^2.0.16",
-    "@trpc/server": "9.16.0",
+    "@smithy/signature-v4": "2.0.16",
+    "@trpc/server": "9.18.0",
     "adm-zip": "0.5.14",
-    "aws-cdk-lib": "2.179.0",
+    "aws-cdk-lib": "2.201.0",
     "aws-iot-device-sdk": "^2.2.13",
     "aws-sdk": "^2.1501.0",
     "builtin-modules": "3.2.0",
-    "cdk-assets": "3.0.0-rc.143",
+    "cdk-assets": "3.3.1",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",
@@ -85,7 +86,6 @@
     "ora": "^6.1.2",
     "react": "^18.0.0",
     "remeda": "^1.3.0",
-    "sst-aws-cdk": "2.179.0-3",
     "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",
@@ -94,11 +94,11 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@aws-sdk/client-api-gateway": "^3.454.0",
-    "@aws-sdk/client-cloudfront": "^3.454.0",
-    "@aws-sdk/client-codebuild": "^3.454.0",
-    "@aws-sdk/client-sqs": "^3.454.0",
-    "@aws-sdk/types": "^3.451.0",
+    "@aws-sdk/client-api-gateway": "3.699.0",
+    "@aws-sdk/client-cloudfront": "3.699.0",
+    "@aws-sdk/client-codebuild": "3.699.0",
+    "@aws-sdk/client-sqs": "3.699.0",
+    "@aws-sdk/types": "3.451.0",
     "@graphql-tools/merge": "^8.3.16",
     "@sls-next/lambda-at-edge": "^3.7.0",
     "@smithy/types": "4.1.0",
@@ -115,7 +115,7 @@
     "@types/node": "18.11.9",
     "@types/react": "^18.0.28",
     "@types/uuid": "^8.3.4",
-    "@types/ws": "^8.5.3",
+    "@types/ws": "8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
     "astro-sst": "2.45.1",

package/package.json.bak

@@ -5,7 +5,7 @@
   },
   "sideEffects": false,
   "name": "sst",
-  "version": "2.48.4",
+  "version": "2.49.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -35,39 +35,40 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@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-cdk/aws-lambda-python-alpha": "2.201.0-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "44.5.0",
+    "@aws-cdk/cloudformation-diff": "2.182.0",
+    "@aws-cdk/cx-api": "2.201.0",
+    "@aws-cdk/toolkit-lib": "1.1.1",
     "@aws-crypto/sha256-js": "^5.2.0",
-    "@aws-sdk/client-cloudformation": "^3.454.0",
-    "@aws-sdk/client-ecs": "^3.454.0",
-    "@aws-sdk/client-eventbridge": "^3.454.0",
-    "@aws-sdk/client-iam": "^3.454.0",
-    "@aws-sdk/client-iot": "^3.454.0",
-    "@aws-sdk/client-iot-data-plane": "^3.454.0",
-    "@aws-sdk/client-lambda": "^3.454.0",
-    "@aws-sdk/client-rds-data": "^3.454.0",
-    "@aws-sdk/client-s3": "^3.454.0",
-    "@aws-sdk/client-ssm": "^3.454.0",
-    "@aws-sdk/client-sts": "^3.454.0",
-    "@aws-sdk/config-resolver": "^3.374.0",
-    "@aws-sdk/credential-providers": "^3.454.0",
-    "@aws-sdk/middleware-retry": "^3.374.0",
-    "@aws-sdk/middleware-signing": "^3.451.0",
-    "@aws-sdk/signature-v4-crt": "^3.451.0",
-    "@aws-sdk/smithy-client": "^3.374.0",
+    "@aws-sdk/client-cloudformation": "3.699.0",
+    "@aws-sdk/client-ecs": "3.699.0",
+    "@aws-sdk/client-eventbridge": "3.699.0",
+    "@aws-sdk/client-iam": "3.699.0",
+    "@aws-sdk/client-iot": "3.699.0",
+    "@aws-sdk/client-iot-data-plane": "3.699.0",
+    "@aws-sdk/client-lambda": "3.699.0",
+    "@aws-sdk/client-rds-data": "3.699.0",
+    "@aws-sdk/client-s3": "3.699.0",
+    "@aws-sdk/client-ssm": "3.699.0",
+    "@aws-sdk/client-sts": "3.699.0",
+    "@aws-sdk/config-resolver": "3.374.0",
+    "@aws-sdk/credential-providers": "3.699.0",
+    "@aws-sdk/middleware-retry": "3.374.0",
+    "@aws-sdk/middleware-signing": "3.451.0",
+    "@aws-sdk/signature-v4-crt": "3.451.0",
+    "@aws-sdk/smithy-client": "3.374.0",
     "@babel/core": "^7.0.0-0",
     "@babel/generator": "^7.20.5",
     "@babel/plugin-syntax-typescript": "^7.21.4",
-    "@smithy/signature-v4": "^2.0.16",
-    "@trpc/server": "9.16.0",
+    "@smithy/signature-v4": "2.0.16",
+    "@trpc/server": "9.18.0",
     "adm-zip": "0.5.14",
-    "aws-cdk-lib": "2.179.0",
+    "aws-cdk-lib": "2.201.0",
     "aws-iot-device-sdk": "^2.2.13",
     "aws-sdk": "^2.1501.0",
     "builtin-modules": "3.2.0",
-    "cdk-assets": "3.0.0-rc.143",
+    "cdk-assets": "3.3.1",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",
@@ -95,7 +96,6 @@
     "ora": "^6.1.2",
     "react": "^18.0.0",
     "remeda": "^1.3.0",
-    "sst-aws-cdk": "2.179.0-3",
     "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",
@@ -104,11 +104,11 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@aws-sdk/client-api-gateway": "^3.454.0",
-    "@aws-sdk/client-cloudfront": "^3.454.0",
-    "@aws-sdk/client-codebuild": "^3.454.0",
-    "@aws-sdk/client-sqs": "^3.454.0",
-    "@aws-sdk/types": "^3.451.0",
+    "@aws-sdk/client-api-gateway": "3.699.0",
+    "@aws-sdk/client-cloudfront": "3.699.0",
+    "@aws-sdk/client-codebuild": "3.699.0",
+    "@aws-sdk/client-sqs": "3.699.0",
+    "@aws-sdk/types": "3.451.0",
     "@graphql-tools/merge": "^8.3.16",
     "@sls-next/lambda-at-edge": "^3.7.0",
     "@smithy/types": "4.1.0",
@@ -125,7 +125,7 @@
     "@types/node": "18.11.9",
     "@types/react": "^18.0.28",
     "@types/uuid": "^8.3.4",
-    "@types/ws": "^8.5.3",
+    "@types/ws": "8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
     "astro-sst": "2.45.1",

package/stacks/deploy.d.ts

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

package/stacks/deploy.js

@@ -1,3 +1,4 @@
+import path from "path";
 import { useBus } from "../bus.js";
 import { useProject } from "../project.js";
 import { useAWSClient, useAWSProvider } from "../credentials.js";
@@ -6,23 +7,16 @@ import { filterOutputs, isFailed, monitor, } from "./monitor.js";
 import { VisibleError } from "../error.js";
 export async function publishAssets(stacks) {
     Logger.debug("Publishing assets");
-    const provider = await useAWSProvider();
-    const { publishDeployAssets } = await import("../cdk/deployments-wrapper.js");
     const results = {};
-    for (const stack of stacks) {
-        const stackTags = Object.entries(stack.tags ?? {}).map(([Key, Value]) => ({
-            Key,
-            Value,
-        }));
-        const result = await publishDeployAssets(provider, {
-            stack: stack,
-            quiet: false,
-            deploymentMethod: {
-                method: "direct",
-            },
-            tags: stackTags,
-        });
-        results[stack.stackName] = result;
+    for (const stackArtifact of stacks) {
+        const cfnStack = await getCloudFormationStack(stackArtifact);
+        await addInUseExports(stackArtifact, cfnStack);
+        const deployment = await createCdkDeployments();
+        await buildAndPublishAssets(deployment, stackArtifact);
+        results[stackArtifact.stackName] = {
+            isUpdate: cfnStack && cfnStack.StackStatus !== "REVIEW_IN_PROGRESS",
+            params: await buildCloudFormationStackParams(deployment, stackArtifact),
+        };
     }
     return results;
 }
@@ -80,38 +74,39 @@ export async function deploy(stack) {
     const bus = useBus();
     const { cdk } = useProject().config;
     Logger.debug("Deploying stack", stack.id);
-    const provider = await useAWSProvider();
-    const { Deployments } = await import("../cdk/deployments.js");
-    const deployment = new Deployments({ sdkProvider: provider });
-    const stackTags = Object.entries(stack.tags ?? {}).map(([Key, Value]) => ({
-        Key,
-        Value,
-    }));
     try {
-        await addInUseExports(stack);
+        const cfnStack = await getCloudFormationStack(stack);
+        await addInUseExports(stack, cfnStack);
         bus.publish("stack.status", {
             stackID: stack.stackName,
             status: "PUBLISH_ASSETS_IN_PROGRESS",
         });
-        const result = await deployment.deployStack({
-            stack: stack,
-            quiet: true,
-            tags: stackTags,
-            deploymentMethod: {
-                method: "direct",
-            },
-            toolkitStackName: cdk?.toolkitStackName,
-        });
-        if (result?.type === "did-deploy-stack" && result.noOp) {
-            bus.publish("stack.status", {
-                stackID: stack.stackName,
-                status: "SKIPPED",
-            });
-            return {
-                errors: {},
-                outputs: filterOutputs(result.outputs),
-                status: "SKIPPED",
-            };
+        const deployment = await createCdkDeployments();
+        await buildAndPublishAssets(deployment, stack);
+        if (cfnStack?.StackStatus === "ROLLBACK_COMPLETE" ||
+            cfnStack?.StackStatus === "ROLLBACK_FAILED") {
+            await deleteCloudFormationStack(stack.stackName);
+        }
+        const stackParams = await buildCloudFormationStackParams(deployment, stack);
+        try {
+            cfnStack && cfnStack.StackStatus !== "REVIEW_IN_PROGRESS"
+                ? await updateCloudFormationStack(stackParams)
+                : await createCloudFormationStack(stackParams);
+        }
+        catch (e) {
+            if (e.name === "ValidationError" &&
+                e.message.includes("No updates are to be performed.")) {
+                bus.publish("stack.status", {
+                    stackID: stack.stackName,
+                    status: "SKIPPED",
+                });
+                return {
+                    errors: {},
+                    outputs: filterOutputs(Object.fromEntries((cfnStack.Outputs || []).map((o) => [o.OutputKey, o.OutputValue]))),
+                    status: "SKIPPED",
+                };
+            }
+            throw e;
         }
         bus.publish("stack.updated", {
             stackID: stack.stackName,
@@ -136,11 +131,11 @@ export async function deploy(stack) {
         };
     }
 }
-async function addInUseExports(stack) {
-    // Get old outputs
-    const oldOutputs = await getCloudFormationStackOutputs(stack);
-    if (!oldOutputs)
+async function addInUseExports(stackArtifact, cfnStack) {
+    if (!cfnStack)
         return;
+    // Get old outputs
+    const oldOutputs = cfnStack.Outputs || [];
     // Get new exports
     // note: that we only want to handle outputs exported by CDK.
     // ie.
@@ -153,7 +148,7 @@ async function addInUseExports(stack) {
     //       "Name": "frank-acme-auth:ExportsOutputRefauthUserPoolA78B038B8D9965B5"
     //     }
     //   },
-    const newTemplate = JSON.parse(await getLocalTemplate(stack));
+    const newTemplate = JSON.parse(await getLocalTemplate(stackArtifact));
     const newOutputs = newTemplate.Outputs || {};
     const newExportNames = Object.keys(newOutputs)
         .filter((outputKey) => outputKey.startsWith("ExportsOutput"))
@@ -192,10 +187,72 @@ async function addInUseExports(stack) {
     }));
     // Save new template
     if (isDirty) {
-        await saveLocalTemplate(stack, JSON.stringify(newTemplate, null, 2));
+        await saveLocalTemplate(stackArtifact, JSON.stringify(newTemplate, null, 2));
+    }
+}
+async function createCdkDeployments() {
+    const cdkToolkitUrl = await import.meta.resolve("@aws-cdk/toolkit-lib");
+    const cdkToolkitPath = new URL(cdkToolkitUrl).pathname;
+    const { Deployments } = await import(path.resolve(cdkToolkitPath, "..", "api", "deployments", "deployments.js"));
+    const { IoHelper } = await import(path.resolve(cdkToolkitPath, "..", "api", "io", "private", "io-helper.js"));
+    const provider = await useAWSProvider();
+    await useAWSProvider();
+    const ioHelper = IoHelper.fromActionAwareIoHost({
+        notify: (msg) => { },
+        requestResponse: (msg) => { },
+    });
+    return new Deployments({
+        sdkProvider: provider,
+        ioHelper,
+    });
+}
+async function buildAndPublishAssets(deployment, stackArtifact) {
+    const { AssetManifestArtifact } = await import("aws-cdk-lib/cx-api");
+    const { AssetManifest } = await import("cdk-assets");
+    for (const artifact of stackArtifact.dependencies) {
+        if (!AssetManifestArtifact.isAssetManifestArtifact(artifact))
+            continue;
+        const manifest = AssetManifest.fromFile(artifact.file);
+        for (const entry of manifest.entries) {
+            await deployment.buildSingleAsset(artifact, manifest, entry, {
+                stack: stackArtifact,
+                roleArn: stackArtifact.cloudFormationExecutionRoleArn,
+                stackName: stackArtifact.stackName,
+            });
+            await deployment.publishSingleAsset(manifest, entry, {
+                stack: stackArtifact,
+                roleArn: stackArtifact.cloudFormationExecutionRoleArn,
+                stackName: stackArtifact.stackName,
+            });
+        }
     }
 }
-async function getCloudFormationStackOutputs(stack) {
+async function buildCloudFormationStackParams(deployment, stack) {
+    const resolvedEnv = await deployment.resolveEnvironment(stack);
+    const s3Url = stack
+        .stackTemplateAssetObjectUrl.replace("${AWS::AccountId}", resolvedEnv.account)
+        .match(/s3:\/\/([^/]+)\/(.*)$/);
+    const templateUrl = s3Url
+        ? `https://s3.${resolvedEnv.region}.amazonaws.com/${s3Url[1]}/${s3Url[2]}`
+        : stack.stackTemplateAssetObjectUrl;
+    return {
+        StackName: stack.stackName,
+        TemplateURL: templateUrl,
+        //TemplateBody: bodyParameter.TemplateBody,
+        //Parameters: stackParams.apiParameters,
+        Parameters: [],
+        Capabilities: [
+            "CAPABILITY_IAM",
+            "CAPABILITY_NAMED_IAM",
+            "CAPABILITY_AUTO_EXPAND",
+        ],
+        Tags: Object.entries(stack.tags ?? {}).map(([Key, Value]) => ({
+            Key,
+            Value,
+        })),
+    };
+}
+async function getCloudFormationStack(stack) {
     const { CloudFormationClient, DescribeStacksCommand } = await import("@aws-sdk/client-cloudformation");
     const client = useAWSClient(CloudFormationClient);
     try {
@@ -204,7 +261,7 @@ async function getCloudFormationStackOutputs(stack) {
         }));
         if (!stacks || stacks.length === 0)
             return;
-        return stacks[0].Outputs || [];
+        return stacks[0];
     }
     catch (e) {
         if (e.name === "ValidationError" &&
@@ -217,6 +274,49 @@ async function getCloudFormationStackOutputs(stack) {
         }
     }
 }
+async function createCloudFormationStack(input) {
+    const { CloudFormationClient, CreateStackCommand } = await import("@aws-sdk/client-cloudformation");
+    const client = useAWSClient(CloudFormationClient);
+    await client.send(new CreateStackCommand(input));
+}
+async function updateCloudFormationStack(input) {
+    const { CloudFormationClient, UpdateStackCommand } = await import("@aws-sdk/client-cloudformation");
+    const client = useAWSClient(CloudFormationClient);
+    await client.send(new UpdateStackCommand(input));
+}
+async function deleteCloudFormationStack(stackName) {
+    const { CloudFormationClient, DescribeStacksCommand, DeleteStackCommand } = await import("@aws-sdk/client-cloudformation");
+    const client = useAWSClient(CloudFormationClient);
+    try {
+        await client.send(new DeleteStackCommand({ StackName: stackName }));
+        while (true) {
+            const { Stacks: stacks } = await client.send(new DescribeStacksCommand({
+                StackName: stackName,
+            }));
+            if (!stacks || stacks.length === 0) {
+                return;
+            }
+            const stack = stacks[0];
+            if (stack.StackStatus === "DELETE_IN_PROGRESS") {
+                await new Promise((resolve) => setTimeout(resolve, 5000));
+            }
+            if (stack.StackStatus === "DELETE_COMPLETE") {
+                return;
+            }
+            if (stack.StackStatus === "DELETE_FAILED") {
+                throw new Error(`Failed deleting stack ${stackName} that had previously failed creation (current state: ${stack.StackStatus})`);
+            }
+        }
+    }
+    catch (e) {
+        if (e.name === "ValidationError" &&
+            e.message.includes("Stack with id") &&
+            e.message.includes("does not exist")) {
+            return;
+        }
+        throw e;
+    }
+}
 async function listImports(exportName) {
     const { CloudFormationClient, ListImportsCommand } = await import("@aws-sdk/client-cloudformation");
     const client = useAWSClient(CloudFormationClient);

package/stacks/synth.js

@@ -1,16 +1,18 @@
 import { Logger } from "../logger.js";
 import { useProject } from "../project.js";
 import { useAWSProvider, useSTSIdentity } from "../credentials.js";
-import * as contextproviders from "sst-aws-cdk/lib/context-providers/index.js";
 import path from "path";
 import { VisibleError } from "../error.js";
 import { Semaphore } from "../util/semaphore.js";
+import { Configuration } from "../util/user-configuration.js";
 const sem = new Semaphore(1);
 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/cli/user-configuration.js");
+    const cdkToolkitUrl = await import.meta.resolve("@aws-cdk/toolkit-lib");
+    const cdkToolkitPath = new URL(cdkToolkitUrl).pathname;
+    const { provideContextValues } = await import(path.resolve(cdkToolkitPath, "..", "context-providers", "index.js"));
     const project = useProject();
     const cwd = process.cwd();
     process.chdir(project.paths.root);
@@ -65,7 +67,7 @@ export async function synth(opts) {
                     throw new VisibleError(formatErrorMessage(next.join("")));
                 Logger.debug("Looking up context for:", next, "Previous:", previous);
                 previous = new Set(next);
-                await contextproviders.provideContextValues(missing, cfg.context, provider);
+                await provideContextValues(missing, cfg.context, provider);
                 if (cfg.context.keys.length) {
                     await cfg.saveContext();
                 }