@hubspot/cli 6.1.1 → 6.2.1

package/commands/project/dev.js

@@ -40,13 +40,13 @@ const {
 const {
   confirmDefaultAccountIsTarget,
   suggestRecommendedNestedAccount,
-  checkIfAppDeveloperAccount,
+  checkIfDefaultAccountIsSupported,
   createSandboxForLocalDev,
   createDeveloperTestAccountForLocalDev,
   createNewProjectForLocalDev,
   createInitialBuildForNewProject,
   useExistingDevTestAccount,
-  validateAccountOption,
+  checkIfAccountFlagIsSupported,
   checkIfParentAccountIsAuthed,
 } = require('../../lib/localDev');
 
@@ -111,12 +111,15 @@ exports.handler = async options => {
   // The account that we are locally testing against
   let targetTestingAccountId = options.account ? accountId : null;
 
+  // Check that the default account or flag option is valid for the type of app in this project
   if (options.account) {
-    validateAccountOption(accountConfig, hasPublicApps);
+    checkIfAccountFlagIsSupported(accountConfig, hasPublicApps);
 
     if (hasPublicApps) {
       targetProjectAccountId = accountConfig.parentAccountId;
     }
+  } else {
+    checkIfDefaultAccountIsSupported(accountConfig, hasPublicApps);
   }
 
   // The user is targeting an account type that we recommend developing on
@@ -131,8 +134,6 @@ exports.handler = async options => {
     } else {
       targetProjectAccountId = accountId;
     }
-  } else if (!targetProjectAccountId && hasPublicApps) {
-    checkIfAppDeveloperAccount(accountConfig);
   }
 
   let createNewSandbox = false;

package/commands/project/download.js

@@ -7,10 +7,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { getCwd, sanitizeFileName } = require('@hubspot/local-dev-lib/path');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { extractZipArchive } = require('@hubspot/local-dev-lib/archive');
 const {
@@ -75,9 +72,10 @@ exports.handler = async options => {
     let buildNumberToDownload = buildNumber;
 
     if (!buildNumberToDownload) {
-      let projectBuildsResult;
-
-      projectBuildsResult = await fetchProjectBuilds(accountId, projectName);
+      const { data: projectBuildsResult } = await fetchProjectBuilds(
+        accountId,
+        projectName
+      );
 
       const { results: projectBuilds } = projectBuildsResult;
 
@@ -87,7 +85,7 @@ exports.handler = async options => {
       }
     }
 
-    const zippedProject = await downloadProject(
+    const { data: zippedProject } = await downloadProject(
       accountId,
       projectName,
       buildNumberToDownload
@@ -108,7 +106,7 @@ exports.handler = async options => {
     );
     process.exit(EXIT_CODES.SUCCESS);
   } catch (e) {
-    logApiErrorInstance(
+    logError(
       e,
       new ApiErrorContext({ accountId, request: 'project download' })
     );

package/commands/project/listBuilds.js

@@ -8,10 +8,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   fetchProject,
@@ -28,6 +25,7 @@ const {
 } = require('../../lib/projects');
 const moment = require('moment');
 const { promptUser } = require('../../lib/prompts/promptUtils');
+const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
 
 const i18nKey = 'commands.project.subcommands.listBuilds';
 
@@ -50,11 +48,9 @@ exports.handler = async options => {
   logger.debug(`Fetching builds for project at path: ${projectPath}`);
 
   const fetchAndDisplayBuilds = async (project, options) => {
-    const { results, paging } = await fetchProjectBuilds(
-      accountId,
-      project.name,
-      options
-    );
+    const {
+      data: { results, paging },
+    } = await fetchProjectBuilds(accountId, project.name, options);
     const currentDeploy = project.deployedBuildId;
     if (options && options.after) {
       logger.log(
@@ -120,14 +116,14 @@ exports.handler = async options => {
   };
 
   try {
-    const project = await fetchProject(accountId, projectConfig.name);
+    const { data: project } = await fetchProject(accountId, projectConfig.name);
 
     await fetchAndDisplayBuilds(project, { limit });
   } catch (e) {
-    if (e.response && e.response.status === 404) {
+    if (isHubSpotHttpError(e) && e.status === 404) {
       logger.error(`Project ${projectConfig.name} not found. `);
     } else {
-      logApiErrorInstance(
+      logError(
         e,
         new ApiErrorContext({ accountId, projectName: projectConfig.name })
       );

package/commands/project/logs.js

@@ -10,7 +10,7 @@ const {
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
+const { logError } = require('../../lib/errorHandlers/');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { uiBetaTag, uiLine, uiLink } = require('../../lib/ui');
@@ -103,7 +103,7 @@ exports.handler = async options => {
 
     logPreamble();
   } catch (e) {
-    logApiErrorInstance(e, {
+    logError(e, {
       accountId: getAccountId(),
       projectName: ProjectLogsManager.projectName,
     });

package/commands/project/migrateApp.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 { promptUser } = require('../../lib/prompts/promptUtils');
 const { isAppDeveloperAccount } = require('../../lib/accountTypes');
@@ -96,7 +93,10 @@ exports.handler = async options => {
         });
 
   try {
-    const selectedApp = await fetchPublicAppMetadata(appId, accountId);
+    const { data: selectedApp } = await fetchPublicAppMetadata(
+      appId,
+      accountId
+    );
     // preventProjectMigrations returns true if we have not added app to allowlist config.
     // listingInfo will only exist for marketplace apps
     const preventProjectMigrations = selectedApp.preventProjectMigrations;
@@ -106,7 +106,7 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
   } catch (error) {
-    logApiErrorInstance(error, new ApiErrorContext({ accountId }));
+    logError(error, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -136,7 +136,7 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
   } catch (error) {
-    logApiErrorInstance(error, new ApiErrorContext({ accountId }));
+    logError(error, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -180,7 +180,11 @@ exports.handler = async options => {
       }
     });
 
-    const migrateResponse = await migrateApp(accountId, appId, projectName);
+    const { data: migrateResponse } = await migrateApp(
+      accountId,
+      appId,
+      projectName
+    );
     const { id } = migrateResponse;
     const pollResponse = await poll(checkMigrationStatus, accountId, id);
     const { status, project } = pollResponse;
@@ -189,7 +193,11 @@ exports.handler = async options => {
       const { env } = getAccountConfig(accountId);
       const baseUrl = getHubSpotWebsiteOrigin(env);
 
-      const zippedProject = await downloadProject(accountId, projectName, 1);
+      const { data: zippedProject } = await downloadProject(
+        accountId,
+        projectName,
+        1
+      );
 
       await extractZipArchive(
         zippedProject,
@@ -232,13 +240,10 @@ exports.handler = async options => {
       text: i18n(`${i18nKey}.migrationStatus.failure`),
       failColor: 'white',
     });
-    // 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 }))
-      );
+    if (error.errors) {
+      error.errors.forEach(logError);
     } else {
-      logApiErrorInstance(error, new ApiErrorContext({ accountId }));
+      logError(error, new ApiErrorContext({ accountId }));
     }
 
     process.exit(EXIT_CODES.ERROR);

package/commands/project/upload.js

@@ -20,12 +20,9 @@ const {
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'commands.project.subcommands.upload';
@@ -71,7 +68,7 @@ exports.handler = async options => {
         logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
         logger.log();
       } else {
-        logApiErrorInstance(
+        logError(
           result.uploadError,
           new ApiErrorContext({
             accountId,
@@ -102,10 +99,7 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.SUCCESS);
     }
   } catch (e) {
-    logApiErrorInstance(
-      e,
-      new ApiErrorContext({ accountId, request: 'project upload' })
-    );
+    logError(e, new ApiErrorContext({ accountId, request: 'project upload' }));
     process.exit(EXIT_CODES.ERROR);
   }
 };

package/commands/project/watch.js

@@ -1,9 +1,6 @@
 const { i18n } = require('../../lib/lang');
 const { createWatcher } = require('../../lib/projectsWatch');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
 const {
@@ -27,7 +24,7 @@ const {
   cancelStagedBuild,
   fetchProjectBuilds,
 } = require('@hubspot/local-dev-lib/api/projects');
-const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { handleKeypress, handleExit } = require('../../lib/process');
@@ -71,7 +68,7 @@ const handleUserInput = (accountId, projectName, currentBuildId) => {
         ) {
           process.exit(EXIT_CODES.SUCCESS);
         } else {
-          logApiErrorInstance(err, new ApiErrorContext({ accountId }));
+          logError(err, new ApiErrorContext({ accountId }));
           process.exit(EXIT_CODES.ERROR);
         }
       }
@@ -103,11 +100,9 @@ exports.handler = async options => {
   await ensureProjectExists(accountId, projectConfig.name);
 
   try {
-    const { results: builds } = await fetchProjectBuilds(
-      accountId,
-      projectConfig.name,
-      options
-    );
+    const {
+      data: { results: builds },
+    } = await fetchProjectBuilds(accountId, projectConfig.name, options);
     const hasNoBuilds = !builds || !builds.length;
 
     const startWatching = async () => {
@@ -139,7 +134,7 @@ exports.handler = async options => {
           logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
           logger.log();
         } else {
-          logApiErrorInstance(
+          logError(
             result.uploadError,
             new ApiErrorContext({
               accountId,
@@ -153,7 +148,7 @@ exports.handler = async options => {
       await startWatching();
     }
   } catch (e) {
-    logApiErrorInstance(e, new ApiErrorContext({ accountId }));
+    logError(e, new ApiErrorContext({ accountId }));
   }
 };
 

package/commands/remove.js

@@ -1,9 +1,6 @@
 const { deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
 
 const {
   addConfigOptions,
@@ -36,7 +33,7 @@ exports.handler = async options => {
     logger.error(
       i18n(`${i18nKey}.errors.deleteFailed`, { accountId, path: hsPath })
     );
-    logApiErrorInstance(
+    logError(
       error,
       new ApiErrorContext({
         accountId,

package/commands/sandbox/create.js

@@ -22,10 +22,8 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { sandboxTypePrompt } = require('../../lib/prompts/sandboxesPrompt');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { syncSandbox } = require('../../lib/sandboxSync');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
-const {
-  isMissingScopeError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
+const { logError } = require('../../lib/errorHandlers/index');
+const { isMissingScopeError } = require('@hubspot/local-dev-lib/errors/index');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   HUBSPOT_ACCOUNT_TYPES,
@@ -102,7 +100,7 @@ exports.handler = async options => {
         })
       );
     } else {
-      logErrorInstance(err);
+      logError(err);
     }
     process.exit(EXIT_CODES.ERROR);
   }
@@ -167,7 +165,7 @@ exports.handler = async options => {
       }
       await handleSyncSandbox(availableSyncTasks);
     } catch (err) {
-      logErrorInstance(err);
+      logError(err);
       throw err;
     }
 

package/commands/sandbox/delete.js

@@ -8,15 +8,9 @@ const {
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const {
-  logErrorInstance,
-  debugErrorAndContext,
-} = require('../../lib/errorHandlers/standardErrors');
-const {
-  isSpecifiedError,
-  isSpecifiedHubSpotAuthError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
-const { deleteSandbox } = require('@hubspot/local-dev-lib/sandboxes');
+const { logError, debugError } = require('../../lib/errorHandlers/index');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
+const { deleteSandbox } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { i18n } = require('../../lib/lang');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
@@ -169,9 +163,9 @@ exports.handler = async options => {
     }
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
-    debugErrorAndContext(err);
+    debugError(err);
 
-    if (isSpecifiedHubSpotAuthError(err, { statusCode: 401 })) {
+    if (isSpecifiedError(err, { statusCode: 401 })) {
       // Intercept invalid key error
       // This command uses the parent portal PAK to delete a sandbox, so we must specify which account needs a new key
       logger.log('');
@@ -221,7 +215,7 @@ exports.handler = async options => {
       }
       process.exit(EXIT_CODES.SUCCESS);
     } else {
-      logErrorInstance(err);
+      logError(err);
     }
     process.exit(EXIT_CODES.ERROR);
   }

package/commands/secrets/addSecret.js

@@ -1,8 +1,5 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { addSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
@@ -47,7 +44,7 @@ exports.handler = async options => {
         secretName,
       })
     );
-    logApiErrorInstance(
+    logError(
       err,
       new ApiErrorContext({
         request: 'add secret',

package/commands/secrets/deleteSecret.js

@@ -1,8 +1,5 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  ApiErrorContext,
-  logApiErrorInstance,
-} = require('../../lib/errorHandlers/apiErrors');
+const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const { deleteSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
@@ -44,7 +41,7 @@ exports.handler = async options => {
         secretName,
       })
     );
-    logApiErrorInstance(
+    logError(
       err,
       new ApiErrorContext({
         request: 'delete a secret',

package/commands/secrets/listSecrets.js

@@ -1,8 +1,5 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { fetchSecrets } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
@@ -29,7 +26,9 @@ exports.handler = async options => {
   trackCommandUsage('secrets-list', null, accountId);
 
   try {
-    const { results } = await fetchSecrets(accountId);
+    const {
+      data: { results },
+    } = await fetchSecrets(accountId);
     const groupLabel = i18n(`${i18nKey}.groupLabel`, {
       accountIdentifier: uiAccountDescription(accountId),
     });
@@ -38,7 +37,7 @@ exports.handler = async options => {
     logger.groupEnd(groupLabel);
   } catch (err) {
     logger.error(i18n(`${i18nKey}.errors.list`));
-    logApiErrorInstance(
+    logError(
       err,
       new ApiErrorContext({
         request: 'add secret',

package/commands/secrets/updateSecret.js

@@ -1,8 +1,5 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  ApiErrorContext,
-  logApiErrorInstance,
-} = require('../../lib/errorHandlers/apiErrors');
+const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const { updateSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
@@ -48,7 +45,7 @@ exports.handler = async options => {
         secretName,
       })
     );
-    logApiErrorInstance(
+    logError(
       err,
       new ApiErrorContext({
         request: 'update secret',

package/commands/theme/preview.js

@@ -21,10 +21,7 @@ const {
   FILE_UPLOAD_RESULT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/files');
 const cliProgress = require('cli-progress');
-const {
-  ApiErrorContext,
-  logApiUploadErrorInstance,
-} = require('../../lib/errorHandlers/apiErrors');
+const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const { handleExit, handleKeypress } = require('../../lib/process');
 const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
 const { getProjectConfig } = require('../../lib/projects');
@@ -160,7 +157,7 @@ exports.handler = async options => {
       results.forEach(result => {
         if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
           logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
-          logApiUploadErrorInstance(
+          logError(
             result.error,
             new ApiErrorContext({
               accountId,

package/commands/upload.js

@@ -14,11 +14,7 @@ const {
   isAllowedExtension,
 } = require('@hubspot/local-dev-lib/path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  ApiErrorContext,
-  logApiUploadErrorInstance,
-} = require('../lib/errorHandlers/apiErrors');
-const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
+const { ApiErrorContext, logError } = require('../lib/errorHandlers/index');
 const {
   validateSrcAndDestPaths,
 } = require('@hubspot/local-dev-lib/cms/modules');
@@ -182,7 +178,7 @@ exports.handler = async options => {
             src,
           })
         );
-        logApiUploadErrorInstance(
+        logError(
           error,
           new ApiErrorContext({
             accountId,
@@ -270,7 +266,7 @@ exports.handler = async options => {
             src,
           })
         );
-        logErrorInstance(error, {
+        logError(error, {
           accountId,
         });
         process.exit(EXIT_CODES.WARNING);

package/commands/watch.js

@@ -18,11 +18,7 @@ const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 const { getUploadableFileList } = require('../lib/upload');
-const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
-const {
-  logApiUploadErrorInstance,
-  ApiErrorContext,
-} = require('../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
 const i18nKey = 'commands.watch';
 
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -99,7 +95,7 @@ exports.handler = async options => {
         accountId,
       })
     );
-    logErrorInstance(error, {
+    logError(error, {
       accountId,
     });
   };
@@ -112,7 +108,7 @@ exports.handler = async options => {
         accountId,
       })
     );
-    logApiUploadErrorInstance(
+    logError(
       error,
       new ApiErrorContext({
         accountId,