@hubspot/cli 7.0.0-experimental.0 → 7.0.0-experimental.1

package/bin/cli.js

@@ -3,12 +3,10 @@
 const yargs = require('yargs');
 const updateNotifier = require('update-notifier');
 const chalk = require('chalk');
-const fs = require('fs');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
-const { loadConfig, configFileExists, getConfigPath, } = require('@hubspot/local-dev-lib/config');
 const { logError } = require('../lib/errorHandlers/index');
-const { setLogLevel, getCommandName, injectAccountIdMiddleware, } = require('../lib/commonOpts');
+const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
 const { getIsInProject } = require('../lib/projects');
 const pkg = require('../package.json');
@@ -26,9 +24,9 @@ const uploadCommand = require('../commands/upload');
 const createCommand = require('../commands/create');
 const fetchCommand = require('../commands/fetch');
 const filemanagerCommand = require('../commands/filemanager');
-const secretCommands = require('../commands/secret');
+const secretsCommand = require('../commands/secrets');
 const customObjectCommand = require('../commands/customObject');
-const functionCommands = require('../commands/function');
+const functionsCommand = require('../commands/functions');
 const listCommand = require('../commands/list');
 const openCommand = require('../commands/open');
 const mvCommand = require('../commands/mv');
@@ -36,12 +34,11 @@ const projectCommands = require('../commands/project');
 const themeCommand = require('../commands/theme');
 const moduleCommand = require('../commands/module');
 const configCommand = require('../commands/config');
-const accountCommands = require('../commands/account');
+const accountsCommand = require('../commands/accounts');
 const sandboxesCommand = require('../commands/sandbox');
 const cmsCommand = require('../commands/cms');
 const feedbackCommand = require('../commands/feedback');
 const doctorCommand = require('../commands/doctor');
