vendor(sst): update aws-cdk-lib from 2.201 to 2.219

And fix test errors (again), it seems my previous fix wasn't enough.

Author: berenddeboer

packages/sst/package.json

@@ -35,11 +35,11 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@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-cdk/aws-lambda-python-alpha": "2.214.1-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "48.14.0",
+    "@aws-cdk/cloudformation-diff": "2.184.1",
+    "@aws-cdk/cx-api": "2.214.1",
+    "@aws-cdk/toolkit-lib": "1.10.0",
     "@aws-crypto/sha256-js": "^5.2.0",
     "@aws-sdk/client-cloudformation": "3.699.0",
     "@aws-sdk/client-ecs": "3.699.0",
@@ -64,7 +64,7 @@
     "@smithy/signature-v4": "2.0.16",
     "@trpc/server": "9.18.0",
     "adm-zip": "0.5.14",
-    "aws-cdk-lib": "2.201.0",
+    "aws-cdk-lib": "2.219.0",
     "aws-iot-device-sdk": "^2.2.13",
     "aws-sdk": "^2.1501.0",
     "builtin-modules": "3.2.0",
@@ -74,7 +74,7 @@
     "ci-info": "^3.7.0",
     "colorette": "^2.0.19",
     "conf": "^10.2.0",
-    "constructs": "10.3.0",
+    "constructs": "10.4.2",
     "cross-spawn": "^7.0.3",
     "dendriform-immer-patch-optimiser": "^2.1.0",
     "dotenv": "^16.0.3",

packages/sst/src/credentials.ts

@@ -1,4 +1,5 @@
 import path from "path";
+import { createRequire } from "module";
 import type { AwsCredentialIdentityProvider } from "@aws-sdk/types";
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
 import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
@@ -145,14 +146,23 @@ export function useAWSClient<C extends any>(
 }
 
 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 require = createRequire(import.meta.url);
