supporting all region execution ARNs

Diler Zaza · Diler Zaza · commit dc5a5c949f16 · 2025-08-11T10:30:34.000-07:00
diff --git a/packages/core/src/stepFunctions/executionDetails/executionDetailProvider.ts b/packages/core/src/stepFunctions/executionDetails/executionDetailProvider.ts
@@ -12,6 +12,7 @@ import { ComponentType } from '../messageHandlers/types'
 import { isLocalDev, localhost, cdn } from '../constants/webviewResources'
 import { handleMessage } from './handleMessage'
 import { ExecutionDetailsContext } from '../messageHandlers/types'
+import { parseExecutionArnForStateMachine } from '../utils'
 
 /**
  * Provider for Execution Details panels.
@@ -89,7 +90,10 @@ export class ExecutionDetailProvider {
         // Only include start time tag for express executions (when startTime is provided)
         const startTimeTag = startTime ? `<meta name="start-time" content="${startTime}" />` : ''
 
-        return `${htmlFileSplit[0]} <head> ${baseTag} ${localeTag} ${darkModeTag} ${componentTypeTag} ${executionArnTag} ${startTimeTag} ${htmlFileSplit[1]}`
+        const region = parseExecutionArnForStateMachine(executionArn)?.region
+        const regionTag = `<meta name="region" content="${region}" />`
+
+        return `${htmlFileSplit[0]} <head> ${baseTag} ${localeTag} ${darkModeTag} ${componentTypeTag} ${executionArnTag} ${startTimeTag} ${regionTag} ${htmlFileSplit[1]}`
     }
 
     /**
diff --git a/packages/core/src/stepFunctions/executionDetails/handleMessage.ts b/packages/core/src/stepFunctions/executionDetails/handleMessage.ts
@@ -12,13 +12,10 @@ import {
     ApiCallRequestMessage,
     InitResponseMessage,
 } from '../messageHandlers/types'
-import {
-    loadStageMessageHandler,
-    handleUnsupportedMessage,
-    apiCallMessageHandler,
-} from '../messageHandlers/handleMessageHelpers'
+import { loadStageMessageHandler, handleUnsupportedMessage } from '../messageHandlers/handleMessageHelpers'
 import { parseExecutionArnForStateMachine, openWorkflowStudio, showExecuteStateMachineWebview } from '../utils'
 import { getLogger } from '../../shared/logger/logger'
+import { StepFunctionApiHandler } from '../messageHandlers/stepFunctionApiHandler'
 
 /**
  * Handles messages received from the ExecutionDetails webview. Depending on the message type and command,
@@ -104,6 +101,20 @@ async function startExecutionMessageHandler(context: ExecutionDetailsContext) {
     }
 }
 
+/**
+ * Handler for making API calls from the webview and returning the response.
+ * @param request The request message containing the API to call and the parameters
+ * @param context The webview context used for returning the API response to the webview
+ */
+export function apiCallMessageHandler(request: ApiCallRequestMessage, context: ExecutionDetailsContext) {
+    const logger = getLogger('stepfunctions')
+    const apiHandler = new StepFunctionApiHandler(
+        parseExecutionArnForStateMachine(context.executionArn)?.region || 'us-east-1',
+        context
+    )
+    apiHandler.performApiCall(request).catch((error) => logger.error('%s API call failed: %O', request.apiName, error))
+}
+
 async function editStateMachineMessageHandler(context: ExecutionDetailsContext) {
     const params = parseExecutionArnForStateMachine(context.executionArn)
     await openWorkflowStudio(params!.stateMachineArn, params!.region)
diff --git a/packages/core/src/stepFunctions/messageHandlers/handleMessageHelpers.ts b/packages/core/src/stepFunctions/messageHandlers/handleMessageHelpers.ts
@@ -4,10 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Command, Message, MessageType, BaseContext, ApiCallRequestMessage, UnsupportedMessage } from './types'
-import { StepFunctionApiHandler } from './stepFunctionApiHandler'
-import globals from '../../shared/extensionGlobals'
-import { getLogger } from '../../shared/logger/logger'
+import { Command, Message, MessageType, BaseContext, UnsupportedMessage } from './types'
 
 /**
  * Handler for managing webview stage load, which updates load notifications.
@@ -20,17 +17,6 @@ export async function loadStageMessageHandler(context: BaseContext) {
     }, 100)
 }
 
-/**
- * Handler for making API calls from the webview and returning the response.
- * @param request The request message containing the API to call and the parameters
- * @param context The webview context used for returning the API response to the webview
- */
-export function apiCallMessageHandler(request: ApiCallRequestMessage, context: BaseContext) {
-    const logger = getLogger('stepfunctions')
-    const apiHandler = new StepFunctionApiHandler(globals.awsContext.getCredentialDefaultRegion(), context)
-    apiHandler.performApiCall(request).catch((error) => logger.error('%s API call failed: %O', request.apiName, error))
-}
-
 /**
  * Handles unsupported or unrecognized messages by sending a response to the webview. Ensures compatibility with future
  * commands and message types, preventing issues if the user has an outdated extension version.
diff --git a/packages/core/src/stepFunctions/workflowStudio/handleMessage.ts b/packages/core/src/stepFunctions/workflowStudio/handleMessage.ts
@@ -28,11 +28,9 @@ import {
     getStateMachineDefinitionFromCfnTemplate,
     toUnescapedAslJsonString,
 } from '../commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate'
-import {
-    loadStageMessageHandler,
-    handleUnsupportedMessage,
-    apiCallMessageHandler,
-} from '../messageHandlers/handleMessageHelpers'
+import { loadStageMessageHandler, handleUnsupportedMessage } from '../messageHandlers/handleMessageHelpers'
+import { StepFunctionApiHandler } from '../messageHandlers/stepFunctionApiHandler'
+import { getLogger } from '../../shared/logger/logger'
 
 const localize = nls.loadMessageBundle()
 
@@ -210,6 +208,17 @@ async function saveFileAndDeployMessageHandler(request: SaveFileRequestMessage,
     })
 }
 
+/**
+ * Handler for making API calls from the webview and returning the response.
+ * @param request The request message containing the API to call and the parameters
+ * @param context The webview context used for returning the API response to the webview
+ */
+export function apiCallMessageHandler(request: ApiCallRequestMessage, context: WebviewContext) {
+    const logger = getLogger('stepfunctions')
+    const apiHandler = new StepFunctionApiHandler(globals.awsContext.getCredentialDefaultRegion(), context)
+    apiHandler.performApiCall(request).catch((error) => logger.error('%s API call failed: %O', request.apiName, error))
+}
+
 /**
  * Handler for auto syncing a file from the webview which updates the workspace but does not save the file.
  * Triggered on every code change from WFS, including invalid JSON.
