@hubspot/cli 6.1.1 → 6.2.0

package/bin/cli.js

@@ -6,7 +6,7 @@ const chalk = require('chalk');
 
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
-const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
+const { logError } = require('../lib/errorHandlers/index');
 const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const {
   trackHelpUsage,
@@ -90,7 +90,7 @@ const handleFailure = (msg, err, yargs) => {
   if (msg) {
     logger.error(msg);
   } else if (err) {
-    logErrorInstance(err);
+    logError(err);
   }
 
   if (msg === null) {

package/commands/accounts/clean.js

@@ -17,10 +17,8 @@ const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getTableContents } = require('../../lib/ui/table');
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
-const {
-  isSpecifiedHubSpotAuthError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { uiAccountDescription } = require('../../lib/ui');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 
 const i18nKey = 'commands.accounts.subcommands.clean';
 
@@ -57,13 +55,13 @@ exports.handler = async options => {
       await accessTokenForPersonalAccessKey(account.portalId, true);
     } catch (error) {
       if (
-        isSpecifiedHubSpotAuthError(error, {
-          status: 401,
+        isSpecifiedError(error, {
+          statusCode: 401,
           category: 'INVALID_AUTHENTICATION',
           subCategory: 'LocalDevAuthErrorType.PORTAL_NOT_ACTIVE',
         }) ||
-        isSpecifiedHubSpotAuthError(error, {
-          status: 404,
+        isSpecifiedError(error, {
+          statusCode: 404,
           category: 'INVALID_AUTHENTICATION',
           subCategory: 'LocalDevAuthErrorType.INVALID_PORTAL_ID',
         })

package/commands/auth.js

@@ -46,7 +46,7 @@ const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { uiFeatureHighlight } = require('../lib/ui');
-const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
+const { logError } = require('../lib/errorHandlers/index');
 
 const i18nKey = 'commands.auth';
 
@@ -70,19 +70,19 @@ exports.describe = i18n(`${i18nKey}.describe`, {
 });
 
 exports.handler = async options => {
-  const { type, config: configPath, qa, account } = options;
+  const { type, config: c, qa, account } = options;
   const authType =
     (type && type.toLowerCase()) || PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
   setLogLevel(options);
   logDebugInfo(options);
 
-  if (!getConfigPath()) {
+  if (!getConfigPath(c)) {
     logger.error(i18n(`${i18nKey}.errors.noConfigFileFound`));
     process.exit(EXIT_CODES.ERROR);
   }
 
   const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-  loadConfig(configPath);
+  loadConfig(c);
   checkAndWarnGitInclusion(getConfigPath());
 
   trackCommandUsage('auth');
@@ -117,7 +117,7 @@ exports.handler = async options => {
           env
         );
       } catch (e) {
-        logErrorInstance(e);
+        logError(e);
       }
 
       if (!updatedConfig) {

package/commands/cms/convertFields.js

@@ -12,7 +12,7 @@ const {
 } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
 
 const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const i18nKey = 'commands.convertFields';
 
@@ -64,7 +64,7 @@ exports.handler = async options => {
     try {
       filePaths = await walk(src);
     } catch (e) {
-      logErrorInstance(e);
+      logError(e);
     }
     const allowedFilePaths = filePaths
       .filter(file => {

package/commands/cms/lighthouseScore.js

@@ -42,7 +42,7 @@ const selectTheme = async accountId => {
       message: i18n(`${i18nKey}.info.promptMessage`),
       choices: async () => {
         try {
-          const result = await fetchThemes(accountId, {
+          const { data: result } = await fetchThemes(accountId, {
             limit: 500,
             sorting: 'MOST_USED',
           });
@@ -77,7 +77,7 @@ exports.handler = async options => {
   if (themeToCheck) {
     let isValidTheme = true;
     try {
-      const result = await fetchThemes(accountId, {
+      const { data: result } = await fetchThemes(accountId, {
         name: encodeURIComponent(themeToCheck),
       });
       isValidTheme = result && result.total;
@@ -98,9 +98,10 @@ exports.handler = async options => {
   // Kick off the scoring
   let requestResult;
   try {
-    requestResult = await requestLighthouseScore(accountId, {
+    const { data } = await requestLighthouseScore(accountId, {
       themePath: themeToCheck,
     });
+    requestResult = data;
   } catch (err) {
     logger.debug(err);
   }
@@ -119,16 +120,21 @@ exports.handler = async options => {
     });
 
     const checkScoreStatus = async () => {
-      const desktopScoreStatus = includeDesktopScore
-        ? await getLighthouseScoreStatus(accountId, {
-            themeId: requestResult.desktopId,
-          })
-        : 'COMPLETED';
-      const mobileScoreStatus = includeMobileScore
-        ? await getLighthouseScoreStatus(accountId, {
-            themeId: requestResult.mobileId,
-          })
-        : 'COMPLETED';
+      let desktopScoreStatus = 'COMPLETED';
+      if (includeDesktopScore) {
+        const { data } = await getLighthouseScoreStatus(accountId, {
+          themeId: requestResult.desktopId,
+        });
+        desktopScoreStatus = data;
+      }
+
+      let mobileScoreStatus = 'COMPLETED';
+      if (includeDesktopScore) {
+        const { data } = await getLighthouseScoreStatus(accountId, {
+          themeId: requestResult.mobileId,
+        });
+        mobileScoreStatus = data;
+      }
 
       if (
         desktopScoreStatus === 'REQUESTED' ||
@@ -148,32 +154,37 @@ exports.handler = async options => {
   }
 
   // Fetch the scoring results
-  let desktopScoreResult;
-  let mobileScoreResult;
-  let verboseViewAverageScoreResult;
+  let desktopScoreResult = {};
+  let mobileScoreResult = {};
+  let verboseViewAverageScoreResult = {};
   try {
     const params = { isAverage: !options.verbose };
-    desktopScoreResult = includeDesktopScore
-      ? await getLighthouseScore(accountId, {
-          ...params,
-          desktopId: requestResult.desktopId,
-        })
-      : {};
-    mobileScoreResult = includeMobileScore
-      ? await getLighthouseScore(accountId, {
-          ...params,
-          mobileId: requestResult.mobileId,
-        })
-      : {};
+
+    if (includeDesktopScore) {
+      const { data } = await getLighthouseScore(accountId, {
+        ...params,
+        desktopId: requestResult.desktopId,
+      });
+      desktopScoreResult = data;
+    }
+
+    if (includeMobileScore) {
+      const { data } = await getLighthouseScore(accountId, {
+        ...params,
+        mobileId: requestResult.mobileId,
+      });
+      mobileScoreResult = data;
+    }
     // This is needed to show the average scores above the verbose output
-    verboseViewAverageScoreResult = options.verbose
-      ? await getLighthouseScore(accountId, {
-          ...params,
-          isAverage: true,
-          desktopId: includeDesktopScore ? requestResult.desktopId : null,
-          mobileId: includeMobileScore ? requestResult.mobileId : null,
-        })
-      : {};
+    if (options.verbose) {
+      const { data } = await getLighthouseScore(accountId, {
+        ...params,
+        isAverage: true,
+        desktopId: includeDesktopScore ? requestResult.desktopId : null,
+        mobileId: includeMobileScore ? requestResult.mobileId : null,
+      });
+      verboseViewAverageScoreResult = data;
+    }
   } catch (err) {
     logger.error(i18n(`${i18nKey}.errors.failedToGetLighthouseScore`));
     process.exit(EXIT_CODES.ERROR);

package/commands/create/function.js

@@ -2,7 +2,7 @@ const { createFunction } = require('@hubspot/local-dev-lib/cms/functions');
 const {
   createFunctionPrompt,
 } = require('../../lib/prompts/createFunctionPrompt');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 module.exports = {
@@ -12,7 +12,7 @@ module.exports = {
     try {
       await createFunction(functionDefinition, dest);
     } catch (e) {
-      logErrorInstance(e);
+      logError(e);
       process.exit(EXIT_CODES.ERROR);
     }
   },

package/commands/create/module.js

@@ -2,7 +2,7 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { createModule } = require('@hubspot/local-dev-lib/cms/modules');
 const { i18n } = require('../../lib/lang');
 const { createModulePrompt } = require('../../lib/prompts/createModulePrompt');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'commands.create.subcommands.module';
@@ -21,7 +21,7 @@ module.exports = {
     try {
       await createModule(moduleDefinition, name, dest, getInternalVersion);
     } catch (e) {
-      logErrorInstance(e);
+      logError(e);
       process.exit(EXIT_CODES.ERROR);
     }
   },

package/commands/create/template.js

@@ -1,6 +1,6 @@
 const { createTemplate } = require('@hubspot/local-dev-lib/cms/templates');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 const {
   createTemplatePrompt,
 } = require('../../lib/prompts/createTemplatePrompt');
@@ -24,7 +24,7 @@ module.exports = {
     try {
       await createTemplate(name, dest, templateType);
     } catch (e) {
-      logErrorInstance(e);
+      logError(e);
       process.exit(EXIT_CODES.ERROR);
     }
     return { templateType };

package/commands/create.js

@@ -23,9 +23,7 @@
  */
 
 const fs = require('fs-extra');
-const {
-  logFileSystemErrorInstance,
-} = require('../lib/errorHandlers/fileSystemErrors');
+const { logError } = require('../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { setLogLevel, getAccountId } = require('../lib/commonOpts');
 const { logDebugInfo } = require('../lib/debugInfo');
@@ -87,9 +85,9 @@ exports.handler = async options => {
         path: dest,
       })
     );
-    logFileSystemErrorInstance(e, {
+    logError(e, {
       filepath: dest,
-      write: true,
+      operation: 'write',
     });
     return;
   }

package/commands/customObject/create.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 { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const {
   checkAndConvertToJson,
@@ -38,7 +38,7 @@ exports.handler = async options => {
     await batchCreateObjects(accountId, name, objectJson);
     logger.success(i18n(`${i18nKey}.success.objectsCreated`));
   } catch (e) {
-    logApiErrorInstance(e, { accountId });
+    logError(e, { accountId });
     logger.error(
       i18n(`${i18nKey}.errors.creationFailed`, {
         definition,

package/commands/customObject/schema/create.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 { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const {
   checkAndConvertToJson,
@@ -54,17 +54,17 @@ exports.handler = async options => {
         })
       );
     } else {
-      const res = await createObjectSchema(accountId, schemaJson);
+      const { data } = await createObjectSchema(accountId, schemaJson);
       logger.success(
         i18n(`${i18nKey}.success.schemaViewable`, {
           url: `${getHubSpotWebsiteOrigin(
             getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
-          )}/contacts/${accountId}/objects/${res.objectTypeId}`,
+          )}/contacts/${accountId}/objects/${data.objectTypeId}`,
         })
       );
     }
   } catch (e) {
-    logApiErrorInstance(e, { accountId });
+    logError(e, { accountId });
     logger.error(
       i18n(`${i18nKey}.errors.creationFailed`, {
         definition,

package/commands/customObject/schema/delete.js

@@ -1,6 +1,4 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logApiErrorInstance } = require('../../../lib/errorHandlers/apiErrors');
-
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { getAccountId } = require('../../../lib/commonOpts');
@@ -8,6 +6,7 @@ const {
   deleteObjectSchema,
 } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../../lib/lang');
+const { logError } = require('../../../lib/errorHandlers');
 
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.delete';
 
@@ -31,7 +30,7 @@ exports.handler = async options => {
       })
     );
   } catch (e) {
-    logApiErrorInstance(e);
+    logError(e);
     logger.error(
       i18n(`${i18nKey}.errors.delete`, {
         name,

package/commands/customObject/schema/fetch-all.js

@@ -1,8 +1,4 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  logErrorInstance,
-} = require('../../../lib/errorHandlers/standardErrors');
-
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { getAccountId } = require('../../../lib/commonOpts');
@@ -12,6 +8,7 @@ const {
 } = require('@hubspot/local-dev-lib/customObjects');
 const { i18n } = require('../../../lib/lang');
 const { logSchemas } = require('../../../lib/schema');
+const { logError } = require('../../../lib/errorHandlers');
 
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.fetchAll';
 
@@ -34,7 +31,7 @@ exports.handler = async options => {
       })
     );
   } catch (e) {
-    logErrorInstance(e);
+    logError(e);
     logger.error(i18n(`${i18nKey}.errors.fetch`));
   }
 };

package/commands/customObject/schema/fetch.js

@@ -1,9 +1,6 @@
 const path = require('path');
 const { isConfigFlagEnabled } = require('@hubspot/local-dev-lib/config');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  logErrorInstance,
-} = require('../../../lib/errorHandlers/standardErrors');
 const { CONFIG_FLAGS } = require('../../../lib/constants');
 const {
   downloadSchema,
@@ -16,6 +13,7 @@ const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { getAccountId } = require('../../../lib/commonOpts');
 const { i18n } = require('../../../lib/lang');
+const { logError } = require('../../../lib/errorHandlers');
 
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.fetch';
 
@@ -50,7 +48,7 @@ exports.handler = async options => {
       );
     }
   } catch (e) {
-    logErrorInstance(e);
+    logError(e);
     logger.error(
       i18n(`${i18nKey}.errors.fetch`, {
         name,

package/commands/customObject/schema/list.js

@@ -1,7 +1,5 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  logErrorInstance,
-} = require('../../../lib/errorHandlers/standardErrors');
+const { logError } = require('../../../lib/errorHandlers/index');
 
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
@@ -24,7 +22,7 @@ exports.handler = async options => {
   try {
     await listSchemas(accountId);
   } catch (e) {
-    logErrorInstance(e);
+    logError(e);
     logger.error(i18n(`${i18nKey}.errors.list`));
   }
 };

package/commands/customObject/schema/update.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 { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const {
   ENVIRONMENTS,
@@ -54,17 +54,17 @@ exports.handler = async options => {
         })
       );
     } else {
-      const res = await updateObjectSchema(accountId, name, schemaJson);
+      const { data } = await updateObjectSchema(accountId, name, schemaJson);
       logger.success(
         i18n(`${i18nKey}.success.viewAtUrl`, {
           url: `${getHubSpotWebsiteOrigin(
             getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
-          )}/contacts/${accountId}/objects/${res.objectTypeId}`,
+          )}/contacts/${accountId}/objects/${data.objectTypeId}`,
         })
       );
     }
   } catch (e) {
-    logApiErrorInstance(e, { accountId });
+    logError(e, { accountId });
     logger.error(
       i18n(`${i18nKey}.errors.update`, {
         definition,

package/commands/fetch.js

@@ -16,7 +16,7 @@ const { i18n } = require('../lib/lang');
 
 const i18nKey = 'commands.fetch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
+const { logError } = require('../lib/errorHandlers/index');
 
 exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -50,7 +50,7 @@ exports.handler = async options => {
       options
     );
   } catch (err) {
-    logErrorInstance(err);
+    logError(err);
     process.exit(EXIT_CODES.ERROR);
   }
 };

package/commands/filemanager/fetch.js

@@ -13,7 +13,7 @@ const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'commands.filemanager.subcommands.fetch';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { logError } = require('../../lib/errorHandlers/index');
 
 exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -44,7 +44,7 @@ exports.handler = async options => {
       includeArchived || false
     );
   } catch (err) {
-    logErrorInstance(err);
+    logError(err);
     process.exit(EXIT_CODES.ERROR);
   }
 };

package/commands/filemanager/upload.js

@@ -10,11 +10,7 @@ const {
 } = require('@hubspot/local-dev-lib/cms/modules');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 
-const {
-  ApiErrorContext,
-  logApiUploadErrorInstance,
-} = require('../../lib/errorHandlers/apiErrors');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const {
   addConfigOptions,
   addAccountOptions,
@@ -106,7 +102,7 @@ exports.handler = async options => {
             src,
           })
         );
-        logApiUploadErrorInstance(
+        logError(
           error,
           new ApiErrorContext({
             accountId,
@@ -133,7 +129,7 @@ exports.handler = async options => {
       })
       .catch(error => {
         logger.error(i18n(`${i18nKey}.errors.uploadingFailed`));
-        logErrorInstance(error, {
+        logError(error, {
           accountId,
         });
       });

package/commands/functions/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 { poll } = require('../../lib/polling');
 const { logger } = require('@hubspot/local-dev-lib/logger');
@@ -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';
 
@@ -61,7 +59,7 @@ exports.handler = async options => {
         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();
@@ -75,13 +73,13 @@ exports.handler = async options => {
     );
   } catch (e) {
     spinner && spinner.stop && spinner.stop();
-    if (e.response && e.response.status === 404) {
+    if (isHubSpotHttpError(e) && e.status === 404) {
       logger.error(
         i18n(`${i18nKey}.errors.noPackageJson`, {
           functionPath,
         })
       );
-    } else if (e.response && e.response.status === 400) {
+    } else if (isHubSpotHttpError(e) && e.status === 400) {
       logger.error(e.error.message);
     } else if (e.status === 'ERROR') {
       await outputBuildLog(e.cdnUrl);
@@ -91,10 +89,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);
   }
 };