@hubspot/cli 6.1.1 → 6.2.1

package/commands/functions/deploy.js

@@ -1,4 +1,4 @@
-const ora = require('ora');
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -6,11 +6,8 @@ const {
   addUseEnvironmentOptions,
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
-
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
+const { uiAccountDescription } = require('../../lib/ui');
 const { poll } = require('../../lib/polling');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
@@ -20,6 +17,7 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { outputBuildLog } = require('../../lib/serverlessLogs');
 const { i18n } = require('../../lib/lang');
+const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
 
 const i18nKey = 'commands.functions.subcommands.deploy';
 
@@ -32,7 +30,6 @@ exports.handler = async options => {
   const { path: functionPath } = options;
   const accountId = getAccountId(options);
   const splitFunctionPath = functionPath.split('.');
-  let spinner;
 
   trackCommandUsage('functions-deploy', null, accountId);
 
@@ -54,17 +51,22 @@ exports.handler = async options => {
     })
   );
 
+  SpinniesManager.init();
+
+  SpinniesManager.add('loading', {
+    text: i18n(`${i18nKey}.loading`, {
+      account: uiAccountDescription(accountId),
+      functionPath,
+    }),
+  });
+
   try {
-    spinner = ora(
-      i18n(`${i18nKey}.loading`, {
-        accountId,
-        functionPath,
-      })
-    ).start();
-    const buildId = await buildPackage(accountId, functionPath);
+    const { data: buildId } = await buildPackage(accountId, functionPath);
     const successResp = await poll(getBuildStatus, accountId, buildId);
     const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
-    spinner.stop();
+
+    SpinniesManager.succeed('loading');
+
     await outputBuildLog(successResp.cdnUrl);
     logger.success(
       i18n(`${i18nKey}.success.deployed`, {
@@ -74,15 +76,19 @@ exports.handler = async options => {
       })
     );
   } catch (e) {
-    spinner && spinner.stop && spinner.stop();
-    if (e.response && e.response.status === 404) {
+    SpinniesManager.fail('loading', {
+      text: i18n(`${i18nKey}.loadingFailed`, {
+        account: uiAccountDescription(accountId),
+        functionPath,
+      }),
+    });
+
+    if (isHubSpotHttpError(e) && e.status === 404) {
       logger.error(
         i18n(`${i18nKey}.errors.noPackageJson`, {
           functionPath,
         })
       );
-    } else if (e.response && e.response.status === 400) {
-      logger.error(e.error.message);
     } else if (e.status === 'ERROR') {
       await outputBuildLog(e.cdnUrl);
       logger.error(
@@ -91,10 +97,7 @@ exports.handler = async options => {
         })
       );
     } else {
-      logApiErrorInstance(
-        e,
-        new ApiErrorContext({ accountId, request: functionPath })
-      );
+      logError(e, new ApiErrorContext({ accountId, request: functionPath }));
     }
   }
 };

package/commands/functions/list.js

@@ -1,9 +1,6 @@
 const { getRoutes } = require('@hubspot/local-dev-lib/api/functions');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { getFunctionArrays } = require('../../lib/getFunctionArrays');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 const {
@@ -31,8 +28,8 @@ exports.handler = async options => {
 
   logger.debug(i18n(`${i18nKey}.debug.gettingFunctions`));
 
-  const routesResp = await getRoutes(accountId).catch(async e => {
-    await logApiErrorInstance(e, new ApiErrorContext({ accountId }));
+  const { data: routesResp } = await getRoutes(accountId).catch(async e => {
+    logError(e, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.SUCCESS);
   });
 

package/commands/hubdb/clear.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const { clearHubDbTableRows } = require('@hubspot/local-dev-lib/hubdb');
 const { publishTable } = require('@hubspot/local-dev-lib/api/hubdb');
 
@@ -37,7 +37,9 @@ exports.handler = async options => {
           tableId,
         })
       );
-      const { rowCount } = await publishTable(accountId, tableId);
+      const {
+        data: { rowCount },
+      } = await publishTable(accountId, tableId);
       logger.log(
         i18n(`${i18nKey}.logs.rowCount`, {
           rowCount,
@@ -52,7 +54,7 @@ exports.handler = async options => {
       );
     }
   } catch (e) {
-    logApiErrorInstance(e);
+    logError(e);
   }
 };
 

package/commands/hubdb/create.js

@@ -1,7 +1,7 @@
 const path = require('path');
 
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { createHubDbTable } = require('@hubspot/local-dev-lib/hubdb');
 
@@ -56,7 +56,7 @@ exports.handler = async options => {
         src,
       })
     );