-const completionCommand = require('../commands/completion');
 const notifier = updateNotifier({
     pkg: { ...pkg, name: '@hubspot/cli' },
     distTag: 'latest',
@@ -119,34 +116,17 @@ const performChecks = argv => {
 const setRequestHeaders = () => {
     addUserAgentHeader('HubSpot CLI', pkg.version);
 };
-const loadConfigMiddleware = async (options) => {
-    if (configFileExists(true)) {
-        loadConfig('', options);
-        if (options.config) {
-            logger.error(i18n(`${i18nKey}.loadConfigMiddleware.configFileExists`, {
-                configPath: getConfigPath(),
-            }));
-            process.exit(EXIT_CODES.ERROR);
-        }
-    }
-    // We need to load the config when options.config exists,
-    // so that getAccountIdFromConfig() in injectAccountIdMiddleware reads from the right config
-    if (options.config && fs.existsSync(options.config)) {
-        const { config: configPath } = options;
-        await loadConfig(configPath, options);
-    }
-};
 const argv = yargs
     .usage('The command line interface to interact with HubSpot.')
-    // loadConfigMiddleware loads the new hidden config for all commands
-    .middleware([
-    setLogLevel,
-    setRequestHeaders,
-    loadConfigMiddleware,
-    injectAccountIdMiddleware,
-])
+    .middleware([setLogLevel, setRequestHeaders])
     .exitProcess(false)
     .fail(handleFailure)
+    .option('debug', {
+    alias: 'd',
+    default: false,
+    describe: 'Set log level to debug',
+    type: 'boolean',
+})
     .option('noHyperlinks', {
     default: false,
     describe: 'prevent hyperlinks from displaying in the ui',
@@ -172,9 +152,9 @@ const argv = yargs
     .command(createCommand)
     .command(fetchCommand)
     .command(filemanagerCommand)
-    .command(secretCommands)
+    .command(secretsCommand)
     .command(customObjectCommand)
-    .command(functionCommands)
+    .command(functionsCommand)
     .command({
     ...listCommand,
     aliases: 'ls',
@@ -185,15 +165,14 @@ const argv = yargs
     .command(themeCommand)
     .command(moduleCommand)
     .command(configCommand)
-    .command(accountCommands)
+    .command(accountsCommand)
     .command(sandboxesCommand)
     .command(feedbackCommand)
     .command(doctorCommand)
-    .command(completionCommand)
     .help()
-    .alias('h', 'help')
     .recommendCommands()
     .demandCommand(1, '')
+    .completion()
     .wrap(getTerminalWidth())
     .strict().argv;
 if (argv.help) {

package/commands/{account → accounts}/clean.js

@@ -7,23 +7,22 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { addTestingOptions, addConfigOptions } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getTableContents } = require('../../lib/ui/table');
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
+const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('../../lib/ui');
-const { deleteAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
-const i18nKey = 'commands.account.subcommands.clean';
+const i18nKey = 'commands.accounts.subcommands.clean';
 exports.command = 'clean';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { qa } = options;
     await loadAndValidateOptions(options, false);
+    const config = getConfig();
     trackCommandUsage('accounts-clean', null);
-    const accountsList = getConfigAccounts();
-    const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
+    const filteredTestAccounts = config.portals.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
         logger.log(i18n(`${i18nKey}.noResults`));
         process.exit(EXIT_CODES.SUCCESS);
@@ -37,7 +36,7 @@ exports.handler = async (options) => {
     });
     for (const account of filteredTestAccounts) {
         try {
-            await accessTokenForPersonalAccessKey(getAccountIdentifier(account), true);
+            await accessTokenForPersonalAccessKey(account.portalId, true);
         }
         catch (error) {
             if (isSpecifiedError(error, {
@@ -63,9 +62,7 @@ exports.handler = async (options) => {
                 count: accountsToRemove.length,
             }),
         });
-        logger.log(getTableContents(accountsToRemove.map(p => [
-            uiAccountDescription(getAccountIdentifier(p)),
-        ]), { border: { bodyLeft: '  ' } }));
+        logger.log(getTableContents(accountsToRemove.map(p => [uiAccountDescription(p.portalId)]), { border: { bodyLeft: '  ' } }));
         const { accountsCleanPrompt } = await promptUser([
             {
                 name: 'accountsCleanPrompt',
@@ -97,6 +94,8 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
     addTestingOptions(yargs);
     yargs.example([['$0 accounts clean']]);
     return yargs;

package/commands/{account → accounts}/info.js

@@ -4,24 +4,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getAccessToken } = require('@hubspot/local-dev-lib/personalAccessKey');
-const { addConfigOptions } = require('../../lib/commonOpts');
+const { getAccountId, addAccountOptions, addConfigOptions, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { getTableContents } = require('../../lib/ui/table');
-const i18nKey = 'commands.account.subcommands.info';
+const i18nKey = 'commands.accounts.subcommands.info';
 exports.describe = i18n(`${i18nKey}.describe`);
-exports.command = 'info [account]';
+exports.command = 'info [--account]';
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { derivedAccountId } = options;
-    const config = getAccountConfig(derivedAccountId);
+    const accountId = getAccountId(options);
+    const config = getAccountConfig(accountId);
     // check if the provided account is using a personal access key, if not, show an error
-    if (config && config.authType === 'personalaccesskey') {
+    if (config.authType === 'personalaccesskey') {
         const { name, personalAccessKey, env } = config;
-        const response = await getAccessToken(personalAccessKey, env, derivedAccountId);
+        const response = await getAccessToken(personalAccessKey, env, accountId);
         const scopeGroups = response.scopeGroups.map(s => [s]);
         logger.log(i18n(`${i18nKey}.name`, { name }));
-        logger.log(i18n(`${i18nKey}.accountId`, { accountId: derivedAccountId }));
+        logger.log(i18n(`${i18nKey}.accountId`, { accountId }));
         logger.log(i18n(`${i18nKey}.scopeGroups`));
         logger.log(getTableContents(scopeGroups, { border: { bodyLeft: '  ' } }));
     }
@@ -31,10 +31,14 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     addConfigOptions(yargs);
+    addAccountOptions(yargs);
     yargs.example([
         ['$0 accounts info', i18n(`${i18nKey}.examples.default`)],
-        ['$0 accounts info MyAccount', i18n(`${i18nKey}.examples.nameBased`)],
-        ['$0 accounts info 1234567', i18n(`${i18nKey}.examples.idBased`)],
+        [
+            '$0 accounts info --account=MyAccount',
+            i18n(`${i18nKey}.examples.nameBased`),
+        ],
+        ['$0 accounts info --account=1234567', i18n(`${i18nKey}.examples.idBased`)],
     ]);
     return yargs;
 };

package/commands/{account → accounts}/list.js

@@ -2,17 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfig, getConfigPath, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
-const { addConfigOptions } = require('../../lib/commonOpts');
+const { getConfig, getConfigPath } = require('@hubspot/local-dev-lib/config');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
+const { addConfigOptions, addAccountOptions, getAccountId, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { isSandbox, isDeveloperTestAccount } = require('../../lib/accountTypes');
 const { i18n } = require('../../lib/lang');
 const { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } = require('@hubspot/local-dev-lib/constants/config');
-const i18nKey = 'commands.account.subcommands.list';
-exports.command = ['list', 'ls'];
+const i18nKey = 'commands.accounts.subcommands.list';
+exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
 const sortAndMapPortals = portals => {
     const mappedPortalData = {};
@@ -22,7 +21,7 @@ const sortAndMapPortals = portals => {
         (p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
             p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER))
         .forEach(portal => {
-        mappedPortalData[getAccountIdentifier(portal)] = [portal];
+        mappedPortalData[portal.portalId] = [portal];
     });
     // Non-standard portals (sandbox, developer test account)
     portals
@@ -35,7 +34,7 @@ const sortAndMapPortals = portals => {
             ];
         }
         else {
-            mappedPortalData[getAccountIdentifier(p)] = [p];
+            mappedPortalData[p.portalId] = [p];
         }
     });
     return mappedPortalData;
@@ -43,7 +42,7 @@ const sortAndMapPortals = portals => {
 const getPortalData = mappedPortalData => {
     const portalData = [];
     Object.entries(mappedPortalData).forEach(([key, set]) => {
-        const hasParentPortal = set.filter(p => getAccountIdentifier(p) === parseInt(key, 10))[0];
+        const hasParentPortal = set.filter(p => p.portalId === parseInt(key, 10))[0];
         set.forEach(portal => {
             let name = `${portal.name} [${HUBSPOT_ACCOUNT_TYPE_STRINGS[portal.accountType]}]`;
             if (isSandbox(portal)) {
@@ -56,19 +55,18 @@ const getPortalData = mappedPortalData => {
                     name = `↳ ${name}`;
                 }
             }
-            portalData.push([name, getAccountIdentifier(portal), portal.authType]);
+            portalData.push([name, portal.portalId, portal.authType]);
         });
     });
     return portalData;
 };
 exports.handler = async (options) => {
     await loadAndValidateOptions(options, false);
-    const { derivedAccountId } = options;
-    trackCommandUsage('accounts-list', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('accounts-list', null, accountId);
     const config = getConfig();
     const configPath = getConfigPath();
-    const accountsList = getConfigAccounts();
-    const mappedPortalData = sortAndMapPortals(accountsList);
+    const mappedPortalData = sortAndMapPortals(config.portals);
     const portalData = getPortalData(mappedPortalData);
     portalData.unshift(getTableHeader([
         i18n(`${i18nKey}.labels.name`),
@@ -76,14 +74,13 @@ exports.handler = async (options) => {
         i18n(`${i18nKey}.labels.authType`),
     ]));
     logger.log(i18n(`${i18nKey}.configPath`, { configPath }));
-    logger.log(i18n(`${i18nKey}.defaultAccount`, {
-        account: getConfigDefaultAccount(config),
-    }));
+    logger.log(i18n(`${i18nKey}.defaultAccount`, { account: config.defaultPortal }));
     logger.log(i18n(`${i18nKey}.accounts`));
     logger.log(getTableContents(portalData, { border: { bodyLeft: '  ' } }));
 };
 exports.builder = yargs => {
     addConfigOptions(yargs);
+    addAccountOptions(yargs);
     yargs.example([['$0 accounts list']]);
     return yargs;
 };

package/commands/{account → accounts}/remove.js

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addConfigOptions } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId: getAccountIdFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const i18nKey = 'commands.account.subcommands.remove';
-exports.command = 'remove [account]';
+const i18nKey = 'commands.accounts.subcommands.remove';
+exports.command = 'remove [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options, false);
-    const { account } = options;
-    let accountToRemove = account;
     let config = getConfig();
+    let accountToRemove = options.account;
     if (accountToRemove && !getAccountIdFromConfig(accountToRemove)) {
         logger.error(i18n(`${i18nKey}.errors.accountNotFound`, {
             specifiedAccount: accountToRemove,
@@ -41,14 +39,16 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    yargs.positional('account', {
+    yargs.option('account', {
         describe: i18n(`${i18nKey}.options.account.describe`),
         type: 'string',
     });
     yargs.example([
         ['$0 accounts remove', i18n(`${i18nKey}.examples.default`)],
-        ['$0 accounts remove MyAccount', i18n(`${i18nKey}.examples.byName`)],
+        [
+            '$0 accounts remove --account=MyAccount',
+            i18n(`${i18nKey}.examples.byName`),
+        ],
     ]);
     return yargs;
 };

package/commands/{account → accounts}/rename.js

@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { renameAccount } = require('@hubspot/local-dev-lib/config');
-const { addConfigOptions, addAccountOptions } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, getAccountId, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.account.subcommands.rename';
+const i18nKey = 'commands.accounts.subcommands.rename';
 exports.command = 'rename <accountName> <newName>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     loadAndValidateOptions(options);
-    const { accountName, newName, derivedAccountId } = options;
-    trackCommandUsage('accounts-rename', null, derivedAccountId);
+    const { accountName, newName } = options;
+    const accountId = getAccountId(options);
+    trackCommandUsage('accounts-rename', null, accountId);
     await renameAccount(accountName, newName);
     return logger.log(i18n(`${i18nKey}.success.renamed`, {
         name: accountName,

package/commands/{account → accounts}/use.js

@@ -7,8 +7,8 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const i18nKey = 'commands.account.subcommands.use';
-exports.command = 'use [account]';
+const i18nKey = 'commands.accounts.subcommands.use';
+exports.command = 'use [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options, false);
@@ -31,14 +31,17 @@ exports.handler = async (options) => {
     }));
 };
 exports.builder = yargs => {
-    yargs.positional('account', {
+    yargs.option('account', {
         describe: i18n(`${i18nKey}.options.account.describe`),
         type: 'string',
     });
     yargs.example([
         ['$0 accounts use', i18n(`${i18nKey}.examples.default`)],
-        ['$0 accounts use MyAccount', i18n(`${i18nKey}.examples.nameBased`)],
-        ['$0 accounts use 1234567', i18n(`${i18nKey}.examples.idBased`)],
+        [
+            '$0 accounts use --account=MyAccount',
+            i18n(`${i18nKey}.examples.nameBased`),
+        ],
+        ['$0 accounts use --account=1234567', i18n(`${i18nKey}.examples.idBased`)],
     ]);
     return yargs;
 };

package/commands/accounts.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { i18n } = require('../lib/lang');
+const list = require('./accounts/list');
+const rename = require('./accounts/rename');
+const use = require('./accounts/use');
+const info = require('./accounts/info');
+const remove = require('./accounts/remove');
+const clean = require('./accounts/clean');
+const i18nKey = 'commands.accounts';
+exports.command = 'accounts';
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.builder = yargs => {
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    yargs
+        .command({
+        ...list,
+        aliases: 'ls',
+    })
+        .command(rename)
+        .command(use)
+        .command(info)
+        .command(remove)
+        .command(clean)
+        .demandCommand(1, '');
+    return yargs;
+};

package/commands/auth.js

@@ -8,13 +8,13 @@ const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments
 const { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, } = require('@hubspot/local-dev-lib/constants/config');
 const { i18n } = require('../lib/lang');
 const { getAccessToken, updateConfigWithAccessToken, } = require('@hubspot/local-dev-lib/personalAccessKey');
-const { updateAccountConfig, writeConfig, getConfig, getConfigPath, loadConfig, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { updateAccountConfig, writeConfig, getConfig, getConfigPath, loadConfig, } = require('@hubspot/local-dev-lib/config');
 const { commaSeparatedValues, toKebabCase, } = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const { personalAccessKeyPrompt, OAUTH_FLOW, } = require('../lib/prompts/personalAccessKeyPrompt');
 const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
 const { setAsDefaultAccountPrompt, } = require('../lib/prompts/setAsDefaultAccountPrompt');
-const { addConfigOptions, setLogLevel, getAccountId, addTestingOptions, addGlobalOptions, } = require('../lib/commonOpts');
+const { addConfigOptions, setLogLevel, getAccountId, addTestingOptions, } = require('../lib/commonOpts');
 const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -31,23 +31,21 @@ const ALLOWED_AUTH_METHODS = [
     PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
 ];
 const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = commaSeparatedValues(ALLOWED_AUTH_METHODS);
-exports.command = 'auth';
+exports.command = 'auth [type] [--account]';
 exports.describe = i18n(`${i18nKey}.describe`, {
     supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
 });
 exports.handler = async (options) => {
-    const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, } = options;
-    const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
-        PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+    const { type, config: c, qa, account } = options;
+    const authType = (type && type.toLowerCase()) || PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     setLogLevel(options);
-    const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-    // Needed to load deprecated config
-    loadConfig(configFlagValue);
-    checkAndWarnGitInclusion(getConfigPath());
-    if (!getConfigPath(configFlagValue)) {
+    if (!getConfigPath(c)) {
         logger.error(i18n(`${i18nKey}.errors.noConfigFileFound`));
         process.exit(EXIT_CODES.ERROR);
     }
+    const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+    loadConfig(c);
+    checkAndWarnGitInclusion(getConfigPath());
     trackCommandUsage('auth');
     trackAuthAction('auth', authType, TRACKING_STATUS.STARTED);
     let configData;
@@ -66,10 +64,7 @@ exports.handler = async (options) => {
             successAuthMethod = OAUTH_AUTH_METHOD.name;
             break;
         case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-            configData = await personalAccessKeyPrompt({
-                env,
-                account: providedAccountId,
-            });
+            configData = await personalAccessKeyPrompt({ env, account });
             try {
                 token = await getAccessToken(configData.personalAccessKey, env);
                 defaultName = toKebabCase(token.hubName);
@@ -117,7 +112,7 @@ exports.handler = async (options) => {
     else {
         const config = getConfig();
         logger.info(i18n(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
-            accountName: getConfigDefaultAccount(config),
+            accountName: config.defaultPortal,
         }));
     }
     logger.success(i18n(`${i18nKey}.success.configFileUpdated`, {
@@ -135,27 +130,25 @@ exports.handler = async (options) => {
     process.exit(EXIT_CODES.SUCCESS);
 };
 exports.builder = yargs => {
+    yargs.positional('type', {
+        describe: i18n(`${i18nKey}.positionals.type.describe`),
+        type: 'string',
+        choices: [
+            `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
+            `${OAUTH_AUTH_METHOD.value}`,
+        ],
+        default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+        defaultDescription: i18n(`${i18nKey}.positionals.type.defaultDescription`, {
+            authMethod: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+        }),
+    });
     yargs.options({
-        'auth-type': {
-            describe: i18n(`${i18nKey}.options.authType.describe`),
-            type: 'string',
-            choices: [
-                `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
-                `${OAUTH_AUTH_METHOD.value}`,
-            ],
-            default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-            defaultDescription: i18n(`${i18nKey}.options.authType.defaultDescription`, {
-                authMethod: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-            }),
-        },
         account: {
             describe: i18n(`${i18nKey}.options.account.describe`),
             type: 'string',
-            alias: 'a',
         },
     });
     addConfigOptions(yargs);
     addTestingOptions(yargs);
-    addGlobalOptions(yargs);
     return yargs;
 };