@hubspot/cli 6.3.0-experimental.0 → 6.4.0-beta.0

package/commands/customObject/schema/update.js

@@ -7,7 +7,7 @@ const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments');
 const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { addTestingOptions } = require('../../../lib/commonOpts');
+const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
 const { CONFIG_FLAGS } = require('../../../lib/constants');
 const { getEnv, isConfigFlagEnabled, } = require('@hubspot/local-dev-lib/config');
 const { updateObjectSchema, } = require('@hubspot/local-dev-lib/api/customObjects');
@@ -19,9 +19,10 @@ const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
 exports.command = 'update <name> <definition>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { definition, name, derivedAccountId } = options;
+    const { definition, name } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('custom-object-schema-update', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('custom-object-schema-update', null, accountId);
     const filePath = getAbsoluteFilePath(definition);
     const schemaJson = checkAndConvertToJson(filePath);
     if (!schemaJson) {
@@ -29,20 +30,20 @@ exports.handler = async (options) => {
     }
     try {
         if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
-            await updateSchemaFromHubFile(derivedAccountId, filePath);
+            await updateSchemaFromHubFile(accountId, filePath);
             logger.success(i18n(`${i18nKey}.success.update`, {
-                accountId: derivedAccountId,
+                accountId,
             }));
         }
         else {
-            const { data } = await updateObjectSchema(derivedAccountId, name, schemaJson);
+            const { data } = await updateObjectSchema(accountId, name, schemaJson);
             logger.success(i18n(`${i18nKey}.success.viewAtUrl`, {
-                url: `${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`,
+                url: `${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${accountId}/objects/${data.objectTypeId}`,
             }));
         }
     }
     catch (e) {
-        logError(e, { accountId: derivedAccountId });
+        logError(e, { accountId });
         logger.error(i18n(`${i18nKey}.errors.update`, {
             definition,
         }));

package/commands/fetch.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileMapper');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { addConfigOptions, addAccountOptions, addOverwriteOptions, addModeOptions, addUseEnvironmentOptions, getMode, } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addOverwriteOptions, addModeOptions, addUseEnvironmentOptions, getAccountId, getMode, } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
@@ -23,12 +23,12 @@ exports.handler = async (options) => {
         logger.error(i18n(`${i18nKey}.errors.sourceRequired`));
         process.exit(EXIT_CODES.ERROR);
     }
-    const { derivedAccountId } = options;
+    const accountId = getAccountId(options);
     const mode = getMode(options);
-    trackCommandUsage('fetch', { mode }, derivedAccountId);
+    trackCommandUsage('fetch', { mode }, accountId);
     try {
         // Fetch and write file/folder.
-        await downloadFileOrFolder(derivedAccountId, src, resolveLocalPath(dest), mode, options);
+        await downloadFileOrFolder(accountId, src, resolveLocalPath(dest), mode, options);
     }
     catch (err) {
         logError(err);

package/commands/filemanager/fetch.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileManager');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { resolveLocalPath } = require('../../lib/filesystem');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
@@ -14,17 +14,18 @@ const { logError } = require('../../lib/errorHandlers/index');
 exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src, includeArchived, derivedAccountId } = options;
+    const { src, includeArchived } = options;
     await loadAndValidateOptions(options);
     if (typeof src !== 'string') {
         logger.error(i18n(`${i18nKey}.errors.sourceRequired`));
         process.exit(EXIT_CODES.ERROR);
     }
     const dest = resolveLocalPath(options.dest);
-    trackCommandUsage('filemanager-fetch', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('filemanager-fetch', null, accountId);
     try {
         // Fetch and write file/folder.
-        await downloadFileOrFolder(derivedAccountId, src, dest, false, includeArchived || false);
+        await downloadFileOrFolder(accountId, src, dest, false, includeArchived || false);
     }
     catch (err) {
         logError(err);

package/commands/filemanager/upload.js

@@ -10,7 +10,7 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { validateSrcAndDestPaths, } = require('@hubspot/local-dev-lib/cms/modules');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
@@ -19,8 +19,9 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 exports.command = 'upload <src> <dest>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src, dest, derivedAccountId } = options;
+    const { src, dest } = options;
     await loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
     const absoluteSrcPath = path.resolve(getCwd(), src);
     let stats;
     try {
@@ -43,7 +44,7 @@ exports.handler = async (options) => {
         return;
     }
     const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
+    trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, accountId);
     const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
         srcDestIssues.forEach(({ message }) => logger.error(message));
@@ -56,10 +57,10 @@ exports.handler = async (options) => {
             }));
             return;
         }
-        uploadFile(derivedAccountId, absoluteSrcPath, normalizedDest)
+        uploadFile(accountId, absoluteSrcPath, normalizedDest)
             .then(() => {
             logger.success(i18n(`${i18nKey}.success.upload`, {
-                accountId: derivedAccountId,
+                accountId,
                 dest: normalizedDest,
                 src,
             }));
@@ -70,7 +71,7 @@ exports.handler = async (options) => {
                 src,
             }));
             logError(error, new ApiErrorContext({
-                accountId: derivedAccountId,
+                accountId,
                 request: normalizedDest,
                 payload: src,
             }));
@@ -78,11 +79,11 @@ exports.handler = async (options) => {
     }
     else {
         logger.log(i18n(`${i18nKey}.logs.uploading`, {
-            accountId: derivedAccountId,
+            accountId,
             dest,
             src,
         }));
-        uploadFolder(derivedAccountId, absoluteSrcPath, dest)
+        uploadFolder(accountId, absoluteSrcPath, dest)
             .then(() => {
             logger.success(i18n(`${i18nKey}.success.uploadComplete`, {
                 dest,
@@ -91,7 +92,7 @@ exports.handler = async (options) => {
             .catch(error => {
             logger.error(i18n(`${i18nKey}.errors.uploadingFailed`));
             logError(error, {
-                accountId: derivedAccountId,
+                accountId,
             });
         });
     }

package/commands/functions/deploy.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { uiAccountDescription } = require('../../lib/ui');
@@ -18,9 +18,10 @@ exports.command = 'deploy <path>';
 exports.describe = false;
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { path: functionPath, derivedAccountId } = options;
+    const { path: functionPath } = options;
+    const accountId = getAccountId(options);
     const splitFunctionPath = functionPath.split('.');
-    trackCommandUsage('functions-deploy', null, derivedAccountId);
+    trackCommandUsage('functions-deploy', null, accountId);
     if (!splitFunctionPath.length ||
         splitFunctionPath[splitFunctionPath.length - 1] !== 'functions') {
         logger.error(i18n(`${i18nKey}.errors.notFunctionsFolder`, {
@@ -34,18 +35,18 @@ exports.handler = async (options) => {
     SpinniesManager.init();
     SpinniesManager.add('loading', {
         text: i18n(`${i18nKey}.loading`, {
-            account: uiAccountDescription(derivedAccountId),
+            account: uiAccountDescription(accountId),
             functionPath,
         }),
     });
     try {
-        const { data: buildId } = await buildPackage(derivedAccountId, functionPath);
-        const successResp = await poll(getBuildStatus, derivedAccountId, buildId);
+        const { data: buildId } = await buildPackage(accountId, functionPath);
+        const successResp = await poll(getBuildStatus, accountId, buildId);
         const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
         SpinniesManager.succeed('loading');
         await outputBuildLog(successResp.cdnUrl);
         logger.success(i18n(`${i18nKey}.success.deployed`, {
-            accountId: derivedAccountId,
+            accountId,
             buildTimeSeconds,
             functionPath,
         }));
@@ -53,7 +54,7 @@ exports.handler = async (options) => {
     catch (e) {
         SpinniesManager.fail('loading', {
             text: i18n(`${i18nKey}.loadingFailed`, {
-                account: uiAccountDescription(derivedAccountId),
+                account: uiAccountDescription(accountId),
                 functionPath,
             }),
         });
@@ -69,10 +70,7 @@ exports.handler = async (options) => {
             }));
         }
         else {
-            logError(e, new ApiErrorContext({
-                accountId: derivedAccountId,
-                request: functionPath,
-            }));
+            logError(e, new ApiErrorContext({ accountId, request: functionPath }));
         }
     }
 };

package/commands/functions/list.js

@@ -6,7 +6,7 @@ const { getRoutes } = require('@hubspot/local-dev-lib/api/functions');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
@@ -16,11 +16,11 @@ exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     loadAndValidateOptions(options);
-    const { derivedAccountId } = options;
-    trackCommandUsage('functions-list', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('functions-list', null, accountId);
     logger.debug(i18n(`${i18nKey}.debug.gettingFunctions`));
-    const { data: routesResp } = await getRoutes(derivedAccountId).catch(async (e) => {
-        logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
+    const { data: routesResp } = await getRoutes(accountId).catch(async (e) => {
+        logError(e, new ApiErrorContext({ accountId }));
         process.exit(EXIT_CODES.SUCCESS);
     });
     if (!routesResp.objects.length) {

package/commands/functions/server.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { start: startTestServer } = require('@hubspot/serverless-dev-runtime');
@@ -12,13 +12,14 @@ exports.command = 'server <path>';
 exports.describe = false;
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { path: functionPath, derivedAccountId } = options;
-    trackCommandUsage('functions-server', null, derivedAccountId);
+    const { path: functionPath } = options;
+    const accountId = getAccountId(options);
+    trackCommandUsage('functions-server', null, accountId);
     logger.debug(i18n(`${i18nKey}.debug.startingServer`, {
         functionPath,
     }));
     startTestServer({
-        accountId: derivedAccountId,
+        accountId,
         ...options,
     });
 };

package/commands/hubdb/clear.js

@@ -7,23 +7,24 @@ const { clearHubDbTableRows } = require('@hubspot/local-dev-lib/hubdb');
 const { publishTable } = require('@hubspot/local-dev-lib/api/hubdb');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.hubdb.subcommands.clear';
 exports.command = 'clear <tableId>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { tableId, derivedAccountId } = options;
+    const { tableId } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('hubdb-clear', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('hubdb-clear', null, accountId);
     try {
-        const { deletedRowCount } = await clearHubDbTableRows(derivedAccountId, tableId);
+        const { deletedRowCount } = await clearHubDbTableRows(accountId, tableId);
         if (deletedRowCount > 0) {
             logger.log(i18n(`${i18nKey}.logs.removedRows`, {
                 deletedRowCount,
                 tableId,
             }));
-            const { data: { rowCount }, } = await publishTable(derivedAccountId, tableId);
+            const { data: { rowCount }, } = await publishTable(accountId, tableId);
             logger.log(i18n(`${i18nKey}.logs.rowCount`, {
                 rowCount,
                 tableId,

package/commands/hubdb/create.js

@@ -8,24 +8,25 @@ const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { createHubDbTable } = require('@hubspot/local-dev-lib/hubdb');
 const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.hubdb.subcommands.create';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 exports.command = 'create <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src, derivedAccountId } = options;
+    const { src } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('hubdb-create', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('hubdb-create', null, accountId);
     try {
         const filePath = path.resolve(getCwd(), src);
         if (!checkAndConvertToJson(filePath)) {
             process.exit(EXIT_CODES.ERROR);
         }
-        const table = await createHubDbTable(derivedAccountId, path.resolve(getCwd(), src));
+        const table = await createHubDbTable(accountId, path.resolve(getCwd(), src));
         logger.success(i18n(`${i18nKey}.success.create`, {
-            accountId: derivedAccountId,
+            accountId,
             rowCount: table.rowCount,
             tableId: table.tableId,
         }));

package/commands/hubdb/delete.js

@@ -6,19 +6,20 @@ const { logError } = require('../../lib/errorHandlers/index');
 const { deleteTable } = require('@hubspot/local-dev-lib/api/hubdb');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.hubdb.subcommands.delete';
 exports.command = 'delete <tableId>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { tableId, derivedAccountId } = options;
+    const { tableId } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('hubdb-delete', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('hubdb-delete', null, accountId);
     try {
-        await deleteTable(derivedAccountId, tableId);
+        await deleteTable(accountId, tableId);
         logger.success(i18n(`${i18nKey}.success.delete`, {
-            accountId: derivedAccountId,
+            accountId,
             tableId,
         }));
     }

package/commands/hubdb/fetch.js

@@ -6,17 +6,18 @@ const { logError } = require('../../lib/errorHandlers/index');
 const { downloadHubDbTable } = require('@hubspot/local-dev-lib/hubdb');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.hubdb.subcommands.fetch';
 exports.command = 'fetch <tableId> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { tableId, dest, derivedAccountId } = options;
+    const { tableId, dest } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('hubdb-fetch', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('hubdb-fetch', null, accountId);
     try {
-        const { filePath } = await downloadHubDbTable(derivedAccountId, tableId, dest);
+        const { filePath } = await downloadHubDbTable(accountId, tableId, dest);
         logger.success(i18n(`${i18nKey}.success.fetch`, {
             path: filePath,
             tableId,

package/commands/init.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const path = require('path');
 const fs = require('fs-extra');
-const { getConfigPath, createEmptyConfigFile, deleteEmptyConfigFile, updateDefaultAccount, loadConfig, configFileExists, } = require('@hubspot/local-dev-lib/config');
+const { getConfigPath, createEmptyConfigFile, deleteEmptyConfigFile, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { addConfigOptions } = require('../lib/commonOpts');
 const { handleExit } = require('../lib/process');
 const { checkAndAddConfigToGitignore, } = require('@hubspot/local-dev-lib/gitignore');
@@ -67,8 +67,8 @@ exports.describe = i18n(`${i18nKey}.describe`, {
     configName: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 });
 exports.handler = async (options) => {
-    const { auth: authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value, c, account: optionalAccount, 'use-hidden-config': useHiddenConfig, 'disable-tracking': disableTracking, } = options;
-    const configPath = (c && path.join(getCwd(), c)) || getConfigPath('', useHiddenConfig);
+    const { auth: authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value, c, account: optionalAccount, disableTracking, } = options;
+    const configPath = (c && path.join(getCwd(), c)) || getConfigPath();
     setLogLevel(options);
     if (!disableTracking) {
         trackCommandUsage('init', {
@@ -86,32 +86,20 @@ exports.handler = async (options) => {
     if (!disableTracking) {
         await trackAuthAction('init', authType, TRACKING_STATUS.STARTED);
     }
-    const doesOtherConfigFileExist = configFileExists(!useHiddenConfig);
-    if (doesOtherConfigFileExist) {
-        const path = getConfigPath('', !useHiddenConfig);
-        logger.error(i18n(`${i18nKey}.errors.bothConfigFilesNotAllowed`, { path }));
-        process.exit(EXIT_CODES.ERROR);
-    }
-    trackAuthAction('init', authType, TRACKING_STATUS.STARTED);
-    createEmptyConfigFile({ path: configPath }, useHiddenConfig);
-    //Needed to load deprecated config
-    loadConfig(configPath, options);
+    createEmptyConfigFile({ path: configPath });
     handleExit(deleteEmptyConfigFile);
     try {
         const { accountId, name } = await CONFIG_CREATION_FLOWS[authType](env, optionalAccount);
+        const configPath = getConfigPath();
         try {
             checkAndAddConfigToGitignore(configPath);
         }
         catch (e) {
             debugError(e);
         }
-        let newConfigPath = configPath;
-        if (!newConfigPath && !useHiddenConfig) {
-            newConfigPath = `${getCwd()}/${DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`;
-        }
         logger.log('');
         logger.success(i18n(`${i18nKey}.success.configFileCreated`, {
-            configPath: newConfigPath,
+            configPath,
         }));
         logger.success(i18n(`${i18nKey}.success.configFileUpdated`, {
             authType: AUTH_TYPE_NAMES[authType],
@@ -132,8 +120,7 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    yargs
-        .options({
+    yargs.options({
         auth: {
             describe: i18n(`${i18nKey}.options.auth.describe`),
             type: 'string',
@@ -155,12 +142,7 @@ exports.builder = yargs => {
             hidden: true,
             default: false,
         },
-        'use-hidden-config': {
-            describe: i18n(`${i18nKey}.options.useHiddenConfig.describe`),
-            type: 'boolean',
-        },
-    })
-        .conflicts('use-hidden-config', 'config');
+    });
     addConfigOptions(yargs);
     addTestingOptions(yargs);
     return yargs;

package/commands/lint.js

@@ -5,7 +5,7 @@ exports.builder = exports.handler = exports.describe = exports.command = void 0;
 const { lint } = require('@hubspot/local-dev-lib/cms/validate');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../lib/errorHandlers/index');
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, getAccountId, } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { loadAndValidateOptions } = require('../lib/validation');
@@ -46,22 +46,22 @@ function printHublValidationResult({ file, validation }) {
 const handler = async (options) => {
     const { path: lintPath } = options;
     await loadAndValidateOptions(options);
-    const { derivedAccountId } = options;
+    const accountId = getAccountId(options);
     const localPath = resolveLocalPath(lintPath);
     const groupName = i18n(`${i18nKey}.groupName`, {
         path: localPath,
     });
-    trackCommandUsage('lint', null, derivedAccountId);
+    trackCommandUsage('lint', null, accountId);
     logger.group(groupName);
     let count = 0;
     try {
-        await lint(derivedAccountId, localPath, result => {
+        await lint(accountId, localPath, result => {
             count += printHublValidationResult(result);
         });
     }
     catch (err) {
         logger.groupEnd(groupName);
-        logError(err, { accountId: derivedAccountId });
+        logError(err, { accountId });
         process.exit(EXIT_CODES.ERROR);
     }
     logger.groupEnd(groupName);

package/commands/list.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const chalk = require('chalk');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { isPathFolder } = require('../lib/filesystem');
 const { logger } = require('@hubspot/local-dev-lib/logger');
@@ -17,15 +17,16 @@ exports.command = 'list [path]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { path, derivedAccountId } = options;
+    const { path } = options;
     const directoryPath = path || '/';
+    const accountId = getAccountId(options);
     let contentsResp;
-    trackCommandUsage('list', null, derivedAccountId);
+    trackCommandUsage('list', null, accountId);
     logger.debug(i18n(`${i18nKey}.gettingPathContents`, {
         path: directoryPath,
     }));
     try {
-        const { data } = await getDirectoryContentsByPath(derivedAccountId, directoryPath);
+        const { data } = await getDirectoryContentsByPath(accountId, directoryPath);
         contentsResp = data;
     }
     catch (e) {

package/commands/logs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { outputLogs } = require('../lib/ui/serverlessFunctionLogs');
@@ -73,9 +73,10 @@ exports.command = 'logs [endpoint]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { latest, derivedAccountId } = options;
-    trackCommandUsage('logs', { latest }, derivedAccountId);
-    endpointLog(derivedAccountId, options);
+    const { latest } = options;
+    const accountId = getAccountId(options);
+    trackCommandUsage('logs', { latest }, accountId);
+    endpointLog(accountId, options);
 };
 exports.builder = yargs => {
     yargs.positional('endpoint', {

package/commands/module/marketplace-validate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
@@ -11,9 +11,10 @@ const i18nKey = 'commands.module.subcommands.marketplaceValidate';
 exports.command = 'marketplace-validate <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src, derivedAccountId } = options;
+    const { src } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('validate', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('validate', null, accountId);
     SpinniesManager.init();
     SpinniesManager.add('marketplaceValidation', {
         text: i18n(`${i18nKey}.logs.validatingModule`, {
@@ -21,10 +22,10 @@ exports.handler = async (options) => {
         }),
     });
     const assetType = 'MODULE';
-    const validationId = await kickOffValidation(derivedAccountId, assetType, src);
-    await pollForValidationFinish(derivedAccountId, validationId);
+    const validationId = await kickOffValidation(accountId, assetType, src);
+    await pollForValidationFinish(accountId, validationId);
     SpinniesManager.remove('marketplaceValidation');
-    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
+    const validationResults = await fetchValidationResults(accountId, validationId);
     processValidationErrors(i18nKey, validationResults);
     displayValidationResults(i18nKey, validationResults);
     process.exit();