bdy 1.22.43-dev → 1.22.44-dev

package/distTs/src/command/sandbox/list.js

@@ -11,29 +11,35 @@ const commandSandboxList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_
 commandSandboxList.alias('ls');
 commandSandboxList.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandSandboxList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandSandboxList.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxList.action(async (options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
-    if (sandboxes.length === 0) {
-        output_1.default.exitNormal('No sandboxes found');
+    if (options.format === 'json') {
+        output_1.default.json(sandboxes);
     }
-    const data = [
-        ['NAME', 'STATUS', 'SETUP_STATUS', 'ID', 'IDENTIFIER', 'URL'],
-    ];
-    for (const sandbox of sandboxes) {
-        data.push([
-            sandbox.name || '-',
-            sandbox.status || '-',
-            sandbox.setup_status || '-',
-            sandbox.id || '-',
-            sandbox.identifier || '-',
-            sandbox.html_url || '-',
-        ]);
+    else {
+        if (sandboxes.length === 0) {
+            output_1.default.exitNormal('No sandboxes found');
+        }
+        const data = [
+            ['NAME', 'STATUS', 'SETUP_STATUS', 'ID', 'IDENTIFIER', 'URL'],
+        ];
+        for (const sandbox of sandboxes) {
+            data.push([
+                sandbox.name || '-',
+                sandbox.status || '-',
+                sandbox.setup_status || '-',
+                sandbox.id || '-',
+                sandbox.identifier || '-',
+                sandbox.html_url || '-',
+            ]);
+        }
+        output_1.default.table(data);
     }
-    output_1.default.table(data);
     output_1.default.exitNormal();
 });
 exports.default = commandSandboxList;

package/distTs/src/command/sandbox/snapshot/get.js

@@ -10,6 +10,7 @@ const input_1 = __importDefault(require("../../../input"));
 const commandSandboxSnapshotGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_SANDBOX_SNAPSHOT_GET);
 commandSandboxSnapshotGet.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandSandboxSnapshotGet.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandSandboxSnapshotGet.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxSnapshotGet.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxSnapshotGet.argument('<snapshot-name>', texts_1.OPTION_SANDBOX_SNAPSHOT_NAME_ARG);
 commandSandboxSnapshotGet.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_SNAPSHOT_GET}`);
@@ -28,20 +29,25 @@ commandSandboxSnapshotGet.action(async (identifier, snapshotName, options) => {
         output_1.default.exitError(texts_1.ERR_SANDBOX_SNAPSHOT_NOT_FOUND);
     }
     const snapshot = await client.getSandboxSnapshot(workspace, sandbox_id, foundSnapshot.id);
-    const data = [
-        ['Field', 'Value'],
-        ['Name', snapshot.name || '-'],
-        ['Status', snapshot.status || '-'],
-        ['Created', snapshot.create_date || '-'],
-    ];
-    if (snapshot.creator) {
-        data.push([
-            'Creator',
-            snapshot.creator.name || snapshot.creator.email || '-',
-        ]);
+    if (options.format === 'json') {
+        output_1.default.json(snapshot);
+    }
+    else {
+        const data = [
+            ['Field', 'Value'],
+            ['Name', snapshot.name || '-'],
+            ['Status', snapshot.status || '-'],
+            ['Created', snapshot.create_date || '-'],
+        ];
+        if (snapshot.creator) {
+            data.push([
+                'Creator',
+                snapshot.creator.name || snapshot.creator.email || '-',
+            ]);
+        }
+        data.push(['URL', snapshot.html_url]);
+        output_1.default.table(data);
     }
-    data.push(['URL', snapshot.html_url]);
-    output_1.default.table(data);
     output_1.default.exitNormal();
 });
 exports.default = commandSandboxSnapshotGet;

package/distTs/src/command/sandbox/snapshot/list.js

@@ -11,6 +11,7 @@ const commandSandboxSnapshotList = (0, utils_1.newCommand)('list', texts_1.DESC_
 commandSandboxSnapshotList.alias('ls');
 commandSandboxSnapshotList.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandSandboxSnapshotList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandSandboxSnapshotList.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxSnapshotList.argument('[identifier]', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxSnapshotList.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_SNAPSHOT_LIST}`);
 commandSandboxSnapshotList.action(async (identifier, options) => {
@@ -30,19 +31,24 @@ commandSandboxSnapshotList.action(async (identifier, options) => {
         const result = await client.listProjectSnapshots(workspace, project);
         snapshots = result.snapshots || [];
     }
-    if (snapshots.length === 0) {
-        output_1.default.exitError(texts_1.ERR_SANDBOX_SNAPSHOTS_NOT_FOUND);
+    if (options.format === 'json') {
+        output_1.default.json(snapshots);
     }
-    const data = [['Name', 'Status', 'Created', 'URL']];
-    for (const snapshot of snapshots) {
-        data.push([
-            snapshot.name || '-',
-            snapshot.status || '-',
-            snapshot.create_date || '-',
-            snapshot.html_url || '-',
-        ]);
+    else {
+        if (snapshots.length === 0) {
+            output_1.default.exitError(texts_1.ERR_SANDBOX_SNAPSHOTS_NOT_FOUND);
+        }
+        const data = [['Name', 'Status', 'Created', 'URL']];
+        for (const snapshot of snapshots) {
+            data.push([
+                snapshot.name || '-',
+                snapshot.status || '-',
+                snapshot.create_date || '-',
+                snapshot.html_url || '-',
+            ]);
+        }
+        output_1.default.table(data);
     }
-    output_1.default.table(data);
     output_1.default.exitNormal();
 });
 exports.default = commandSandboxSnapshotList;

package/distTs/src/command/sandbox/status.js

@@ -10,6 +10,7 @@ const input_1 = __importDefault(require("../../input"));
 const commandSandboxStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_SANDBOX_STATUS);
 commandSandboxStatus.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandSandboxStatus.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandSandboxStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxStatus.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxStatus.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -20,11 +21,16 @@ commandSandboxStatus.action(async (identifier, options) => {
         output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
     }
     const sandbox = await client.getSandbox(workspace, sandbox_id);
-    output_1.default.table([
-        ['Type', 'Status'],
-        ['Status', sandbox.status || 'UNKNOWN'],
-        ['Setup', sandbox.setup_status || 'UNKNOWN'],
-    ]);
+    if (options.format === 'json') {
+        output_1.default.json(sandbox);
+    }
+    else {
+        output_1.default.table([
+            ['Type', 'Status'],
+            ['Status', sandbox.status || 'UNKNOWN'],
+            ['Setup', sandbox.setup_status || 'UNKNOWN'],
+        ]);
+    }
     output_1.default.exitNormal();
 });
 exports.default = commandSandboxStatus;

package/distTs/src/command/whoami.js

@@ -10,7 +10,8 @@ const output_1 = __importDefault(require("../output"));
 const input_1 = __importDefault(require("../input"));
 const cfg_2 = __importDefault(require("../project/cfg"));
 const commandWhoami = (0, utils_1.newCommand)('whoami', texts_1.DESC_COMMAND_WHOAMI);
-commandWhoami.action(async () => {
+commandWhoami.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandWhoami.action(async (options) => {
     const workspace = cfg_1.default.getWorkspace();
     const localWorkspace = cfg_2.default.getWorkspace();
     const localProject = cfg_2.default.getProject();
@@ -20,27 +21,35 @@ commandWhoami.action(async () => {
         output_1.default.exitError(texts_1.ERR_WHOAMI_LOGOUT);
     }
     const email = await (0, utils_1.tryGetEmail)(client);
-    output_1.default.normal(`User: ${user.name}${email ? ` (${email})` : ''}`);
+    const obj = {
+        'User': `${user.name}${email ? ` (${email})` : ''}`
+    };
     if (localWorkspace) {
-        output_1.default.normal(`Workspace: ${localWorkspace}`);
+        obj.Workspace = localWorkspace;
     }
     else {
-        output_1.default.normal(`Workspace: ${!workspace ? texts_1.TXT_WHOAMI_NO_WORKSPACE : workspace}`);
+        obj.Workspace = !workspace ? texts_1.TXT_WHOAMI_NO_WORKSPACE : workspace;
     }
     if (localProject) {
-        output_1.default.normal(`Project: ${localProject}`);
+        obj.Project = localProject;
     }
     const vtSuite = cfg_2.default.getVtSuite();
     const utSuite = cfg_2.default.getUtSuite();
     const crawlSuite = cfg_2.default.getCrawlSuite();
     if (vtSuite) {
-        output_1.default.normal(`Visual test suite: ${vtSuite}`);
+        obj['Visual test suite'] = vtSuite;
     }
     if (utSuite) {
-        output_1.default.normal(`Unit test suite: ${utSuite}`);
+        obj['Unit test suite'] = utSuite;
     }
     if (crawlSuite) {
-        output_1.default.normal(`Crawl suite: ${crawlSuite}`);
+        obj['Crawl suite'] = crawlSuite;
+    }
+    if (options.format === 'json') {
+        output_1.default.json(obj);
+    }
+    else {
+        output_1.default.object(obj);
     }
     output_1.default.exitNormal();
 });

package/distTs/src/command/workspace/list.js

@@ -9,18 +9,24 @@ const utils_1 = require("../../utils");
 const input_1 = __importDefault(require("../../input"));
 const commandWorkspaceList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_WORKSPACE_LIST);
 commandWorkspaceList.alias('ls');
-commandWorkspaceList.action(async () => {
+commandWorkspaceList.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandWorkspaceList.action(async (options) => {
     const client = input_1.default.restApiTokenClient();
     const response = await client.getWorkspaces();
-    if (!response.workspaces || response.workspaces.length === 0) {
-        output_1.default.normal('No workspaces found.');
-        output_1.default.exitNormal();
+    if (options.format === 'json') {
+        output_1.default.json(response.workspaces || []);
     }
-    const data = [['NAME', 'DOMAIN', 'URL']];
-    for (const ws of response.workspaces) {
-        data.push([ws.name, ws.domain, ws.html_url]);
+    else {
+        if (!response.workspaces || response.workspaces.length === 0) {
+            output_1.default.normal('No workspaces found.');
+            output_1.default.exitNormal();
+        }
+        const data = [['NAME', 'DOMAIN', 'URL']];
+        for (const ws of response.workspaces) {
+            data.push([ws.name, ws.domain, ws.html_url]);
+        }
+        output_1.default.table(data);
     }
-    output_1.default.table(data);
     output_1.default.exitNormal();
 });
 exports.default = commandWorkspaceList;

package/distTs/src/input.js

@@ -50,6 +50,7 @@ const node_path_1 = __importStar(require("node:path"));
 const cfg_1 = __importDefault(require("./tunnel/cfg"));
 const uuid_1 = require("uuid");
 const sandbox_1 = require("./types/sandbox");
+const distro_1 = require("./types/distro");
 class Input {
     static timeout(timeout) {
         const t = parseInt(timeout, 10);
@@ -341,11 +342,25 @@ class Input {
         const baseUrl = this.restApiBaseUrl(api, region, t);
         return new ApiClient(baseUrl, t, refreshToken, clientId, clientSecret, clientToken);
     }
+    static routeType(type) {
+        if (!type)
+            return distro_1.ROUTE_TYPE.PROXY;
+        if (Object.values(distro_1.ROUTE_TYPE).includes(type)) {
+            return type;
+        }
+        output_1.default.exitError(texts_1.ERR_COMMAND_ROUTE_TYPE);
+    }
+    static routePath(path) {
+        if (!path)
+            return '';
+        return path.replace(/^\/+/, '');
+    }
     static artifactType(type) {
         if (!type)
             return utils_1.ARTIFACT_TYPE.BUCKET;
-        if (Object.values(utils_1.ARTIFACT_TYPE).includes(type))
+        if (Object.values(utils_1.ARTIFACT_TYPE).includes(type)) {
             return type;
+        }
         output_1.default.exitError(texts_1.ERR_COMMAND_ARTIFACT_TYPE);
     }
     static artifactScope(project) {
@@ -489,6 +504,154 @@ class Input {
         });
         return list;
     }
+    static async routeTarget(client, workspace, project, targetList) {
+        if (!targetList || !Array.isArray(targetList) || !targetList.length) {
+            output_1.default.exitError(texts_1.ERR_COMMAND_ROUTE_NO_TARGET);
+        }
+        const targets = {};
+        const SEP = '\x00';
+        for (let j = 0; j < targetList.length; j += 1) {
+            const str = targetList[j];
+            let type = null;
+            let url = '';
+            let artifact = '';
+            let sandbox = '';
+            let region = null;
+            const parts = str
+                .replace(/\\,/g, SEP)
+                .split(',')
+                .map((p) => p.split(SEP).join(','));
+            for (let i = 0; i < parts.length; i += 1) {
+                const p = parts[i];
+                const idx = p.indexOf('=');
+                if (idx < 0) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'No key=val delimiter'));
+                }
+                const key = p.substring(0, idx).trim();
+                const val = p.substring(idx + 1).trim();
+                if (key === 'url' && val) {
+                    if (url || type !== null) {
+                        output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Param url defined twice'));
+                    }
+                    type = distro_1.ROUTE_TARGET_TYPE.EXTERNAL;
+                    url = val;
+                }
+                else if (key === 'artifact' && val) {
+                    if (artifact || type !== null) {
+                        output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Param artifact defined twice'));
+                    }
+                    type = distro_1.ROUTE_TARGET_TYPE.ARTIFACT;
+                    artifact = val;
+                }
+                else if (key === 'sandbox' && val) {
+                    if (sandbox || type !== null) {
+                        output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Param sandbox defined twice'));
+                    }
+                    type = distro_1.ROUTE_TARGET_TYPE.SANDBOX;
+                    sandbox = val;
+                }
+                else if (key === 'region' && val) {
+                    if (region) {
+                        output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Param region defined twice'));
+                    }
+                    const match = Object.values(distro_1.ROUTE_REGION).find((r) => r.toLowerCase() === val.toLowerCase());
+                    if (match) {
+                        region = match;
+                    }
+                    else {
+                        output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Wrong value of region'));
+                    }
+                }
+                else {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Unknown param'));
+                }
+            }
+            if (!type) {
+                output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Unrecognized type'));
+            }
+            if (!region) {
+                region = distro_1.ROUTE_REGION.Default;
+            }
+            if (targets[region]) {
+                output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Region already used by another target'));
+            }
+            let target;
+            if (type === distro_1.ROUTE_TARGET_TYPE.EXTERNAL) {
+                target = {
+                    type,
+                    external_url: url,
+                };
+            }
+            else if (type === distro_1.ROUTE_TARGET_TYPE.ARTIFACT) {
+                const idx = artifact.indexOf(':');
+                if (idx < 0) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'artifact wrong format (identifier:version)'));
+                }
+                const identifier = artifact.substring(0, idx).trim();
+                const version = artifact.substring(idx + 1).trim();
+                if (!identifier || !version) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'artifact wrong format (identifier:version)'));
+                }
+                let result = await client.getArtifactVersionByIdentifier(workspace, project, identifier, version);
+                if (!result.artifact_id && project) {
+                    // try in workspace scope
+                    result = await client.getArtifactVersionByIdentifier(workspace, null, identifier, version);
+                }
+                if (!result.domain) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, texts_1.ERR_WORKSPACE_NOT_FOUND));
+                }
+                if (!result.artifact_id) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, texts_1.ERR_ARTIFACT_NOT_FOUND));
+                }
+                if (!result.artifact_version_id) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, texts_1.ERR_ARTIFACT_VERSION_NOT_FOUND));
+                }
+                target = {
+                    type,
+                    artifact: {
+                        id: result.artifact_id,
+                        version_id: result.artifact_version_id,
+                    },
+                };
+            }
+            else if (type === distro_1.ROUTE_TARGET_TYPE.SANDBOX) {
+                const idx = sandbox.indexOf(':');
+                if (idx < 0) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'sandbox wrong format (identifier:endpoint)'));
+                }
+                const identifier = sandbox.substring(0, idx).trim();
+                const endpoint = sandbox.substring(idx + 1).trim();
+                if (!identifier || !endpoint) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'sandbox wrong format (identifier:endpoint)'));
+                }
+                if (!project) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'sandbox target can be used only in project'));
+                }
+                const result = await client.getSandboxByIdentifier(workspace, project, identifier);
+                if (!result.domain) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, texts_1.ERR_WORKSPACE_NOT_FOUND));
+                }
+                if (!result.sandbox_id) {
+                    output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, texts_1.ERR_SANDBOX_NOT_FOUND));
+                }
+                target = {
+                    type,
+                    sandbox: {
+                        id: result.sandbox_id,
+                        endpoint: endpoint,
+                    },
+                };
+            }
+            else {
+                output_1.default.exitError((0, texts_1.ERR_WRONG_ROUTE_TARGET)(str, 'Unknown target type'));
+            }
+            targets[region] = target;
+        }
+        if (!targets[distro_1.ROUTE_REGION.Default]) {
+            output_1.default.exitError(texts_1.ERR_ROUTE_NO_DEFAULT);
+        }
+        return targets;
+    }
     static sandboxFetch(fetchList) {
         const fetch = [];
         const SEP = '\x00';
@@ -872,6 +1035,22 @@ class Input {
             output_1.default.exitError(texts_1.ERR_API_WRONG_METHOD);
         return null;
     }
+    static distroScope(project, scope) {
+        if (scope) {
+            if (scope === distro_1.DISTRO_SCOPE.WORKSPACE) {
+                return scope;
+            }
+            if (scope === distro_1.DISTRO_SCOPE.PROJECT) {
+                if (!project)
+                    output_1.default.exitError(texts_1.ERR_COMMAND_DISTRO_NO_PROJECT);
+                return scope;
+            }
+            return output_1.default.exitError(texts_1.ERR_COMMAND_DISTRO_SCOPE);
+        }
+        if (project)
+            return distro_1.DISTRO_SCOPE.PROJECT;
+        return distro_1.DISTRO_SCOPE.WORKSPACE;
+    }
     static restApiProject(project, allowNull) {
         const ProjectCfg = require('./project/cfg').default;
         let p = process.env.BUDDY_PROJECT;

package/distTs/src/output.js

@@ -158,6 +158,14 @@ class Output {
     static cyan(txt, newLine = true) {
         this.normal(this.getCyanColor(txt), newLine);
     }
+    static identifier(identifier) {
+        Output.dim('Identifier: ', false);
+        Output.cyan(identifier);
+    }
+    static id(id) {
+        Output.dim('Id: ', false);
+        Output.cyan(id);
+    }
     static debug(txt) {
         const { debug } = require('./visualTest/context');
         if (debug) {
@@ -243,10 +251,10 @@ class Output {
             this.tunnelNonInteractive(tunnel);
     }
     static object(data) {
-        const table = [['Field', 'Value'], ...Object.entries(data)];
-        this.table(table);
+        const table = [...Object.entries(data)];
+        this.table(table, false);
     }
-    static table(data) {
+    static table(data, firstRowBlue = true) {
         // apply padding
         for (let i = 0; i < data.length; i += 1) {
             for (let j = 0; j < data[i].length; j += 1) {
@@ -258,11 +266,13 @@ class Output {
                 data[i][j] = tmp.join('\n');
             }
         }
-        getTerminal().table(data, {
+        const opts = {
             fit: false,
             hasBorder: false,
-            firstRowTextAttr: { color: 'blue' },
-        });
+        };
+        if (firstRowBlue)
+            opts.firstRowTextAttr = { color: 'blue' };
+        getTerminal().table(data, opts);
     }
     static configTunnels(tunnels) {
         const OutputNoninteractiveConfigTunnels = require('./tunnel/output/noninteractive/config/tunnels').default;