test remove if check

CHANGELOG.md

@@ -2,18 +2,6 @@
 
 * Add changes here
 
-## 2.7.3 (July 13, 2023)
-
-Bugs:
-
-* Revert to the handling of secrets in JSON format since v2.1.2 [GH-478](https://github.com/hashicorp/vault-action/pull/478)
-
-## 2.7.2 (July 6, 2023)
-
-Bugs:
-
-* Fix a regression that broke support for secrets in JSON format [GH-473](https://github.com/hashicorp/vault-action/pull/473)
-
 ## 2.7.1 (July 3, 2023)
 
 Bugs:

README.md

@@ -76,7 +76,7 @@ For example, a common pattern is to save all the secrets in a JSON file:
             - name: Step following 'Import Secrets'
               run: |
                 touch secrets.json
-                echo '${{ toJson(steps.import-secrets.outputs) }}' >> secrets.json
+                echo "${{ toJson(steps.import-secrets.outputs) }}" >> secrets.json
             # ...
 ```
 
@@ -373,13 +373,6 @@ with:
         secret/data/ci/aws accessKey | AWS_ACCESS_KEY_ID ;
         secret/data/ci/aws secretKey | AWS_SECRET_ACCESS_KEY
 ```
-You can specify a wildcard * for the key name to get all keys in the path.  If you provide an output name with the wildcard, the name will be prepended to the key name:
-
-```yaml
-with:
-    secrets: |
-        secret/data/ci/aws * | MYAPP_ ;
-```
 
 ## Other Secret Engines
 

dist/index.js

@@ -3702,7 +3702,6 @@ function asPromise(normalizedOptions) {
                     request._beforeError(new types_1.HTTPError(response));
                     return;
                 }
-                request.destroy();
                 resolve(request.options.resolveBodyOnly ? response.body : response);
             });
             const onError = (error) => {
@@ -18517,9 +18516,6 @@ const core = __nccwpck_require__(2186);
 const command = __nccwpck_require__(7351);
 const got = (__nccwpck_require__(3061)["default"]);
 const jsonata = __nccwpck_require__(4245);
-const { normalizeOutputKey } = __nccwpck_require__(1608);
-const { WILDCARD } = __nccwpck_require__(4438);
-
 const { auth: { retrieveToken }, secrets: { getSecrets } } = __nccwpck_require__(4351);
 
 const AUTH_METHODS = ['approle', 'token', 'github', 'jwt', 'kubernetes', 'ldap', 'userpass'];
@@ -18688,7 +18684,7 @@ function parseSecretsInput(secretsInput) {
         const selectorAst = jsonata(selectorQuoted).ast();
         const selector = selectorQuoted.replace(new RegExp('"', 'g'), '');
 
-        if (selector !== WILDCARD && (selectorAst.type !== "path" || selectorAst.steps[0].stages) && selectorAst.type !== "string" && !outputVarName) {
+        if ((selectorAst.type !== "path" || selectorAst.steps[0].stages) && selectorAst.type !== "string" && !outputVarName) {
             throw Error(`You must provide a name for the output key when using json selectors. Input: "${secret}"`);
         }
 
@@ -18708,6 +18704,20 @@ function parseSecretsInput(secretsInput) {
     return output;
 }
 
+/**
+ * Replaces any dot chars to __ and removes non-ascii charts
+ * @param {string} dataKey
+ * @param {boolean=} isEnvVar
+ */
+function normalizeOutputKey(dataKey, isEnvVar = false) {
+    let outputKey = dataKey
+        .replace('.', '__').replace(new RegExp('-', 'g'), '').replace(/[^\p{L}\p{N}_-]/gu, '');
+    if (isEnvVar) {
+        outputKey = outputKey.toUpperCase();
+    }
+    return outputKey;
+}
+
 /**
  * @param {string} inputKey
  * @param {any} inputOptions
@@ -18736,11 +18746,11 @@ function parseHeadersInput(inputKey, inputOptions) {
 module.exports = {
     exportSecrets,
     parseSecretsInput,
-    parseHeadersInput,
+    normalizeOutputKey,
+    parseHeadersInput
 };
 
 
-
 /***/ }),
 
 /***/ 4915:
@@ -18907,17 +18917,6 @@ module.exports = {
 };
 
 
-/***/ }),
-
-/***/ 4438:
-/***/ ((module) => {
-
-const WILDCARD = '*';
-
-module.exports = {
-    WILDCARD
-};
-
 /***/ }),
 
 /***/ 4351:
