@ledgerhq/vault-cli 2.0.0 → 2.1.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @ledgerhq/vault-cli@2.0.0 build /home/runner/work/vault-ts/vault-ts/apps/cli
+> @ledgerhq/vault-cli@2.1.0 build /home/runner/work/vault-ts/vault-ts/apps/cli
 > tsup && chmod +x bin/index.js
 
 CLI Building entry: src/index.ts
@@ -10,9 +10,9 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM bin/index.mjs     146.68 KB
-ESM bin/index.mjs.map 277.63 KB
-ESM ⚡️ Build success in 706ms
-CJS bin/index.js     148.33 KB
-CJS bin/index.js.map 241.32 KB
-CJS ⚡️ Build success in 711ms
+ESM bin/index.mjs     148.05 KB
+ESM bin/index.mjs.map 280.24 KB
+ESM ⚡️ Build success in 691ms
+CJS bin/index.js     150.00 KB
+CJS bin/index.js.map 243.45 KB
+CJS ⚡️ Build success in 700ms

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @ledgerhq/vault-cli
 
+## 2.1.0
+
+### Minor Changes
+
+- c8b6804: feat(onboarding): VG-25117 try to deduce cid/selfs/token from minivault instance
+
+### Patch Changes
+
+- Updated dependencies [25931d6]
+  - @ledgerhq/vault-common@2.0.1
+
 ## 2.0.0
 
 ### Major Changes

package/bin/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-"use strict"; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var __getOwnPropNames = Object.getOwnPropertyNames;
+"use strict"; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -9,7 +9,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@ledgerhq/vault-cli",
-      version: "2.0.0",
+      version: "2.1.0",
       description: "A various utility command-line for Vault development",
       homepage: "https://github.com/LedgerHQ/vault-ts",
       license: "BSD-2-Clause",
@@ -2112,6 +2112,7 @@ var FORMAT_OPTION = {
 };
 
 // src/revault-compat.ts
+var _get = require('lodash/get'); var _get2 = _interopRequireDefault(_get);
 var REVAULT_ONBOARDING_OPTIONS = [
   {
     name: "compartmentId",
@@ -2134,19 +2135,44 @@ var REVAULT_ONBOARDING_OPTIONS = [
     description: "{black.bgGreen.bold  NEW } The target revault API URL to use for the onboarding"
   }
 ];
-function extractRevaultOnboardingOptions(maybeOptions) {
-  if (!maybeOptions) return;
-  const revaultApiUrl = maybeOptions.minivaultURL ? (
-    /* istanbul ignore next */
-    `${maybeOptions.minivaultURL}/api`
-  ) : maybeOptions.revaultApiUrl;
-  if (maybeOptions.compartmentId !== void 0 && revaultApiUrl !== void 0 && maybeOptions.revaultRootAuthToken !== void 0 && maybeOptions.hsmScriptsVersion !== void 0) {
-    return {
-      compartmentId: maybeOptions.compartmentId,
-      hsmScriptsVersion: maybeOptions.hsmScriptsVersion,
-      revaultApiUrl,
-      revaultRootAuthToken: maybeOptions.revaultRootAuthToken
-    };
+function extractMinivaultUrlFromGate(gate) {
+  const match = gate.match(/(https?:\/\/[^.]+\.minivault\..*)\//);
+  if (match) {
+    return match[1];
+  }
+}
+function getInstanceNameFromMinivaultUrl(minivaultUrl) {
+  const match = minivaultUrl.match(/https?:\/\/([^.]+)\.minivault\..*/);
+  const instanceName = match && match[1];
+  if (!instanceName) {
+    throw new Error(`Could not extract instance name from minivault URL: ${minivaultUrl}`);
+  }
+  return instanceName;
+}
+async function extractRevaultOnboardingOptions(maybeOptions) {
+  let compartmentId = maybeOptions.compartmentId;
+  let revaultRootAuthToken = maybeOptions.revaultRootAuthToken;
+  let revaultApiUrl = maybeOptions.revaultApiUrl;
+  let hsmScriptsVersion = maybeOptions.hsmScriptsVersion;
+  if (compartmentId === void 0 || revaultRootAuthToken === void 0 || revaultApiUrl === void 0 || hsmScriptsVersion === void 0) {
+    let minivaultURL = maybeOptions.minivaultURL;
+    const gate = maybeOptions.gate;
+    if (minivaultURL === void 0 && gate !== void 0) {
+      minivaultURL = extractMinivaultUrlFromGate(gate);
+    }
+    if (minivaultURL !== void 0) {
+      const remoteUrl = minivaultURL.replace(/https:\/\/[^.]+/, "https://remote");
+      const instanceName = getInstanceNameFromMinivaultUrl(minivaultURL);
+      const instanceValuesResponse = await fetch(`${remoteUrl}/api/instances/${instanceName}`);
+      const instanceValues = await instanceValuesResponse.json();
+      compartmentId = _nullishCoalesce(compartmentId, () => ( _get2.default.call(void 0, instanceValues, "values.hsm.compartmentID")));
+      hsmScriptsVersion = _nullishCoalesce(hsmScriptsVersion, () => ( _get2.default.call(void 0, instanceValues, "values.gate.hsmScriptsVersion")));
+      revaultApiUrl = _nullishCoalesce(revaultApiUrl, () => ( `${minivaultURL}/api`));
+      revaultRootAuthToken = _nullishCoalesce(revaultRootAuthToken, () => ( "root-auth-token"));
+    }
+  }
+  if (compartmentId !== void 0 && revaultApiUrl !== void 0 && revaultRootAuthToken !== void 0 && hsmScriptsVersion !== void 0) {
+    return { compartmentId, hsmScriptsVersion, revaultApiUrl, revaultRootAuthToken };
   }
 }
 
@@ -2373,7 +2399,7 @@ var bake_default = {
         await _vaultcommon.bakeManifest.call(void 0, manifest, pool, {
           logger: logger_default,
           twoStepsRequest,
-          revaultOnboarding: extractRevaultOnboardingOptions(options2)
+          revaultOnboarding: await extractRevaultOnboardingOptions(options2)
         });
         break;
       } catch (err) {
@@ -4352,7 +4378,7 @@ var onboard_default = {
       {
         logger: logger_default,
         untilStep,
-        revaultOnboarding: extractRevaultOnboardingOptions(options2)
+        revaultOnboarding: await extractRevaultOnboardingOptions(options2)
       }
     );
   }