Refactoring and adjusting helper functions

Author: Diler Zaza

packages/core/src/stepFunctions/executionDetails/handleMessage.ts

@@ -19,12 +19,10 @@ import {
     handleUnsupportedMessage,
     apiCallMessageHandler,
 } from '../messageHandlers/handleMessageHelpers'
-import { parseExecutionArnForStateMachine, openWFSfromARN } from '../utils'
+import { parseExecutionArnForStateMachine, openWorkflowStudio } from '../utils'
 import { ExecuteStateMachineWebview } from '../vue/executeStateMachine/executeStateMachine'
 import { VueWebview } from '../../webviews/main'
 import globals from '../../shared/extensionGlobals'
-// import { ExecutionDetailProvider } from './executionDetailProvider'
-// import { WorkflowStudioEditorProvider } from '../workflowStudio/workflowStudioEditorProvider'
 
 /**
  * Handles messages received from the ExecutionDetails webview. Depending on the message type and command,
@@ -91,7 +89,12 @@ async function initMessageHandler(context: ExecutionDetailsContext) {
 
 async function startExecutionMessageHandler(context: ExecutionDetailsContext) {
     // Parsing execution ARN to get state machine info
-    const { region, stateMachineName, stateMachineArn } = parseExecutionArnForStateMachine(context.executionArn)
+    const parsedArn = parseExecutionArnForStateMachine(context.executionArn)
+    if (!parsedArn) {
+        throw new Error(`Invalid execution ARN format: ${context.executionArn}`)
+    }
+
+    const { region, stateMachineName, stateMachineArn } = parsedArn
 
     const Panel = VueWebview.compilePanel(ExecuteStateMachineWebview)
     const wv = new Panel(globals.context, globals.outputChannel, {
@@ -107,5 +110,6 @@ async function startExecutionMessageHandler(context: ExecutionDetailsContext) {
 }
 
 async function editStateMachineMessageHandler(context: ExecutionDetailsContext) {
-    await openWFSfromARN(context)
+    const params = parseExecutionArnForStateMachine(context.executionArn)
+    await openWorkflowStudio(params!.stateMachineArn, params!.region)
 }

packages/core/src/stepFunctions/utils.ts

@@ -17,14 +17,14 @@ import {
 } from 'amazon-states-language-service'
 import { fromExtensionManifest } from '../shared/settings'
 import { IamRole } from '../shared/clients/iam'
-import { ExecutionDetailsContext } from './messageHandlers/types'
 import { WorkflowStudioEditorProvider } from './workflowStudio/workflowStudioEditorProvider'
 
 const documentSettings: DocumentLanguageSettings = { comments: 'error', trailingCommas: 'error' }
 const languageService = getLanguageService({})
 
 const arnResourceTypeSegmentIndex = 5
 const expressExecutionArnSegmentCount = 9
+const executionArnSegmentCount = 8
 const arnRegionSegmentIndex = 3
 const arnAccountIdSegmentIndex = 4
 const arnStateMachineNameSegmentIndex = 6
@@ -119,14 +119,16 @@ export const isExpressExecution = (arn: string): boolean => {
  */
 export const parseExecutionArnForStateMachine = (executionArn: string) => {
     const arnSegments = executionArn.split(':')
-    const region = arnSegments[arnRegionSegmentIndex]
-    const stateMachineName = arnSegments[arnStateMachineNameSegmentIndex]
-    const stateMachineArn = `arn:aws:states:${region}:${arnSegments[arnAccountIdSegmentIndex]}:stateMachine:${stateMachineName}`
-
-    return {
-        region,
-        stateMachineName,
-        stateMachineArn,
+    if (arnSegments.length === executionArnSegmentCount || arnSegments.length === expressExecutionArnSegmentCount) {
+        const region = arnSegments[arnRegionSegmentIndex]
+        const stateMachineName = arnSegments[arnStateMachineNameSegmentIndex]
+        const stateMachineArn = `arn:aws:states:${region}:${arnSegments[arnAccountIdSegmentIndex]}:stateMachine:${stateMachineName}`
+
+        return {
+            region,
+            stateMachineName,
+            stateMachineArn,
+        }
     }
 }
 
@@ -156,16 +158,11 @@ export const openWorkflowStudioWithDefinition = async (definition: string | unde
 
     const textEditor = await vscode.window.showTextDocument(doc)
     await WorkflowStudioEditorProvider.openWithWorkflowStudio(textEditor.document.uri, {
-        preserveFocus: true,
-        viewColumn: vscode.ViewColumn.Beside,
+        preserveFocus: false,
+        viewColumn: vscode.ViewColumn.One,
     })
 }
 
-export const openWFSfromARN = async (context: ExecutionDetailsContext) => {
-    const params = parseExecutionArnForStateMachine(context.executionArn)
-    await openWorkflowStudio(params.stateMachineArn, params.region)
-}
-
 const isInvalidJson = (content: string): boolean => {
     try {
         JSON.parse(content)

packages/core/src/test/stepFunctions/utils.test.ts

@@ -276,6 +276,7 @@ describe('parseExecutionArnForStateMachine', function () {
         const expressArn = 'arn:aws:states:us-east-1:123456789012:express:stateMachine:MyStateMachine:execution-name'
         const result = parseExecutionArnForStateMachine(expressArn)
 
+        assert.ok(result)
         assert.strictEqual(result.region, 'us-east-1')
         assert.strictEqual(result.stateMachineName, 'MyStateMachine')
         assert.strictEqual(result.stateMachineArn, 'arn:aws:states:us-east-1:123456789012:stateMachine:MyStateMachine')
@@ -285,6 +286,7 @@ describe('parseExecutionArnForStateMachine', function () {
         const standardArn = 'arn:aws:states:us-west-2:987654321098:stateMachine:TestMachine:execution-id'
         const result = parseExecutionArnForStateMachine(standardArn)
 
+        assert.ok(result)
         assert.strictEqual(result.region, 'us-west-2')
         assert.strictEqual(result.stateMachineName, 'TestMachine')
         assert.strictEqual(result.stateMachineArn, 'arn:aws:states:us-west-2:987654321098:stateMachine:TestMachine')
@@ -294,6 +296,7 @@ describe('parseExecutionArnForStateMachine', function () {
         const euArn = 'arn:aws:states:eu-west-1:555666777888:stateMachine:EuroMachine:exec-123'
         const result = parseExecutionArnForStateMachine(euArn)
 
+        assert.ok(result)
         assert.strictEqual(result.region, 'eu-west-1')
         assert.strictEqual(result.stateMachineName, 'EuroMachine')
         assert.strictEqual(result.stateMachineArn, 'arn:aws:states:eu-west-1:555666777888:stateMachine:EuroMachine')
@@ -304,6 +307,7 @@ describe('parseExecutionArnForStateMachine', function () {
             'arn:aws:states:ap-southeast-2:111222333444:stateMachine:My-State_Machine.Test:exec-456'
         const result = parseExecutionArnForStateMachine(arnWithSpecialName)
 
+        assert.ok(result)
         assert.strictEqual(result.region, 'ap-southeast-2')
         assert.strictEqual(result.stateMachineName, 'My-State_Machine.Test')
         assert.strictEqual(
@@ -316,6 +320,7 @@ describe('parseExecutionArnForStateMachine', function () {
         const differentAccountArn = 'arn:aws:states:us-central-1:999888777666:stateMachine:AccountTestMachine:exec-789'
         const result = parseExecutionArnForStateMachine(differentAccountArn)
 
+        assert.ok(result)
         assert.strictEqual(result.region, 'us-central-1')
         assert.strictEqual(result.stateMachineName, 'AccountTestMachine')
         assert.strictEqual(