@mablhq/mabl-cli 1.19.3 → 1.20.1

package/commands/credentials/credentials_cmds/list.js

@@ -18,7 +18,7 @@ exports.handler = (0, util_1.failWrapper)(listCredentials);
 async function listCredentials(parsed) {
     const output = parsed.output;
     const limit = parsed.limit;
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const credentials = await apiClient.getCredentials(workspaceId, limit);
     printCredentials(credentials, output);

package/commands/deploy/deploy_cmds/create.js

@@ -10,7 +10,7 @@ const awaitDeploymentCompletion_1 = require("./awaitDeploymentCompletion");
 const moment = require("moment");
 const scmContextProvider_1 = require("../../../providers/scmContextProvider");
 const cliConfigProvider_1 = require("../../../providers/cliConfigProvider");
-const set_1 = require("../../config/config_cmds/set");
+const configKeys_1 = require("../../config/config_cmds/configKeys");
 const codeInsights_1 = require("../../commandUtil/codeInsights");
 const constants_1 = require("../../constants");
 const describe_1 = require("../../commandUtil/describe");
@@ -277,7 +277,7 @@ exports.printDeploymentEventResultOutput = printDeploymentEventResultOutput;
 async function collectSourceControlMetadataIfEnabled(parsed) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const userSuppliedRepositoryUrl = parsed['repository-url'];
-    if (cliConfigProvider_1.CliConfigProvider.getConfigProperty(set_1.configKeys.enableSourceControlMetadataCollection)) {
+    if (await cliConfigProvider_1.CliConfigProvider.getConfigProperty(configKeys_1.configKeys.enableSourceControlMetadataCollection)) {
         const buildInfo = await new scmContextProvider_1.ScmContextProvider(process.env).extractScmAndBuildInfo();
         const sourceControlBranch = ((_a = buildInfo === null || buildInfo === void 0 ? void 0 : buildInfo.scmInfo) === null || _a === void 0 ? void 0 : _a.branchName) || ((_b = buildInfo === null || buildInfo === void 0 ? void 0 : buildInfo.buildInfo) === null || _b === void 0 ? void 0 : _b.branchName);
         const sourceControlTag = ((_c = buildInfo === null || buildInfo === void 0 ? void 0 : buildInfo.scmInfo) === null || _c === void 0 ? void 0 : _c.tagName) || ((_d = buildInfo === null || buildInfo === void 0 ? void 0 : buildInfo.buildInfo) === null || _d === void 0 ? void 0 : _d.tagName);

package/commands/deploy/deploy_cmds/list.js

@@ -18,7 +18,7 @@ exports.handler = (0, util_1.failWrapper)(listDeployments);
 async function listDeployments(parsed) {
     const output = parsed.output;
     const limit = parsed.limit;
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const deployments = await apiClient.getDeploymentEvents(workspaceId, limit);
     printDeployments(deployments, output);

package/commands/environments/environments_cmds/create.js

@@ -12,7 +12,6 @@ const branches_1 = require("../../commandUtil/branches");
 const chalk_1 = __importDefault(require("chalk"));
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const add_1 = require("./urls_cmds/add");
-const cliConfigProvider_1 = require("../../../providers/cliConfigProvider");
 exports.command = 'create';
 exports.describe = 'Create a new mabl environment';
 exports.builder = (yargs) => {
@@ -96,11 +95,16 @@ function addUpdateEnvCommands(argv) {
 }
 exports.addUpdateEnvCommands = addUpdateEnvCommands;
 async function createEnvironment(parsed) {
-    var _a, _b, _c;
+    var _a;
     let environment;
     try {
         const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
-        const workspaceId = (_a = parsed[constants_1.CommandArgWorkspaceId]) !== null && _a !== void 0 ? _a : (_b = cliConfigProvider_1.CliConfigProvider.getWorkspace()) === null || _b === void 0 ? void 0 : _b.id;
+        let workspaceId;
+        try {
+            workspaceId = await (0, util_1.getWorkspaceId)(parsed);
+        }
+        catch {
+        }
         environment = {
             organization_id: workspaceId,
             name: parsed[constants_1.CommandArgName],
@@ -114,7 +118,7 @@ async function createEnvironment(parsed) {
             variables: parsed[constants_1.CommandArgVariables],
         };
         environment = await apiClient.createEnvironment(environment);
-        loggingProvider_1.logger.info(chalk_1.default.green(`Environment ${chalk_1.default.bold((_c = environment.id) !== null && _c !== void 0 ? _c : '')} CREATED`));
+        loggingProvider_1.logger.info(chalk_1.default.green(`Environment ${chalk_1.default.bold((_a = environment.id) !== null && _a !== void 0 ? _a : '')} CREATED`));
         const applicationId = parsed[constants_1.CommandArgApplicationId];
         if (applicationId) {
             loggingProvider_1.logger.info('Associating URLs with environment');

package/commands/environments/environments_cmds/list.js

@@ -17,7 +17,7 @@ exports.builder = (0, list_1.getListBuilderOptions)('environments');
 exports.handler = (0, util_1.failWrapper)(listEnvironments);
 async function listEnvironments(parsed) {
     const output = parsed.output;
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const limit = parsed.limit;
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const environments = await apiClient.getEnvironments(workspaceId, limit);

package/commands/flows/flows_cmds/list.js

@@ -30,7 +30,7 @@ exports.builder = (yargs) => {
 exports.handler = (0, util_1.failWrapper)(listFlows);
 async function listFlows(parsed) {
     const limit = parsed.limit;
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const flows = await apiClient.getFlows({
         organization_id: workspaceId,

package/commands/link-agents/link-agents_cmds/delete.js

@@ -8,7 +8,6 @@ const constants_1 = require("../../constants");
 const util_1 = require("../../commandUtil/util");
 const chalk_1 = __importDefault(require("chalk"));
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
-const cliConfigProvider_1 = require("../../../providers/cliConfigProvider");
 exports.command = `delete <${constants_1.CommandArgLinkLabel}>`;
 exports.describe =
     'Delete link agents and infrastructure associate with the link agent label and block new agents with the given label for 15 minutes.  Customers dynamically creating link agents must call this when the agent is no longer needed.';
@@ -25,14 +24,10 @@ exports.builder = (yargs) => {
 };
 exports.handler = (0, util_1.failWrapper)(deleteLinkAgent);
 async function deleteLinkAgent(parsed) {
-    var _a, _b;
     try {
         const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
         const linkLabel = parsed[constants_1.CommandArgLinkLabel];
-        const workspaceId = (_a = parsed[constants_1.CommandArgWorkspaceId]) !== null && _a !== void 0 ? _a : (_b = cliConfigProvider_1.CliConfigProvider.getWorkspace()) === null || _b === void 0 ? void 0 : _b.id;
-        if (!workspaceId) {
-            throw new Error('Workspace id is required');
-        }
+        const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
         await apiClient.deleteLinkLabel(workspaceId, linkLabel);
         loggingProvider_1.logger.info(chalk_1.default.green(`Link agent ${chalk_1.default.bold(linkLabel)} DELETED`));
         return linkLabel;

package/commands/plans/plans_cmds/list.js

@@ -30,7 +30,7 @@ exports.builder = (yargs) => {
 exports.handler = (0, util_1.failWrapper)(listPlans);
 async function listPlans(parsed) {
     const limit = parsed.limit;
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const plans = await apiClient.getPlans({
         organization_id: workspaceId,

package/commands/tests/testsUtil.js

@@ -34,7 +34,7 @@ const path = __importStar(require("path"));
 const constants_1 = require("../constants");
 const messaging_1 = require("../../core/messaging/messaging");
 const cliConfigProvider_1 = require("../../providers/cliConfigProvider");
-const set_1 = require("../config/config_cmds/set");
+const configKeys_1 = require("../config/config_cmds/configKeys");
 const trainingSessionActions_1 = require("../../core/messaging/actions/trainingSessionActions");
 const async_retry_1 = __importDefault(require("async-retry"));
 const env_1 = require("../../env/env");
@@ -93,22 +93,22 @@ function searchForChrome() {
     })[0];
 }
 exports.searchForChrome = searchForChrome;
-function findChrome() {
-    const existingLocation = cliConfigProvider_1.CliConfigProvider.getConfigProperty(set_1.configKeys.browserPath);
+async function findChrome() {
+    const existingLocation = await cliConfigProvider_1.CliConfigProvider.getConfigProperty(configKeys_1.configKeys.browserPath);
     if (typeof existingLocation === 'string' &&
         existingLocation &&
         fs.existsSync(existingLocation)) {
         return existingLocation;
     }
     const chromePath = searchForChrome();
-    cliConfigProvider_1.CliConfigProvider.setConfigProperty(set_1.configKeys.browserPath, chromePath);
+    await cliConfigProvider_1.CliConfigProvider.setConfigProperty(configKeys_1.configKeys.browserPath, chromePath);
     return chromePath;
 }
 exports.findChrome = findChrome;
 async function createBrowserWithAuthedExtension(accessToken, browserWidth, browserHeight, tempBrowserPreferencesDirectory, options) {
     const { credentials, disableIsolation, ignoreCertificateErrors, runnerType, loggerFunc, } = options;
     const pathToExtension = await (0, trainerUtil_1.getMablTrainerExtensionPath)();
-    const chromePath = findChrome();
+    const chromePath = await findChrome();
     if (!chromePath.length) {
         messaging_1.mablEventEmitter.log(chalk.yellow('Could not find a local install of Chrome to use, please ensure you have it installed and try again'));
         throw new Error('Chrome not found error');
@@ -209,7 +209,7 @@ function removeTempBrowserPreferencesDirectory(tempDirPath) {
 }
 async function createBrowser(browserWidth, browserHeight, headless, containerTesting, tempBrowserPreferencesDirectory, options) {
     const { bypassContentSecurityPolicy, credentials, browserPath, disableIsolation, extraHttpHeaders, ignoreCertificateErrors, emulationConfig, enableExtensions, runnerType, loggerFunc, resourcesDirectoryOverride, userAgent, } = options || {};
-    const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : findChrome();
+    const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : (await findChrome());
     if (!chromePath.length) {
         messaging_1.mablEventEmitter.log(chalk.yellow('Could not find a local install of Chrome to use, please ensure you have it installed and try again'));
         throw new Error('Chrome not found error');
@@ -279,7 +279,7 @@ function addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, em
 exports.addExecutionEngineLaunchArgs = addExecutionEngineLaunchArgs;
 async function createBrowserForExecutionEngine(browserWidth, browserHeight, headless, tempBrowserPreferencesDirectory, proxyInfo, options) {
     const { credentials, browserPath, emulationConfig, runnerType, loggerFunc } = options || {};
-    const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : findChrome();
+    const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : (await findChrome());
     const { launchArgs, defaultDeviceDescriptor } = addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, emulationConfig);
     const maybeBrowser = await maybeLaunchBrowser(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, {
         defaultDeviceDescriptor,
@@ -535,7 +535,7 @@ async function downloadUploadFile(fileUploadUrl, fileUpload, downloadDirectory,
         client = mablApiClient.httpClient;
     }
     else {
-        client = axios_1.default.create((0, httpUtil_1.currentProxyConfig)());
+        client = axios_1.default.create(await (0, httpUtil_1.currentProxyConfig)());
     }
     try {
         const finalDirectory = path.normalize(`${downloadDirectory}/${fileUpload.id}`);

package/commands/tests/tests_cmds/create.js

@@ -96,7 +96,7 @@ async function launchTrainingSession(parsed) {
     const width = parsed.width;
     const height = parsed.height;
     const testName = parsed['test-name'];
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const testDescription = parsed['test-description'];
     const branchName = parsed['mabl-branch'];
     const autoBranch = parsed['auto-branch'];

package/commands/tests/tests_cmds/import.js

@@ -107,7 +107,7 @@ exports.builder = (yargs) => {
 };
 exports.handler = (0, util_1.failWrapper)(importTest);
 async function importTest(parsed) {
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const importMultipleTests = parsed.multi;
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const name = await getTestName(parsed.name);
@@ -245,7 +245,7 @@ async function runTests(workspaceId, name, apiClient, importedTests) {
     var _a, _b;
     const flows = importedTests.map((steps) => stepsToFlow(workspaceId, steps));
     const firstUrl = (_a = flows.find((flow) => flow.url)) === null || _a === void 0 ? void 0 : _a.url;
-    const browserPath = (0, testsUtil_1.findChrome)();
+    const browserPath = await (0, testsUtil_1.findChrome)();
     for (let flowIndex = 0; flowIndex < flows.length; flowIndex++) {
         loggingProvider_1.logger.info(`Running test ${flowIndex + 1} of ${flows.length}.`);
         const flow = flows[flowIndex];

package/commands/tests/tests_cmds/list.js

@@ -42,7 +42,7 @@ exports.builder = (yargs) => {
 exports.handler = (0, util_1.failWrapper)(listTests);
 async function listTests(parsed) {
     const limit = parsed.limit;
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const labels = parsed[constants_1.CommandArgLabels];
     const output = parsed[constants_1.CommandArgOutput];
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();

package/commands/tests/tests_cmds/run-cloud.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const mablApiClientFactory_1 = require("../../../api/mablApiClientFactory");
 const constants_1 = require("../../constants");
-const cliConfigProvider_1 = require("../../../providers/cliConfigProvider");
 const util_1 = require("../../commandUtil/util");
 const branches_1 = require("../../commandUtil/branches");
 const env_1 = require("../../../env/env");
@@ -134,12 +133,9 @@ exports.builder = (yargs) => {
 };
 exports.handler = (0, util_1.failWrapper)(runInCloud);
 async function runInCloud(parsed) {
-    var _a, _b, _c;
+    var _a;
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClientFromOptionalApiKey(parsed['api-key']);
-    const workspaceId = (_a = parsed['workspace-id']) !== null && _a !== void 0 ? _a : (_b = cliConfigProvider_1.CliConfigProvider.getWorkspace()) === null || _b === void 0 ? void 0 : _b.id;
-    if (!workspaceId) {
-        throw new Error('Provide workspace ID with --workspace-id or configure a default workspace');
-    }
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const prompt = parsed.prompt;
     const branchName = parsed['mabl-branch'] || constants_1.DefaultBranchName;
     const branchChangesOnly = parsed['branch-changes-only'];
@@ -147,7 +143,7 @@ async function runInCloud(parsed) {
     const labelsInclude = parsed.labels || [];
     const labelsExclude = parsed['exclude-labels'] || [];
     const maybeDeploymentId = parsed['deployment-id'];
-    const maybeUrlApp = (_c = parsed['app-url']) !== null && _c !== void 0 ? _c : parsed.url;
+    const maybeUrlApp = (_a = parsed['app-url']) !== null && _a !== void 0 ? _a : parsed.url;
     const maybeUrlApi = parsed['api-url'];
     const browsers = parsed.browsers;
     const credentialsId = parsed['credentials-id'];

package/commands/tests/tests_cmds/run.js

@@ -4,7 +4,6 @@ exports.run = void 0;
 const util_1 = require("../../commandUtil/util");
 const testsUtil_1 = require("../testsUtil");
 const constants_1 = require("../../constants");
-const cliConfigProvider_1 = require("../../../providers/cliConfigProvider");
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const mablApi_1 = require("../../../mablApi");
 const reporter_1 = require("../../../reporters/reporter");
@@ -170,11 +169,16 @@ exports.builder = (yargs) => {
 const exitCodeOnError = 1;
 exports.handler = (0, util_1.failWrapper)(run, exitCodeOnError);
 async function run(parsed) {
-    var _a, _b, _c;
+    var _a;
     const commandStartTime = Date.now();
-    const workspaceId = (_a = parsed['workspace-id']) !== null && _a !== void 0 ? _a : (_b = cliConfigProvider_1.CliConfigProvider.getWorkspace()) === null || _b === void 0 ? void 0 : _b.id;
+    let workspaceId;
+    try {
+        workspaceId = await (0, util_1.getWorkspaceId)(parsed);
+    }
+    catch {
+    }
     const extraHttpHeaders = {};
-    ((_c = parsed['http-headers']) !== null && _c !== void 0 ? _c : []).forEach((header) => {
+    ((_a = parsed['http-headers']) !== null && _a !== void 0 ? _a : []).forEach((header) => {
         const headerParts = header.split(':');
         if (headerParts.length === 2 && headerParts[0] && headerParts[1]) {
             extraHttpHeaders[headerParts[0].toLowerCase()] = headerParts[1];

package/commands/tests/tests_cmds/trainer_cmds/trainerUtil.js

@@ -93,7 +93,7 @@ function getTrainerVersion() {
 exports.getTrainerVersion = getTrainerVersion;
 async function downloadTrainer(version) {
     fs.ensureDirSync(getTrainerPath());
-    const client = axios_1.default.create((0, httpUtil_1.currentProxyConfig)());
+    const client = axios_1.default.create(await (0, httpUtil_1.currentProxyConfig)());
     const url = `${env_1.BASE_API_URL}/trainer/distribution?${buildQueryStringsForDistro(version)}`;
     const finalPath = getTrainerZipFile();
     const writer = fs.createWriteStream(finalPath);
@@ -154,7 +154,7 @@ exports.checkForTrainerUpdate = checkForTrainerUpdate;
 async function getCurrentVersionChecksum() {
     const url = `${env_1.BASE_API_URL}/trainer/distribution?${buildQueryStringsForDistro()}`;
     return axios_1.default
-        .head(url, (0, httpUtil_1.currentProxyConfig)())
+        .head(url, await (0, httpUtil_1.currentProxyConfig)())
         .then((response) => response.headers['x-goog-hash'])
         .catch((error) => {
         loggingProvider_1.logger.error(chalk.red.bold(`There was an issue checking the current mabl trainer. ${error.message}`));