gh-actions/jq: Handle using fs for filter arg (#981)

Signed-off-by: Ryan Northey <ryan@synca.io>
envoyproxy · Nov 8, 2023 · deb978c · deb978c
1 parent 27d8096
commit deb978c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/gh-actions/jq/action.yml b/gh-actions/jq/action.yml
@@ -34,6 +34,9 @@ inputs:
   use-tmp-file:
     type: boolean
     default: true
+  use-tmp-file-filter:
+    type: boolean
+    default: false
   input-format:
     type: string
     default: json

diff --git a/gh-actions/jq/dist/index.js b/gh-actions/jq/dist/index.js
diff --git a/gh-actions/jq/jq.ts b/gh-actions/jq/jq.ts
@@ -13,6 +13,7 @@ const run = async (): Promise<void> => {
     if (!input || input === '') return
 
     const useTmpFile = core.getBooleanInput('use-tmp-file')
+    const useTmpFileForFilter = core.getBooleanInput('use-tmp-file-filter')
     const encode = core.getBooleanInput('encode')
     const decode = core.getBooleanInput('decode')
     const options = core.getInput('options')
@@ -47,17 +48,30 @@ const run = async (): Promise<void> => {
     }
 
     let tmpFile: tmp.FileResult
-    let shellCommand = `printf '%s' '${sanitizedInput}' ${decodePipe} | jq ${options} '${filter}' ${encodePipe}`
+    let tmpFileFilter: tmp.FileResult
+    let filterArg
+
+    if (os.platform() === 'win32' || useTmpFileForFilter) {
+      tmpFileFilter = tmp.fileSync()
+      fs.writeFileSync(tmpFileFilter.name, filter)
+      filterArg = `-f ${tmpFileFilter.name}`
+    } else {
+      filterArg = `'${filter}'`
+    }
+    let shellCommand = `printf '%s' '${sanitizedInput}' ${decodePipe} | jq ${options} ${filterArg} ${encodePipe}`
     if (os.platform() === 'win32' || useTmpFile) {
       tmpFile = tmp.fileSync()
       fs.writeFileSync(tmpFile.name, sanitizedInput)
-      shellCommand = `cat ${tmpFile.name} ${decodePipe} | jq ${options} '${filter}' ${encodePipe}`
+      shellCommand = `cat ${tmpFile.name} ${decodePipe} | jq ${options} ${filterArg} ${encodePipe}`
     }
     core.debug(`Running shell command: ${shellCommand}`)
     const proc = exec(shellCommand, (error, stdout, stderr) => {
       if (tmpFile) {
         tmpFile.removeCallback()
       }
+      if (tmpFileFilter) {
+        tmpFileFilter.removeCallback()
+      }
       if (error) {
         console.error(`Error: ${error}`)
         return