Merge pull request #131 from fjogeleit/node-upgrade

Upgrade to Node20

README.md

@@ -45,6 +45,7 @@ jobs:
 |httpsCert| Client Certificate as string ||
 |httpsKey| Client Certificate Key as string ||
 |responseFile| Persist the response data to the specified file path ||
+|markResponse| If set to true, the response will be masked in the logs of the action |'false'|
 |retry| optional amount of retries if the request is failing, does not retry if the status code is ignored ||
 |retryWait| time between each retry in millseconds | 3000 |
 

action.yml

@@ -59,6 +59,10 @@ inputs:
     responseFile:
         description: 'Persist the response data to the specified file path'
         required: false
+    maskResponse:
+        description: 'Allows to mark your response as secret and hide the output in the action logs'
+        required: false
+        default: 'false'
     retry:
         description: 'optional amount of retries if the request fails'
         required: false
@@ -71,5 +75,5 @@ outputs:
     headers:
         description: 'HTTP Response Headers'
 runs:
-    using: 'node16'
+    using: 'node20'
     main: 'dist/index.js'

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "http-request-action",
-  "version": "1.14.1",
+  "version": "1.14.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "http-request-action",
-      "version": "1.14.1",
+      "version": "1.14.2",
       "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.10.1"
@@ -87,12 +87,12 @@
       "dev": true
     },
     "node_modules/axios": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+      "version": "1.6.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
+      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
       "dev": true,
       "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.4",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -166,9 +166,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
       "dev": true,
       "funding": [
         {
@@ -288,9 +288,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.27.2",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.27.2.tgz",
-      "integrity": "sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==",
+      "version": "5.28.2",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz",
+      "integrity": "sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==",
       "dependencies": {
         "@fastify/busboy": "^2.0.0"
       },

src/githubActions.js

@@ -19,6 +19,10 @@ class GithubActions {
     core.setOutput(name, output)
   }
 
+  setSecret(value) {
+    core.setSecret(value)
+  }
+
   setFailed(message) {
     core.setFailed(message)
   }

src/handler/mask.js

@@ -0,0 +1,15 @@
+'use strict'
+
+const axios = require('axios');
+const { GithubActions } = require('../githubActions');
+
+/**
+ * @param {GithubActions} actions
+ * 
+ * @returns {(response: axios.AxiosResponse) => void}
+ */
+const createMaskHandler = (actions) => (response) => {
+    actions.setSecret(JSON.stringify(response.data))
+}
+
+module.exports = { createMaskHandler }

src/handler/output.js

@@ -0,0 +1,16 @@
+'use strict'
+
+const axios = require('axios');
+const { GithubActions } = require('../githubActions');
+
+/**
+ * @param {GithubActions} actions
+ * 
+ * @returns {(response: axios.AxiosResponse) => void}
+ */
+const createOutputHandler  = (actions) => (response) => {
+    actions.setOutput('response', JSON.stringify(response.data))
+    actions.setOutput('headers', response.headers)
+}
+
+module.exports = { createOutputHandler }

src/httpClient.js

@@ -119,9 +119,6 @@ const request = async({ method, instanceConfig, data, files, file, actions, opti
       return null
     }
 
-    actions.setOutput('response', JSON.stringify(response.data))
-    actions.setOutput('headers', response.headers)
-
     return response
   } catch (error) {
     if ((typeof error === 'object') && (error.isAxiosError === true)) {

src/index.js

@@ -5,7 +5,10 @@ const axios = require('axios');
 const https = require('https');
 const { request, METHOD_POST } = require('./httpClient');
 const { GithubActions } = require('./githubActions');
+
 const { createPersistHandler } = require('./handler/persist');
+const { createOutputHandler } = require('./handler/output');
+const { createMaskHandler } = require('./handler/mask');
 
 let customHeaders = {}
 
@@ -73,9 +76,16 @@ if (typeof ignoreStatusCodes === 'string' && ignoreStatusCodes.length > 0) {
   ignoredCodes = ignoreStatusCodes.split(',').map(statusCode => parseInt(statusCode.trim()))
 }
 
-const handler = [];
 const actions = new GithubActions();
 
+const handler = [];
+
+if (core.getBooleanInput('maskResponse')) {
+  handler.push(createMaskHandler(actions))
+}
+
+handler.push(createOutputHandler(actions))
+
 if (!!responseFile) {
   handler.push(createPersistHandler(responseFile, actions))
 }
@@ -89,7 +99,7 @@ const options = {
 }
 
 request({ data, method, instanceConfig, files, file, actions, options }).then(response => {
-  if (typeof response == 'object') {
+  if (response && typeof response == 'object') {
     handler.forEach(h => h(response))
   }
 })