mirror of
https://github.com/hashicorp/vault-action.git
synced 2025-11-07 07:06:56 +00:00
Update to v2.7.2 (#475)
This commit is contained in:
parent
b138504969
commit
65d7a12a80
2 changed files with 21 additions and 2 deletions
|
|
@ -2,6 +2,12 @@
|
||||||
|
|
||||||
* Add changes here
|
* Add changes here
|
||||||
|
|
||||||
|
## 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)
|
## 2.7.1 (July 3, 2023)
|
||||||
|
|
||||||
Bugs:
|
Bugs:
|
||||||
|
|
|
||||||
13
dist/index.js
vendored
13
dist/index.js
vendored
|
|
@ -19010,6 +19010,7 @@ async function getSecrets(secretRequests, client) {
|
||||||
async function selectData(data, selector) {
|
async function selectData(data, selector) {
|
||||||
const ata = jsonata(selector);
|
const ata = jsonata(selector);
|
||||||
let result = JSON.stringify(await ata.evaluate(data));
|
let result = JSON.stringify(await ata.evaluate(data));
|
||||||
|
|
||||||
// Compat for custom engines
|
// Compat for custom engines
|
||||||
if (!result && ((ata.ast().type === "path" && ata.ast()['steps'].length === 1) || ata.ast().type === "string") && selector !== 'data' && 'data' in data) {
|
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 = JSON.stringify(await jsonata(`data.${selector}`).evaluate(data));
|
||||||
|
|
@ -19018,7 +19019,18 @@ async function selectData(data, selector) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result.startsWith(`"`)) {
|
if (result.startsWith(`"`)) {
|
||||||
|
// Support multi-line secrets like JSON strings and ssh keys, see https://github.com/hashicorp/vault-action/pull/173
|
||||||
|
// Deserialize the value so that newlines and special characters are
|
||||||
|
// not escaped in our return value.
|
||||||
result = JSON.parse(result);
|
result = JSON.parse(result);
|
||||||
|
} else {
|
||||||
|
// Support secrets stored in Vault as pure JSON, see https://github.com/hashicorp/vault-action/issues/194
|
||||||
|
// Serialize the value so that any special characters in the data are
|
||||||
|
// properly escaped.
|
||||||
|
result = JSON.stringify(result);
|
||||||
|
// strip the surrounding quotes added by stringify because the data did
|
||||||
|
// not have them in the first place
|
||||||
|
result = result.substring(1, result.length - 1);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
@ -19028,6 +19040,7 @@ module.exports = {
|
||||||
selectData
|
selectData
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
/***/ 9491:
|
/***/ 9491:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue