@hubspot/cli 4.1.8-beta.4 → 4.1.8-beta.6

package/commands/accounts/info.js

@@ -8,6 +8,7 @@ const {
 } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
+const { getTableContents } = require('@hubspot/cli-lib/lib/table');
 
 const i18nKey = 'cli.commands.accounts.subcommands.info';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -26,11 +27,12 @@ exports.handler = async options => {
 
     const response = await getAccessToken(personalAccessKey, env, accountId);
 
-    let scopeGroups = response.scopeGroups.join('\n');
+    const scopeGroups = response.scopeGroups.map(s => [s]);
 
     logger.log(i18n(`${i18nKey}.name`, { name }));
     logger.log(i18n(`${i18nKey}.accountId`, { accountId }));
-    logger.log(i18n(`${i18nKey}.scopeGroups`, { scopeGroups }));
+    logger.log(i18n(`${i18nKey}.scopeGroups`));
+    logger.log(getTableContents(scopeGroups, { border: { bodyLeft: '  ' } }));
   } else {
     logger.log(i18n(`${i18nKey}.errors.notUsingPersonalAccessKey`));
   }

package/commands/project/create.js

@@ -35,7 +35,7 @@ exports.handler = async options => {
     path.resolve(getCwd(), options.location || location),
     options.name || name,
     options.template || template,
-    options.repoPath
+    options.templateSource
   );
 
   logger.log('');
@@ -62,8 +62,8 @@ exports.builder = yargs => {
       describe: i18n(`${i18nKey}.options.template.describe`),
       type: 'string',
     },
-    repoPath: {
-      describe: i18n(`${i18nKey}.options.repoPath.describe`),
+    templateSource: {
+      describe: i18n(`${i18nKey}.options.templateSource.describe`),
       type: 'string',
     },
   });

package/commands/project/deploy.js

@@ -52,32 +52,30 @@ exports.handler = async options => {
 
   let buildIdToDeploy = buildIdOption;
 
-  if (!buildIdOption) {
-    const { latestBuild, deployedBuildId } = await fetchProject(
-      accountId,
-      projectName
-    );
-    if (!latestBuild || !latestBuild.buildId) {
-      logger.error(i18n(`${i18nKey}.errors.noBuilds`));
-      process.exit(EXIT_CODES.ERROR);
-    }
-    const buildIdPromptResponse = await buildIdPrompt(
-      latestBuild.buildId,
-      deployedBuildId,
-      projectName
-    );
-
-    buildIdToDeploy = buildIdPromptResponse.buildId;
-  }
+  try {
+    if (!buildIdOption) {
+      const { latestBuild, deployedBuildId } = await fetchProject(
+        accountId,
+        projectName
+      );
+      if (!latestBuild || !latestBuild.buildId) {
+        logger.error(i18n(`${i18nKey}.errors.noBuilds`));
+        process.exit(EXIT_CODES.ERROR);
+      }
+      const buildIdPromptResponse = await buildIdPrompt(
+        latestBuild.buildId,
+        deployedBuildId,
+        projectName
+      );
 
-  if (!buildIdToDeploy) {
-    logger.error(i18n(`${i18nKey}.errors.noBuildId`));
-    process.exit(EXIT_CODES.ERROR);
-  }
+      buildIdToDeploy = buildIdPromptResponse.buildId;
+    }
 
-  let exitCode = EXIT_CODES.SUCCESS;
+    if (!buildIdToDeploy) {
+      logger.error(i18n(`${i18nKey}.errors.noBuildId`));
+      process.exit(EXIT_CODES.ERROR);
+    }
 
-  try {
     const deployResp = await deployProject(
       accountId,
       projectName,
@@ -90,7 +88,6 @@ exports.handler = async options => {
           details: deployResp.error.message,
         })
       );
-      exitCode = EXIT_CODES.ERROR;
       return;
     }
 
@@ -106,9 +103,8 @@ exports.handler = async options => {
     } else {
       logApiErrorInstance(e, new ApiErrorContext({ accountId, projectName }));
     }
-    exitCode = 1;
+    process.exit(EXIT_CODES.ERROR);
   }
