sst 2.49.4 → 2.49.6

package/credentials.js

@@ -1,4 +1,5 @@
 import path from "path";
+import { fileURLToPath, pathToFileURL } from "url";
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
 import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
 import { Logger } from "./logger.js";
@@ -121,9 +122,9 @@ export function useAWSClient(client, force = false) {
 }
 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 cdkToolkitPath = fileURLToPath(cdkToolkitUrl);
+    const { SdkProvider } = await import(pathToFileURL(path.resolve(cdkToolkitPath, "..", "api", "aws-auth", "sdk-provider.js")).href);
+    const { IoHelper } = await import(pathToFileURL(path.resolve(cdkToolkitPath, "..", "api", "io", "private", "io-helper.js")).href);
     const project = useProject();
     return new SdkProvider(useAWSCredentialsProvider(), project.config.region, {
         ioHelper: IoHelper.fromActionAwareIoHost({

package/iot.js

@@ -1,6 +1,8 @@
 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";
+import { Logger } from "./logger.js";
 export const useIOTEndpoint = lazy(async () => {
     const iot = useAWSClient(IoTClient);
     Logger.debug("Getting IoT endpoint");
@@ -15,10 +17,8 @@ export const useIOTEndpoint = lazy(async () => {
 import iot from "aws-iot-device-sdk";
 import { useBus } from "./bus.js";
 import { useProject } from "./project.js";
-import { Logger } from "./logger.js";
 import { useBootstrap } from "./bootstrap.js";
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { lazy } from "./util/lazy.js";
 export const useIOT = lazy(async () => {
     const bus = useBus();
     const endpoint = await useIOTEndpoint();

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.49.4",
+  "version": "2.49.6",
   "bin": {
     "sst": "cli/sst.js"
   },

package/package.json.bak

@@ -5,7 +5,7 @@
   },
   "sideEffects": false,
   "name": "sst",
-  "version": "2.49.4",
+  "version": "2.49.6",
   "bin": {
     "sst": "cli/sst.js"
   },

package/stacks/deploy.js

@@ -1,4 +1,5 @@
 import path from "path";
+import { fileURLToPath, pathToFileURL } from "url";
 import { useBus } from "../bus.js";
 import { useProject } from "../project.js";
 import { useAWSClient, useAWSProvider } from "../credentials.js";
@@ -193,9 +194,9 @@ async function addInUseExports(stackArtifact, cfnStack) {
 }
 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 cdkToolkitPath = fileURLToPath(cdkToolkitUrl);
+    const { Deployments } = await import(pathToFileURL(path.resolve(cdkToolkitPath, "..", "api", "deployments", "deployments.js")).href);
+    const { IoHelper } = await import(pathToFileURL(path.resolve(cdkToolkitPath, "..", "api", "io", "private", "io-helper.js")).href);
     const provider = await useAWSProvider();
     await useAWSProvider();
     const ioHelper = IoHelper.fromActionAwareIoHost({

package/stacks/synth.js

@@ -2,6 +2,7 @@ import { Logger } from "../logger.js";
 import { useProject } from "../project.js";
 import { useAWSProvider, useSTSIdentity } from "../credentials.js";
 import path from "path";
+import { fileURLToPath, pathToFileURL } from "url";
 import { VisibleError } from "../error.js";
 import { Semaphore } from "../util/semaphore.js";
 import { Configuration } from "../util/user-configuration.js";
@@ -11,10 +12,10 @@ export async function synth(opts) {
     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 cdkToolkitPath = fileURLToPath(cdkToolkitUrl);
+    const { IoHelper } = await import(pathToFileURL(path.resolve(cdkToolkitPath, "..", "api", "io", "private", "io-helper.js")).href);
+    const { PluginHost } = await import(pathToFileURL(path.resolve(cdkToolkitPath, "..", "api", "plugin", "plugin.js")).href);
+    const { provideContextValues } = await import(pathToFileURL(path.resolve(cdkToolkitPath, "..", "context-providers", "index.js")).href);
     const project = useProject();
     const cwd = process.cwd();
     process.chdir(project.paths.root);

package/util/user-configuration.js

@@ -1,16 +1,28 @@
-// @ts-nocheck
 import * as os from "os";
 import * as fs_path from "path";
 import * as fs from "fs";
+import { fileURLToPath, pathToFileURL } from "url";
 export const PROJECT_CONFIG = "cdk.json";
 export const USER_DEFAULTS = "~/.cdk.json";
 const CONTEXT_KEY = "context";
-const cdkToolkitUrl = await import.meta.resolve("@aws-cdk/toolkit-lib");
-const cdkToolkitPath = new URL(cdkToolkitUrl).pathname;
-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"));
+let cdkToolkitPath = "";
+let cdkToolkitUrl = "";
+try {
+    cdkToolkitUrl = await import.meta.resolve("@aws-cdk/toolkit-lib");
+    cdkToolkitPath = fileURLToPath(cdkToolkitUrl);
+}
+catch (e) {
+    // Fallback for test environment where import.meta.resolve is not available
+    const module = await import("module");
+    const require = module.createRequire(import.meta.url);
+    cdkToolkitPath = require.resolve("@aws-cdk/toolkit-lib");
+    cdkToolkitUrl = pathToFileURL(cdkToolkitPath).href;
+}
+const { ToolkitError } = await import(cdkToolkitUrl);
+const { Context, PROJECT_CONTEXT } = await import(pathToFileURL(fs_path.resolve(cdkToolkitPath, "..", "api", "context.js")).href);
+const { Settings } = await import(pathToFileURL(fs_path.resolve(cdkToolkitPath, "..", "api", "settings.js"))
+    .href);
+const { Tags } = await import(pathToFileURL(fs_path.resolve(cdkToolkitPath, "..", "api", "tags", "index.js")).href);
 export var Command;
 (function (Command) {
     Command["LS"] = "ls";