@hubspot/cli 3.0.13-beta.3 → 4.0.1-beta.0

package/bin/cli.js

@@ -58,24 +58,55 @@ const getTerminalWidth = () => {
   return width;
 };
 
-const argv = yargs
-  .usage('Tools for working with HubSpot')
-  .middleware([setLogLevel])
-  .exitProcess(false)
-  .fail((msg, err, yargs) => {
-    if (msg) {
-      logger.error(msg);
-    } else if (err) {
-      logErrorInstance(err);
-    }
+const handleFailure = (msg, err, yargs) => {
+  if (msg) {
+    logger.error(msg);
+  } else if (err) {
+    logErrorInstance(err);
+  }
 
-    if (msg === null) {
-      yargs.showHelp();
-      process.exit(EXIT_CODES.SUCCESS);
-    } else {
+  if (msg === null) {
+    yargs.showHelp();
+    process.exit(EXIT_CODES.SUCCESS);
+  } else {
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+const performChecks = argv => {
+  // "hs config set default-account" has moved to "hs accounts use"
+  if (
+    argv._[0] === 'config' &&
+    argv._[1] === 'set' &&
+    argv._[2] === 'default-account'
+  ) {
+    logger.error(i18n(`${i18nKey}.setDefaultAccountMoved`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  // Require "project" command when running upload/watch inside of a project
+  if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
+    if (getIsInProject(argv.src)) {
+      logger.error(
+        i18n(`${i18nKey}.srcIsProject`, {
+          src: argv.src || './',
+          command: argv._.join(' '),
+        })
+      );
       process.exit(EXIT_CODES.ERROR);
+    } else {
+      return true;
     }
-  })
+  } else {
+    return true;
+  }
+};
+
+const argv = yargs
+  .usage('The command line interface to interact with HubSpot.')
+  .middleware([setLogLevel])
+  .exitProcess(false)
+  .fail(handleFailure)
   .option('debug', {
     alias: 'd',
     default: false,
@@ -94,23 +125,7 @@ const argv = yargs
     hidden: true,
     type: 'boolean',
   })
-  .check(argv => {
-    if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
-      if (getIsInProject(argv.src)) {
-        logger.error(
-          i18n(`${i18nKey}.srcIsProject`, {
-            src: argv.src,
-            command: argv._.join(' '),
-          })
-        );
-        process.exit(EXIT_CODES.ERROR);
-      } else {
-        return true;
-      }
-    } else {
-      return true;
-    }
-  })
+  .check(performChecks)
   .command(authCommand)
   .command(initCommand)
   .command(logsCommand)

package/commands/accounts/use.js

@@ -33,7 +33,7 @@ const selectAccountFromConfig = async config => {
   return selectedDefault;
 };
 
-exports.command = 'use [account]';
+exports.command = 'use [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -68,14 +68,17 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  yargs.positional('account', {
-    describe: i18n(`${i18nKey}.positionals.account.describe`),
+  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/auth.js

@@ -13,8 +13,8 @@ const {
 } = require('@hubspot/cli-lib/personalAccessKey');
 const {
   updateAccountConfig,
-  accountNameExistsInConfig,
   writeConfig,
+  getConfig,
   getConfigPath,
 } = require('@hubspot/cli-lib/lib/config');
 const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
@@ -23,8 +23,13 @@ const {
   personalAccessKeyPrompt,
   OAUTH_FLOW,
   API_KEY_FLOW,
-  ACCOUNT_NAME,
 } = require('../lib/prompts/personalAccessKeyPrompt');
+const {
+  enterAccountNamePrompt,
+} = require('../lib/prompts/enterAccountNamePrompt');
+const {
+  setAsDefaultAccountPrompt,
+} = require('../lib/prompts/setAsDefaultAccountPrompt');
 const {
   addConfigOptions,
   setLogLevel,
@@ -34,6 +39,7 @@ const { logDebugInfo } = require('../lib/debugInfo');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
+const { uiFeatureHighlight } = require('../lib/ui');
 
 const i18nKey = 'cli.commands.auth';
 
@@ -45,34 +51,13 @@ const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = commaSeparatedValues(
   ALLOWED_AUTH_METHODS
 );
 
-const promptForAccountNameIfNotSet = async updatedConfig => {
-  if (!updatedConfig.name) {
-    let promptAnswer;
-    let validName = null;
-    while (!validName) {
-      promptAnswer = await promptUser([ACCOUNT_NAME]);
-
-      if (!accountNameExistsInConfig(promptAnswer.name)) {
-        validName = promptAnswer.name;
-      } else {
-        logger.log(
-          i18n(`${i18nKey}.errors.accountNameExists`, {
-            name: promptAnswer.name,
-          })
-        );
-      }
-    }
-    return validName;
-  }
-};
-
-exports.command = 'auth [type]';
+exports.command = 'auth [type] [--account]';
 exports.describe = i18n(`${i18nKey}.describe`, {
   supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
 });
 
 exports.handler = async options => {
-  const { type, config: configPath, qa } = options;
+  const { type, config: configPath, qa, account } = options;
   const authType =
     (type && type.toLowerCase()) || PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
   setLogLevel(options);
@@ -92,11 +77,18 @@ exports.handler = async options => {
   let configData;
   let updatedConfig;
   let validName;
+  let successAuthMethod;
+
   switch (authType) {
     case API_KEY_AUTH_METHOD.value:
       configData = await promptUser(API_KEY_FLOW);
       updatedConfig = await updateAccountConfig(configData);
-      validName = await promptForAccountNameIfNotSet(updatedConfig);
+      validName = updatedConfig.name;
+
+      if (!validName) {
+        const { name: namePrompt } = await enterAccountNamePrompt();
+        validName = namePrompt;
+      }
 
       updateAccountConfig({
         ...updatedConfig,
@@ -105,13 +97,7 @@ exports.handler = async options => {
       });
       writeConfig();
 
-      logger.success(
-        i18n(`${i18nKey}.success.configFileUpdated`, {
-          configFilename: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-          authMethod: API_KEY_AUTH_METHOD.name,
-        })
-      );
-
+      successAuthMethod = API_KEY_AUTH_METHOD.name;
       break;
     case OAUTH_AUTH_METHOD.value:
       configData = await promptUser(OAUTH_FLOW);
@@ -119,16 +105,22 @@ exports.handler = async options => {
         ...configData,
         env,
       });
+      successAuthMethod = OAUTH_AUTH_METHOD.name;
       break;
     case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-      configData = await personalAccessKeyPrompt({ env });
+      configData = await personalAccessKeyPrompt({ env, account });
       updatedConfig = await updateConfigWithPersonalAccessKey(configData);
 
       if (!updatedConfig) {
-        process.exit(EXIT_CODES.SUCCESS);
+        break;
       }
 
-      validName = await promptForAccountNameIfNotSet(updatedConfig);
+      validName = updatedConfig.name;
+
+      if (!validName) {
+        const { name: namePrompt } = await enterAccountNamePrompt();
+        validName = namePrompt;
+      }
 
       updateAccountConfig({
         ...updatedConfig,
@@ -138,12 +130,7 @@ exports.handler = async options => {
       });
       writeConfig();
 
-      logger.success(
-        i18n(`${i18nKey}.success.configFileUpdated`, {
-          configFilename: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-          authMethod: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
-        })
-      );
+      successAuthMethod = PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
       break;
     default:
       logger.error(
@@ -154,6 +141,43 @@ exports.handler = async options => {
       );
       break;
   }
+
+  if (!successAuthMethod) {
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  const accountName = updatedConfig.name || validName;
+
+  const setAsDefault = await setAsDefaultAccountPrompt(accountName);
+
+  logger.log('');
+  if (setAsDefault) {
+    logger.success(
+      i18n(`cli.lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
+        accountName,
+      })
+    );
+  } else {
+    const config = getConfig();
+    logger.info(
+      i18n(`cli.lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
+        accountName: config.defaultPortal,
+      })
+    );
+  }
+  logger.success(
+    i18n(`${i18nKey}.success.configFileUpdated`, {
+      configFilename: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+      authType: successAuthMethod,
+      accountName,
+    })
+  );
+  uiFeatureHighlight([
+    'accountsUseCommand',
+    'accountOption',
+    'accountsListCommand',
+  ]);
+
   process.exit(EXIT_CODES.SUCCESS);
 };
 
@@ -172,6 +196,13 @@ exports.builder = yargs => {
     }),
   });
 
+  yargs.options({
+    account: {
+      describe: i18n(`${i18nKey}.options.account.describe`),
+      type: 'string',
+    },
+  });
+
   addConfigOptions(yargs, true);
   addTestingOptions(yargs, true);
 

package/commands/config/set.js

@@ -33,7 +33,7 @@ const selectOptions = async () => {
 };
 
 const handleConfigUpdate = async (accountId, options) => {
-  const { defaultMode, httpTimeout, allowUsageTracking } = options;
+  const { allowUsageTracking, defaultMode, httpTimeout } = options;
 
   if (typeof defaultMode !== 'undefined') {
     await setDefaultMode({ defaultMode, accountId });
@@ -89,5 +89,8 @@ exports.builder = yargs => {
 
   yargs.example([['$0 config set', i18n(`${i18nKey}.examples.default`)]]);
 
+  //TODO remove this when "hs accounts use" is fully rolled out
+  yargs.strict(false);
+
   return yargs;
 };

package/commands/init.js

@@ -30,12 +30,15 @@ const { promptUser } = require('../lib/prompts/promptUtils');
 const {
   OAUTH_FLOW,
   API_KEY_FLOW,
-  ACCOUNT_NAME,
   personalAccessKeyPrompt,
 } = require('../lib/prompts/personalAccessKeyPrompt');
+const {
+  enterAccountNamePrompt,
+} = require('../lib/prompts/enterAccountNamePrompt');
 const { logDebugInfo } = require('../lib/debugInfo');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
+const { uiFeatureHighlight } = require('../lib/ui');
 
 const i18nKey = 'cli.commands.init';
 
@@ -45,9 +48,9 @@ const TRACKING_STATUS = {
   COMPLETE: 'complete',
 };
 
-const personalAccessKeyConfigCreationFlow = async env => {
-  const configData = await personalAccessKeyPrompt({ env });
-  const { name } = await promptUser([ACCOUNT_NAME]);
+const personalAccessKeyConfigCreationFlow = async (env, account) => {
+  const configData = await personalAccessKeyPrompt({ env, account });
+  const { name } = await enterAccountNamePrompt();
   const accountConfig = {
     ...configData,
     name,
@@ -85,13 +88,23 @@ const CONFIG_CREATION_FLOWS = {
   [API_KEY_AUTH_METHOD.value]: apiKeyConfigCreationFlow,
 };
 
-exports.command = 'init';
+const AUTH_TYPE_NAMES = {
+  [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
+  [OAUTH_AUTH_METHOD.value]: OAUTH_AUTH_METHOD.name,
+  [API_KEY_AUTH_METHOD.value]: API_KEY_AUTH_METHOD.name,
+};
+
+exports.command = 'init [--account]';
 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 } = options;
+  const {
+    auth: authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+    c,
+    account: optionalAccount,
+  } = options;
   const configPath = (c && path.join(getCwd(), c)) || getConfigPath();
   setLogLevel(options);
   logDebugInfo(options);
@@ -106,7 +119,7 @@ exports.handler = async options => {
         configPath,
       })
     );
-    logger.info(i18n(`${i18nKey}.info.updateConfig`));
+    logger.info(i18n(`${i18nKey}.logs.updateConfig`));
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -115,16 +128,25 @@ exports.handler = async options => {
   handleExit(deleteEmptyConfigFile);
 
   try {
-    const { accountId, name } = await CONFIG_CREATION_FLOWS[authType](env);
+    const { accountId, name } = await CONFIG_CREATION_FLOWS[authType](
+      env,
+      optionalAccount
+    );
     const configPath = getConfigPath();
 
+    logger.log('');
     logger.success(
       i18n(`${i18nKey}.success.configFileCreated`, {
         configPath,
-        authType,
+      })
+    );
+    logger.success(
+      i18n(`${i18nKey}.success.configFileUpdated`, {
+        authType: AUTH_TYPE_NAMES[authType],
         account: name || accountId,
       })
     );
+    uiFeatureHighlight(['helpCommand', 'authCommand', 'accountsListCommand']);
 
     trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
     process.exit(EXIT_CODES.SUCCESS);
@@ -135,18 +157,24 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  yargs.option('auth', {
-    describe: i18n(`${i18nKey}.options.auth.describe`),
-    type: 'string',
-    choices: [
-      `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
-      `${OAUTH_AUTH_METHOD.value}`,
-      `${API_KEY_AUTH_METHOD.value}`,
-    ],
-    default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    defaultDescription: i18n(`${i18nKey}.options.auth.defaultDescription`, {
-      defaultType: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    }),
+  yargs.options({
+    auth: {
+      describe: i18n(`${i18nKey}.options.auth.describe`),
+      type: 'string',
+      choices: [
+        `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
+        `${OAUTH_AUTH_METHOD.value}`,
+        `${API_KEY_AUTH_METHOD.value}`,
+      ],
+      default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+      defaultDescription: i18n(`${i18nKey}.options.auth.defaultDescription`, {
+        defaultType: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+      }),
+    },
+    account: {
+      describe: i18n(`${i18nKey}.options.account.describe`),
+      type: 'string',
+    },
   });
 
   addConfigOptions(yargs, true);

package/commands/project/create.js

@@ -8,14 +8,14 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { getCwd } = require('@hubspot/cli-lib/path');
 const path = require('path');
+const chalk = require('chalk');
 const {
   createProjectPrompt,
 } = require('../../lib/prompts/createProjectPrompt');
-const {
-  createProjectConfig,
-  showProjectWelcomeMessage,
-} = require('../../lib/projects');
+const { createProjectConfig } = require('../../lib/projects');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { uiFeatureHighlight } = require('../../lib/ui');
+const { logger } = require('@hubspot/cli-lib/logger');
 
 const i18nKey = 'cli.commands.project.subcommands.create';
 
@@ -37,7 +37,14 @@ exports.handler = async options => {
     options.template || template
   );
 
-  showProjectWelcomeMessage();
+  logger.log('');
+  logger.log(chalk.bold(i18n(`${i18nKey}.logs.welcomeMessage`)));
+  uiFeatureHighlight([
+    'createCommand',
+    'projectUploadCommand',
+    'projectDeployCommand',
+    'projectHelpCommand',
+  ]);
 };
 
 exports.builder = yargs => {

package/commands/project/deploy.js

@@ -12,41 +12,44 @@ const {
 const { logger } = require('@hubspot/cli-lib/logger');
 const { deployProject, fetchProject } = require('@hubspot/cli-lib/api/dfs');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const {
-  getProjectConfig,
-  pollDeployStatus,
-  validateProjectConfig,
-} = require('../../lib/projects');
+const { getProjectConfig, pollDeployStatus } = require('../../lib/projects');
+const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-exports.command = 'deploy [path]';
+exports.command = 'deploy [--project] [--buildId]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);
 
-  const { path: projectPath, buildId } = options;
   const accountId = getAccountId(options);
+  const { project, buildId } = options;
 
-  trackCommandUsage('project-deploy', { projectPath }, accountId);
+  trackCommandUsage('project-deploy', { project }, accountId);
 
-  const { projectConfig, projectDir } = await getProjectConfig(projectPath);
+  const { projectConfig } = await getProjectConfig();
 
-  validateProjectConfig(projectConfig, projectDir);
+  let projectName = project;
 
-  logger.debug(
-    i18n(`${i18nKey}.debug.deploying`, {
-      path: projectPath,
-    })
-  );
+  if (!projectName && projectConfig) {
+    projectName = projectConfig.name;
+  }
+
+  const namePrompt = await projectNamePrompt(accountId, {
+    project: projectName,
+  });
+
+  if (!projectName && namePrompt.projectName) {
+    projectName = namePrompt.projectName;
+  }
 
   let exitCode = EXIT_CODES.SUCCESS;
 
   const getBuildId = async () => {
-    const { latestBuild } = await fetchProject(accountId, projectConfig.name);
+    const { latestBuild } = await fetchProject(accountId, projectName);
     if (latestBuild && latestBuild.buildId) {
       return latestBuild.buildId;
     }
@@ -60,7 +63,7 @@ exports.handler = async options => {
 
     const deployResp = await deployProject(
       accountId,
-      projectConfig.name,
+      projectName,
       deployedBuildId
     );
 
@@ -76,7 +79,7 @@ exports.handler = async options => {
 
     await pollDeployStatus(
       accountId,
-      projectConfig.name,
+      projectName,
       deployResp.id,
       deployedBuildId
     );
@@ -84,7 +87,7 @@ exports.handler = async options => {
     if (e.statusCode === 400) {
       logger.error(e.error.message);
     } else {
-      logApiErrorInstance(e, new ApiErrorContext({ accountId, projectPath }));
+      logApiErrorInstance(e, new ApiErrorContext({ accountId, projectName }));
     }
     exitCode = 1;
   }
@@ -92,20 +95,23 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  yargs.positional('path', {
-    describe: i18n(`${i18nKey}.positionals.path.describe`),
-    type: 'string',
-  });
-
   yargs.options({
+    project: {
+      describe: i18n(`${i18nKey}.options.project.describe`),
+      type: 'string',
+    },
     buildId: {
       describe: i18n(`${i18nKey}.options.buildId.describe`),
       type: 'number',
     },
   });
 
+  yargs.example([['$0 project deploy', i18n(`${i18nKey}.examples.default`)]]);
   yargs.example([
-    ['$0 project deploy myProjectFolder', i18n(`${i18nKey}.examples.default`)],
+    [
+      '$0 project deploy --project="my-project" --buildId=5',
+      i18n(`${i18nKey}.examples.withOptions`),
+    ],
   ]);
 
   addConfigOptions(yargs, true);

package/commands/project/open.js

@@ -6,6 +6,7 @@ const {
   addUseEnvironmentOptions,
   addTestingOptions,
 } = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
@@ -27,6 +28,9 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
   const { project } = options;
+
+  trackCommandUsage('project-open', { project }, accountId);
+
   const { projectConfig } = await getProjectConfig();
 
   let projectName = project;
@@ -42,7 +46,7 @@ exports.handler = async options => {
   } else if (!projectName && projectConfig) {
     projectName = projectConfig.name;
   } else if (!projectName && !projectConfig) {
-    const namePrompt = await projectNamePrompt(accountId, projectConfig);
+    const namePrompt = await projectNamePrompt(accountId);
 
     if (!namePrompt.projectName) {
       process.exit(EXIT_CODES.ERROR);

package/commands/sandbox/create.js

@@ -3,6 +3,7 @@ const {
   addConfigOptions,
   getAccountId,
   addUseEnvironmentOptions,
+  addTestingOptions,
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/cli-lib/logger');
@@ -11,9 +12,97 @@ const { createSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { createSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const {
+  ENVIRONMENTS,
+  PERSONAL_ACCESS_KEY_AUTH_METHOD,
+  DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+} = require('@hubspot/cli-lib/lib/constants');
+const {
+  personalAccessKeyPrompt,
+} = require('../../lib/prompts/personalAccessKeyPrompt');
+const {
+  updateConfigWithPersonalAccessKey,
+} = require('@hubspot/cli-lib/personalAccessKey');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const {
+  getConfig,
+  writeConfig,
+  updateAccountConfig,
+  getAccountConfig,
+} = require('@hubspot/cli-lib');
+const {
+  enterAccountNamePrompt,
+} = require('../../lib/prompts/enterAccountNamePrompt');
+const {
+  setAsDefaultAccountPrompt,
+} = require('../../lib/prompts/setAsDefaultAccountPrompt');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
+const {
+  isMissingScopeError,
+} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+const { uiFeatureHighlight } = require('../../lib/ui');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
 
+const personalAccessKeyFlow = async (env, account, name) => {
+  const configData = await personalAccessKeyPrompt({ env, account });
+  const updatedConfig = await updateConfigWithPersonalAccessKey(configData);
+
+  if (!updatedConfig) {
+    process.exit(EXIT_CODES.SUCCESS);
+  }
+
+  let validName = updatedConfig.name;
+
+  if (!updatedConfig.name) {
+    const nameForConfig = name
+      .toLowerCase()
+      .split(' ')
+      .join('-');
+    const { name: promptName } = await enterAccountNamePrompt(nameForConfig);
+    validName = promptName;
+  }
+
+  updateAccountConfig({
+    ...updatedConfig,
+    environment: updatedConfig.env,
+    tokenInfo: updatedConfig.auth.tokenInfo,
+    name: validName,
+  });
+  writeConfig();
+
+  const setAsDefault = await setAsDefaultAccountPrompt(validName);
+
+  logger.log('');
+  if (setAsDefault) {
+    logger.success(
+      i18n(`cli.lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
+        accountName: validName,
+      })
+    );
+  } else {
+    const config = getConfig();
+    logger.info(
+      i18n(`cli.lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
+        accountName: config.defaultPortal,
+      })
+    );
+  }
+  logger.success(
+    i18n(`${i18nKey}.success.configFileUpdated`, {
+      configFilename: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+      authMethod: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
+      account: validName,
+    })
+  );
+  uiFeatureHighlight([
+    'accountsUseCommand',
+    'accountOption',
+    'accountsListCommand',
+  ]);
+};
+
 exports.command = 'create [name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
@@ -22,6 +111,8 @@ exports.handler = async options => {
 
   const { name } = options;
   const accountId = getAccountId(options);
+  const accountConfig = getAccountConfig(accountId);
+  const env = options.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
   let namePrompt;
 
   trackCommandUsage('sandbox-create', {}, accountId);
@@ -37,18 +128,44 @@ exports.handler = async options => {
       name: sandboxName,
     })
   );
-
-  return createSandbox(accountId, sandboxName).then(
-    ({ name, sandboxHubId }) => {
-      logger.success(
-        i18n(`${i18nKey}.success.create`, {
-          name,
-          sandboxHubId,
+  let result;
+  try {
+    result = await createSandbox(accountId, sandboxName).then(
+      ({ name, sandboxHubId }) => {
+        logger.log('');
+        logger.success(
+          i18n(`${i18nKey}.success.create`, {
+            name,
+            sandboxHubId,
+          })
+        );
+        return { name, sandboxHubId };
+      }
+    );
+  } catch (err) {
+    if (isMissingScopeError(err)) {
+      logger.error(
+        i18n(`${i18nKey}.failure.scopes.message`, {
+          accountName: accountConfig.name || accountId,
+        })
+      );
+      const websiteOrigin = getHubSpotWebsiteOrigin(env);
+      const url = `${websiteOrigin}/personal-access-key/${accountId}`;
+      logger.info(
+        i18n(`${i18nKey}.failure.scopes.instructions`, {
+          accountName: accountConfig.name || accountId,
+          url,
         })
       );
-      logger.info(i18n(`${i18nKey}.info.auth`));
     }
-  );
+    process.exit(EXIT_CODES.ERROR);
+  }
+  try {
+    await personalAccessKeyFlow(env, result.sandboxHubId, result.name);
+    process.exit(EXIT_CODES.SUCCESS);
+  } catch (err) {
+    logErrorInstance(err);
+  }
 };
 
 exports.builder = yargs => {
@@ -64,6 +181,7 @@ exports.builder = yargs => {
   addConfigOptions(yargs, true);
   addAccountOptions(yargs, true);
   addUseEnvironmentOptions(yargs, true);
+  addTestingOptions(yargs, true);
 
   return yargs;
 };

package/commands/upload.js

@@ -26,6 +26,7 @@ const {
   getAccountId,
   getMode,
 } = require('../lib/commonOpts');
+const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { getThemePreviewUrl } = require('@hubspot/cli-lib/lib/files');
@@ -34,7 +35,7 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const i18nKey = 'cli.commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
-exports.command = 'upload <src> <dest>';
+exports.command = 'upload [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 const logThemePreview = (filePath, accountId) => {
@@ -50,8 +51,6 @@ const logThemePreview = (filePath, accountId) => {
 };
 
 exports.handler = async options => {
-  const { src, dest } = options;
-
   await loadAndValidateOptions(options);
 
   if (!validateMode(options)) {
@@ -60,6 +59,12 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
   const mode = getMode(options);
+
+  const uploadPromptAnswers = await uploadPrompt(options);
+
+  const src = options.src || uploadPromptAnswers.src;
+  const dest = options.dest || uploadPromptAnswers.dest;
+
   const absoluteSrcPath = path.resolve(getCwd(), src);
   let stats;
   try {

package/commands/watch.js

@@ -13,6 +13,7 @@ const {
   getAccountId,
   getMode,
 } = require('../lib/commonOpts');
+const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
@@ -20,11 +21,11 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const i18nKey = 'cli.commands.watch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
-exports.command = 'watch <src> <dest>';
+exports.command = 'watch [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
-  const { src, dest, remove, initialUpload, disableInitial, notify } = options;
+  const { remove, initialUpload, disableInitial, notify } = options;
 
   await loadAndValidateOptions(options);
 
@@ -35,6 +36,11 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   const mode = getMode(options);
 
+  const uploadPromptAnswers = await uploadPrompt(options);
+
+  const src = options.src || uploadPromptAnswers.src;
+  const dest = options.dest || uploadPromptAnswers.dest;
+
   const absoluteSrcPath = path.resolve(getCwd(), src);
   try {
     const stats = fs.statSync(absoluteSrcPath);

package/lib/projects.js

@@ -165,7 +165,7 @@ const validateProjectConfig = (projectConfig, projectDir) => {
 const ensureProjectExists = async (
   accountId,
   projectName,
-  { forceCreate = false, allowCreate = true } = {}
+  { forceCreate = false, allowCreate = true, noLogs = false } = {}
 ) => {
   try {
     const project = await fetchProject(accountId, projectName);
@@ -194,11 +194,13 @@ const ensureProjectExists = async (
           return logApiErrorInstance(err, new ApiErrorContext({ accountId }));
         }
       } else {
-        logger.log(
-          `Your project ${chalk.bold(
-            projectName
-          )} could not be found in ${chalk.bold(accountId)}.`
-        );
+        if (!noLogs) {
+          logger.log(
+            `Your project ${chalk.bold(
+              projectName
+            )} could not be found in ${chalk.bold(accountId)}.`
+          );
+        }
         return false;
       }
     }
@@ -211,7 +213,7 @@ const getProjectDetailUrl = (projectName, accountId) => {
   if (!projectName) return;
 
   const baseUrl = getHubSpotWebsiteOrigin(
-    getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
+    getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
   );
 
   return `${baseUrl}/developer-projects/${accountId}/project/${projectName}`;
@@ -324,26 +326,6 @@ const handleProjectUpload = async (
   archive.finalize();
 };
 
-const showProjectWelcomeMessage = () => {
-  logger.log('');
-  logger.log(chalk.bold('Welcome to HubSpot Developer Projects!'));
-  logger.log('\n');
-  uiLine();
-  logger.log('\n');
-  logger.log(chalk.bold("What's next?\n"));
-  logger.log('🎨 Add components to your project with `hs create`.\n');
-  logger.log(
-    `🏗  Run \`hs project upload\` to upload your files to HubSpot and trigger builds.\n`
-  );
-  logger.log(
-    `🚀 Ready to take your project live? Run \`hs project deploy\`.\n`
-  );
-  logger.log(
-    `🔗 Use \`hs project --help\` to learn more about available commands.\n`
-  );
-  uiLine();
-};
-
 const makePollTaskStatusFunc = ({
   statusFn,
   statusText,
@@ -519,7 +501,6 @@ module.exports = {
   handleProjectUpload,
   createProjectConfig,
   validateProjectConfig,
-  showProjectWelcomeMessage,
   getProjectDetailUrl,
   getProjectBuildDetailUrl,
   pollBuildStatus,

package/lib/prompts/enterAccountNamePrompt.js

@@ -0,0 +1,33 @@
+const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.enterAccountNamePrompt';
+
+const accountNamePrompt = defaultName => ({
+  name: 'name',
+  message: i18n(`${i18nKey}.enterAccountName`),
+  default: defaultName,
+  validate(val) {
+    if (typeof val !== 'string') {
+      return i18n(`${i18nKey}.errors.invalidName`);
+    } else if (!val.length) {
+      return i18n(`${i18nKey}.errors.nameRequired`);
+    } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
+      return i18n(`${i18nKey}.errors.spacesInName`);
+    }
+    return accountNameExistsInConfig(val)
+      ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
+      : true;
+  },
+});
+
+const enterAccountNamePrompt = defaultName => {
+  return promptUser(accountNamePrompt(defaultName));
+};
+
+module.exports = {
+  accountNamePrompt,
+  enterAccountNamePrompt,
+};

package/lib/prompts/personalAccessKeyPrompt.js

@@ -3,11 +3,15 @@ const {
   OAUTH_SCOPES,
   DEFAULT_OAUTH_SCOPES,
 } = require('@hubspot/cli-lib/lib/constants');
+const { deleteEmptyConfigFile } = require('@hubspot/cli-lib/lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { API_KEY_REGEX, STRING_WITH_NO_SPACES_REGEX } = require('../regex');
+const { API_KEY_REGEX } = require('../regex');
 const { promptUser } = require('./promptUtils');
+const { accountNamePrompt } = require('./enterAccountNamePrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { uiInfoSection } = require('../ui');
+const { EXIT_CODES } = require('../enums/exitCodes');
 
 const i18nKey = 'cli.lib.prompts.personalAccessKeyPrompt';
 
@@ -15,12 +19,25 @@ const i18nKey = 'cli.lib.prompts.personalAccessKeyPrompt';
  * Displays notification to user that we are about to open the browser,
  * then opens their browser to the personal-access-key shortlink
  */
-const personalAccessKeyPrompt = async ({ env } = {}) => {
+const personalAccessKeyPrompt = async ({ env, account } = {}) => {
   const websiteOrigin = getHubSpotWebsiteOrigin(env);
-  const url = `${websiteOrigin}/l/personal-access-key`;
+  let url = `${websiteOrigin}/l/personal-access-key`;
   if (process.env.BROWSER !== 'none') {
-    await promptUser([PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP]);
-    open(url, { url: true });
+    uiInfoSection(i18n(`${i18nKey}.personalAccessKeySetupTitle`), () => {
+      logger.log(i18n(`${i18nKey}.personalAccessKeyBrowserOpenPrep`));
+    });
+    if (account) {
+      url = `${websiteOrigin}/personal-access-key/${account}`;
+    }
+    const { personalAcessKeyBrowserOpenPrep: shouldOpen } = await promptUser([
+      PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP,
+    ]);
+    if (shouldOpen) {
+      open(url, { url: true });
+    } else {
+      deleteEmptyConfigFile();
+      process.exit(EXIT_CODES.SUCCESS);
+    }
   }
 
   logger.log(i18n(`${i18nKey}.logs.openingWebBrowser`, { url }));
@@ -72,21 +89,6 @@ const CLIENT_SECRET = {
   },
 };
 
-const ACCOUNT_NAME = {
-  name: 'name',
-  message: i18n(`${i18nKey}.enterAccountName`),
-  validate(val) {
-    if (typeof val !== 'string') {
-      return i18n(`${i18nKey}.errors.invalidName`);
-    } else if (!val.length) {
-      return i18n(`${i18nKey}.errors.nameRequired`);
-    } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
-      return i18n(`${i18nKey}.errors.spacesInName`);
-    }
-    return true;
-  },
-};
-
 const ACCOUNT_API_KEY = {
   name: 'apiKey',
   message: i18n(`${i18nKey}.enterApiKey`),
@@ -100,12 +102,21 @@ const ACCOUNT_API_KEY = {
 
 const PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP = {
   name: 'personalAcessKeyBrowserOpenPrep',
-  message: i18n(`${i18nKey}.personalAccessKeyBrowserOpenPrep`),
+  type: 'confirm',
+  message: i18n(`${i18nKey}.personalAccessKeyBrowserOpenPrompt`),
 };
 
 const PERSONAL_ACCESS_KEY = {
   name: 'personalAccessKey',
   message: i18n(`${i18nKey}.enterPersonalAccessKey`),
+  transformer: val => {
+    if (!val) return val;
+    let res = '';
+    for (let i = 0; i < val.length; i++) {
+      res += '*';
+    }
+    return res;
+  },
   validate(val) {
     if (!val || typeof val !== 'string') {
       return i18n(`${i18nKey}.errors.invalidPersonalAccessKey`);
@@ -124,8 +135,14 @@ const SCOPES = {
   choices: OAUTH_SCOPES,
 };
 
-const OAUTH_FLOW = [ACCOUNT_NAME, ACCOUNT_ID, CLIENT_ID, CLIENT_SECRET, SCOPES];
-const API_KEY_FLOW = [ACCOUNT_NAME, ACCOUNT_ID, ACCOUNT_API_KEY];
+const OAUTH_FLOW = [
+  accountNamePrompt(),
+  ACCOUNT_ID,
+  CLIENT_ID,
+  CLIENT_SECRET,
+  SCOPES,
+];
+const API_KEY_FLOW = [accountNamePrompt(), ACCOUNT_ID, ACCOUNT_API_KEY];
 
 module.exports = {
   personalAccessKeyPrompt,
@@ -133,10 +150,8 @@ module.exports = {
   CLIENT_SECRET,
   ACCOUNT_API_KEY,
   ACCOUNT_ID,
-  ACCOUNT_NAME,
   SCOPES,
   PERSONAL_ACCESS_KEY,
-
   // Flows
   API_KEY_FLOW,
   OAUTH_FLOW,

package/lib/prompts/projectNamePrompt.js

@@ -4,20 +4,24 @@ const { ensureProjectExists } = require('../projects');
 
 const i18nKey = 'cli.lib.prompts.projectNamePrompt';
 
-const projectNamePrompt = accountId => {
+const projectNamePrompt = (accountId, options = {}) => {
   return promptUser({
     name: 'projectName',
     message: i18n(`${i18nKey}.enterName`),
+    when: !options.project,
     validate: async val => {
-      if (typeof val !== 'string') {
+      if (typeof val !== 'string' || !val) {
         return i18n(`${i18nKey}.errors.invalidName`);
       }
       const projectExists = await ensureProjectExists(accountId, val, {
         allowCreate: false,
+        noLogs: true,
       });
-
       if (!projectExists) {
-        return false;
+        return i18n(`${i18nKey}.errors.projectDoesNotExist`, {
+          projectName: val,
+          accountId,
+        });
       }
       return true;
     },

package/lib/prompts/setAsDefaultAccountPrompt.js

@@ -0,0 +1,30 @@
+const {
+  getConfig,
+  updateDefaultAccount,
+} = require('@hubspot/cli-lib/lib/config');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.setAsDefaultAccountPrompt';
+
+const setAsDefaultAccountPrompt = async accountName => {
+  const config = getConfig();
+
+  const { setAsDefault } = await promptUser([
+    {
+      name: 'setAsDefault',
+      type: 'confirm',
+      when: config.defaultPortal !== accountName,
+      message: i18n(`${i18nKey}.setAsDefaultAccountMessage`),
+    },
+  ]);
+
+  if (setAsDefault) {
+    updateDefaultAccount(accountName);
+  }
+  return setAsDefault;
+};
+
+module.exports = {
+  setAsDefaultAccountPrompt,
+};

package/lib/prompts/uploadPrompt.js

@@ -0,0 +1,39 @@
+const path = require('path');
+const { getCwd } = require('@hubspot/cli-lib/path');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.uploadPrompt';
+
+const uploadPrompt = (promptOptions = {}) => {
+  return promptUser([
+    {
+      name: 'src',
+      message: i18n(`${i18nKey}.enterSrc`),
+      when: !promptOptions.src,
+      default: '.',
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.srcRequired`);
+        }
+        return true;
+      },
+    },
+    {
+      name: 'dest',
+      message: i18n(`${i18nKey}.enterDest`),
+      when: !promptOptions.dest,
+      default: path.basename(getCwd()),
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.destRequired`);
+        }
+        return true;
+      },
+    },
+  ]);
+};
+
+module.exports = {
+  uploadPrompt,
+};

package/lib/ui.js

@@ -2,6 +2,7 @@ const chalk = require('chalk');
 const supportsHyperlinks = require('../lib/supportHyperlinks');
 const supportsColor = require('../lib/supportsColor');
 const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 
 /**
@@ -65,8 +66,36 @@ const uiAccountDescription = accountId => {
   );
 };
 
+const uiInfoSection = (title, logContent) => {
+  uiLine();
+  logger.log(chalk.bold(title));
+  logger.log('');
+  logContent();
+  logger.log('');
+  uiLine();
+};
+
+const uiFeatureHighlight = (commands, title) => {
+  const i18nKey = 'cli.lib.ui.featureHighlight';
+
+  uiInfoSection(title ? title : i18n(`${i18nKey}.defaultTitle`), () => {
+    commands.forEach((c, i) => {
+      const commandKey = `${i18nKey}.commandKeys.${c}`;
+      const message = i18n(`${commandKey}.message`, {
+        command: chalk.bold(i18n(`${commandKey}.command`)),
+      });
+      if (i !== 0) {
+        logger.log('');
+      }
+      logger.log(message);
+    });
+  });
+};
+
 module.exports = {
+  uiAccountDescription,
+  uiFeatureHighlight,
+  uiInfoSection,
   uiLine,
   uiLink,
-  uiAccountDescription,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.13-beta.3",
+  "version": "4.0.1-beta.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "3.0.13-beta.3",
-    "@hubspot/serverless-dev-runtime": "3.0.13-beta.3",
+    "@hubspot/cli-lib": "4.0.1-beta.0",
+    "@hubspot/serverless-dev-runtime": "4.0.1-beta.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "34e55c31dee127f375faaddbbe0f71940c01c860"
+  "gitHead": "fb23906d7f8694f9de4bb43043127a74f5b63a29"
 }