adjust tryRun to take full options

Author: Hweinstock

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

@@ -8,6 +8,7 @@ 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/childProcess'
 
 type sshKeyType = 'rsa' | 'ed25519'
 
@@ -46,16 +47,12 @@ export class SshKeyPair {
      * @param keyType type of key to generate.
      */
     public static async tryKeyGen(keyPath: string, keyType: sshKeyType): Promise<boolean> {
-        const overrideKeys = async (proc: any, _t: string) => {
-            await proc.send('yes')
+        const overrideKeys = async (_t: string, context: RunParameterContext) => {
+            await context.send('yes')
         }
-        return !(await tryRun(
-            'ssh-keygen',
-            ['-t', keyType, '-N', '', '-q', '-f', keyPath],
-            'yes',
-            'unknown key type',
-            overrideKeys
-        ))
+        return !(await 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/shared/utilities/childProcess.ts

@@ -8,11 +8,13 @@ import * as crossSpawn from 'cross-spawn'
 import * as logger from '../logger'
 import { Timeout, CancellationError, waitUntil } from './timeoutUtils'
 
-interface RunParameterContext {
+export interface RunParameterContext {
     /** Reports an error parsed from the stdin/stdout streams. */
     reportError(err: string | Error): void
     /** Attempts to stop the running process. See {@link ChildProcess.stop}. */
     stop(force?: boolean, signal?: string): void
+    /** Send string to stdin */
+    send(text: string): Promise<void>
     /** The active `Timeout` object (if applicable). */
     readonly timeout?: Timeout
     /** The logger being used by the process. */
@@ -160,6 +162,7 @@ export class ChildProcess {
                 timeout,
                 logger: this.#log,
                 stop: this.stop.bind(this),
+                send: this.send.bind(this),
                 reportError: (err) => errorHandler(err instanceof Error ? err : new Error(err)),
             }
 

packages/core/src/shared/utilities/pathFind.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode'
 import * as path from 'path'
 import fs from '../../shared/fs/fs'
-import { ChildProcess } from './childProcess'
+import { ChildProcess, ChildProcessOptions } from './childProcess'
 import { GitExtension } from '../extensions/git'
 import { Settings } from '../settings'
 import { getLogger } from '../logger/logger'
@@ -31,11 +31,10 @@ export async function tryRun(
     args: string[],
     logging: 'yes' | 'no' | 'noresult' = 'yes',
     expected?: string,
-    onStdout?: (proc: ChildProcess, text: string) => void
+    opt?: ChildProcessOptions
 ): Promise<boolean> {
     const proc = new ChildProcess(p, args, { logging: 'no' })
-    const options = onStdout ? { onStdout: (text: string) => onStdout(proc, text) } : {}
-    const r = await proc.run(options)
+    const r = await proc.run(opt)
     const ok = r.exitCode === 0 && (expected === undefined || r.stdout.includes(expected))
     if (logging === 'noresult') {
         getLogger().info('tryRun: %s: %s', ok ? 'ok' : 'failed', proc)