refactor(util): use spawn instead of exec

renovatebot · Jul 21, 2022 · 3fa4f25 · 3fa4f25
1 parent d9c4629
commit 3fa4f25
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/lib/util/exec/common.ts b/lib/util/exec/common.ts
@@ -114,6 +114,7 @@ export function exec(cmd: string, opts: RawExecOptions): Promise<ExecResult> {
 
 function kill(cp: ChildProcess, signal: NodeJS.Signals): boolean {
   try {
+    // TODO: will be enabled in #16654
     /**
      * If `pid` is negative, but not `-1`, signal shall be sent to all processes
      * (excluding an unspecified set of system processes),
@@ -136,8 +137,8 @@ function kill(cp: ChildProcess, signal: NodeJS.Signals): boolean {
   }
 }
 
-// TODO: rename
+// TODO: rename #16653
 export const rawExec: (
   cmd: string,
   opts: RawExecOptions
-) => Promise<ExecResult> = exec; // TODO: rename
+) => Promise<ExecResult> = exec; // TODO: rename #16653
diff --git a/lib/util/exec/types.ts b/lib/util/exec/types.ts
@@ -27,24 +27,25 @@ export interface DockerOptions {
   cwd?: Opt<string>;
 }
 
-// TODO: rename
+// TODO: rename #16653
 export interface RawExecOptions extends ChildProcessSpawnOptions {
+  // TODO: to be removed in #16655
   /**
    * @deprecated renovate uses utf8, encoding property is ignored.
    */
   encoding: string;
   maxBuffer?: number | undefined;
 }
 
-// TODO: rename
+// TODO: rename #16653
 export interface ExecResult {
   stdout: string;
   stderr: string;
 }
 
 export type ExtraEnv<T = unknown> = Record<string, T>;
 
-// TODO: rename
+// TODO: rename #16653
 export interface ExecOptions {
   cwd?: string;
   cwdFile?: string;

diff --git a/test/exec-util.ts b/test/exec-util.ts
@@ -8,7 +8,7 @@ import { regEx } from '../lib/util/regex';
 
 type CallOptions = ExecOptions | null | undefined;
 
-// TODO: rename
+// TODO: rename #16653
 export type ExecResult = { stdout: string; stderr: string } | Error;
 
 // TODO: fix type #7154
@@ -18,16 +18,16 @@ export const exec: ExecMock = _exec as any;
 export type SpawnMock = jest.MockedFunction<typeof _spawn>;
 export const spawn = _spawn as SpawnMock;
 
-// TODO: rename
+// TODO: rename #16653
 interface ExecSnapshot {
   cmd: string;
   options?: ExecOptions | null | undefined;
 }
 
-// TODO: rename
+// TODO: rename #16653
 export type ExecSnapshots = ExecSnapshot[];
 
-// TODO: rename
+// TODO: rename #16653
 export function execSnapshot(cmd: string, options?: CallOptions): ExecSnapshot {
   const snapshot = {
     cmd,
@@ -48,7 +48,7 @@ export function execSnapshot(cmd: string, options?: CallOptions): ExecSnapshot {
 
 const defaultExecResult = { stdout: '', stderr: '' };
 
-// TODO: rename
+// TODO: rename #16653
 export function mockExecAll(
   execFn: ExecMock,
   execResult: ExecResult = defaultExecResult
@@ -64,7 +64,7 @@ export function mockExecAll(
   return snapshots;
 }
 
-// TODO: rename
+// TODO: rename #16653
 export function mockExecSequence(
   execFn: ExecMock,
   execResults: ExecResult[]