simplify more

src/secrets.js

@@ -73,24 +73,16 @@ async function getSecrets(secretRequests, client) {
 async function selectData(data, selector) {
     const ata = jsonata(selector);
     let d = await ata.evaluate(data);
+    console.log(selector);
 
-    console.log(selector)
     // If we have a Javascript Object, then this data was stored in Vault as
-    // pure JSON (not a JSON string)
+    // pure JSON (not a JSON string). We will capture that before we stringify it.
     const storedAsJSONData = isObject(d);
-
+    result = JSON.stringify(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 = jsonstringify(await jsonata(`data.${selector}`).evaluate(data), 1);
+        result = JSON.stringify(await jsonata(`data.${selector}`).evaluate(data));
     } else if (!result) {
         throw Error(`Unable to retrieve result for ${selector}. No match data was found. Double check your Key or Selector.`);
     }
@@ -98,40 +90,29 @@ async function selectData(data, selector) {
     if (result.startsWith(`"`)) {
         // 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}"`
+        console.log(" =>>> PARSING")
+        result = JSON.parse(result);
+        // }
+    } else {
+        console.log('does not start with quote')
+        // 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 = JSON.stringify(result);
         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)
-}
-
 /**
  * isOjbect returns true if target is a Javascript object
  * @param {Type} target
  */
 function isObject(target) {
-    console.log('isObject: ', typeof target === 'object' && target !== null)
     return typeof target === 'object' && target !== null;
 }
 
@@ -141,18 +122,15 @@ function isObject(target) {
  */
 function isJSONString(target) {
     if (typeof target !== "string"){
-        console.log('isJSONString: false, not string')
         return false;
     }
 
     try {
         JSON.parse(target);
     } catch (e) {
-        console.log('isJSONString: false, failed to parse')
         return false;
     }
 
-    console.log('isJSONString: true')
     return true;
 }