@@ -18937,8 +18936,8 @@ module.exports = {
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const jsonata = __nccwpck_require__(4245);
-const { WILDCARD } = __nccwpck_require__(4438);
-const { normalizeOutputKey } = __nccwpck_require__(1608);
+
+
 /**
  * @typedef {Object} SecretRequest
  * @property {string} path
@@ -18961,8 +18960,7 @@ const { normalizeOutputKey } = __nccwpck_require__(1608);
   */
 async function getSecrets(secretRequests, client) {
     const responseCache = new Map();
-    let results = [];
-
+    const results = [];
     for (const secretRequest of secretRequests) {
         let { path, selector } = secretRequest;
 
@@ -18985,65 +18983,33 @@ async function getSecrets(secretRequests, client) {
                 throw error
             }
         }
-
-        body = JSON.parse(body);
-
-        if (selector == WILDCARD) {                     
-            let keys = body.data;
-            if (body.data["data"] != undefined) {
-                keys = keys.data;
-            }
-
-            for (let key in keys) {
-                let newRequest = Object.assign({},secretRequest);
-                newRequest.selector = key;                  
-                
-                if (secretRequest.selector === secretRequest.outputVarName) {
-                    newRequest.outputVarName = key;
-                    newRequest.envVarName = key;        		
-                }
-                else {
-                    newRequest.outputVarName = secretRequest.outputVarName+key;
-                    newRequest.envVarName = secretRequest.envVarName+key;        		
-                }
-
-                newRequest.outputVarName = normalizeOutputKey(newRequest.outputVarName);
-                newRequest.envVarName = normalizeOutputKey(newRequest.envVarName,true);   
-
-                selector = key;
-
-                results = await selectAndAppendResults(
-                  selector,
-                  body,
-                  cachedResponse,
-                  newRequest,
-                  results
-                );
-            }
+        if (!selector.match(/.*[\.].*/)) {
+            selector = '"' + selector + '"'
+        }
+        selector = "data." + selector
+        body = JSON.parse(body)
+        if (body.data["data"] != undefined) {
+            selector = "data." + selector
         }
-        else {
-          results = await selectAndAppendResults(
-            selector, 
-            body, 
-            cachedResponse, 
-            secretRequest, 
-            results
-          );
-        }   
-    }
 
+        const value = await selectData(body, selector);
+        results.push({
+            request: secretRequest,
+            value,
+            cachedResponse
+        });
+    }
     return results;
 }
 
 /**
  * Uses a Jsonata selector retrieve a bit of data from the result
- * @param {object} data
- * @param {string} selector
+ * @param {object} data 
+ * @param {string} selector 
  */
 async function selectData(data, selector) {
     const ata = jsonata(selector);
     let result = JSON.stringify(await ata.evaluate(data));
-
     // Compat for custom engines
     if (!result && ((ata.ast().type === "path" && ata.ast()['steps'].length === 1) || ata.ast().type === "string") && selector !== 'data' && 'data' in data) {
         result = JSON.stringify(await jsonata(`data.${selector}`).evaluate(data));
@@ -19057,75 +19023,11 @@ async function selectData(data, selector) {
     return result;
 }
 
-/**
- * Uses selectData with the selector to get the value and then appends it to the
- * results. Returns a new array with all of the results.
- * @param {string} selector
- * @param {object} body
- * @param {object} cachedResponse
- * @param {TRequest} secretRequest
- * @param {SecretResponse<TRequest>[]} results
- * @return {Promise<SecretResponse<TRequest>[]>}
- */
-const selectAndAppendResults = async (
-  selector,
-  body,
-  cachedResponse,
-  secretRequest,
-  results
-) => {
-  if (!selector.match(/.*[\.].*/)) {
-    selector = '"' + selector + '"';
-  }
-  selector = "data." + selector;
-
-  if (body.data["data"] != undefined) {
-    selector = "data." + selector;
-  }
-
-  const value = await selectData(body, selector);
-  return [
-    ...results,
-    {
-      request: secretRequest,
-      value,
-      cachedResponse,
-    },
-  ];
-};
-
 module.exports = {
     getSecrets,
     selectData
 }
 
-
-/***/ }),
-
-/***/ 1608:
-/***/ ((module) => {
-
-/**
- * Replaces any dot chars to __ and removes non-ascii charts
- * @param {string} dataKey
- * @param {boolean=} isEnvVar
- */
-function normalizeOutputKey(dataKey, isEnvVar = false) {
-  let outputKey = dataKey
-    .replace(".", "__")
-    .replace(new RegExp("-", "g"), "")
-    .replace(/[^\p{L}\p{N}_-]/gu, "");
-  if (isEnvVar) {
-    outputKey = outputKey.toUpperCase();
-  }
-  return outputKey;
-}
-
-module.exports = { 
-    normalizeOutputKey 
-};
-
-
 /***/ }),
 
 /***/ 9491:

integrationTests/basic/integration.test.js

@@ -171,26 +171,6 @@ describe('integration', () => {
         expect(core.exportVariable).toBeCalledWith('OTHERSECRETDASH', 'OTHERSUPERSECRET');
     });
 
-    it('get wildcard secrets', async () => {
-        mockInput(`secret/data/test * ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('SECRET', 'SUPERSECRET');
-    });
-
-    it('get wildcard secrets with name prefix', async () => {
-        mockInput(`secret/data/test * | GROUP_ ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('GROUP_SECRET', 'SUPERSECRET');
-    });
-
     it('leading slash kvv2', async () => {
         mockInput('/secret/data/foobar fookv2');
 
@@ -215,34 +195,6 @@ describe('integration', () => {
         expect(core.exportVariable).toBeCalledWith('OTHERSECRETDASH', 'OTHERCUSTOMSECRET');
     });
 
-    it('get K/V v1 wildcard secrets', async () => {
-        mockInput(`secret-kv1/test * ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('SECRET', 'CUSTOMSECRET');
-    });
-
-    it('get K/V v1 wildcard secrets with name prefix', async () => {
-        mockInput(`secret-kv1/test * | GROUP_ ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('GROUP_SECRET', 'CUSTOMSECRET');
-    });
-
-    it('get wildcard nested secret from K/V v1', async () => {
-        mockInput('secret-kv1/nested/test *');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('OTHERSECRETDASH', 'OTHERCUSTOMSECRET');
-    });
-
     it('leading slash kvv1', async () => {
         mockInput('/secret-kv1/foobar fookv1');
 
@@ -273,17 +225,6 @@ describe('integration', () => {
             expect(core.exportVariable).toBeCalledWith('FOO', 'bar');
         });
 
-        it('wildcard supports cubbyhole', async () => {            
-            mockInput('/cubbyhole/test *');
-
-            await exportSecrets();
-            
-            expect(core.exportVariable).toBeCalledTimes(2);
-
-            expect(core.exportVariable).toBeCalledWith('FOO', 'bar');
-            expect(core.exportVariable).toBeCalledWith('ZIP', 'zap');
-        });
-        
         it('caches responses', async () => {            
             mockInput(`
             /cubbyhole/test foo ;

integrationTests/e2e/e2e.test.js

@@ -12,6 +12,9 @@ describe('e2e', () => {
         expect(process.env.SUBSEQUENT_TEST_SECRET).toBe("SUBSEQUENT_TEST_SECRET");
         expect(process.env.JSONSTRING).toBe('{"x":1,"y":"qux"}');
         expect(process.env.JSONSTRINGMULTILINE).toBe('{"x": 1, "y": "q\\nux"}');
-        expect(process.env.JSONDATA).toBe('{"x":1,"y":"qux"}');
+
+        let result = JSON.stringify('{"x":1,"y":"qux"}');
+        result = result.substring(1, result.length - 1);
+        expect(process.env.JSONDATA).toBe(result);
     });
 });

integrationTests/enterprise/enterprise.test.js

@@ -72,22 +72,6 @@ describe('integration', () => {
         expect(core.exportVariable).toBeCalledWith('TEST_KEY', 'SUPERSECRET_IN_NAMESPACE');
     });
 
-    it('get wildcard secrets', async () => {
-        mockInput('secret/data/test *');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('SECRET', 'SUPERSECRET_IN_NAMESPACE');
-    });
-
-    it('get wildcard secrets with name prefix', async () => {
-        mockInput('secret/data/test * | GROUP_');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('GROUP_SECRET', 'SUPERSECRET_IN_NAMESPACE');
-    });
-
     it('get nested secret', async () => {
         mockInput('secret/data/nested/test otherSecret');
 
@@ -119,22 +103,6 @@ describe('integration', () => {
         expect(core.exportVariable).toBeCalledWith('SECRET', 'CUSTOMSECRET_IN_NAMESPACE');
     });
 
-    it('get wildcard secrets from K/V v1', async () => {
-        mockInput('my-secret/test *');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('SECRET', 'CUSTOMSECRET_IN_NAMESPACE');
-    });
-
-    it('get wildcard secrets from K/V v1 with name prefix', async () => {
-        mockInput('my-secret/test * | GROUP_');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('GROUP_SECRET', 'CUSTOMSECRET_IN_NAMESPACE');
-    });
-
     it('get nested secret from K/V v1', async () => {
         mockInput('my-secret/nested/test otherSecret');
 

package-lock.json

@@ -9,7 +9,7 @@
             "version": "0.1.0",
             "license": "MIT",
             "dependencies": {
-                "got": "^11.8.6",
+                "got": "^11.8.5",
                 "jsonata": "^2.0.3",
                 "jsrsasign": "^10.8.6"
             },
@@ -2150,9 +2150,9 @@
             }
         },
         "node_modules/got": {
-            "version": "11.8.6",
-            "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-            "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+            "version": "11.8.5",
+            "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+            "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
             "dependencies": {
                 "@sindresorhus/is": "^4.0.0",
                 "@szmarczak/http-timer": "^4.0.5",
@@ -5975,9 +5975,9 @@
             "dev": true
         },
         "got": {
-            "version": "11.8.6",
-            "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-            "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+            "version": "11.8.5",
+            "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+            "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
             "requires": {
                 "@sindresorhus/is": "^4.0.0",
                 "@szmarczak/http-timer": "^4.0.5",

package.json

@@ -34,7 +34,7 @@
     },
     "homepage": "https://github.com/hashicorp/vault-action#readme",
     "dependencies": {
-        "got": "^11.8.6",
+        "got": "^11.8.5",
         "jsonata": "^2.0.3",
         "jsrsasign": "^10.8.6"
     },

src/action.js

@@ -3,9 +3,6 @@ const core = require('@actions/core');
 const command = require('@actions/core/lib/command');
 const got = require('got').default;
 const jsonata = require('jsonata');
-const { normalizeOutputKey } = require('./utils');
-const { WILDCARD } = require('./constants');
-
 const { auth: { retrieveToken }, secrets: { getSecrets } } = require('./index');
 
 const AUTH_METHODS = ['approle', 'token', 'github', 'jwt', 'kubernetes', 'ldap', 'userpass'];
@@ -174,7 +171,7 @@ function parseSecretsInput(secretsInput) {
         const selectorAst = jsonata(selectorQuoted).ast();
         const selector = selectorQuoted.replace(new RegExp('"', 'g'), '');
 
-        if (selector !== WILDCARD && (selectorAst.type !== "path" || selectorAst.steps[0].stages) && selectorAst.type !== "string" && !outputVarName) {
+        if ((selectorAst.type !== "path" || selectorAst.steps[0].stages) && selectorAst.type !== "string" && !outputVarName) {
             throw Error(`You must provide a name for the output key when using json selectors. Input: "${secret}"`);
         }
 
@@ -194,6 +191,20 @@ function parseSecretsInput(secretsInput) {
     return output;
 }
 
+/**
+ * Replaces any dot chars to __ and removes non-ascii charts
+ * @param {string} dataKey
+ * @param {boolean=} isEnvVar
+ */
+function normalizeOutputKey(dataKey, isEnvVar = false) {
+    let outputKey = dataKey
+        .replace('.', '__').replace(new RegExp('-', 'g'), '').replace(/[^\p{L}\p{N}_-]/gu, '');
+    if (isEnvVar) {
+        outputKey = outputKey.toUpperCase();
+    }
+    return outputKey;
+}
+
 /**
  * @param {string} inputKey
  * @param {any} inputOptions
@@ -222,6 +233,6 @@ function parseHeadersInput(inputKey, inputOptions) {
 module.exports = {
     exportSecrets,
     parseSecretsInput,
-    parseHeadersInput,
+    normalizeOutputKey,
+    parseHeadersInput
 };
-

src/action.test.js

@@ -223,7 +223,10 @@ describe('exportSecrets', () => {
     it('JSON data secret retrieval', async () => {
         const jsonData = {"x":1,"y":2};
 
-        let result = JSON.stringify(jsonData);
+        // for secrets stored in Vault as pure JSON, we call stringify twice
+        // and remove the added surrounding quotes
+        let result = JSON.stringify(JSON.stringify(jsonData));
+        result = result.substring(1, result.length - 1);
 
         mockInput('test key');
         mockVaultData({

src/constants.js

@@ -1,5 +0,0 @@
-const WILDCARD = '*';
-
-module.exports = {
-    WILDCARD
-};

src/secrets.js

@@ -1,6 +1,6 @@
 const jsonata = require("jsonata");
-const { WILDCARD } = require("./constants");
-const { normalizeOutputKey } = require("./utils");
+
+
 /**
  * @typedef {Object} SecretRequest
  * @property {string} path
@@ -23,8 +23,7 @@ const { normalizeOutputKey } = require("./utils");
   */
 async function getSecrets(secretRequests, client) {
     const responseCache = new Map();
-    let results = [];
-
+    const results = [];
     for (const secretRequest of secretRequests) {
         let { path, selector } = secretRequest;
 
@@ -47,114 +46,115 @@ async function getSecrets(secretRequests, client) {
                 throw error
             }
         }
-
-        body = JSON.parse(body);
-
-        if (selector == WILDCARD) {                     
-            let keys = body.data;
-            if (body.data["data"] != undefined) {
-                keys = keys.data;
-            }
-
-            for (let key in keys) {
-                let newRequest = Object.assign({},secretRequest);
-                newRequest.selector = key;                  
-                
-                if (secretRequest.selector === secretRequest.outputVarName) {
-                    newRequest.outputVarName = key;
-                    newRequest.envVarName = key;        		
-                }
-                else {
-                    newRequest.outputVarName = secretRequest.outputVarName+key;
-                    newRequest.envVarName = secretRequest.envVarName+key;        		
-                }
-
-                newRequest.outputVarName = normalizeOutputKey(newRequest.outputVarName);
-                newRequest.envVarName = normalizeOutputKey(newRequest.envVarName,true);   
-
-                selector = key;
-
-                results = await selectAndAppendResults(
-                  selector,
-                  body,
-                  cachedResponse,
-                  newRequest,
-                  results
-                );
-            }
+        if (!selector.match(/.*[\.].*/)) {
+            selector = '"' + selector + '"'
+        }
+        selector = "data." + selector
+        body = JSON.parse(body)
+        if (body.data["data"] != undefined) {
+            selector = "data." + selector
         }
-        else {
-          results = await selectAndAppendResults(
-            selector, 
-            body, 
-            cachedResponse, 
-            secretRequest, 
-            results
-          );
-        }   
-    }
 
+        const value = await selectData(body, selector);
+        results.push({
+            request: secretRequest,
+            value,
+            cachedResponse
+        });
+    }
     return results;
 }
 
 /**
  * Uses a Jsonata selector retrieve a bit of data from the result
- * @param {object} data
- * @param {string} selector
+ * @param {object} data 
+ * @param {string} selector 
  */
 async function selectData(data, selector) {
     const ata = jsonata(selector);
-    let result = JSON.stringify(await ata.evaluate(data));
+    let d = await ata.evaluate(data);
+
+    console.log(selector)
+    // If we have a Javascript Object, then this data was stored in Vault as
+    // pure JSON (not a JSON string)
+    const storedAsJSONData = isObject(d);
+
+    // if (isJSONString(d)) {
+        // If we already have a JSON string we will not "stringify" it yet so
+        // that we don't end up calling JSON.parse. This would break the
+        // secrets that are stored as pure JSON. See: https://github.com/hashicorp/vault-action/issues/194
+        // result = d;
+    // } else {
+        result = jsonstringify(d, 0);
+    // }
 
     // Compat for custom engines
     if (!result && ((ata.ast().type === "path" && ata.ast()['steps'].length === 1) || ata.ast().type === "string") && selector !== 'data' && 'data' in data) {
-        result = JSON.stringify(await jsonata(`data.${selector}`).evaluate(data));
+        result = jsonstringify(await jsonata(`data.${selector}`).evaluate(data), 1);
     } else if (!result) {
         throw Error(`Unable to retrieve result for ${selector}. No match data was found. Double check your Key or Selector.`);
     }
 
     if (result.startsWith(`"`)) {
-        result = JSON.parse(result);
+        // we need to strip the beginning and ending quotes otherwise it will
+        // always successfully parse as a JSON string
+        result = result.substring(1, result.length - 1);
+        if (!isJSONString(result)) {
+            // add the quotes back so we can parse it into a Javascript object
+            // to allow support for multi-line secrets. See https://github.com/hashicorp/vault-action/issues/160
+            result = `"${result}"`
+            result = JSON.parse(result);
+        }
+    } else if (isJSONString(result)) {
+        if (storedAsJSONData) {
+            // Support secrets stored in Vault as pure JSON.
+            // See https://github.com/hashicorp/vault-action/issues/194 and https://github.com/hashicorp/vault-action/pull/173
+            result = jsonstringify(result, 2);
+            result = result.substring(1, result.length - 1);
+        } else {
+            // Support secrets stored in Vault as JSON Strings
+            result = jsonstringify(result, 3);
+            result = JSON.parse(result);
+        }
     }
+    console.log()
     return result;
 }
 
+function jsonstringify(input, call) {
+    console.log('stringify', call);
+    return JSON.stringify(input)
+}
+
 /**
- * Uses selectData with the selector to get the value and then appends it to the
- * results. Returns a new array with all of the results.
- * @param {string} selector
- * @param {object} body
- * @param {object} cachedResponse
- * @param {TRequest} secretRequest
- * @param {SecretResponse<TRequest>[]} results
- * @return {Promise<SecretResponse<TRequest>[]>}
+ * isOjbect returns true if target is a Javascript object
+ * @param {Type} target
  */
-const selectAndAppendResults = async (
-  selector,
-  body,
-  cachedResponse,
-  secretRequest,
-  results
-) => {
-  if (!selector.match(/.*[\.].*/)) {
-    selector = '"' + selector + '"';
-  }
-  selector = "data." + selector;
+function isObject(target) {
+    console.log('isObject: ', typeof target === 'object' && target !== null)
+    return typeof target === 'object' && target !== null;
+}
 
-  if (body.data["data"] != undefined) {
-    selector = "data." + selector;
-  }
+/**
+ * isJSONString returns true if target parses as a valid JSON string
+ * @param {Type} target
+ */
+function isJSONString(target) {
+    if (typeof target !== "string"){
+        console.log('isJSONString: false, not string')
+        return false;
+    }
 
-  const value = await selectData(body, selector);
-  return [
-    ...results,
-    {
-      request: secretRequest,
-      value,
-      cachedResponse,
-    },
-  ];
-};
+    try {
+        JSON.parse(target);
+    } catch (e) {
+        console.log('isJSONString: false, failed to parse')
+        return false;
+    }
+
+    console.log('isJSONString: true')
+    return true;
+}
 
 module.exports = {
     getSecrets,

src/utils.js

@@ -1,19 +0,0 @@
-/**
- * Replaces any dot chars to __ and removes non-ascii charts
- * @param {string} dataKey
- * @param {boolean=} isEnvVar
- */
-function normalizeOutputKey(dataKey, isEnvVar = false) {
-  let outputKey = dataKey
-    .replace(".", "__")
-    .replace(new RegExp("-", "g"), "")
-    .replace(/[^\p{L}\p{N}_-]/gu, "");
-  if (isEnvVar) {
-    outputKey = outputKey.toUpperCase();
-  }
-  return outputKey;
-}
-
-module.exports = { 
-    normalizeOutputKey 
-};