chore: Update CLI to utilize new error object.

packages/cli/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,
@@ -71,7 +71,7 @@ const handleFailure = (msg, err, yargs) => {
   if (msg) {
     logger.error(msg);
   } else if (err) {
-    logErrorInstance(err);
+    logError(err);
   }
 
   if (msg === null) {

packages/cli/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);
     } 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',
         })

packages/cli/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';
 
@@ -117,7 +117,7 @@ exports.handler = async options => {
           env
         );
       } catch (e) {
-        logErrorInstance(e);
+        logError(e);
       }
 
       if (!updatedConfig) {

packages/cli/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 i18nKey = 'commands.convertFields';
 
 exports.command = 'convert-fields';
@@ -59,7 +59,7 @@ exports.handler = async options => {
     try {
       filePaths = await walk(src);
     } catch (e) {
-      logErrorInstance(e);
+      logError(e);
     }
     const allowedFilePaths = filePaths
       .filter(file => {

packages/cli/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;
   }

packages/cli/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);
     }
   },

packages/cli/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);
     }
   },

packages/cli/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 };

packages/cli/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,

packages/cli/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,
@@ -64,7 +64,7 @@ exports.handler = async options => {
       );
     }
   } catch (e) {
-    logApiErrorInstance(e, { accountId });
+    logError(e, { accountId });
     logger.error(
       i18n(`${i18nKey}.errors.creationFailed`, {
         definition,

packages/cli/commands/customObject/schema/delete.js

@@ -1,13 +1,12 @@
 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');
 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,

packages/cli/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`));
   }
 };

packages/cli/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,

packages/cli/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`));
   }
 };

packages/cli/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,
@@ -64,7 +64,7 @@ exports.handler = async options => {
       );
     }
   } catch (e) {
-    logApiErrorInstance(e, { accountId });
+    logError(e, { accountId });
     logger.error(
       i18n(`${i18nKey}.errors.update`, {
         definition,

packages/cli/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);
   }
 };

packages/cli/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);
   }
 };

packages/cli/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,
         });
       });