@ledgerhq/vault-cli 2.0.0 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +7 -7
- package/CHANGELOG.md +11 -0
- package/bin/index.js +43 -17
- package/bin/index.js.map +1 -1
- package/bin/index.mjs +42 -16
- package/bin/index.mjs.map +1 -1
- package/package.json +2 -2
package/bin/index.mjs
CHANGED
|
@@ -9,7 +9,7 @@ var require_package = __commonJS({
|
|
|
9
9
|
"package.json"(exports, module) {
|
|
10
10
|
module.exports = {
|
|
11
11
|
name: "@ledgerhq/vault-cli",
|
|
12
|
-
version: "2.
|
|
12
|
+
version: "2.1.0",
|
|
13
13
|
description: "A various utility command-line for Vault development",
|
|
14
14
|
homepage: "https://github.com/LedgerHQ/vault-ts",
|
|
15
15
|
license: "BSD-2-Clause",
|
|
@@ -2112,6 +2112,7 @@ var FORMAT_OPTION = {
|
|
|
2112
2112
|
};
|
|
2113
2113
|
|
|
2114
2114
|
// src/revault-compat.ts
|
|
2115
|
+
import get from "lodash/get";
|
|
2115
2116
|
var REVAULT_ONBOARDING_OPTIONS = [
|
|
2116
2117
|
{
|
|
2117
2118
|
name: "compartmentId",
|
|
@@ -2134,19 +2135,44 @@ var REVAULT_ONBOARDING_OPTIONS = [
|
|
|
2134
2135
|
description: "{black.bgGreen.bold NEW } The target revault API URL to use for the onboarding"
|
|
2135
2136
|
}
|
|
2136
2137
|
];
|
|
2137
|
-
function
|
|
2138
|
-
|
|
2139
|
-
|
|
2140
|
-
|
|
2141
|
-
|
|
2142
|
-
|
|
2143
|
-
|
|
2144
|
-
|
|
2145
|
-
|
|
2146
|
-
|
|
2147
|
-
|
|
2148
|
-
|
|
2149
|
-
|
|
2138
|
+
function extractMinivaultUrlFromGate(gate) {
|
|
2139
|
+
const match = gate.match(/(https?:\/\/[^.]+\.minivault\..*)\//);
|
|
2140
|
+
if (match) {
|
|
2141
|
+
return match[1];
|
|
2142
|
+
}
|
|
2143
|
+
}
|
|
2144
|
+
function getInstanceNameFromMinivaultUrl(minivaultUrl) {
|
|
2145
|
+
const match = minivaultUrl.match(/https?:\/\/([^.]+)\.minivault\..*/);
|
|
2146
|
+
const instanceName = match && match[1];
|
|
2147
|
+
if (!instanceName) {
|
|
2148
|
+
throw new Error(`Could not extract instance name from minivault URL: ${minivaultUrl}`);
|
|
2149
|
+
}
|
|
2150
|
+
return instanceName;
|
|
2151
|
+
}
|
|
2152
|
+
async function extractRevaultOnboardingOptions(maybeOptions) {
|
|
2153
|
+
let compartmentId = maybeOptions.compartmentId;
|
|
2154
|
+
let revaultRootAuthToken = maybeOptions.revaultRootAuthToken;
|
|
2155
|
+
let revaultApiUrl = maybeOptions.revaultApiUrl;
|
|
2156
|
+
let hsmScriptsVersion = maybeOptions.hsmScriptsVersion;
|
|
2157
|
+
if (compartmentId === void 0 || revaultRootAuthToken === void 0 || revaultApiUrl === void 0 || hsmScriptsVersion === void 0) {
|
|
2158
|
+
let minivaultURL = maybeOptions.minivaultURL;
|
|
2159
|
+
const gate = maybeOptions.gate;
|
|
2160
|
+
if (minivaultURL === void 0 && gate !== void 0) {
|
|
2161
|
+
minivaultURL = extractMinivaultUrlFromGate(gate);
|
|
2162
|
+
}
|
|
2163
|
+
if (minivaultURL !== void 0) {
|
|
2164
|
+
const remoteUrl = minivaultURL.replace(/https:\/\/[^.]+/, "https://remote");
|
|
2165
|
+
const instanceName = getInstanceNameFromMinivaultUrl(minivaultURL);
|
|
2166
|
+
const instanceValuesResponse = await fetch(`${remoteUrl}/api/instances/${instanceName}`);
|
|
2167
|
+
const instanceValues = await instanceValuesResponse.json();
|
|
2168
|
+
compartmentId = compartmentId ?? get(instanceValues, "values.hsm.compartmentID");
|
|
2169
|
+
hsmScriptsVersion = hsmScriptsVersion ?? get(instanceValues, "values.gate.hsmScriptsVersion");
|
|
2170
|
+
revaultApiUrl = revaultApiUrl ?? `${minivaultURL}/api`;
|
|
2171
|
+
revaultRootAuthToken = revaultRootAuthToken ?? "root-auth-token";
|
|
2172
|
+
}
|
|
2173
|
+
}
|
|
2174
|
+
if (compartmentId !== void 0 && revaultApiUrl !== void 0 && revaultRootAuthToken !== void 0 && hsmScriptsVersion !== void 0) {
|
|
2175
|
+
return { compartmentId, hsmScriptsVersion, revaultApiUrl, revaultRootAuthToken };
|
|
2150
2176
|
}
|
|
2151
2177
|
}
|
|
2152
2178
|
|
|
@@ -2373,7 +2399,7 @@ var bake_default = {
|
|
|
2373
2399
|
await bakeManifest(manifest, pool, {
|
|
2374
2400
|
logger: logger_default,
|
|
2375
2401
|
twoStepsRequest,
|
|
2376
|
-
revaultOnboarding: extractRevaultOnboardingOptions(options2)
|
|
2402
|
+
revaultOnboarding: await extractRevaultOnboardingOptions(options2)
|
|
2377
2403
|
});
|
|
2378
2404
|
break;
|
|
2379
2405
|
} catch (err) {
|
|
@@ -4352,7 +4378,7 @@ var onboard_default = {
|
|
|
4352
4378
|
{
|
|
4353
4379
|
logger: logger_default,
|
|
4354
4380
|
untilStep,
|
|
4355
|
-
revaultOnboarding: extractRevaultOnboardingOptions(options2)
|
|
4381
|
+
revaultOnboarding: await extractRevaultOnboardingOptions(options2)
|
|
4356
4382
|
}
|
|
4357
4383
|
);
|
|
4358
4384
|
}
|