@hubspot/cli 6.1.0 → 6.2.0

package/lib/projectsWatch.js

@@ -2,10 +2,7 @@ const chokidar = require('chokidar');
 const path = require('path');
 const chalk = require('chalk');
 const { default: PQueue } = require('p-queue');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('./errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('./errorHandlers/index');
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
@@ -17,7 +14,7 @@ const {
   deleteFileFromBuild,
   queueBuild,
 } = 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 { PROJECT_ERROR_TYPES } = require('./constants');
 
 const i18nKey = 'commands.project.subcommands.watch';
@@ -85,7 +82,7 @@ const debounceQueueBuild = (accountId, projectName, platformVersion) => {
         logger.log(i18n(`${i18nKey}.logs.watchCancelledFromUi`));
         process.exit(0);
       } else {
-        logApiErrorInstance(err, new ApiErrorContext({ accountId }));
+        logError(err, new ApiErrorContext({ accountId }));
       }
 
       return;
@@ -148,14 +145,12 @@ const queueFileOrFolder = async (
 const createNewBuild = async (accountId, projectName, platformVersion) => {
   try {
     logger.debug(i18n(`${i18nKey}.debug.attemptNewBuild`));
-    const { buildId } = await provisionBuild(
-      accountId,
-      projectName,
-      platformVersion
-    );
+    const {
+      data: { buildId },
+    } = await provisionBuild(accountId, projectName, platformVersion);
     return buildId;
   } catch (err) {
-    logApiErrorInstance(err, new ApiErrorContext({ accountId }));
+    logError(err, new ApiErrorContext({ accountId }));
     if (
       isSpecifiedError(err, { subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED })
     ) {

package/lib/prompts/createProjectPrompt.js

@@ -60,14 +60,20 @@ const createProjectPrompt = async (
   skipTemplatePrompt = false
 ) => {
   let projectTemplates = [];
+  let selectedTemplate;
+
   if (!skipTemplatePrompt) {
     projectTemplates = await createTemplateOptions(
       promptOptions.templateSource,
       githubRef
     );
+
+    selectedTemplate =
+      promptOptions.template &&
+      projectTemplates.find(t => t.name === promptOptions.template);
   }
 
-  return promptUser([
+  const result = await promptUser([
     {
       name: 'name',
       message: i18n(`${i18nKey}.enterName`),
@@ -115,10 +121,7 @@ const createProjectPrompt = async (
             })
           : i18n(`${i18nKey}.selectTemplate`);
       },
-      when:
-        !skipTemplatePrompt &&
-        (!promptOptions.template ||
-          !projectTemplates.find(t => t.name === promptOptions.template)),
+      when: !skipTemplatePrompt && !selectedTemplate,
       type: 'list',
       choices: projectTemplates.map(template => {
         return {
@@ -128,6 +131,12 @@ const createProjectPrompt = async (
       }),
     },
   ]);
+
+  if (selectedTemplate) {
+    result.template = selectedTemplate;
+  }
+
+  return result;
 };
 
 module.exports = {

package/lib/prompts/downloadProjectPrompt.js

@@ -1,10 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { fetchProjects } = require('@hubspot/local-dev-lib/api/projects');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../enums/exitCodes');
 const { i18n } = require('../lang');
 
@@ -12,10 +9,10 @@ const i18nKey = 'lib.prompts.downloadProjectPrompt';
 
 const createProjectsList = async accountId => {
   try {
-    const projects = await fetchProjects(accountId);
+    const { data: projects } = await fetchProjects(accountId);
     return projects.results;
   } catch (e) {
-    logApiErrorInstance(e, new ApiErrorContext({ accountId }));
+    logError(e, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.ERROR);
   }
 };

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -3,7 +3,9 @@ const { i18n } = require('../lang');
 const { uiAccountDescription, uiCommandReference } = require('../ui');
 const { isSandbox } = require('../accountTypes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
-const { getSandboxUsageLimits } = require('@hubspot/local-dev-lib/sandboxes');
+const {
+  getSandboxUsageLimits,
+} = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const {
   HUBSPOT_ACCOUNT_TYPES,
   HUBSPOT_ACCOUNT_TYPE_STRINGS,
@@ -11,7 +13,7 @@ const {
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   fetchDeveloperTestAccounts,
-} = require('@hubspot/local-dev-lib/developerTestAccounts');
+} = require('@hubspot/local-dev-lib/api/developerTestAccounts');
 
 const i18nKey = 'lib.prompts.projectDevTargetAccountPrompt';
 
@@ -38,7 +40,8 @@ const selectSandboxTargetAccountPrompt = async (
   let choices = [];
   let sandboxUsage = {};
   try {
-    sandboxUsage = await getSandboxUsageLimits(defaultAccountId);
+    const { data } = await getSandboxUsageLimits(defaultAccountId);
+    sandboxUsage = data.usage;
   } catch (err) {
     logger.debug('Unable to fetch sandbox usage limits: ', err);
   }
@@ -101,9 +104,8 @@ const selectDeveloperTestTargetAccountPrompt = async (
   const defaultAccountId = getAccountId(defaultAccountConfig.name);
   let devTestAccountsResponse = undefined;
   try {
-    devTestAccountsResponse = await fetchDeveloperTestAccounts(
-      defaultAccountId
-    );
+    const { data } = await fetchDeveloperTestAccounts(defaultAccountId);
+    devTestAccountsResponse = data;
   } catch (err) {
     logger.debug('Unable to fetch developer test account usage limits: ', err);
   }

package/lib/prompts/selectPublicAppPrompt.js

@@ -1,7 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiLine } = require('../ui');
-const { logApiErrorInstance } = require('../errorHandlers/apiErrors');
+const { logError } = require('../errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   fetchPublicAppsForPortal,
@@ -16,7 +16,7 @@ const fetchPublicAppOptions = async (
   isMigratingApp = false
 ) => {
   try {
-    const publicApps = await fetchPublicAppsForPortal(accountId);
+    const { data: publicApps } = await fetchPublicAppsForPortal(accountId);
     const filteredPublicApps = publicApps.filter(
       app => !app.projectId && !app.sourceId
     );
@@ -44,7 +44,7 @@ const fetchPublicAppOptions = async (
     }
     return filteredPublicApps;
   } catch (error) {
-    logApiErrorInstance(error, { accountId });
+    logError(error, { accountId });
     logger.error(i18n(`${i18nKey}.errors.errorFetchingApps`));
     process.exit(EXIT_CODES.ERROR);
   }

package/lib/sandboxSync.js

@@ -3,13 +3,13 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('./lang');
 const { getAvailableSyncTypes } = require('./sandboxes');
-const { initiateSync } = require('@hubspot/local-dev-lib/sandboxes');
-const { debugErrorAndContext } = require('./errorHandlers/standardErrors');
+const { initiateSync } = require('@hubspot/local-dev-lib/api/sandboxSync');
 const {
-  logApiErrorInstance,
+  debugError,
+  logError,
   ApiErrorContext,
-} = require('./errorHandlers/apiErrors');
-const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
+} = require('./errorHandlers/index');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const {
@@ -88,7 +88,7 @@ const syncSandbox = async ({
       ),
     });
   } catch (err) {
-    debugErrorAndContext(err);
+    debugError(err);
 
     SpinniesManager.fail('sandboxSync', {
       text: i18n(`${i18nKey}.loading.fail`),
@@ -155,7 +155,7 @@ const syncSandbox = async ({
         'https://app.hubspot.com/l/docs/guides/crm/project-cli-commands#developer-projects-cli-commands-beta'
       );
     } else {
-      logApiErrorInstance(
+      logError(
         err,
         new ApiErrorContext({
           accountId: parentAccountId,

package/lib/sandboxes.js

@@ -1,9 +1,9 @@
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
-  fetchTypes,
   getSandboxUsageLimits,
-} = require('@hubspot/local-dev-lib/sandboxes');
+} = require('@hubspot/local-dev-lib/api/sandboxHubs');
+const { fetchTypes } = require('@hubspot/local-dev-lib/api/sandboxSync');
 const {
   getConfig,
   getAccountId,
@@ -19,9 +19,9 @@ const { uiAccountDescription } = require('./ui');
 const {
   isMissingScopeError,
   isSpecifiedError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
+} = require('@hubspot/local-dev-lib/errors/index');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { logError } = require('./errorHandlers/index');
 
 const syncTypes = {
   OBJECT_RECORDS: 'object-records',
@@ -73,7 +73,9 @@ function getSandboxLimit(error) {
 async function getAvailableSyncTypes(parentAccountConfig, config) {
   const parentPortalId = getAccountId(parentAccountConfig.portalId);
   const portalId = getAccountId(config.portalId);
-  const syncTypes = await fetchTypes(parentPortalId, portalId);
+  const {
+    data: { results: syncTypes },
+  } = await fetchTypes(parentPortalId, portalId);
   if (!syncTypes) {
     throw new Error(
       'Unable to fetch available sandbox sync types. Please try again.'
@@ -126,7 +128,9 @@ const getSyncTypesWithContactRecordsPrompt = async (
  */
 const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
   const accountId = getAccountId(accountConfig.portalId);
-  const usage = await getSandboxUsageLimits(accountId);
+  const {
+    data: { usage },
+  } = await getSandboxUsageLimits(accountId);
   if (!usage) {
     throw new Error('Unable to fetch sandbox usage limits. Please try again.');
   }
@@ -348,7 +352,7 @@ function handleSandboxCreateError({
     }
     logger.log('');
   } else {
-    logErrorInstance(err);
+    logError(err);
   }
   throw err;
 }

package/lib/schema.js

@@ -24,8 +24,8 @@ const logSchemas = schemas => {
 };
 
 const listSchemas = async accountId => {
-  const response = await fetchObjectSchemas(accountId);
-  logSchemas(response.results);
+  const { data } = await fetchObjectSchemas(accountId);
+  logSchemas(data.results);
 };
 
 module.exports = {

package/lib/serverlessLogs.js

@@ -4,13 +4,20 @@ const { handleExit, handleKeypress } = require('./process');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { outputLogs } = require('./ui/serverlessFunctionLogs');
-const {
-  logServerlessFunctionApiErrorInstance,
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('./errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('./errorHandlers/index');
 
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
+const {
+  isHubSpotHttpError,
+  isMissingScopeError,
+} = require('@hubspot/local-dev-lib/errors/index');
+const {
+  SCOPE_GROUPS,
+  PERSONAL_ACCESS_KEY_AUTH_METHOD,
+} = require('@hubspot/local-dev-lib/constants/auth');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
+const { fetchScopeData } = require('@hubspot/local-dev-lib/api/localDevAuth');
+const { i18n } = require('./lang');
 
 const TAIL_DELAY = 5000;
 
@@ -38,6 +45,47 @@ const handleUserInput = () => {
   });
 };
 
+async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
+  const accountConfig = getAccountConfig(accountId);
+  // TODO[JOE]: Update this i18n key
+  const i18nKey = 'lib.serverless';
+  const { authType } = accountConfig;
+  if (authType !== PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+    return;
+  }
+
+  let scopesData;
+  try {
+    scopesData = await fetchScopeData(accountId, scopeGroup);
+  } catch (e) {
+    logger.debug(
+      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
+        scopeGroup,
+        error: e,
+      })
+    );
+    return;
+  }
+  const { portalScopesInGroup, userScopesInGroup } = scopesData;
+
+  if (!portalScopesInGroup.length) {
+    logger.error(
+      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.portalMissingScope`)
+    );
+    return;
+  }
+
+  if (!portalScopesInGroup.every(s => userScopesInGroup.includes(s))) {
+    logger.error(
+      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.userMissingScope`)
+    );
+  } else {
+    logger.error(
+      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.genericMissingScope`)
+    );
+  }
+}
+
 const tailLogs = async ({
   accountId,
   compact,
@@ -48,16 +96,19 @@ const tailLogs = async ({
   let initialAfter;
 
   try {
-    const latestLog = await fetchLatest();
+    const { data: latestLog } = await fetchLatest();
     initialAfter = latestLog && base64EncodeString(latestLog.id);
   } catch (e) {
     // A 404 means no latest log exists(never executed)
-    if (e.response && e.response.status !== 404) {
-      await logServerlessFunctionApiErrorInstance(
-        accountId,
-        e,
-        new ApiErrorContext({ accountId })
-      );
+    if (isHubSpotHttpError(e) && e.status !== 404) {
+      if (isMissingScopeError(e)) {
+        await verifyAccessKeyAndUserAccess(
+          accountId,
+          SCOPE_GROUPS.CMS_FUNCTIONS
+        );
+      } else {
+        await logError(e, new ApiErrorContext({ accountId }));
+      }
     }
   }
 
@@ -65,11 +116,12 @@ const tailLogs = async ({
     let latestLog;
     let nextAfter;
     try {
-      latestLog = await tailCall(after);
+      const { data } = await tailCall(after);
+      latestLog = data;
       nextAfter = latestLog.paging.next.after;
     } catch (e) {
-      if (e.response && e.response.status !== 404) {
-        logApiErrorInstance(
+      if (isHubSpotHttpError(e) && e.status !== 404) {
+        logError(
           e,
           new ApiErrorContext({
             accountId,

package/lib/upload.js

@@ -6,7 +6,7 @@ const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
 const {
   isConvertableFieldJs,
 } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { logError } = require('./errorHandlers/index');
 
 /*
  * Walks the src folder for files, filters them based on ignore filter.
@@ -17,7 +17,7 @@ const getUploadableFileList = async (src, convertFields) => {
   try {
     filePaths = await walk(src);
   } catch (e) {
-    logErrorInstance(e);
+    logError(e);
   }
   const allowedFiles = filePaths
     .filter(file => {

package/lib/validation.js

@@ -28,7 +28,7 @@ const { getAccountId, getMode, setLogLevel } = require('./commonOpts');
 const { logDebugInfo } = require('./debugInfo');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { checkAndWarnGitInclusion } = require('./ui/git');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { logError } = require('./errorHandlers/index');
 
 async function loadAndValidateOptions(options, shouldValidateAccount = true) {
   setLogLevel(options);
@@ -156,7 +156,7 @@ async function validateAccount(options) {
         return false;
       }
     } catch (e) {
-      logErrorInstance(e);
+      logError(e);
       return false;
     }
   } else if (!apiKey) {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@hubspot/cli",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/HubSpot/hubspot-cms-tools"
+    "url": "https://github.com/HubSpot/hubspot-cli"
   },
   "dependencies": {
-    "@hubspot/local-dev-lib": "1.13.0",
-    "@hubspot/serverless-dev-runtime": "6.0.0",
-    "@hubspot/theme-preview-dev-server": "0.0.7",
+    "@hubspot/local-dev-lib": "2.0.0",
+    "@hubspot/serverless-dev-runtime": "6.2.0",
+    "@hubspot/theme-preview-dev-server": "0.0.8",
     "@hubspot/ui-extensions-dev-server": "0.8.33",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "51f7638e491a999b6f64a9f3bda3c4d05fff0dbc"
+  "gitHead": "760939368a64cd5dedf529ca89106253dbf98fce"
 }

package/lib/errorHandlers/apiErrors.js

@@ -1,145 +0,0 @@
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const {
-  isMissingScopeError,
-  isApiUploadValidationError,
-  getAxiosErrorWithContext,
-  parseValidationErrors,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
-const {
-  SCOPE_GROUPS,
-  PERSONAL_ACCESS_KEY_AUTH_METHOD,
-} = require('@hubspot/local-dev-lib/constants/auth');
-const { fetchScopeData } = require('@hubspot/local-dev-lib/api/localDevAuth');
-const {
-  debugErrorAndContext,
-  logErrorInstance,
-  ErrorContext,
-} = require('./standardErrors');
-const { overrideErrors } = require('./overrideErrors');
-const { i18n } = require('../lang');
-
-const i18nKey = 'lib.errorHandlers.apiErrors';
-
-class ApiErrorContext extends ErrorContext {
-  constructor(props = {}) {
-    super(props);
-    /** @type {string} */
-    this.request = props.request || '';
-    /** @type {string} */
-    this.payload = props.payload || '';
-  }
-}
-
-/**
- * @param {Error}           error
- * @param {ApiErrorContext} context
- */
-function logValidationErrors(error, context) {
-  const { response = {} } = error;
-  const validationErrors = parseValidationErrors(response.data);
-  if (validationErrors.length) {
-    logger.error(validationErrors.join('\n- '));
-  }
-  debugErrorAndContext(error, context);
-}
-
-/**
- * Logs a message for an error instance resulting from API interaction.
- *
- * @param {Error|SystemError|Object} error
- * @param {ApiErrorContext}          context
- */
-function logApiErrorInstance(error, context) {
-  if (error.isAxiosError) {
-    if (overrideErrors(error, context)) return;
-    const errorWithContext = getAxiosErrorWithContext(error, context);
-    logger.error(errorWithContext.message);
-    return;
-  }
-  logErrorInstance(error, context);
-}
-
-/**
- * Logs a message for an error instance resulting from filemapper API upload.
- *
- * @param {Error|SystemError|Object} error
- * @param {ApiErrorContext}          context
- */
-function logApiUploadErrorInstance(error, context) {
-  if (isApiUploadValidationError(error)) {
-    logValidationErrors(error, context);
-    return;
-  }
-  logApiErrorInstance(error, context);
-}
-
-async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
-  const accountConfig = getAccountConfig(accountId);
-  const { authType } = accountConfig;
-  if (authType !== PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-    return;
-  }
-
-  let scopesData;
-  try {
-    scopesData = await fetchScopeData(accountId, scopeGroup);
-  } catch (e) {
-    logger.debug(
-      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
-        scopeGroup,
-        error: e,
-      })
-    );
-    return;
-  }
-  const { portalScopesInGroup, userScopesInGroup } = scopesData;
-
-  if (!portalScopesInGroup.length) {
-    logger.error(
-      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.portalMissingScope`)
-    );
-    return;
-  }
-
-  if (!portalScopesInGroup.every(s => userScopesInGroup.includes(s))) {
-    logger.error(
-      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.userMissingScope`)
-    );
-    return;
-  } else {
-    logger.error(
-      i18n(`${i18nKey}.verifyAccessKeyAndUserAccess.genericMissingScope`)
-    );
-    return;
-  }
-}
-
-/**
- * Logs a message for an error instance resulting from API interaction
- * related to serverless function.
- *
- * @param {int} accountId
- * @param {Error|SystemError|Object} error
- * @param {ApiErrorContext}          context
- */
-async function logServerlessFunctionApiErrorInstance(
-  accountId,
-  error,
-  context
-) {
-  if (isMissingScopeError(error)) {
-    await verifyAccessKeyAndUserAccess(accountId, SCOPE_GROUPS.CMS_FUNCTIONS);
-    return;
-  }
-
-  logApiErrorInstance(error, context);
-}
-
-module.exports = {
-  ApiErrorContext,
-  parseValidationErrors,
-  logApiErrorInstance,
-  logApiUploadErrorInstance,
-  logServerlessFunctionApiErrorInstance,
-};

package/lib/errorHandlers/fileSystemErrors.js

@@ -1,20 +0,0 @@
-const {
-  getFileSystemError,
-} = require('@hubspot/local-dev-lib/errors/fileSystemErrors');
-const { debugErrorAndContext, logErrorInstance } = require('./standardErrors');
-
-/**
- * Logs a message for an error instance resulting from filesystem interaction.
- *
- * @param {Error|SystemError|Object} error
- * @param {FileSystemErrorContext}   context
- */
-function logFileSystemErrorInstance(error, context) {
-  const fileSystemError = getFileSystemError(error, context);
-  logErrorInstance(fileSystemError.message, context);
-  debugErrorAndContext(error, context);
-}
-
-module.exports = {
-  logFileSystemErrorInstance,
-};