-    logApiErrorInstance(e);
+    logError(e);
   }
 };
 

package/commands/hubdb/delete.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const { deleteTable } = require('@hubspot/local-dev-lib/api/hubdb');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -40,7 +40,7 @@ exports.handler = async options => {
         tableId,
       })
     );
-    logApiErrorInstance(e);
+    logError(e);
   }
 };
 

package/commands/hubdb/fetch.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const { downloadHubDbTable } = require('@hubspot/local-dev-lib/hubdb');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
@@ -37,7 +37,7 @@ exports.handler = async options => {
       })
     );
   } catch (e) {
-    logApiErrorInstance(e);
+    logError(e);
   }
 };
 

package/commands/init.js

@@ -11,10 +11,7 @@ const { handleExit } = require('../lib/process');
 const {
   checkAndAddConfigToGitignore,
 } = require('@hubspot/local-dev-lib/gitignore');
-const {
-  logErrorInstance,
-  debugErrorAndContext,
-} = require('../lib/errorHandlers/standardErrors');
+const { debugError, logError } = require('../lib/errorHandlers/index');
 const {
   OAUTH_AUTH_METHOD,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
@@ -71,7 +68,7 @@ const personalAccessKeyConfigCreationFlow = async (env, account) => {
       true
     );
   } catch (e) {
-    logErrorInstance(e);
+    logError(e);
   }
   return updatedConfig;
 };
@@ -140,7 +137,7 @@ exports.handler = async options => {
     try {
       checkAndAddConfigToGitignore(configPath);
     } catch (e) {
-      debugErrorAndContext(e);
+      debugError(e);
     }
 
     logger.log('');
@@ -165,7 +162,7 @@ exports.handler = async options => {
     );
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
-    logErrorInstance(err);
+    logError(err);
     await trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
     process.exit(EXIT_CODES.ERROR);
   }

package/commands/lint.js

@@ -1,7 +1,7 @@
 const { lint } = require('@hubspot/local-dev-lib/cms/validate');
 const { printHublValidationResult } = require('../lib/hublValidate');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
+const { logError } = require('../lib/errorHandlers/index');
 
 const {
   addConfigOptions,
@@ -41,7 +41,7 @@ exports.handler = async options => {
     });
   } catch (err) {
     logger.groupEnd(groupName);
-    logErrorInstance(err, { accountId });
+    logError(err, { accountId });
     process.exit(EXIT_CODES.ERROR);
   }
   logger.groupEnd(groupName);

package/commands/list.js

@@ -9,10 +9,7 @@ const { trackCommandUsage } = require('../lib/usageTracking');
 const { isPathFolder } = require('../lib/filesystem');
 
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../lib/errorHandlers/apiErrors');
+const { logError } = require('../lib/errorHandlers/index');
 const {
   getDirectoryContentsByPath,
 } = require('@hubspot/local-dev-lib/api/fileMapper');
@@ -43,9 +40,10 @@ exports.handler = async options => {
   );
 
   try {
-    contentsResp = await getDirectoryContentsByPath(accountId, directoryPath);
+    const { data } = await getDirectoryContentsByPath(accountId, directoryPath);
+    contentsResp = data;
   } catch (e) {
-    logApiErrorInstance(e, new ApiErrorContext({ accountId, directoryPath }));
+    logError(e);
     process.exit(EXIT_CODES.SUCCESS);
   }
 

package/commands/logs.js

