finish migration

Author: Hweinstock

packages/core/src/shared/extensions/git.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode'
 import * as GitTypes from '../../../types/git.d'
 import { SemVer, parse as semverParse } from 'semver'
-import { execFile } from 'child_process'
+import { execFile } from 'child_process' // eslint-disable-line no-restricted-imports
 import { promisify } from 'util'
 import { VSCODE_EXTENSION_ID } from '../extensions'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../filesystemUtilities'

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SpawnOptions } from 'child_process'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import { getLogger } from '../../logger'
 import { getUserAgent } from '../../telemetry/util'
 import { ChildProcessResult, ChildProcessOptions } from '../../utilities/processUtils'

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SpawnOptions } from 'child_process'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import { pushIf } from '../../utilities/collectionUtils'
 import * as nls from 'vscode-nls'
 import { getLogger, getDebugConsoleLogger, Logger } from '../../logger'

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

@@ -18,7 +18,7 @@ import { getLogger } from '../../logger'
 import fs from '../../fs/fs'
 import { ChildProcess } from '../../utilities/processUtils'
 import { Timeout } from '../../utilities/timeoutUtils'
-import { execFileSync, SpawnOptions } from 'child_process'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import * as nls from 'vscode-nls'
 import { sleep } from '../../utilities/timeoutUtils'
 import globals from '../../extensionGlobals'
@@ -174,9 +174,11 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom
     // Go from trying to find the manifest file and uses GOPATH provided below.
     installOptions.env!['GO111MODULE'] = 'off'
 
-    function getDelveVersion(repo: string, silent: boolean): string {
+    async function getDelveVersion(repo: string, silent: boolean): Promise<string> {
         try {
-            return execFileSync('git', ['-C', repo, 'describe', '--tags', '--abbrev=0']).toString().trim()
+            return (
+                await ChildProcess.exec('git', ['-C', repo, 'describe', '--tags', '--abbrev=0'], { collect: true })
+            ).stdout.trim()
         } catch (e) {
             if (!silent) {
                 throw e
@@ -187,7 +189,9 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom
 
     // It's fine if we can't get the latest Delve version, the Toolkit will use the last built one instead
     try {
-        const goPath: string = JSON.parse(execFileSync('go', ['env', '-json']).toString()).GOPATH
+        const goPath: string = JSON.parse(
+            (await ChildProcess.exec('go', ['env', '-json'], { collect: true })).stdout
+        ).GOPATH
         let repoPath: string = path.join(goPath, 'src', delveRepo)
 
         if (!getDelveVersion(repoPath, true)) {
@@ -200,11 +204,11 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom
             installOptions.env!['GOPATH'] = debuggerPath
             repoPath = path.join(debuggerPath, 'src', delveRepo)
             const args = ['get', '-d', `${delveRepo}/cmd/dlv`]
-            const out = execFileSync('go', args, installOptions as any)
+            const out = await ChildProcess.exec('go', args, { ...(installOptions as any), collect: true })
             getLogger().debug('"go %O": %s', args, out)
         }
 
-        delveVersion = getDelveVersion(repoPath, false)
+        delveVersion = await getDelveVersion(repoPath, false)
     } catch (e) {
         getLogger().debug('Failed to get latest Delve version: %O', e as Error)
     }

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as proc from 'child_process'
+import * as proc from 'child_process' // eslint-disable-line no-restricted-imports
 import * as crossSpawn from 'cross-spawn'
 import * as logger from '../logger'
 import { Timeout, CancellationError, waitUntil } from './timeoutUtils'

packages/core/src/test/shared/sam/cli/samCliBuild.test.ts

@@ -4,7 +4,7 @@
  */
 
 import assert from 'assert'
-import { SpawnOptions } from 'child_process'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import * as path from 'path'
 import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities'
 import { makeUnexpectedExitCodeError } from '../../../../shared/sam/cli/samCliInvokerUtils'

packages/core/src/test/shared/sam/cli/samCliInit.test.ts

@@ -4,7 +4,7 @@
  */
 
 import assert from 'assert'
-import { SpawnOptions } from 'child_process'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import {
     eventBridgeStarterAppTemplate,
     getSamCliTemplateParameter,

packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts

@@ -4,7 +4,7 @@
  */
 
 import assert from 'assert'
-import { SpawnOptions } from 'child_process'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 
 import { isError } from 'lodash'
 import {

packages/core/src/testInteg/shared/extensions/git.test.ts

@@ -10,7 +10,7 @@ import * as GitTypes from '../../../../types/git'
 import { GitExtension, Repository } from '../../../shared/extensions/git'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { realpathSync } from 'fs' // eslint-disable-line no-restricted-imports
-import { execFileSync } from 'child_process'
+import { execFileSync } from 'child_process' // eslint-disable-line no-restricted-imports
 import { sleep } from '../../../shared/utilities/timeoutUtils'
 import { getLogger } from '../../../shared/logger/logger'
 import { getMinVscodeVersion } from '../../../shared/vscode/env'

packages/core/src/testLint/testUtils.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SpawnSyncOptions, spawnSync } from 'child_process'
+import { SpawnSyncOptions, spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports
 
 export function runCmd(args: string[], options?: SpawnSyncOptions & { throws?: boolean }) {
     const result = spawnSync(args[0], args.slice(1), options)