Merge pull request #1050 from polywrap/better-child-process-logging

fix: add child_process stdout to error object

packages/cli/src/__tests__/e2e/app.spec.ts

@@ -4,6 +4,7 @@ import { runCLI } from "@polywrap/test-env-js";
 import { GetPathToCliTestFiles } from "@polywrap/test-cases";
 import path from "path";
 import fs from "fs";
+import os from "os";
 import rimraf from "rimraf";
 import { compareSync } from "dir-compare";
 
@@ -167,9 +168,8 @@ describe("e2e tests for app command", () => {
 
   it("Should store generated files to specified codegen dir", async () => {
     const testCaseDir = getTestCaseDir(0);
-    const codegenDir = path.resolve(
-      process.env.TMPDIR || "/tmp",
-      `codegen-${Date.now()}`
+    const codegenDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), `polywrap-cli-tests`)
     );
     const { exitCode: code, stdout: output, stderr: error } = await runCLI({
       args: ["app", "codegen", "--codegen-dir", codegenDir],

packages/cli/src/__tests__/e2e/build.spec.ts

@@ -4,6 +4,7 @@ import { clearStyle, polywrapCli } from "./utils";
 import { runCLI } from "@polywrap/test-env-js";
 import { GetPathToCliTestFiles } from "@polywrap/test-cases";
 import fs from "fs";
+import os from "os";
 import path from "path";
 
 const HELP = `Usage: polywrap build|b [options]
@@ -164,20 +165,18 @@ describe("e2e tests for build command", () => {
   });
 
   it("Should store build files in specified output dir", async () => {
-    const outputDir = path.resolve(
-      process.env.TMPDIR || "/tmp",
-      `codegen-${Date.now()}`
+    const outputDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), `polywrap-cli-tests`)
     );
     const testCaseDir = getTestCaseDir(0);
-    const { exitCode: code, stdout: output, stderr: error } = await runCLI({
+    const { exitCode: code, stdout: output } = await runCLI({
       args: ["build", "-v", "--output-dir", outputDir],
       cwd: testCaseDir,
       cli: polywrapCli,
     });
 
     const buildDir = `./${path.relative(testCaseDir, outputDir)}`;
 
-    expect(error).toBe("");
     expect(code).toEqual(0);
     expect(output).toContain(`Artifacts written to ${buildDir}`);
     expect(output).toContain(`WRAP manifest written in ${buildDir}/wrap.info`);

packages/cli/src/__tests__/e2e/codegen.spec.ts

@@ -4,6 +4,7 @@ import { runCLI } from "@polywrap/test-env-js";
 import { GetPathToCliTestFiles } from "@polywrap/test-cases";
 import path from "path";
 import fs from "fs";
+import os from "os";
 import rimraf from "rimraf";
 import { compareSync } from "dir-compare";
 
@@ -172,9 +173,8 @@ describe("e2e tests for codegen command", () => {
   });
 
   it("Should store build files in specified codegen dir", async () => {
-    const codegenDir = path.resolve(
-      process.env.TMPDIR || "/tmp",
-      `codegen-${Date.now()}`
+    const codegenDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), `polywrap-cli-tests`)
     );
     const testCaseDir = getTestCaseDir(0);
     const { exitCode: code, stdout: output, stderr: error } = await runCLI({

packages/cli/src/__tests__/e2e/docgen.spec.ts

@@ -4,6 +4,7 @@ import { runCLI } from "@polywrap/test-env-js";
 import { GetPathToCliTestFiles } from "@polywrap/test-cases";
 import path from "path";
 import fs from "fs";
+import os from "os";
 import rimraf from "rimraf";
 import { compareSync } from "dir-compare";
 
@@ -147,9 +148,8 @@ describe("e2e tests for docgen command", () => {
   });
 
   it("Should store build files in specified docgen dir", async () => {
-    const docgenDir = path.resolve(
-      process.env.TMPDIR || "/tmp",
-      `docgen-${Date.now()}`
+    const docgenDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), `polywrap-cli-tests`)
     );
     const testCaseDir = getTestCaseDir(0);
     const { exitCode: code, stdout: output, stderr: error } = await runCLI({

packages/cli/src/lib/helpers/workflow-validator.ts

@@ -1,14 +1,16 @@
 import { runCommand } from "../system";
 import { intlMsg } from "../intl";
 
+import path from "path";
 import fs from "fs";
+import os from "os";
 import { InvokeResult } from "@polywrap/core-js";
 
-const TMPDIR = process.env.TMPDIR || "/tmp";
+const TMPDIR = fs.mkdtempSync(path.join(os.tmpdir(), `polywrap-cli`));
 
 export async function cueExists(): Promise<boolean> {
   try {
-    const { stdout } = await runCommand("cue version");
+    const { stdout } = await runCommand("cue version", true);
     return stdout.startsWith("cue version ");
   } catch (e) {
     return false;
@@ -43,7 +45,7 @@ export async function validateOutput(
       console.log("Validation: SUCCEED");
     }
   } catch (e) {
-    const msgLines = e.split(/\r?\n/);
+    const msgLines = e.stderr.split(/\r?\n/);
     msgLines[1] = `${validateScriptPath}:${msgLines[1]
       .split(":")
       .slice(1)

packages/cli/src/lib/infra/fetchers/NodeDependencyFetcher.ts

@@ -9,7 +9,7 @@ import path from "path";
 export class NodeDependencyFetcher extends InfraDependencyFetcher {
   public async installPackages(packages: InfraPackageArg[]): Promise<void> {
     this.composePackageJson(packages);
-    await runCommand(`cd ${this.config.installationDirectory} && npm i`);
+    await runCommand(`cd ${this.config.installationDirectory} && npm i`, true);
   }
 
   public getPackageDir(packageName: string): string {
@@ -44,6 +44,6 @@ export class NodeDependencyFetcher extends InfraDependencyFetcher {
 export class YarnDependencyFetcher extends NodeDependencyFetcher {
   public async installPackages(packages: InfraPackageArg[]): Promise<void> {
     this.composePackageJson(packages);
-    await runCommand(`cd ${this.config.installationDirectory} && yarn`);
+    await runCommand(`cd ${this.config.installationDirectory} && yarn`, true);
   }
 }

packages/cli/src/lib/system/child-process.ts

@@ -2,7 +2,7 @@ import { exec, ExecException } from "child_process";
 
 export async function runCommand(
   command: string,
-  quiet = true,
+  quiet = false,
   env: Record<string, string> | undefined = undefined
 ): Promise<{ stdout: string; stderr: string }> {
   if (!quiet) {
@@ -16,7 +16,7 @@ export async function runCommand(
       stderr: string
     ) => {
       if (err) {
-        reject(stderr);
+        reject({ stdout, stderr });
       } else {
         resolve({ stdout, stderr });
       }
@@ -40,7 +40,7 @@ export async function runCommand(
       });
 
       childObj.stderr?.on("data", (data) => {
-        console.log(data.toString());
+        console.error(data.toString());
       });
     }
   });

packages/cli/src/lib/system/docker.ts

@@ -19,7 +19,7 @@ export function getDockerFileLock(): FileLock {
 }
 
 export async function isDockerBuildxInstalled(): Promise<boolean> {
-  const { stdout: version } = await runCommand("docker buildx version");
+  const { stdout: version } = await runCommand("docker buildx version", true);
   return version.startsWith("github.com/docker/buildx");
 }
 
@@ -134,7 +134,10 @@ export async function createBuildImage(
       // Build the docker image
       let buildxUseFailed: boolean;
       try {
-        const { stderr } = await runCommand(`docker buildx use ${imageName}`);
+        const { stderr } = await runCommand(
+          `docker buildx use ${imageName}`,
+          quiet
+        );
         buildxUseFailed = !!stderr;
       } catch (e) {
         buildxUseFailed = true;