update dist folder

SAP · Jan 31, 2025 · 824191d · 824191d
1 parent 49bf93e
commit 824191d
Showing 4 changed files with 39 additions and 65 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/docker.ts b/src/docker.ts
@@ -18,9 +18,7 @@ export async function runContainers (actionCfg: ActionConfiguration, ctxConfig:
 
 export async function startContainer (actionCfg: ActionConfiguration, ctxConfig: any): Promise<void> {
   const dockerImage = actionCfg.dockerImage !== '' ? actionCfg.dockerImage : ctxConfig.dockerImage
-  if (dockerImage === undefined || dockerImage === '') {
-    return
-  }
+  if (dockerImage === undefined || dockerImage === '') return
 
   const piperPath = internalActionVariables.piperBinPath
   const containerID = uuidv4()
@@ -30,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[] = [

diff --git a/src/execute.ts b/src/execute.ts
@@ -10,11 +10,8 @@ export interface piperExecResult {
 }
 
 export async function executePiper (
-  stepName: string, flags?: string[], ignoreDefaults?: boolean, execOptions?: ExecOptions
+  stepName: string, flags: string[] = [], ignoreDefaults: boolean = false, execOptions?: ExecOptions
 ): Promise<piperExecResult> {
-  flags = flags ?? []
-  ignoreDefaults = ignoreDefaults ?? false
-
   if (process.env.GITHUB_JOB !== undefined) flags.push('--stageName', process.env.GITHUB_JOB)
 
   flags = !ignoreDefaults && process.env.defaultsFlags !== undefined
@@ -31,13 +28,9 @@ export async function executePiper (
       stdout: (data: Buffer) => {
         notice('about to print some data from options.listeners.stdout')
         const outString = data.toString()
-        outString.split('\n').forEach(line => {
-          if (line.toLowerCase().includes('fatal')) {
-            error(`${line}`) // GitHub Actions highlights this in red
-          } else {
-            piperOutput += `${line}\n`
-          }
-        })
+        piperOutput += outString.toLowerCase().includes('fatal')
+          ? `::error::${outString}\n`
+          : `${outString}\n`
         notice('end printing data from options.listeners.stdout')
       },
       stderr: (data: Buffer) => {
@@ -64,25 +57,21 @@ export async function executePiper (
 
     ]
     return await exec('docker', args, options)
-      .then(exitCode => {
-        return {
-          output: piperOutput,
-          error: piperError,
-          exitCode
-        }
-      })
+      .then(exitCode => ({
+        output: piperOutput.trim(),
+        error: piperError.trim(),
+        exitCode
+      }))
       .catch(err => { throw new Error(`Piper execution error: ${err as string}: ${piperError}`) })
   }
 
   const args: string[] = [stepName, ...flags]
 
   return await exec(piperPath, args, options)
-    .then(exitCode => {
-      return {
-        output: piperOutput,
-        error: piperError,
-        exitCode
-      }
-    })
+    .then(exitCode => ({
+      output: piperOutput,
+      error: piperError,
+      exitCode
+    }))
     .catch(err => { throw new Error(`Piper execution error: ${err as string}: ${piperError}`) })
 }