-  process.exit(exitCode);
 };
 
 exports.builder = yargs => {

package/commands/project/dev.js

@@ -29,6 +29,7 @@ const {
   LocalDevManager,
   UPLOAD_PERMISSIONS,
 } = require('../../lib/LocalDevManager');
+const { isSandbox } = require('../../lib/sandboxes');
 const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
@@ -37,12 +38,18 @@ const {
   getAvailableSyncTypes,
 } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
-const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const {
+  logErrorInstance,
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('@hubspot/cli-lib/errorHandlers');
 const { buildSandbox } = require('../../lib/sandbox-create');
 const { syncSandbox } = require('../../lib/sandbox-sync');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   isMissingScopeError,
+  isSpecifiedError,
 } = require('@hubspot/cli-lib/errorHandlers/apiErrors');
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
@@ -60,13 +67,7 @@ exports.handler = async options => {
 
   const { projectConfig, projectDir } = await getProjectConfig();
 
-  logger.log(i18n(`${i18nKey}.logs.introHeader`));
-  uiLine();
-  logger.log(i18n(`${i18nKey}.logs.introBody1`));
-  logger.log();
-  logger.log(i18n(`${i18nKey}.logs.introBody2`));
-  uiLine();
-  logger.log();
+  logger.log(i18n(`${i18nKey}.logs.betaMessage`));
 
   if (!projectConfig) {
     logger.error(i18n(`${i18nKey}.errors.noProjectConfig`));
@@ -74,47 +75,32 @@ exports.handler = async options => {
   }
 
   const accounts = getConfigAccounts();
-  let targetAccountId = options.accountId;
+  let targetAccountId = options.account ? accountId : null;
   let createNewSandbox = false;
-  let chooseNonSandbox = false;
+  const defaultAccountIsSandbox = isSandbox(accountConfig);
+
+  if (!targetAccountId && defaultAccountIsSandbox) {
+    targetAccountId = accountId;
+  }
 
   if (!targetAccountId) {
+    //logger.log(i18n(`${i18nKey}.logs.learnMoreLink`));
+    logger.log();
+    uiLine();
+    logger.warn(i18n(`${i18nKey}.logs.nonSandboxWarning`));
+    uiLine();
+    logger.log();
+
     const {
       targetAccountId: promptTargetAccountId,
-      chooseNonSandbox: promptChooseNonSandbox,
       createNewSandbox: promptCreateNewSandbox,
-    } = await selectTargetAccountPrompt(accounts, accountConfig, false);
+    } = await selectTargetAccountPrompt(accounts, accountConfig);
 
     targetAccountId = promptTargetAccountId;
-    chooseNonSandbox = promptChooseNonSandbox;
     createNewSandbox = promptCreateNewSandbox;
   }
 
-  logger.log();
-
-  // Show a warning if the user chooses a non-sandbox account (false)
-  let shouldTargetNonSandboxAccount;
-  if (chooseNonSandbox) {
-    uiLine();
-    logger.warn(i18n(`${i18nKey}.logs.prodAccountWarning`));
-    uiLine();
-    logger.log();
-
-    shouldTargetNonSandboxAccount = await confirmPrompt(
-      i18n(`${i18nKey}.prompt.targetNonSandbox`)
-    );
-
-    if (shouldTargetNonSandboxAccount) {
-      const {
-        targetAccountId: promptNonSandboxTargetAccountId,
-      } = await selectTargetAccountPrompt(accounts, accountConfig, true);
-
-      targetAccountId = promptNonSandboxTargetAccountId;
-      logger.log();
-    } else {
-      process.exit(EXIT_CODES.SUCCESS);
-    }
-  } else if (createNewSandbox) {
+  if (createNewSandbox) {
     try {
       await validateSandboxUsageLimits(accountConfig, DEVELOPER_SANDBOX, env);
     } catch (err) {
@@ -179,7 +165,8 @@ exports.handler = async options => {
     }
   );
 
-  const isNonSandboxAccount = shouldTargetNonSandboxAccount;
+  const isNonSandboxAccount =
+    !defaultAccountIsSandbox && targetAccountId === accountId;
 
   let uploadPermission = isNonSandboxAccount
     ? UPLOAD_PERMISSIONS.manual
@@ -198,21 +185,26 @@ exports.handler = async options => {
   const spinnies = SpinniesManager.init();
 
   if (!projectExists) {
-    uiLine();
-    logger.warn(
-      i18n(`${i18nKey}.logs.projectMustExistExplanation`, {
-        accountIdentifier: uiAccountDescription(targetAccountId),
-        projectName: projectConfig.name,
-      })
-    );
-    uiLine();
+    // Create the project without prompting if this is a newly created sandbox
+    let shouldCreateProject = createNewSandbox;
+
+    if (!shouldCreateProject) {
+      uiLine();
+      logger.warn(
+        i18n(`${i18nKey}.logs.projectMustExistExplanation`, {
+          accountIdentifier: uiAccountDescription(targetAccountId),
+          projectName: projectConfig.name,
+        })
+      );
+      uiLine();
 
-    const shouldCreateProject = await confirmPrompt(
-      i18n(`${i18nKey}.prompt.createProject`, {
-        accountIdentifier: uiAccountDescription(targetAccountId),
-        projectName: projectConfig.name,
-      })
-    );
+      shouldCreateProject = await confirmPrompt(
+        i18n(`${i18nKey}.prompt.createProject`, {
+          accountIdentifier: uiAccountDescription(targetAccountId),
+          projectName: projectConfig.name,
+        })
+      );
+    }
 
     if (shouldCreateProject) {
       try {
@@ -228,9 +220,10 @@ exports.handler = async options => {
             accountIdentifier: uiAccountDescription(targetAccountId),
             projectName: projectConfig.name,
           }),
+          succeedColor: 'white',
         });
       } catch (err) {
-        logger.log(i18n(`${i18nKey}.logs.failedToCreateProject`));
+        logger.log(i18n(`${i18nKey}.status.failedToCreateProject`));
         process.exit(EXIT_CODES.ERROR);
       }
     } else {
@@ -260,10 +253,24 @@ exports.handler = async options => {
     );
   }
 
-  if (result && !result.succeeded) {
-    spinnies.fail('devModeSetup', {
-      text: i18n(`${i18nKey}.status.startupFailed`),
-    });
+  if (result && result.error) {
+    if (
+      isSpecifiedError(result.error, {
+        subCategory: ERROR_TYPES.PROJECT_LOCKED,
+      })
+    ) {
+      logger.log();
+      logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+      logger.log();
+    } else {
+      logApiErrorInstance(
+        result.error,
+        new ApiErrorContext({
+          accountId,
+          projectName: projectConfig.name,
+        })
+      );
+    }
     process.exit(EXIT_CODES.ERROR);
   } else {
     spinnies.remove('devModeSetup');

package/commands/project/download.js

@@ -44,83 +44,77 @@ exports.handler = async options => {
 
   trackCommandUsage('project-download', null, accountId);
 
-  const projectExists = await ensureProjectExists(accountId, projectName, {
-    allowCreate: false,
-    noLogs: true,
-  });
-
-  if (!projectExists) {
-    logger.error(
-      i18n(`${i18nKey}.errors.projectNotFound`, {
-        projectName: chalk.bold(projectName),
-        accountId: chalk.bold(accountId),
-      })
-    );
-    let { name: promptedProjectName } = await downloadProjectPrompt(options);
-    let projectName = promptedProjectName || project;
-  }
+  try {
+    const projectExists = await ensureProjectExists(accountId, projectName, {
+      allowCreate: false,
+      noLogs: true,
+    });
+
+    if (!projectExists) {
+      logger.error(
+        i18n(`${i18nKey}.errors.projectNotFound`, {
+          projectName: chalk.bold(projectName),
+          accountId: chalk.bold(accountId),
+        })
+      );
+      let { name: promptedProjectName } = await downloadProjectPrompt(options);
+      let projectName = promptedProjectName || project;
+    }
 
-  const absoluteDestPath = dest ? path.resolve(getCwd(), dest) : getCwd();
+    const absoluteDestPath = dest ? path.resolve(getCwd(), dest) : getCwd();
 
-  const projectConfigCreated = await createProjectConfig(
-    absoluteDestPath,
-    projectName,
-    { name: 'no-template' }
-  );
+    const projectConfigCreated = await createProjectConfig(
+      absoluteDestPath,
+      projectName,
+      { name: 'no-template' }
+    );
 
-  if (!projectConfigCreated) {
-    logger.log(i18n(`${i18nKey}.logs.downloadCancelled`));
-    process.exit(EXIT_CODES.SUCCESS);
-  }
+    if (!projectConfigCreated) {
+      logger.log(i18n(`${i18nKey}.logs.downloadCancelled`));
+      process.exit(EXIT_CODES.SUCCESS);
+    }
 
-  let success = false;
-  let buildNumberToDownload = buildNumber;
+    let buildNumberToDownload = buildNumber;
 
-  if (!buildNumberToDownload) {
-    let projectBuildsResult;
+    if (!buildNumberToDownload) {
+      let projectBuildsResult;
 
-    try {
       projectBuildsResult = await fetchProjectBuilds(accountId, projectName);
-    } catch (e) {
-      logApiErrorInstance(e, new ApiErrorContext({ accountId }));
-      process.exit(EXIT_CODES.ERROR);
-    }
 
-    const { results: projectBuilds } = projectBuildsResult;
+      const { results: projectBuilds } = projectBuildsResult;
 
-    if (projectBuilds && projectBuilds.length) {
-      const latestBuild = projectBuilds[0];
-      buildNumberToDownload = latestBuild.buildId;
+      if (projectBuilds && projectBuilds.length) {
+        const latestBuild = projectBuilds[0];
+        buildNumberToDownload = latestBuild.buildId;
+      }
     }
-  }
 
-  const zippedProject = await downloadProject(
-    accountId,
-    projectName,
-    buildNumberToDownload
-  );
-
-  success = await extractZipArchive(
-    zippedProject,
-    projectName,
-    path.resolve(absoluteDestPath, 'src'),
-    {
-      includesRootDir: false,
-    }
-  );
+    const zippedProject = await downloadProject(
+      accountId,
+      projectName,
+      buildNumberToDownload
+    );
+
+    await extractZipArchive(
+      zippedProject,
+      projectName,
+      path.resolve(absoluteDestPath, 'src'),
+      {
+        includesRootDir: false,
+      }
+    );
 
-  if (!success) {
-    logger.log(i18n(`${i18nKey}.errors.downloadFailed`));
+    logger.log(
+      i18n(`${i18nKey}.logs.downloadSucceeded`, {
+        buildId: buildNumberToDownload,
+        projectName,
+      })
+    );
+    process.exit(EXIT_CODES.SUCCESS);
+  } catch (e) {
+    logApiErrorInstance(e, new ApiErrorContext({ accountId, projectName }));
     process.exit(EXIT_CODES.ERROR);
   }
-
-  logger.log(
-    i18n(`${i18nKey}.logs.downloadSucceeded`, {
-      buildId: buildNumberToDownload,
-      projectName,
-    })
-  );
-  process.exit(EXIT_CODES.SUCCESS);
 };
 
 exports.builder = yargs => {

package/commands/project/listBuilds.js

@@ -127,7 +127,10 @@ exports.handler = async options => {
     if (e.statusCode === 404) {
       logger.error(`Project ${projectConfig.name} not found. `);
     } else {
-      logApiErrorInstance(e, new ApiErrorContext({ accountId }));
+      logApiErrorInstance(
+        e,
+        new ApiErrorContext({ accountId, projectName: projectConfig.name })
+      );
     }
   }
 };

package/commands/project/logs.js

@@ -22,6 +22,10 @@ const {
   getProjectAppFunctionLogs,
   getLatestProjectAppFunctionLog,
 } = require('@hubspot/cli-lib/api/functions');
+const {
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('@hubspot/cli-lib/errorHandlers');
 const {
   getFunctionLogs,
   getLatestFunctionLog,
@@ -44,10 +48,16 @@ const getPrivateAppsUrl = accountId => {
   return `${baseUrl}/private-apps/${accountId}`;
 };
 
-const handleLogsError = (e, name) => {
-  logger.debug(`Log fetch error: ${e.message}`);
+const handleLogsError = (e, name, projectName) => {
   if (e.statusCode === 404) {
+    logger.debug(`Log fetch error: ${e.message}`);
     logger.log(i18n(`${i18nKey}.logs.noLogsFound`, { name }));
+  } else {
+    logApiErrorInstance(
+      e,
+      new ApiErrorContext({ accountId: getAccountId(), projectName })
+    );
+    process.exit(EXIT_CODES.ERROR);
   }
 };
 
@@ -77,7 +87,7 @@ const handleFunctionLog = async (accountId, options) => {
           )
         : getFunctionLogs(accountId, functionName, { after });
     } catch (e) {
-      handleLogsError(e, functionName);
+      handleLogsError(e, functionName, projectName);
     }
   };
 
@@ -89,7 +99,7 @@ const handleFunctionLog = async (accountId, options) => {
           projectName,
           appPath
         )
-      : getLatestFunctionLog(accountId, functionName);
+      : getLatestFunctionLog(accountId, functionName, projectName);
   };
 
   if (follow) {
@@ -104,14 +114,14 @@ const handleFunctionLog = async (accountId, options) => {
     try {
       logsResp = await fetchLatest();
     } catch (e) {
-      handleLogsError(e, functionName);
+      handleLogsError(e, functionName, projectName);
       return true;
     }
   } else {
     try {
       logsResp = await tailCall();
     } catch (e) {
-      handleLogsError(e, functionName);
+      handleLogsError(e, functionName, projectName);
       return true;
     }
   }

package/commands/project/upload.js

@@ -19,6 +19,14 @@ const {
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/cli-lib');
+const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const {
+  isSpecifiedError,
+} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+const {
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('@hubspot/cli-lib/errorHandlers');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
@@ -42,34 +50,53 @@ exports.handler = async options => {
 
   await ensureProjectExists(accountId, projectConfig.name, { forceCreate });
 
-  const result = await handleProjectUpload(
-    accountId,
-    projectConfig,
-    projectDir,
-    pollProjectBuildAndDeploy,
-    message
-  );
-
-  if (result.buildSucceeded && !result.autodeployEnabled) {
-    uiLine();
-    logger.log(
-      chalk.bold(
-        i18n(`${i18nKey}.logs.buildSucceeded`, {
-          buildId: result.buildId,
-        })
-      )
-    );
-    logger.log(i18n(`${i18nKey}.logs.readyToGoLive`));
-    logger.log(
-      i18n(`${i18nKey}.logs.runCommand`, {
-        command: chalk.hex('f5c26b')('hs project deploy'),
-      })
+  try {
+    const result = await handleProjectUpload(
+      accountId,
+      projectConfig,
+      projectDir,
+      pollProjectBuildAndDeploy,
+      message
     );
-    uiLine();
-  }
 
-  logFeedbackMessage(result.buildId);
-  process.exit(result.succeeded ? EXIT_CODES.SUCCESS : EXIT_CODES.ERROR);
+    if (result.error) {
+      if (
+        isSpecifiedError(result.error, {
+          subCategory: ERROR_TYPES.PROJECT_LOCKED,
+        })
+      ) {
+        logger.log();
+        logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+        logger.log();
+      } else {
+        logApiErrorInstance(
+          result.error,
+          new ApiErrorContext({
+            accountId,
+            projectName: projectConfig.name,
+          })
+        );
+      }
+      process.exit(EXIT_CODES.ERROR);
+    }
+    if (result.buildSucceeded && !result.autodeployEnabled) {
+      uiLine();
+      logger.log(
+        chalk.bold(
+          i18n(`${i18nKey}.logs.buildSucceeded`, {
+            buildId: result.buildId,
+          })
+        )
+      );
+      uiLine();
+      logFeedbackMessage(result.buildId);
+      process.exit(EXIT_CODES.SUCCESS);
+    }
+  } catch (e) {
+    const projectName = projectConfig.name;
+    logApiErrorInstance(e, new ApiErrorContext({ accountId, projectName }));
+    process.exit(EXIT_CODES.ERROR);
+  }
 };
 
 exports.builder = yargs => {