diff --git a/dist/index.js b/dist/index.js index 62184bf..dc39856 100644 --- a/dist/index.js +++ b/dist/index.js @@ -10895,7 +10895,9 @@ async function getSecrets(secretRequests, client) { } let value; - if(selector !== "*"){ + if(selector === "*"){ + value = body.data["data"]; + } else { if (!selector.match(/.*[\.].*/)) { selector = '"' + selector + '"' } @@ -10905,8 +10907,6 @@ async function getSecrets(secretRequests, client) { selector = "data." + selector } value = selectData(body, selector); - } else { - value = body.data["data"]; } results.push({ @@ -14690,8 +14690,8 @@ async function exportSecrets() { addMask(value) core.exportVariable(request.envVarName, value); } - //core.setOutput(request.outputVarName, `${value}`); - //core.debug(`✔ ${request.path} => outputs.${request.outputVarName}${exportEnv ? ` | env.${request.envVarName}` : ''}`); + core.setOutput(request.outputVarName, typeof value === "object" ? value : `${value}`); + core.debug(`✔ ${request.path} => outputs.${request.outputVarName}${exportEnv ? ` | env.${request.envVarName}` : ''}`); } }; @@ -14743,7 +14743,7 @@ function parseSecretsInput(secretsInput) { if (selectorQuoted === "*") { output.push({ path, - envVarName: "", + envVarName: "*", outputVarName: "", selector: "*" }); diff --git a/src/action.js b/src/action.js index 86f258c..6b45aa6 100644 --- a/src/action.js +++ b/src/action.js @@ -97,8 +97,8 @@ async function exportSecrets() { addMask(value) core.exportVariable(request.envVarName, value); } - //core.setOutput(request.outputVarName, `${value}`); - //core.debug(`✔ ${request.path} => outputs.${request.outputVarName}${exportEnv ? ` | env.${request.envVarName}` : ''}`); + core.setOutput(request.outputVarName, typeof value === "object" ? value : `${value}`); + core.debug(`✔ ${request.path} => outputs.${request.outputVarName}${exportEnv ? ` | env.${request.envVarName}` : ''}`); } }; @@ -150,7 +150,7 @@ function parseSecretsInput(secretsInput) { if (selectorQuoted === "*") { output.push({ path, - envVarName: "", + envVarName: "*", outputVarName: "", selector: "*" }); diff --git a/src/action.test.js b/src/action.test.js index 4b97db3..e06e0fe 100644 --- a/src/action.test.js +++ b/src/action.test.js @@ -27,12 +27,11 @@ describe('parseSecretsInput', () => { it('parses all secrets', () => { const output = parseSecretsInput('test *'); - console.log(output); expect(output).toContainEqual({ path: 'test', selector: '*', outputVarName: '', - envVarName: '' + envVarName: '*' }); }); diff --git a/src/secrets.js b/src/secrets.js index dd69cf8..34d81f4 100644 --- a/src/secrets.js +++ b/src/secrets.js @@ -40,7 +40,9 @@ async function getSecrets(secretRequests, client) { } let value; - if(selector !== "*"){ + if(selector === "*"){ + value = body.data["data"]; + } else { if (!selector.match(/.*[\.].*/)) { selector = '"' + selector + '"' } @@ -50,8 +52,6 @@ async function getSecrets(secretRequests, client) { selector = "data." + selector } value = selectData(body, selector); - } else { - value = body.data["data"]; } results.push({