refactor pathfinder

Author: Hweinstock

packages/core/src/awsService/ec2/sshKeyPair.ts

@@ -4,10 +4,10 @@
  */
 import { fs } from '../../shared'
 import { ToolkitError } from '../../shared/errors'
-import { tryRun } from '../../shared/utilities/pathFind'
 import { Timeout } from '../../shared/utilities/timeoutUtils'
 import { findAsync } from '../../shared/utilities/collectionUtils'
 import { RunParameterContext } from '../../shared/utilities/processUtils'
+import { PathFinder } from '../../shared/utilities/pathFinder'
 
 type sshKeyType = 'rsa' | 'ed25519'
 
@@ -48,9 +48,15 @@ export class SshKeyPair {
         const overrideKeys = async (_t: string, proc: RunParameterContext) => {
             await proc.send('yes')
         }
-        return !(await tryRun('ssh-keygen', ['-t', keyType, '-N', '', '-q', '-f', keyPath], 'yes', 'unknown key type', {
-            onStdout: overrideKeys,
-        }))
+        return !(await PathFinder.tryRun(
+            'ssh-keygen',
+            ['-t', keyType, '-N', '', '-q', '-f', keyPath],
+            'yes',
+            'unknown key type',
+            {
+                onStdout: overrideKeys,
+            }
+        ))
     }
 
     public static async tryKeyTypes(keyPath: string, keyTypes: sshKeyType[]): Promise<boolean> {

packages/core/src/codewhisperer/commands/basicCommands.ts

@@ -41,8 +41,8 @@ import { ToolkitError, getTelemetryReason, getTelemetryReasonDesc } from '../../
 import { isRemoteWorkspace } from '../../shared/vscode/env'
 import { isBuilderIdConnection } from '../../auth/connection'
 import globals from '../../shared/extensionGlobals'
-import { getVscodeCliPath, tryRun } from '../../shared/utilities/pathFind'
 import { setContext } from '../../shared/vscode/setContext'
+import pathFinder, { PathFinder } from '../../shared/utilities/pathFinder'
 
 const MessageTimeOut = 5_000
 
@@ -315,7 +315,7 @@ export const installAmazonQExtension = Commands.declare(
              * installExtension will fail on remote environments when the amazon q extension is already installed locally.
              * Until thats fixed we need to manually install the amazon q extension using the cli
              */
-            const vscPath = await getVscodeCliPath()
+            const vscPath = await pathFinder.getVscodeCliPath()
             if (!vscPath) {
                 throw new ToolkitError('installAmazonQ: Unable to find VSCode CLI path', {
                     code: 'CodeCLINotFound',
@@ -328,7 +328,7 @@ export const installAmazonQExtension = Commands.declare(
                 },
                 (progress, token) => {
                     progress.report({ message: 'Installing Amazon Q' })
-                    return tryRun(vscPath, ['--install-extension', VSCODE_EXTENSION_ID.amazonq])
+                    return PathFinder.tryRun(vscPath, ['--install-extension', VSCODE_EXTENSION_ID.amazonq])
                 }
             )
             return

packages/core/src/shared/remoteSession.ts

@@ -18,10 +18,10 @@ import { getLogger } from './logger/logger'
 import { getOrInstallCli } from './utilities/cliUtils'
 import { pushIf } from './utilities/collectionUtils'
 import { ChildProcess } from './utilities/processUtils'
-import { findSshPath, getVscodeCliPath } from './utilities/pathFind'
 import { IamClient } from './clients/iamClient'
 import { IAM } from 'aws-sdk'
 import { getIdeProperties } from './extensionUtilities'
+import { pathFinder } from './utilities/pathFinder'
 
 const policyAttachDelay = 5000
 
@@ -139,7 +139,7 @@ async function ensureSsmCli() {
 }
 
 export async function ensureTools() {
-    const [vsc, ssh, ssm] = await Promise.all([getVscodeCliPath(), findSshPath(), ensureSsmCli()])
+    const [vsc, ssh, ssm] = await Promise.all([pathFinder.getVscodeCliPath(), pathFinder.findSshPath(), ensureSsmCli()])
 
     const missing: MissingTool[] = []
     pushIf(missing, vsc === undefined, { name: 'code' })

packages/core/src/shared/sam/cli/samCliLocator.ts

@@ -10,15 +10,15 @@ import { getLogger, Logger } from '../../logger'
 import { SamCliInfoInvocation } from './samCliInfo'
 import { DefaultSamCliValidator, SamCliValidatorContext, SamCliVersionValidation } from './samCliValidator'
 import { PerfLog } from '../../logger/perfLogger'
-import { tryRun } from '../../utilities/pathFind'
+import { PathFinder } from '../../utilities/pathFinder'
 
 export class SamCliLocationProvider {
     private static samCliLocator: BaseSamCliLocator | undefined
     protected static cachedSamLocation: { path: string; version: string } | undefined
 
     /** Checks that the given `sam` actually works by invoking `sam --version`. */
     private static async isValidSamLocation(samPath: string) {
-        return await tryRun(samPath, ['--version'], 'no', 'SAM CLI')
+        return await PathFinder.tryRun(samPath, ['--version'], 'no', 'SAM CLI')
     }
 
     /**

packages/core/src/shared/sam/debugger/typescriptSamDebug.ts

@@ -16,7 +16,7 @@ import { findParentProjectFile } from '../../utilities/workspaceUtils'
 import { DefaultSamLocalInvokeCommand, waitForDebuggerMessages } from '../cli/samCliLocalInvoke'
 import { runLambdaFunction, waitForPort } from '../localLambdaRunner'
 import { SamLaunchRequestArgs } from './awsSamDebugger'
-import { findTypescriptCompiler } from '../../utilities/pathFind'
+import { findTypescriptCompiler } from '../../utilities/pathFinder'
 import fs from '../../fs/fs'
 
 const tsConfigFile = 'aws-toolkit-tsconfig.json'