stdline and stderr

SAP · Feb 3, 2025 · 04a52e1 · 04a52e1
1 parent 1c006ef
commit 04a52e1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 73 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/execute.ts b/src/execute.ts
@@ -1,7 +1,7 @@
 import { type ExecOptions, type ExecOutput, getExecOutput } from '@actions/exec'
 import path from 'path'
 import { internalActionVariables } from './piper'
-import { error, notice } from '@actions/core'
+import { error } from '@actions/core'
 
 export interface piperExecResult {
   output: string
@@ -20,44 +20,19 @@ export async function executePiper (
 
   const piperPath = internalActionVariables.piperBinPath
   const containerID = internalActionVariables.dockerContainerID
-
-  const piperError = ''
+  let piperError = ''
   let options = {
     listeners: {
       stdline: (data: string) => {
-        if (data.includes('fatal')) error(`${data.toString()}`)
+        if (data.includes('fatal')) error(data)
+        piperError += data
       },
       errline: (data: string) => {
-        if (data.includes('fatal')) error(`${data.toString()}`)
+        if (data.includes('fatal')) {
+          error(data)
+          piperError += data
+        }
       }
-      // stdout: (data: Buffer) => {
-      //   let outString: string = ''
-      //   const inString: string = data.toString()
-      //   inString.split('\n').forEach(line => {
-      //     if (line.includes('fatal')) {
-      //       notice(`stdout line contains fatal: ${line}`)
-      //       outString += `::error::${line}\n`
-      //     } else {
-      //       outString += `${line}\n`
-      //     }
-      //   })
-      //   data = Buffer.from(outString)
-      // },
-      // stderr: (data: Buffer) => {
-      //   let outString: string = ''
-      //   const inString = data.toString()
-      //   inString.split('\n').forEach(line => {
-      //     if (line.includes('fatal')) {
-      //       notice(` stderr line contains fatal: ${line}`)
-      //       outString += `::error::${line}\n`
-      //       piperError += `::error::${line}\n`
-      //     } else {
-      //       outString += `${line}\n`
-      //       piperError += `${line}\n`
-      //     }
-      //   })
-      //   data = Buffer.from(outString)
-      // }
     }
   }
   options = Object.assign({}, options, execOptions)

diff --git a/test/execute.test.ts b/test/execute.test.ts
@@ -14,7 +14,7 @@ describe('Execute', () => {
   const stageNameArg = ['--stageName', 'units']
 
   beforeEach(() => {
-    jest.spyOn(exec, 'exec').mockReturnValue(Promise.resolve(0))
+    jest.spyOn(exec, 'getExecOutput').mockReturnValue(Promise.resolve({ stdout: 'testout', stderr: 'testerr', exitCode: 0 }))
 
     process.env.GITHUB_JOB = stageNameArg[1]
 
@@ -36,7 +36,7 @@ describe('Execute', () => {
     const stepName = 'version'
 
     const piperExec = await executePiper(stepName)
-    expect(exec.exec).toHaveBeenCalledWith(piperPath, [stepName, ...stageNameArg], expectedOptions)
+    expect(exec.getExecOutput).toHaveBeenCalledWith(piperPath, [stepName, ...stageNameArg], expectedOptions)
     expect(piperExec.exitCode).toBe(0)
   })
 
@@ -45,7 +45,7 @@ describe('Execute', () => {
     const piperFlags = ['--verbose']
 
     const piperExec = await executePiper(stepName, piperFlags)
-    expect(exec.exec).toHaveBeenCalledWith(piperPath, [stepName, ...piperFlags], expectedOptions)
+    expect(exec.getExecOutput).toHaveBeenCalledWith(piperPath, [stepName, ...piperFlags], expectedOptions)
     expect(piperFlags).toEqual(expect.arrayContaining(stageNameArg))
     expect(piperExec.exitCode).toBe(0)
   })
@@ -55,7 +55,7 @@ describe('Execute', () => {
     const piperFlags = ['--createBOM', '--globalSettingsFile', 'global_settings.xml']
 
     const piperExec = await executePiper(stepName, piperFlags)
-    expect(exec.exec).toHaveBeenCalledWith(piperPath, [stepName, ...piperFlags], expectedOptions)
+    expect(exec.getExecOutput).toHaveBeenCalledWith(piperPath, [stepName, ...piperFlags], expectedOptions)
     expect(piperFlags).toEqual(expect.arrayContaining(stageNameArg))
     expect(piperExec.exitCode).toBe(0)
   })
@@ -66,7 +66,7 @@ describe('Execute', () => {
     internalActionVariables.dockerContainerID = dockerContainerID
 
     const piperExec = await executePiper(stepName, undefined)
-    expect(exec.exec).toHaveBeenCalledWith('docker', ['exec', dockerContainerID, '/piper/piper', stepName, ...stageNameArg], expectedOptions)
+    expect(exec.getExecOutput).toHaveBeenCalledWith('docker', ['exec', dockerContainerID, '/piper/piper', stepName, ...stageNameArg], expectedOptions)
     expect(piperExec.exitCode).toBe(0)
   })
 
@@ -77,7 +77,7 @@ describe('Execute', () => {
     internalActionVariables.dockerContainerID = dockerContainerID
 
     const piperExec = await executePiper(stepName, piperFlags)
-    expect(exec.exec).toHaveBeenCalledWith('docker', ['exec', dockerContainerID, '/piper/piper', stepName, ...piperFlags], expectedOptions)
+    expect(exec.getExecOutput).toHaveBeenCalledWith('docker', ['exec', dockerContainerID, '/piper/piper', stepName, ...piperFlags], expectedOptions)
     expect(piperFlags).toEqual(expect.arrayContaining(stageNameArg))
     expect(piperExec.exitCode).toBe(0)
   })
@@ -89,7 +89,7 @@ describe('Execute', () => {
     internalActionVariables.dockerContainerID = dockerContainerID
 
     const piperExec = await executePiper(stepName, piperFlags)
-    expect(exec.exec).toHaveBeenCalledWith('docker', ['exec', dockerContainerID, '/piper/piper', stepName, ...piperFlags], expectedOptions)
+    expect(exec.getExecOutput).toHaveBeenCalledWith('docker', ['exec', dockerContainerID, '/piper/piper', stepName, ...piperFlags], expectedOptions)
     expect(piperFlags).toEqual(expect.arrayContaining(stageNameArg))
     expect(piperExec.exitCode).toBe(0)
   })