chore(Add red printing for fatal errors)

src/build.ts

@@ -38,9 +38,7 @@ export async function buildPiperInnerSource (version: string, wdfGithubEnterpris
   })
   const wd = cwd()
 
-  const repositoryPath = join(path, fs.readdirSync(path).find((name: string) => {
-    return name.includes(repository)
-  }) ?? '')
+  const repositoryPath = join(path, fs.readdirSync(path).find((name: string) => name.includes(repository)) ?? '')
   info(`repositoryPath: ${repositoryPath}`)
   chdir(repositoryPath)
 

src/config.ts

@@ -178,9 +178,8 @@ export async function downloadDefaultConfig (server: string, apiURL: string, ver
   const flags: string[] = []
   flags.push(...defaultsPathsArgs)
   flags.push('--gitHubTokens', `${getHost(server)}:${token}`)
-  const piperExec = await executePiper('getDefaults', flags)
-
-  let defaultConfigs = JSON.parse(piperExec.output)
+  const { stdout } = await executePiper('getDefaults', flags)
+  let defaultConfigs = JSON.parse(stdout)
   if (customDefaultsPathsArray.length === 0) {
     defaultConfigs = [defaultConfigs]
   }
@@ -268,8 +267,8 @@ export async function downloadStageConfig (actionCfg: ActionConfiguration): Prom
   const flags: string[] = ['--useV1']
   flags.push('--defaultsFile', stageConfigPath)
   flags.push('--gitHubTokens', `${getHost(actionCfg.gitHubEnterpriseServer)}:${actionCfg.gitHubEnterpriseToken}`)
-  const piperExec = await executePiper('getDefaults', flags)
-  const config = JSON.parse(piperExec.output)
+  const { stdout } = await executePiper('getDefaults', flags)
+  const config = JSON.parse(stdout)
   fs.writeFileSync(path.join(CONFIG_DIR, ENTERPRISE_STAGE_CONFIG_FILENAME), config.content)
 }
 
@@ -352,6 +351,6 @@ export async function readContextConfig (stepName: string, flags: string[]): Pro
     getConfigFlags.push('--customConfig', customConfigFlagValue)
   }
 
-  const piperExec = await executePiper('getConfig', getConfigFlags)
-  return JSON.parse(piperExec.output)
+  const { stdout } = await executePiper('getConfig', getConfigFlags)
+  return JSON.parse(stdout)
 }

src/docker.ts

@@ -28,10 +28,10 @@ export async function startContainer (actionCfg: ActionConfiguration, ctxConfig:
 
   let dockerOptionsArray: string[] = []
   const dockerOptions = actionCfg.dockerOptions !== '' ? actionCfg.dockerOptions : ctxConfig.dockerOptions
-  if (dockerOptions !== undefined && Array.isArray(dockerOptions)) {
-    dockerOptionsArray = dockerOptions.map(option => option.split(' ')).flat()
-  } else if (dockerOptions !== undefined) {
-    dockerOptionsArray = dockerOptions.split(' ')
+  if (dockerOptions !== undefined) {
+    dockerOptionsArray = Array.isArray(dockerOptions)
+      ? dockerOptions.map(option => option.split(' ')).flat()
+      : dockerOptionsArray = dockerOptions.split(' ')
   }
 
   const dockerRunArgs: string[] = [

src/execute.ts

@@ -1,70 +1,55 @@
-import { exec, type ExecOptions } from '@actions/exec'
+import { type ExecOptions, type ExecOutput, getExecOutput } from '@actions/exec'
 import path from 'path'
 import { internalActionVariables } from './piper'
-
-export interface piperExecResult {
-  output: string
-  error: string
-  exitCode: number
-}
+import { debug, error } from '@actions/core'
 
 export async function executePiper (
-  stepName: string, flags?: string[], ignoreDefaults?: boolean, execOptions?: ExecOptions
-): Promise<piperExecResult> {
-  let piperOutput = ''
+  stepName: string, flags: string[] = [], ignoreDefaults: boolean = false, execOptions?: ExecOptions
+): Promise<ExecOutput> {
+  if (process.env.GITHUB_JOB !== undefined) flags.push('--stageName', process.env.GITHUB_JOB)
+
+  flags = !ignoreDefaults && process.env.defaultsFlags !== undefined
+    ? flags.concat(JSON.parse(process.env.defaultsFlags))
+    : flags
+
+  const piperPath = internalActionVariables.piperBinPath
+  const containerID = internalActionVariables.dockerContainerID
   let piperError = ''
   let options = {
     listeners: {
-      stdout: (data: Buffer) => {
-        piperOutput += data.toString()
+      stdline: (data: string) => {
+        if (data.includes('fatal')) {
+          error(data)
+          piperError += data
+        }
       },
-      stderr: (data: Buffer) => {
-        piperError += data.toString()
+      errline: (data: string) => {
+        if (data.includes('fatal')) {
+          error(data)
+          piperError += data
+        }
       }
     }
   }
   options = Object.assign({}, options, execOptions)
 
-  flags = flags ?? []
-
-  const stageName = process.env.GITHUB_JOB
-  if (stageName !== undefined) {
-    flags.push('--stageName', stageName)
-  }
-
-  const defaultsFlags = process.env.defaultsFlags
-  if (ignoreDefaults !== false && defaultsFlags !== undefined) {
-    flags = flags.concat(JSON.parse(defaultsFlags))
-  }
+  // Default to Piper
+  let binaryPath = piperPath
+  let args: string[] = [stepName, ...flags]
 
-  const piperPath = internalActionVariables.piperBinPath
-  const containerID = internalActionVariables.dockerContainerID
-  if (containerID === '') {
-    return await exec(piperPath, [
-      stepName,
-      ...flags
-    ],
-    options)
-      .then(exitCode => {
-        return { output: piperOutput, error: piperError, exitCode }
-      })
-      .catch(err => {
-        throw new Error(`Piper execution error: ${err as string}: ${piperError}`)
-      })
-  }
-  return await exec('docker', [
-    'exec',
-    containerID,
+  if (containerID !== '') { // Running in a container
+    debug(`containerID: ${containerID}, running in docker`)
+    binaryPath = 'docker'
+    args = [
+      'exec',
+      containerID,
       `/piper/${path.basename(piperPath)}`,
       stepName,
       ...flags
-  ], options).then(exitCode => {
-    return {
-      output: piperOutput,
-      error: piperError,
-      exitCode
-    }
-  }).catch(err => {
-    throw new Error(`Piper execution error: ${err as string}: ${piperError}`)
-  })
+    ]
+  }
+
+  return await getExecOutput(binaryPath, args, options)
+    .then((execOutput: ExecOutput) => (execOutput))
+    .catch(err => { throw new Error(`Piper execution error: ${err as string}: ${piperError}`) })
 }

src/pipelineEnv.ts

@@ -27,7 +27,7 @@ export async function exportPipelineEnv (exportPipelineEnvironment: boolean): Pr
   })
 
   try {
-    const pipelineEnv = JSON.stringify(JSON.parse((piperExec.output)))
+    const pipelineEnv = JSON.stringify(JSON.parse((piperExec.stdout)))
     setOutput('pipelineEnv', pipelineEnv)
   } catch (err) {
     throw new Error(`Could not export pipeline environment: ${err as string}`)