@hubspot/cli 6.1.1 → 6.2.1

package/lib/marketplace-validate.js

@@ -14,7 +14,7 @@ const SLEEP_TIME = 2000;
 const kickOffValidation = async (accountId, assetType, src) => {
   const requestGroup = 'EXTERNAL_DEVELOPER';
   try {
-    const requestResult = await requestValidation(accountId, {
+    const { data: requestResult } = await requestValidation(accountId, {
       path: src,
       assetType,
       requestGroup,
@@ -29,7 +29,7 @@ const kickOffValidation = async (accountId, assetType, src) => {
 const pollForValidationFinish = async (accountId, validationId) => {
   try {
     const checkValidationStatus = async () => {
-      const validationStatus = await getValidationStatus(accountId, {
+      const { data: validationStatus } = await getValidationStatus(accountId, {
         validationId,
       });
 
@@ -47,7 +47,7 @@ const pollForValidationFinish = async (accountId, validationId) => {
 
 const fetchValidationResults = async (accountId, validationId) => {
   try {
-    const validationResults = await getValidationResults(accountId, {
+    const { data: validationResults } = await getValidationResults(accountId, {
       validationId,
     });
     return validationResults;

package/lib/oauth.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const open = require('open');
 const {
-  default: OAuth2Manager,
+  OAuth2Manager,
 } = require('@hubspot/local-dev-lib/models/OAuth2Manager');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { addOauthToAccountConfig } = require('@hubspot/local-dev-lib/oauth');

package/lib/polling.js

@@ -4,7 +4,7 @@ const poll = (callback, accountId, taskId) => {
   return new Promise((resolve, reject) => {
     const pollInterval = setInterval(async () => {
       try {
-        const pollResp = await callback(accountId, taskId);
+        const { data: pollResp } = await callback(accountId, taskId);
         const { status } = pollResp;
 
         if (status === POLLING_STATUS.SUCCESS) {

package/lib/projectLogsManager.js

@@ -54,10 +54,9 @@ class ProjectLogsManager {
       throw new Error(i18n(`${i18nKey}.errors.noProjectConfig`));
     }
 
-    const { topLevelComponentMetadata } = await fetchProjectComponentsMetadata(
-      this.accountId,
-      this.projectId
-    );
+    const {
+      data: { topLevelComponentMetadata },
+    } = await fetchProjectComponentsMetadata(this.accountId, this.projectId);
 
     const apps = topLevelComponentMetadata.filter(componentMetadata => {
       const { type } = componentMetadata;

package/lib/projectStructure.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { walk } = require('@hubspot/local-dev-lib/fs');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { logError } = require('./errorHandlers/index');
 
 const COMPONENT_TYPES = Object.freeze({
   privateApp: 'private-app',
@@ -94,7 +94,7 @@ async function findProjectComponents(projectSourceDir) {
   try {
     projectFiles = await walk(projectSourceDir);
   } catch (e) {
-    logErrorInstance(e);
+    logError(e);
   }
 
   projectFiles.forEach(projectFile => {

package/lib/projects.js

@@ -33,10 +33,7 @@ const {
   fetchBuildWarnLogs,
   fetchDeployWarnLogs,
 } = require('@hubspot/local-dev-lib/api/projects');
-const {
-  isSpecifiedError,
-  isSpecifiedHubSpotAuthError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { getCwd, getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { downloadGithubRepoContents } = require('@hubspot/local-dev-lib/github');
@@ -45,10 +42,7 @@ const { EXIT_CODES } = require('./enums/exitCodes');
 const { uiLine, uiLink, uiAccountDescription } = require('../lib/ui');
 const { i18n } = require('./lang');
 const SpinniesManager = require('./ui/SpinniesManager');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('./errorHandlers/apiErrors');
+const { logError, ApiErrorContext } = require('./errorHandlers/index');
 
 const i18nKey = 'lib.projects';
 
@@ -215,11 +209,11 @@ const pollFetchProject = async (accountId, projectName) => {
     });
     const pollInterval = setInterval(async () => {
       try {
-        const project = await fetchProject(accountId, projectName);
-        if (project) {
+        const response = await fetchProject(accountId, projectName);
+        if (response && response.data) {
           SpinniesManager.remove('pollFetchProject');
           clearInterval(pollInterval);
-          resolve(project);
+          resolve(response);
         }
       } catch (err) {
         if (
@@ -254,7 +248,7 @@ const ensureProjectExists = async (
 ) => {
   const accountIdentifier = uiAccountDescription(accountId);
   try {
-    const project = withPolling
+    const { data: project } = withPolling
       ? await pollFetchProject(accountId, projectName)
       : await fetchProject(accountId, projectName);
     return { projectExists: !!project, project };
@@ -278,7 +272,7 @@ const ensureProjectExists = async (
 
       if (shouldCreateProject) {
         try {
-          const project = await createProject(accountId, projectName);
+          const { data: project } = await createProject(accountId, projectName);
           logger.success(
             i18n(`${i18nKey}.ensureProjectExists.createSuccess`, {
               projectName,
@@ -287,7 +281,7 @@ const ensureProjectExists = async (
           );
           return { projectExists: true, project };
         } catch (err) {
-          return logApiErrorInstance(err, new ApiErrorContext({ accountId }));
+          return logError(err, new ApiErrorContext({ accountId }));
         }
       } else {
         if (!noLogs) {
@@ -302,14 +296,14 @@ const ensureProjectExists = async (
       }
     }
     if (
-      isSpecifiedHubSpotAuthError(err, {
+      isSpecifiedError(err, {
         statusCode: 401,
       })
     ) {
       logger.error(err.message);
       process.exit(EXIT_CODES.ERROR);
     }
-    logApiErrorInstance(err, new ApiErrorContext({ accountId }));
+    logError(err, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.ERROR);
   }
 };
@@ -364,7 +358,7 @@ const uploadProjectFiles = async (
   let error;
 
   try {
-    const upload = await uploadProject(
+    const { data: upload } = await uploadProject(
       accountId,
       projectName,
       filePath,
@@ -442,7 +436,7 @@ const pollProjectBuildAndDeploy = async (
         )
       );
 
-      displayWarnLogs(accountId, projectConfig.name, buildId);
+      await displayWarnLogs(accountId, projectConfig.name, buildId);
     }
 
     // autoDeployId of 0 indicates a skipped deploy
@@ -501,7 +495,7 @@ const pollProjectBuildAndDeploy = async (
   }
 
   if (result && result.deployResult) {
-    displayWarnLogs(
+    await displayWarnLogs(
       accountId,
       projectConfig.name,
       result.deployResult.deployId,
@@ -636,8 +630,10 @@ const makePollTaskStatusFunc = ({
     });
 
     const [
-      initialTaskStatus,
-      { topLevelComponentsWithChildren: taskStructure },
+      { data: initialTaskStatus },
+      {
+        data: { topLevelComponentsWithChildren: taskStructure },
+      },
     ] = await Promise.all([
       statusFn(accountId, taskName, taskId),
       structureFn(accountId, taskName, taskId),
@@ -711,9 +707,17 @@ const makePollTaskStatusFunc = ({
       const pollInterval = setInterval(async () => {
         let taskStatus;
         try {
-          taskStatus = await statusFn(accountId, taskName, taskId);
+          const { data } = await statusFn(accountId, taskName, taskId);
+          taskStatus = data;
         } catch (e) {
           logger.debug(e);
+          logError(
+            e,
+            new ApiErrorContext({
+              accountId,
+              projectName: taskName,
+            })
+          );
           return reject(
             new Error(
               i18n(
@@ -981,22 +985,31 @@ const displayWarnLogs = async (
 
   if (isDeploy) {
     try {
-      result = await fetchDeployWarnLogs(accountId, projectName, taskId);
+      const { data } = await fetchDeployWarnLogs(
+        accountId,
+        projectName,
+        taskId
+      );
+      result = data;
     } catch (e) {
-      logApiErrorInstance(e);
+      logError(e);
     }
   } else {
     try {
-      result = await fetchBuildWarnLogs(accountId, projectName, taskId);
+      const { data } = await fetchBuildWarnLogs(accountId, projectName, taskId);
+      result = data;
     } catch (e) {
-      logApiErrorInstance(e);
+      logError(e);
     }
   }
 
-  if (result && result.logs.length) {
-    result.logs.forEach(log => {
+  if (result && result.logs) {
+    const logLength = result.logs.length;
+    result.logs.forEach((log, i) => {
       logger.warn(log.message);
-      logger.log('');
+      if (i < logLength - 1) {
+        logger.log('');
+      }
     });
   }
 };

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,9 @@ const fetchPublicAppOptions = async (
   isMigratingApp = false
 ) => {
   try {
-    const publicApps = await fetchPublicAppsForPortal(accountId);
+    const {
+      data: { results: publicApps },
+    } = await fetchPublicAppsForPortal(accountId);
     const filteredPublicApps = publicApps.filter(
       app => !app.projectId && !app.sourceId
     );
@@ -44,7 +46,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,