@hubspot/cli 4.1.8-beta.5 → 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/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

@@ -50,54 +50,53 @@ exports.handler = async options => {
 
   await ensureProjectExists(accountId, projectConfig.name, { forceCreate });
 
-  const result = await handleProjectUpload(
-    accountId,
-    projectConfig,
-    projectDir,
-    pollProjectBuildAndDeploy,
-    message
-  );
-
-  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,
+  try {
+    const result = await handleProjectUpload(
+      accountId,
+      projectConfig,
+      projectDir,
+      pollProjectBuildAndDeploy,
+      message
+    );
+
+    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);
   }
-  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'),
-      })
-    );
-    uiLine();
-  }
-
-  logFeedbackMessage(result.buildId);
-  process.exit(result.succeeded ? EXIT_CODES.SUCCESS : EXIT_CODES.ERROR);
 };
 
 exports.builder = yargs => {

package/commands/project/watch.js

@@ -99,33 +99,40 @@ exports.handler = async options => {
 
   await ensureProjectExists(accountId, projectConfig.name);
 
-  const { results: builds } = await fetchProjectBuilds(
-    accountId,
-    projectConfig.name,
-    options
-  );
-  const hasNoBuilds = !builds || !builds.length;
-
-  const startWatching = async () => {
-    await createWatcher(
+  try {
+    const { results: builds } = await fetchProjectBuilds(
       accountId,
-      projectConfig,
-      projectDir,
-      handleBuildStatus,
-      handleUserInput
+      projectConfig.name,
+      options
     );
-  };
-
-  // Upload all files if no build exists for this project yet
-  if (initialUpload || hasNoBuilds) {
-    await handleProjectUpload(
-      accountId,
-      projectConfig,
-      projectDir,
-      startWatching
+    const hasNoBuilds = !builds || !builds.length;
+
+    const startWatching = async () => {
+      await createWatcher(
+        accountId,
+        projectConfig,
+        projectDir,
+        handleBuildStatus,
+        handleUserInput
+      );
+    };
+
+    // Upload all files if no build exists for this project yet
+    if (initialUpload || hasNoBuilds) {
+      await handleProjectUpload(
+        accountId,
+        projectConfig,
+        projectDir,
+        startWatching
+      );
+    } else {
+      await startWatching();
+    }
+  } catch (e) {
+    logApiErrorInstance(
+      e,
+      new ApiErrorContext({ accountId, projectName: projectConfig.name })
     );
-  } else {
-    await startWatching();
   }
 };
 

package/commands/sandbox/create.js

@@ -186,12 +186,14 @@ exports.handler = async options => {
       throw err;
     }
 
-    uiFeatureHighlight([
-      'accountsUseCommand',
-      sandboxType === DEVELOPER_SANDBOX
-        ? 'projectDevCommand'
-        : 'projectUploadCommand',
-    ]);
+    const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
+    if (sandboxType === DEVELOPER_SANDBOX) {
+      highlightItems.push('projectDevCommand');
+    } else {
+      highlightItems.push('projectUploadCommand');
+    }
+
+    uiFeatureHighlight(highlightItems);
     process.exit(EXIT_CODES.SUCCESS);
   } catch (error) {
     trackCommandUsage('sandbox-create', { successful: false }, accountId);

package/commands/sandbox/sync.js

@@ -24,6 +24,12 @@ const {
 } = require('../../lib/sandboxes');
 const { syncSandbox } = require('../../lib/sandbox-sync');
 const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
+const {
+  isSpecifiedError,
+} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+const {
+  logErrorInstance,
+} = require('@hubspot/cli-lib/errorHandlers/standardErrors');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.sync';
 
@@ -70,6 +76,32 @@ exports.handler = async options => {
   const isStandardSandbox =
     sandboxTypeMap[accountConfig.sandboxAccountType] === STANDARD_SANDBOX;
 
+  let availableSyncTasks;
+  try {
+    availableSyncTasks = await getAvailableSyncTypes(
+      parentAccountConfig,
+      accountConfig
+    );
+  } catch (error) {
+    if (
+      isSpecifiedError(error, {
+        statusCode: 404,
+        category: 'OBJECT_NOT_FOUND',
+        subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
+      })
+    ) {
+      logger.error(
+        i18n('cli.lib.sandbox.sync.failure.objectNotFound', {
+          account: getAccountName(accountConfig),
+        })
+      );
+    } else {
+      logErrorInstance(error);
+    }
+    trackCommandUsage('sandbox-sync', { successful: false }, accountId);
+    process.exit(EXIT_CODES.ERROR);
+  }
+
   if (isDevelopmentSandbox) {
     logger.log(i18n(`${i18nKey}.info.developmentSandbox`));
     logger.log(
@@ -145,10 +177,6 @@ exports.handler = async options => {
   }
 
   try {
-    const availableSyncTasks = await getAvailableSyncTypes(
-      parentAccountConfig,
-      accountConfig
-    );
     const syncTasks = await getSyncTypesWithContactRecordsPrompt(
       accountConfig,
       availableSyncTasks,