@@ -15,11 +15,12 @@ const { tailLogs } = require('../lib/serverlessLogs');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
+const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
 
 const i18nKey = 'commands.logs';
 
 const handleLogsError = (e, accountId, functionPath) => {
-  if (e.response.status === 404 || e.response.status == 400) {
+  if (isHubSpotHttpError(e) && (e.status === 404 || e.status == 400)) {
     logger.error(
       i18n(`${i18nKey}.errors.noLogsFound`, {
         accountId,
@@ -61,14 +62,16 @@ const endpointLog = async (accountId, options) => {
     });
   } else if (latest) {
     try {
-      logsResp = await getLatestFunctionLog(accountId, functionPath);
+      const { data } = await getLatestFunctionLog(accountId, functionPath);
+      logsResp = data;
     } catch (e) {
       handleLogsError(e, accountId, functionPath);
       process.exit(EXIT_CODES.ERROR);
     }
   } else {
     try {
-      logsResp = await getFunctionLogs(accountId, functionPath, options);
+      const { data } = await getFunctionLogs(accountId, functionPath, options);
+      logsResp = data;
     } catch (e) {
       handleLogsError(e, accountId, functionPath);
       process.exit(EXIT_CODES.ERROR);

package/commands/mv.js

@@ -1,10 +1,7 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { moveFile } = require('@hubspot/local-dev-lib/api/fileMapper');
-const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../lib/errorHandlers/apiErrors');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
+const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
 const {
   addConfigOptions,
   addAccountOptions,
@@ -64,7 +61,7 @@ exports.handler = async options => {
         })
       );
     } else {
-      logApiErrorInstance(
+      logError(
         error,
         new ApiErrorContext({
           accountId,

package/commands/project/__tests__/deploy.test.js

@@ -57,6 +57,9 @@ const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
 const { AxiosError, HttpStatusCode } = require('axios');
 
 const chalk = require('chalk');
+const {
+  HubSpotHttpError,
+} = require('@hubspot/local-dev-lib/models/HubSpotHttpError');
 
 describe('commands/project/deploy', () => {
   const projectFlag = 'project';
@@ -163,8 +166,8 @@ describe('commands/project/deploy', () => {
       });
       getAccountId.mockReturnValue(accountId);
       getAccountConfig.mockReturnValue({ accountType });
-      fetchProject.mockResolvedValue(projectDetails);
-      deployProject.mockResolvedValue(deployDetails);
+      fetchProject.mockResolvedValue({ data: projectDetails });
+      deployProject.mockResolvedValue({ data: deployDetails });
       deployBuildIdPrompt.mockResolvedValue({
         buildId: projectDetails.latestBuild.buildId,
       });
@@ -251,7 +254,7 @@ describe('commands/project/deploy', () => {
     });
 
     it('should log an error and exit when latest build is not defined', async () => {
-      fetchProject.mockResolvedValue({});
+      fetchProject.mockResolvedValue({ data: {} });
       await handler(options);
       expect(logger.error).toHaveBeenCalledTimes(1);
       expect(logger.error).toHaveBeenCalledWith(
@@ -332,7 +335,9 @@ describe('commands/project/deploy', () => {
     it('should log an error and exit when the deploy fails', async () => {
       const errorMessage = `Just wasn't feeling it`;
       deployProject.mockResolvedValue({
-        error: { message: errorMessage },
+        data: {
+          error: { message: errorMessage },
+        },
       });
 
       await handler(options);
@@ -361,13 +366,15 @@ describe('commands/project/deploy', () => {
       uiCommandReference.mockReturnValue(commandReference);
       uiAccountDescription.mockReturnValue(accountDescription);
       fetchProject.mockImplementation(() => {
-        throw new AxiosError(
-          'OH NO',
-          '',
-          {},
-          {},
-          { status: HttpStatusCode.NotFound }
-        );
+        throw new HubSpotHttpError('OH NO', {
+          cause: new AxiosError(
+            'OH NO',
+            '',
+            {},
+            {},
+            { status: HttpStatusCode.NotFound }
+          ),
+        });
       });
       await handler(options);
 
@@ -388,18 +395,20 @@ describe('commands/project/deploy', () => {
       uiAccountDescription.mockReturnValue(accountDescription);
       const errorMessage = 'Something bad happened';
       fetchProject.mockImplementation(() => {
-        throw new AxiosError(
-          errorMessage,
-          '',
-          {},
-          {},
-          { status: HttpStatusCode.BadRequest }
-        );
+        throw new HubSpotHttpError(errorMessage, {
+          cause: new AxiosError(
+            errorMessage,
+            '',
+            {},
+            {},
+            { status: HttpStatusCode.BadRequest }
+          ),
+        });
       });
       await handler(options);
 
       expect(logger.error).toHaveBeenCalledTimes(1);
-      expect(logger.error).toHaveBeenCalledWith(errorMessage);
+      expect(logger.error).toHaveBeenCalledWith('The request was bad.');
       expect(processExitSpy).toHaveBeenCalledTimes(1);
       expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
     });
@@ -411,13 +420,15 @@ describe('commands/project/deploy', () => {
       uiAccountDescription.mockReturnValue(accountDescription);
       const errorMessage = 'Something bad happened';
       fetchProject.mockImplementation(() => {
-        throw new AxiosError(
-          errorMessage,
-          '',
-          {},
-          {},
-          { status: HttpStatusCode.MethodNotAllowed }
-        );
+        throw new HubSpotHttpError('OH NO', {
+          cause: new AxiosError(
+            errorMessage,
+            '',
+            {},
+            {},
+            { status: HttpStatusCode.MethodNotAllowed }
+          ),
+        });
       });
       await handler(options);
 

package/commands/project/__tests__/logs.test.js

@@ -4,10 +4,9 @@ jest.mock('../../../lib/validation');
 jest.mock('../../../lib/projectLogsManager');
 jest.mock('../../../lib/prompts/projectsLogsPrompt');
 jest.mock('@hubspot/local-dev-lib/logger');
-jest.mock('../../../lib/errorHandlers/apiErrors');
 jest.mock('../../../lib/ui/table');
 jest.mock('../../../lib/ui');
-jest.mock('../../../lib/errorHandlers/apiErrors');
+jest.mock('../../../lib/errorHandlers');
 
 // Deps where we don't want mocks
 const libUi = jest.requireActual('../../../lib/ui');
@@ -27,7 +26,6 @@ const {
 const { getTableContents, getTableHeader } = require('../../../lib/ui/table');
 
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { logApiErrorInstance } = require('../../../lib/errorHandlers/apiErrors');
 
 const {
   handler,
@@ -36,6 +34,7 @@ const {
   builder,
 } = require('../logs');
 const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
+const { logError } = require('../../../lib/errorHandlers');
 
 describe('commands/project/logs', () => {
   let processExitSpy;
@@ -292,8 +291,8 @@ describe('commands/project/logs', () => {
 
       await handler({});
 
-      expect(logApiErrorInstance).toHaveBeenCalledTimes(1);
-      expect(logApiErrorInstance).toHaveBeenCalledWith(error, {
+      expect(logError).toHaveBeenCalledTimes(1);
+      expect(logError).toHaveBeenCalledWith(error, {
         accountId: accountId,
         projectName: ProjectLogsManager.projectName,
       });

package/commands/project/add.js

@@ -1,6 +1,6 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const { fetchReleaseData } = require('@hubspot/local-dev-lib/github');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -58,7 +58,7 @@ exports.handler = async options => {
       })
     );
   } catch (error) {
-    logErrorInstance(error);
+    logError(error);
   }
 };
 

package/commands/project/cloneApp.js

@@ -26,10 +26,7 @@ const {
   uiAccountDescription,
 } = require('../../lib/ui');
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { isAppDeveloperAccount } = require('../../lib/accountTypes');
 const { writeProjectConfig } = require('../../lib/projects');
@@ -90,7 +87,7 @@ exports.handler = async options => {
     name = projectResponse.name;
     location = projectResponse.location;
   } catch (error) {
-    logApiErrorInstance(error, new ApiErrorContext({ accountId }));
+    logError(error, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.ERROR);
   }
   try {
@@ -100,7 +97,9 @@ exports.handler = async options => {
       text: i18n(`${i18nKey}.cloneStatus.inProgress`),
     });
 
-    const { exportId } = await cloneApp(accountId, appId);
+    const {
+      data: { exportId },
+    } = await cloneApp(accountId, appId);
     const { status } = await poll(checkCloneStatus, accountId, exportId);
     if (status === 'SUCCESS') {
       // Ensure correct project folder structure exists
@@ -109,7 +108,10 @@ exports.handler = async options => {
       fs.mkdirSync(absoluteDestPath, { recursive: true });
 
       // Extract zipped app files and place them in correct directory
-      const zippedApp = await downloadClonedProject(accountId, exportId);
+      const { data: zippedApp } = await downloadClonedProject(
+        accountId,
+        exportId
+      );
       await extractZipArchive(
         zippedApp,
         sanitizeFileName(name),
@@ -169,10 +171,10 @@ exports.handler = async options => {
     // Migrations endpoints return a response object with an errors property. The errors property contains an array of errors.
     if (error.errors && Array.isArray(error.errors)) {
       error.errors.forEach(e =>
-        logApiErrorInstance(e, new ApiErrorContext({ accountId }))
+        logError(e, new ApiErrorContext({ accountId }))
       );
     } else {
-      logApiErrorInstance(error, new ApiErrorContext({ accountId }));
+      logError(error, new ApiErrorContext({ accountId }));
     }
   }
 };

package/commands/project/create.js

@@ -47,16 +47,12 @@ exports.handler = async options => {
     options
   );
 
-  trackCommandUsage(
-    'project-create',
-    { type: options.template || template },
-    accountId
-  );
+  trackCommandUsage('project-create', { type: template.name }, accountId);
 
   await createProjectConfig(
     path.resolve(getCwd(), options.location || location),
     options.name || name,
-    template || { path: options.template },
+    template,
     options.templateSource,
     githubRef
   );

package/commands/project/deploy.js

@@ -6,10 +6,7 @@ const {
   addUseEnvironmentOptions,
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   deployProject,
@@ -32,6 +29,7 @@ const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const i18nKey = 'commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { uiCommandReference, uiAccountDescription } = require('../../lib/ui');
+const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
 
 exports.command = 'deploy';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
@@ -94,10 +92,9 @@ exports.handler = async options => {
   let buildIdToDeploy = buildIdOption;
 
   try {
-    const { latestBuild, deployedBuildId } = await fetchProject(
-      accountId,
-      projectName
-    );
+    const {
+      data: { latestBuild, deployedBuildId },
+    } = await fetchProject(accountId, projectName);
 
     if (!latestBuild || !latestBuild.buildId) {
       logger.error(i18n(`${i18nKey}.errors.noBuilds`));
@@ -137,7 +134,7 @@ exports.handler = async options => {
       return process.exit(EXIT_CODES.ERROR);
     }
 
-    const deployResp = await deployProject(
+    const { data: deployResp } = await deployProject(
       accountId,
       projectName,
       buildIdToDeploy
@@ -159,7 +156,7 @@ exports.handler = async options => {
       buildIdToDeploy
     );
   } catch (e) {
-    if (e.response && e.response.status === 404) {
+    if (isHubSpotHttpError(e) && e.status === 404) {
       logger.error(
         i18n(`${i18nKey}.errors.projectNotFound`, {
           projectName: chalk.bold(projectName),
@@ -167,10 +164,10 @@ exports.handler = async options => {
           command: uiCommandReference('hs project upload'),
         })
       );
-    } else if (e.response && e.response.status === 400) {
+    } else if (isHubSpotHttpError(e) && e.status === 400) {
       logger.error(e.message);
     } else {
-      logApiErrorInstance(
+      logError(
         e,
         new ApiErrorContext({ accountId, request: 'project deploy' })
       );