@intelligems/sst 2.49.3 → 2.49.6-ig.10

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";
@@ -7,6 +8,7 @@ import { filterOutputs, isFailed, monitor, } from "./monitor.js";
 import { VisibleError } from "../error.js";
 export async function publishAssets(stacks) {
     Logger.debug("Publishing assets");
+    const { cdk } = useProject().config;
     const results = {};
     for (const stackArtifact of stacks) {
         const cfnStack = await getCloudFormationStack(stackArtifact);
@@ -15,7 +17,7 @@ export async function publishAssets(stacks) {
         await buildAndPublishAssets(deployment, stackArtifact);
         results[stackArtifact.stackName] = {
             isUpdate: cfnStack && cfnStack.StackStatus !== "REVIEW_IN_PROGRESS",
-            params: await buildCloudFormationStackParams(deployment, stackArtifact),
+            params: await buildCloudFormationStackParams(deployment, stackArtifact, cdk),
         };
     }
     return results;
@@ -87,7 +89,7 @@ export async function deploy(stack) {
             cfnStack?.StackStatus === "ROLLBACK_FAILED") {
             await deleteCloudFormationStack(stack.stackName);
         }
-        const stackParams = await buildCloudFormationStackParams(deployment, stack);
+        const stackParams = await buildCloudFormationStackParams(deployment, stack, cdk);
         try {
             cfnStack && cfnStack.StackStatus !== "REVIEW_IN_PROGRESS"
                 ? await updateCloudFormationStack(stackParams)
@@ -192,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({
@@ -227,17 +229,19 @@ async function buildAndPublishAssets(deployment, stackArtifact) {
         }
     }
 }
-async function buildCloudFormationStackParams(deployment, stack) {
-    const resolvedEnv = await deployment.resolveEnvironment(stack);
+async function buildCloudFormationStackParams(deployment, stack, cdkOptions) {
+    const env = await deployment.envs.accessStackForMutableStackOperations(stack);
+    const executionRoleArn = cdkOptions?.cloudFormationExecutionRole ?? await env.replacePlaceholders(stack.cloudFormationExecutionRoleArn);
     const s3Url = stack
-        .stackTemplateAssetObjectUrl.replace("${AWS::AccountId}", resolvedEnv.account)
+        .stackTemplateAssetObjectUrl.replace("${AWS::AccountId}", env.resolvedEnvironment.account)
         .match(/s3:\/\/([^/]+)\/(.*)$/);
     const templateUrl = s3Url
-        ? `https://s3.${resolvedEnv.region}.amazonaws.com/${s3Url[1]}/${s3Url[2]}`
+        ? `https://s3.${env.resolvedEnvironment.region}.amazonaws.com/${s3Url[1]}/${s3Url[2]}`
         : stack.stackTemplateAssetObjectUrl;
     return {
         StackName: stack.stackName,
         TemplateURL: templateUrl,
+        RoleARN: executionRoleArn,
         //TemplateBody: bodyParameter.TemplateBody,
         //Parameters: stackParams.apiParameters,
         Parameters: [],
@@ -257,7 +261,7 @@ async function getCloudFormationStack(stack) {
     const client = useAWSClient(CloudFormationClient);
     try {
         const { Stacks: stacks } = await client.send(new DescribeStacksCommand({
-            StackName: stack.id,
+            StackName: stack.stackName,
         }));
         if (!stacks || stacks.length === 0)
             return;

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);