+  const cdkToolkitPath = require.resolve("@aws-cdk/toolkit-lib");
+  const { SdkProvider } = require(path.resolve(
+    cdkToolkitPath,
+    "..",
+    "api",
+    "aws-auth",
+    "sdk-provider.js"
+  ));
+  const { IoHelper } = require(path.resolve(
+    cdkToolkitPath,
+    "..",
+    "api",
+    "io",
+    "private",
+    "io-helper.js"
+  ));
   const project = useProject();
   return new SdkProvider(useAWSCredentialsProvider(), project.config.region!, {
     ioHelper: IoHelper.fromActionAwareIoHost({

packages/sst/src/iot.ts

@@ -1,6 +1,7 @@
 import { IoTClient, DescribeEndpointCommand } from "@aws-sdk/client-iot";
 import { useAWSClient, useAWSCredentials } from "./credentials.js";
 import { VisibleError } from "./error.js";
+import { lazy } from "./util/lazy.js";
 
 export const useIOTEndpoint = lazy(async () => {
   const iot = useAWSClient(IoTClient);
@@ -25,7 +26,6 @@ import { Logger } from "./logger.js";
 import { randomUUID } from "crypto";
 import { useBootstrap } from "./bootstrap.js";
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { lazy } from "./util/lazy.js";
 
 interface Fragment {
   id: string;

packages/sst/src/stacks/deploy.ts

@@ -1,4 +1,5 @@
 import path from "path";
+import { createRequire } from "module";
 import { useBus } from "../bus.js";
 import { ConfigOptions, useProject } from "../project.js";
 import { useAWSClient, useAWSProvider } from "../credentials.js";
@@ -25,7 +26,11 @@ export async function publishAssets(stacks: CloudFormationStackArtifact[]) {
     await buildAndPublishAssets(deployment, stackArtifact);
     results[stackArtifact.stackName] = {
       isUpdate: cfnStack && cfnStack.StackStatus !== "REVIEW_IN_PROGRESS",
-      params: await buildCloudFormationStackParams(deployment, stackArtifact, cdk),
+      params: await buildCloudFormationStackParams(
+        deployment,
+        stackArtifact,
+        cdk
+      ),
     };
   }
   return results;
@@ -121,7 +126,11 @@ export async function deploy(
       await deleteCloudFormationStack(stack.stackName);
     }
 
-    const stackParams = await buildCloudFormationStackParams(deployment, stack, cdk);
+    const stackParams = await buildCloudFormationStackParams(
+      deployment,
+      stack,
+      cdk
+    );
     try {
       cfnStack && cfnStack.StackStatus !== "REVIEW_IN_PROGRESS"
         ? await updateCloudFormationStack(stackParams)
@@ -248,14 +257,23 @@ async function addInUseExports(
 }
 
 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 require = createRequire(import.meta.url);
+  const cdkToolkitPath = require.resolve("@aws-cdk/toolkit-lib");
+  const { Deployments } = require(path.resolve(
+    cdkToolkitPath,
+    "..",
+    "api",
+    "deployments",
+    "deployments.js"
+  ));
+  const { IoHelper } = require(path.resolve(
+    cdkToolkitPath,
+    "..",
+    "api",
+    "io",
+    "private",
+    "io-helper.js"
+  ));
   const provider = await useAWSProvider();
   await useAWSProvider();
   const ioHelper = IoHelper.fromActionAwareIoHost({
@@ -300,7 +318,9 @@ async function buildCloudFormationStackParams(
   cdkOptions?: ConfigOptions["cdk"]
 ) {
   const env = await deployment.envs.accessStackForMutableStackOperations(stack);
-  const executionRoleArn = cdkOptions?.cloudFormationExecutionRole ?? await env.replacePlaceholders(stack.cloudFormationExecutionRoleArn);
+  const executionRoleArn =
+    cdkOptions?.cloudFormationExecutionRole ??
+    (await env.replacePlaceholders(stack.cloudFormationExecutionRoleArn));
   const s3Url = stack
     .stackTemplateAssetObjectUrl!.replace(
       "${AWS::AccountId}",
@@ -337,7 +357,7 @@ async function getCloudFormationStack(stack: CloudFormationStackArtifact) {
   const client = useAWSClient(CloudFormationClient);
   try {
     const { Stacks: stacks } = await client.send(
-        new DescribeStacksCommand({
+      new DescribeStacksCommand({
         StackName: stack.stackName,
       })
     );

packages/sst/src/stacks/synth.ts

@@ -3,6 +3,7 @@ import type { App } from "../constructs/App.js";
 import { useProject } from "../project.js";
 import { useAWSProvider, useSTSIdentity } from "../credentials.js";
 import path from "path";
+import { createRequire } from "module";
 import { VisibleError } from "../error.js";
 import { Semaphore } from "../util/semaphore.js";
 import { Configuration } from "../util/user-configuration.js";
@@ -23,17 +24,29 @@ export async function synth(opts: SynthOptions) {
   const { App } = await import("../constructs/App.js");
   const cxapi = await import("@aws-cdk/cx-api");
 
-  const cdkToolkitUrl = await import.meta.resolve!("@aws-cdk/toolkit-lib");
-  const cdkToolkitPath = new URL(cdkToolkitUrl).pathname;
-  const { IoHelper } = await import(
-    path.resolve(cdkToolkitPath, "..", "api", "io", "private", "io-helper.js")
-  );
-  const { PluginHost } = await import(
-    path.resolve(cdkToolkitPath, "..", "api", "plugin", "plugin.js")
-  );
-  const { provideContextValues } = await import(
-    path.resolve(cdkToolkitPath, "..", "context-providers", "index.js")
-  );
+  const require = createRequire(import.meta.url);
+  const cdkToolkitPath = require.resolve("@aws-cdk/toolkit-lib");
+  const { IoHelper } = require(path.resolve(
+    cdkToolkitPath,
+    "..",
+    "api",
+    "io",
+    "private",
+    "io-helper.js"
+  ));
+  const { PluginHost } = require(path.resolve(
+    cdkToolkitPath,
+    "..",
+    "api",
+    "plugin",
+    "plugin.js"
+  ));
+  const { provideContextValues } = require(path.resolve(
+    cdkToolkitPath,
+    "..",
+    "context-providers",
+    "index.js"
+  ));
   const project = useProject();
 
   const cwd = process.cwd();

packages/sst/src/util/user-configuration.ts

@@ -2,31 +2,34 @@
 import * as os from "os";
 import * as fs_path from "path";
 import * as fs from "fs";
+import { createRequire } from "module";
 
 export const PROJECT_CONFIG = "cdk.json";
 export const USER_DEFAULTS = "~/.cdk.json";
 const CONTEXT_KEY = "context";
 
-let cdkToolkitPath: string;
-try {
-  const cdkToolkitUrl = await import.meta.resolve!("@aws-cdk/toolkit-lib");
-  cdkToolkitPath = new URL(cdkToolkitUrl).pathname;
-} catch (e) {
-  // Fallback for test environment where import.meta.resolve is not available
-  const module = await import("module");
-  const require = (module as any).createRequire(import.meta.url);
-  cdkToolkitPath = require.resolve("@aws-cdk/toolkit-lib");
-}
-const { ToolkitError } = await import(cdkToolkitPath);
-const { Context, PROJECT_CONTEXT } = await import(
-  fs_path.resolve(cdkToolkitPath, "..", "api", "context.js")
-);
-const { Settings } = await import(
-  fs_path.resolve(cdkToolkitPath, "..", "api", "settings.js")
-);
-const { Tags } = await import(
-  fs_path.resolve(cdkToolkitPath, "..", "api", "tags", "index.js")
-);
+const require = createRequire(import.meta.url);
+const cdkToolkitPath = require.resolve("@aws-cdk/toolkit-lib");
+const { ToolkitError } = require(cdkToolkitPath);
+const { Context, PROJECT_CONTEXT } = require(fs_path.resolve(
+  cdkToolkitPath,
+  "..",
+  "api",
+  "context.js"
+));
+const { Settings } = require(fs_path.resolve(
+  cdkToolkitPath,
+  "..",
+  "api",
+  "settings.js"
+));
+const { Tags } = require(fs_path.resolve(
+  cdkToolkitPath,
+  "..",
+  "api",
+  "tags",
+  "index.js"
+));
 
 export enum Command {
   LS = "ls",