@hubspot/cli 5.1.2 → 5.1.3-beta.1

package/commands/auth.js

@@ -44,7 +44,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('@hubspot/cli-lib/errorHandlers');
+const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
 
 const i18nKey = 'cli.commands.auth';
 
@@ -154,7 +154,8 @@ exports.handler = async options => {
     process.exit(EXIT_CODES.ERROR);
   }
 
-  const accountName = updatedConfig.name || validName;
+  const accountName =
+    (updatedConfig && updatedConfig.name) || validName || configData.name;
 
   const setAsDefault = await setAsDefaultAccountPrompt(accountName);
 

package/commands/cms/convertFields.js

@@ -12,7 +12,7 @@ const {
 } = require('@hubspot/cli-lib/lib/handleFieldsJs');
 
 const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
-const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const i18nKey = 'cli.commands.convertFields';
 
 exports.command = 'convert-fields';

package/commands/cms/lighthouseScore.js

@@ -13,12 +13,12 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { i18n } = require('../../lib/lang');
-const { fetchThemes } = require('@hubspot/cli-lib/api/designManager');
+const { fetchThemes } = require('@hubspot/local-dev-lib/api/designManager');
 const {
   requestLighthouseScore,
   getLighthouseScoreStatus,
   getLighthouseScore,
-} = require('@hubspot/cli-lib/api/lighthouseScore');
+} = require('@hubspot/local-dev-lib/api/lighthouseScore');
 const {
   HUBSPOT_FOLDER,
   MARKETPLACE_FOLDER,

package/commands/create/function.js

@@ -1,12 +1,19 @@
-const { createFunction } = require('@hubspot/cli-lib/functions');
+const { createFunction } = require('@hubspot/local-dev-lib/cms/functions');
 const {
   createFunctionPrompt,
 } = require('../../lib/prompts/createFunctionPrompt');
+const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 module.exports = {
   dest: ({ name }) => name,
   execute: async ({ dest }) => {
     const functionDefinition = await createFunctionPrompt();
-    createFunction(functionDefinition, dest);
+    try {
+      await createFunction(functionDefinition, dest);
+    } catch (e) {
+      logErrorInstance(e);
+      process.exit(EXIT_CODES.ERROR);
+    }
   },
 };

package/commands/create/module.js

@@ -1,7 +1,9 @@
-const { createModulePrompt } = require('../../lib/prompts/createModulePrompt');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { createModule } = require('@hubspot/local-dev-lib/cms/modules');
 const { i18n } = require('../../lib/lang');
-const { createModule } = require('@hubspot/cli-lib/modules');
+const { createModulePrompt } = require('../../lib/prompts/createModulePrompt');
+const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.create.subcommands.module';
 
@@ -12,11 +14,15 @@ module.exports = {
       logger.error(i18n(`${i18nKey}.errors.nameRequired`));
       return false;
     }
-
     return true;
   },
   execute: async ({ name, dest }) => {
     const moduleDefinition = await createModulePrompt();
-    await createModule(moduleDefinition, name, dest);
+    try {
+      await createModule(moduleDefinition, name, dest);
+    } catch (e) {
+      logErrorInstance(e);
+      process.exit(EXIT_CODES.ERROR);
+    }
   },
 };

package/commands/create/template.js

@@ -1,9 +1,11 @@
+const { createTemplate } = require('@hubspot/local-dev-lib/cms/templates');
+const { logger } = require('@hubspot/cli-lib/logger');
+const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const {
   createTemplatePrompt,
 } = require('../../lib/prompts/createTemplatePrompt');
-const { logger } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('../../lib/lang');
-const { createTemplate } = require('@hubspot/cli-lib/templates');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.create.subcommands.template';
 
@@ -19,7 +21,12 @@ module.exports = {
   },
   execute: async ({ name, dest }) => {
     const { templateType } = await createTemplatePrompt();
-    await createTemplate(name, dest, templateType);
+    try {
+      await createTemplate(name, dest, templateType);
+    } catch (e) {
+      logErrorInstance(e);
+      process.exit(EXIT_CODES.ERROR);
+    }
     return { templateType };
   },
 };

package/commands/fetch.js

@@ -1,6 +1,5 @@
 const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileMapper');
 const { logger } = require('@hubspot/cli-lib/logger');
-
 const {
   addConfigOptions,
   addAccountOptions,
@@ -17,22 +16,7 @@ const { i18n } = require('../lib/lang');
 
 const i18nKey = 'cli.commands.fetch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { buildLogCallbacks } = require('../lib/logCallbacks');
-const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
-
-const fileMapperLogCallbacks = buildLogCallbacks({
-  skippedExisting: `${i18nKey}.fileMapperLogCallbacks.skippedExisting`,
-  wroteFolder: `${i18nKey}.fileMapperLogCallbacks.wroteFolder`,
-  completedFetch: {
-    key: `${i18nKey}.fileMapperLogCallbacks.completedFetch`,
-    logger: logger.success,
-  },
-  folderFetch: `${i18nKey}.fileMapperLogCallbacks.folderFetch`,
-  completedFolderFetch: {
-    key: `${i18nKey}.fileMapperLogCallbacks.completedFolderFetch`,
-    logger: logger.success,
-  },
-});
+const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
 
 exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -63,8 +47,7 @@ exports.handler = async options => {
       src,
       resolveLocalPath(dest),
       mode,
-      options,
-      fileMapperLogCallbacks
+      options
     );
   } catch (err) {
     logErrorInstance(err);

package/commands/filemanager/fetch.js

@@ -1,8 +1,6 @@
 const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileManager');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { resolveLocalPath } = require('../../lib/filesystem');
-const { buildLogCallbacks } = require('../../lib/logCallbacks');
-
 const {
   addConfigOptions,
   addAccountOptions,
@@ -15,21 +13,7 @@ const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.filemanager.subcommands.fetch';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
-
-const downloadLogCallbacks = buildLogCallbacks({
-  skippedExisting: `${i18nKey}.downloadLogCallbacks.skippedExisting`,
-  fetchFolderStarted: `${i18nKey}.downloadLogCallbacks.fetchFolderStarted`,
-  fetchFolderSuccess: {
-    key: `${i18nKey}.downloadLogCallbacks.fetchFolderSuccess`,
-    logger: logger.success,
-  },
-  fetchFileStarted: `${i18nKey}.downloadLogCallbacks.fetchFileStarted`,
-  fetchFileSuccess: {
-    key: `${i18nKey}.downloadLogCallbacks.fetchFileSuccess`,
-    logger: logger.success,
-  },
-});
+const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 
 exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -57,8 +41,7 @@ exports.handler = async options => {
       src,
       dest,
       false,
-      includeArchived || false,
-      downloadLogCallbacks
+      includeArchived || false
     );
   } catch (err) {
     logErrorInstance(err);

package/commands/filemanager/upload.js

@@ -2,17 +2,19 @@ const fs = require('fs');
 const path = require('path');
 
 const { uploadFolder } = require('@hubspot/local-dev-lib/fileManager');
-const { uploadFile } = require('@hubspot/cli-lib/api/fileManager');
+const { uploadFile } = require('@hubspot/local-dev-lib/api/fileManager');
 const { getCwd, convertToUnixPath } = require('@hubspot/local-dev-lib/path');
 const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  validateSrcAndDestPaths,
+} = 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 { validateSrcAndDestPaths } = require('@hubspot/cli-lib/modules');
-const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
-
 const {
   addConfigOptions,
   addAccountOptions,
@@ -25,11 +27,6 @@ const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.filemanager.subcommands.upload';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { buildLogCallbacks } = require('../../lib/logCallbacks');
-
-const uploadLogCallbacks = buildLogCallbacks({
-  uploadSuccess: `${i18nKey}.uploadLogCallbacks.uploadSuccess`,
-});
 
 exports.command = 'upload <src> <dest>';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -126,7 +123,7 @@ exports.handler = async options => {
         src,
       })
     );
-    uploadFolder(accountId, absoluteSrcPath, dest, uploadLogCallbacks)
+    uploadFolder(accountId, absoluteSrcPath, dest)
       .then(() => {
         logger.success(
           i18n(`${i18nKey}.success.uploadComplete`, {

package/commands/list.js

@@ -15,7 +15,7 @@ const {
 } = require('../lib/errorHandlers/apiErrors');
 const {
   getDirectoryContentsByPath,
-} = require('@hubspot/cli-lib/api/fileMapper');
+} = require('@hubspot/local-dev-lib/api/fileMapper');
 const {
   HUBSPOT_FOLDER,
   MARKETPLACE_FOLDER,

package/commands/logs.js

@@ -10,15 +10,16 @@ const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
 const {
   getFunctionLogs,
   getLatestFunctionLog,
-} = require('@hubspot/cli-lib/api/results');
+} = require('@hubspot/local-dev-lib/api/functions');
 const { tailLogs } = require('../lib/serverlessLogs');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
+const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.logs';
 
 const handleLogsError = (e, accountId, functionPath) => {
-  if (e.statusCode === 404) {
+  if (e.response.status === 404 || e.response.status == 400) {
     logger.error(
       i18n(`${i18nKey}.errors.noLogsFound`, {
         accountId,
@@ -63,12 +64,14 @@ const endpointLog = async (accountId, options) => {
       logsResp = await getLatestFunctionLog(accountId, functionPath);
     } catch (e) {
       handleLogsError(e, accountId, functionPath);
+      process.exit(EXIT_CODES.ERROR);
     }
   } else {
     try {
       logsResp = await getFunctionLogs(accountId, functionPath, options);
     } catch (e) {
       handleLogsError(e, accountId, functionPath);
+      process.exit(EXIT_CODES.ERROR);
     }
   }
 

package/commands/mv.js

@@ -1,10 +1,9 @@
-const { moveFile } = require('@hubspot/cli-lib/api/fileMapper');
+const { moveFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('../lib/errorHandlers/apiErrors');
-
 const {
   addConfigOptions,
   addAccountOptions,

package/commands/project/dev.js

@@ -61,9 +61,11 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-  isMissingScopeError,
-  isSpecifiedError,
+  isSpecifiedError, // Migrate isSpecifiedError to local-dev-lib version only after uploadProject is migrated to local-dev-lib
 } = require('../../lib/errorHandlers/apiErrors');
+const {
+  isMissingScopeError,
+} = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 
 const i18nKey = 'cli.commands.project.subcommands.dev';

package/commands/project/download.js

@@ -24,16 +24,10 @@ const {
 } = require('../../lib/prompts/downloadProjectPrompt');
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag } = require('../../lib/ui');
-const { buildLogCallbacks } = require('../../lib/logCallbacks');
 
 const i18nKey = 'cli.commands.project.subcommands.download';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-const archiveLogCallbacks = buildLogCallbacks({
-  init: `${i18nKey}.archiveLogCallbacks.init`,
-  copy: `${i18nKey}.archiveLogCallbacks.copy`,
-});
-
 exports.command = 'download [--project]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
@@ -99,8 +93,7 @@ exports.handler = async options => {
       zippedProject,
       projectName,
       path.resolve(absoluteDestPath),
-      { includesRootDir: false },
-      archiveLogCallbacks
+      { includesRootDir: false }
     );
 
     logger.log(

package/commands/project/logs.js

@@ -21,15 +21,14 @@ const {
 // const {
 //   getProjectAppFunctionLogs,
 //   getLatestProjectAppFunctionLog,
+//   getFunctionLogs,
+//   getLatestFunctionLog,
 // } = require('@hubspot/cli-lib/api/functions');
 // const {
 //   logApiErrorInstance,
 //   ApiErrorContext,
 // } = require('../../lib/errorHandlers/apiErrors');
-// const {
-//   getFunctionLogs,
-//   getLatestFunctionLog,
-// } = require('@hubspot/cli-lib/api/results');
+
 const { ensureProjectExists } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { uiBetaTag, uiLine, uiLink } = require('../../lib/ui');

package/commands/remove.js

@@ -1,4 +1,4 @@
-const { deleteFile } = require('@hubspot/cli-lib/api/fileMapper');
+const { deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   logApiErrorInstance,

package/commands/sandbox/create.js

@@ -33,7 +33,9 @@ const {
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { syncSandbox } = require('../../lib/sandbox-sync');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
-const { isMissingScopeError } = require('../../lib/errorHandlers/apiErrors');
+const {
+  isMissingScopeError,
+} = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';

package/commands/sandbox/delete.js

@@ -15,7 +15,7 @@ const {
 const {
   isSpecifiedError,
   isSpecifiedHubSpotAuthError,
-} = require('../../lib/errorHandlers/apiErrors');
+} = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { deleteSandbox } = require('@hubspot/local-dev-lib/sandboxes');
 const { i18n } = require('../../lib/lang');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');

package/commands/sandbox/sync.js

@@ -24,7 +24,7 @@ const {
 } = require('../../lib/sandboxes');
 const { syncSandbox } = require('../../lib/sandbox-sync');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
-const { isSpecifiedError } = require('../../lib/errorHandlers/apiErrors');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.sync';

package/commands/upload.js

@@ -4,7 +4,7 @@ const { uploadFolder, hasUploadErrors } = require('@hubspot/cli-lib');
 const {
   getFileMapperQueryValues,
 } = require('@hubspot/local-dev-lib/fileMapper');
-const { upload, deleteFile } = require('@hubspot/cli-lib/api/fileMapper');
+const { upload, deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const {
   getCwd,
   convertToUnixPath,
@@ -16,8 +16,14 @@ const {
   logApiUploadErrorInstance,
 } = require('../lib/errorHandlers/apiErrors');
 const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
-const { validateSrcAndDestPaths } = require('@hubspot/cli-lib/modules');
+const {
+  validateSrcAndDestPaths,
+} = require('@hubspot/local-dev-lib/cms/modules');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
+const {
+  getThemePreviewUrl,
+  getThemeJSONPath,
+} = require('@hubspot/local-dev-lib/cms/themes');
 
 const {
   addConfigOptions,
@@ -32,10 +38,7 @@ const { cleanUploadPrompt } = require('../lib/prompts/cleanUploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { getUploadableFileList } = require('../lib/upload');
-const {
-  getThemePreviewUrl,
-  getThemeJSONPath,
-} = require('@hubspot/local-dev-lib/cms/themes');
+
 const { i18n } = require('../lib/lang');
 const i18nKey = 'cli.commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');

package/lang/en.lyaml

@@ -274,12 +274,6 @@ en:
             describe: "Local directory you would like the files to be placed in, relative to your current working directory"
           src:
             describe: "Path in HubSpot Design Tools"
-        fileMapperLogCallbacks:
-          skippedExisting: 'Skipped existing "{{ filepath }}"'
-          wroteFolder: 'Wrote folder "{{ filepath }}"'
-          completedFetch: 'Completed fetch of file "{{ src }}"{{ version }} to "{{ dest }}" from the Design Manager'
-          folderFetch: 'Fetched "{{ src }}" from account {{ accountId }} from the Design Manager successfully'
-          completedFolderFetch: 'Completed fetch of folder "{{ src }}"{{ version }} to "{{ dest }}" from the Design Manager'
       filemanager:
         describe: "Commands for working with the File Manager."
         subcommands:
@@ -295,12 +289,6 @@ en:
                 describe: "Path in HubSpot Design Tools"
               src:
                 describe: "Path to the local directory you would like the files to be placed, relative to your current working directory. If omitted, this argument will default to your current working directory"
-            downloadLogCallbacks:
-              skippedExisting: "Skipped existing {{ filepath }}"
-              fetchFolderStarted: 'Fetching folder from "{{ src }}" to "{{ dest }}" in the File Manager of account {{ accountId }}'
-              fetchFolderSuccess: "Completed fetch of folder \"{{ src }}\" to \"{{ dest }}\" from the File Manager"
-              fetchFileStarted: "Fetching file from \"{{ src }}\" to \"{{ dest }}\" in the File Manager of account {{ accountId }}"
-              fetchFileSuccess: "Completed fetch of file \"{{ src }}\" to \"{{ dest }}\" from the File Manager"
           upload:
             describe: "Upload a folder or file from your computer to the HubSpot File Manager"
             errors:
@@ -319,8 +307,6 @@ en:
             success:
               upload: "Uploaded file from \"{{ src }}\" to \"{{ dest }}\" in the File Manager of account {{ accountId }}"
               uploadComplete: "Uploading files to \"{{ dest }}\" in the File Manager is complete"
-            uploadLogCallbacks:
-             uploadSuccess: 'Uploaded file "{{ file }}" to "{{ destPath }}"'
       functions:
         describe: "Commands for working with functions."
         subcommands:
@@ -645,9 +631,6 @@ en:
                 describe: "The name of the project to download"
               dest:
                 describe: "Destination folder for the project"
-            archiveLogCallbacks:
-              init: "Extracting project source..."
-              copy: "Copying project source..."
           open:
             describe: "Open the specified project's details page in the browser"
             options:
@@ -1201,6 +1184,7 @@ en:
             configFileUpdated: "{{ configFilename }} updated with {{ authMethod }} for account {{ account }}."
           failure:
             invalidUser: "Couldn't create {{#bold}}{{ accountName }}{{/bold}} because your account has been removed from {{#bold}}{{ parentAccountName }}{{/bold}} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in {{#bold}}{{ parentAccountName }}{{/bold}}."
+            403Gating: "Couldn't create {{#bold}}{{ accountName }}{{/bold}} because {{#bold}}{{ parentAccountName }}{{/bold}} does not have access to development sandboxes. To opt in to the CRM Development Beta and use development sandboxes, visit https://app.hubspot.com/l/whats-new/betas?productUpdateId=13860216."
             limit:
               developer:
                 one: "{{#bold}}{{ accountName }}{{/bold}} reached the limit of {{ limit }} development sandbox.

package/lib/DevServerManager.js

@@ -1,4 +1,3 @@
-const httpClient = require('@hubspot/cli-lib/http');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { COMPONENT_TYPES } = require('./projectStructure');
 const { i18n } = require('./lang');
@@ -91,7 +90,6 @@ class DevServerManager {
           await serverInterface.start({
             accountId,
             debug: this.debug,
-            httpClient,
             projectConfig,
             requestPorts,
           });

package/lib/__tests__/validation.js

@@ -1,5 +1,5 @@
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { getOauthManager } = require('@hubspot/cli-lib/oauth');
+const { getOauthManager } = require('@hubspot/local-dev-lib/oauth');
 const {
   accessTokenForPersonalAccessKey,
 } = require('@hubspot/local-dev-lib/personalAccessKey');
@@ -10,7 +10,7 @@ const { validateAccount } = require('../validation');
 jest.mock('@hubspot/cli-lib');
 jest.mock('@hubspot/local-dev-lib/config');
 jest.mock('@hubspot/cli-lib/logger');
-jest.mock('@hubspot/cli-lib/oauth');
+jest.mock('@hubspot/local-dev-lib/oauth');
 jest.mock('@hubspot/local-dev-lib/personalAccessKey');
 jest.mock('../commonOpts');
 

package/lib/commonOpts.js

@@ -1,4 +1,7 @@
 const Logger = require('@hubspot/cli-lib/logger');
+const {
+  setLogLevel: setLocalDevLibLogLevel,
+} = require('@hubspot/local-dev-lib/logger');
 const { DEFAULT_MODE, Mode } = require('@hubspot/cli-lib');
 const {
   getAccountId: getAccountIdFromConfig,
@@ -66,8 +69,16 @@ const setLogLevel = (options = {}) => {
   const { debug } = options;
   if (debug) {
     Logger.setLogLevel(LOG_LEVEL.DEBUG);
+
+    // Update the log level in local-dev-lib's instance of the logger
+    // This will evenutally replace cli-lib's version of it
+    setLocalDevLibLogLevel(LOG_LEVEL.DEBUG);
   } else {
     Logger.setLogLevel(LOG_LEVEL.LOG);
+
+    // Update the log level in local-dev-lib's instance of the logger
+    // This will evenutally replace cli-lib's version of it
+    setLocalDevLibLogLevel(LOG_LEVEL.LOG);
   }
 };
 

package/lib/errorHandlers/apiErrors.js

@@ -1,5 +1,8 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
+const {
+  getAxiosErrorWithContext,
+} = require('@hubspot/local-dev-lib/errors/apiErrors');
 const {
   SCOPE_GROUPS,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
@@ -251,6 +254,13 @@ function logApiStatusCodeError(error, context) {
  * @param {ApiErrorContext}          context
  */
 function logApiErrorInstance(error, context) {
+  // Use the new local-dev-lib error handler
+  // NOTE: This will eventually replace the logic in logApiStatusCodeError
+  if (error.isAxiosError) {
+    const errorWithContext = getAxiosErrorWithContext(error, context);
+    logger.error(errorWithContext.message);
+    return;
+  }
   // StatusCodeError
   if (isApiStatusCodeError(error)) {
     logApiStatusCodeError(error, context);

package/lib/errorHandlers/standardErrors.js

@@ -1,5 +1,7 @@
 const util = require('util');
-const { HubSpotAuthError } = require('@hubspot/cli-lib/lib/models/Errors');
+const {
+  HubSpotAuthError,
+} = require('@hubspot/local-dev-lib/models/HubSpotAuthError');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('../lang');
 

package/lib/oauth.js

@@ -1,8 +1,10 @@
 const express = require('express');
 const open = require('open');
-const OAuth2Manager = require('@hubspot/cli-lib/lib/models/OAuth2Manager');
+const {
+  default: OAuth2Manager,
+} = require('@hubspot/local-dev-lib/models/OAuth2Manager');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { addOauthToAccountConfig } = require('@hubspot/cli-lib/oauth');
+const { addOauthToAccountConfig } = require('@hubspot/local-dev-lib/oauth');
 const { handleExit } = require('./process');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
@@ -13,11 +15,11 @@ const redirectUri = `http://localhost:${PORT}/oauth-callback`;
 
 const buildAuthUrl = oauthManager => {
   return (
-    `${getHubSpotWebsiteOrigin(oauthManager.env)}/oauth/${
-      oauthManager.accountId
+    `${getHubSpotWebsiteOrigin(oauthManager.account.env)}/oauth/${
+      oauthManager.account.accountId
     }/authorize` +
-    `?client_id=${encodeURIComponent(oauthManager.clientId)}` + // app's client ID
-    `&scope=${encodeURIComponent(oauthManager.scopes.join(' '))}` + // scopes being requested by the app
+    `?client_id=${encodeURIComponent(oauthManager.account.clientId)}` + // app's client ID
+    `&scope=${encodeURIComponent(oauthManager.account.scopes.join(' '))}` + // scopes being requested by the app
     `&redirect_uri=${encodeURIComponent(redirectUri)}` // where to send the user after the consent page
   );
 };
@@ -44,8 +46,8 @@ const authorize = async oauthManager => {
       if (req.query.code) {
         const authCodeProof = {
           grant_type: 'authorization_code',
-          client_id: oauthManager.clientId,
-          client_secret: oauthManager.clientSecret,
+          client_id: oauthManager.account.clientId,
+          client_secret: oauthManager.account.clientSecret,
           redirect_uri: redirectUri,
           code: req.query.code,
         };
@@ -84,13 +86,10 @@ const authorize = async oauthManager => {
 const setupOauth = accountConfig => {
   const accountId = parseInt(accountConfig.portalId, 10);
   const config = getAccountConfig(accountId) || {};
-  return new OAuth2Manager(
-    {
-      ...accountConfig,
-      environment: accountConfig.env || config.env || ENVIRONMENTS.PROD,
-    },
-    logger
-  );
+  return new OAuth2Manager({
+    ...accountConfig,
+    environment: accountConfig.env || config.env || ENVIRONMENTS.PROD,
+  });
 };
 
 const authenticateWithOauth = async configData => {

package/lib/process.js

@@ -1,5 +1,8 @@
 const readline = require('readline');
 const { logger, setLogLevel, LOG_LEVEL } = require('@hubspot/cli-lib/logger');
+const {
+  setLogLevel: setLocalDevLibLogLevel,
+} = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('./lang');
 
 const i18nKey = 'cli.lib.process';
@@ -28,6 +31,10 @@ const handleExit = callback => {
         // Prevent logs when terminal closes
         if (isSIGHUP) {
           setLogLevel(LOG_LEVEL.NONE);
+
+          // Update the log level in local-dev-lib's instance of the logger
+          // This will evenutally replace cli-lib's version of it
+          setLocalDevLibLogLevel(LOG_LEVEL.LOG);
         }
 
         logger.debug(i18n(`${i18nKey}.exitDebug`, { signal }));

package/lib/projects.js

@@ -40,7 +40,7 @@ const SpinniesManager = require('./SpinniesManager');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-  isSpecifiedError,
+  isSpecifiedError, // Migrate isSpecifiedError to local-dev-lib version only after fetchProject is migrated to local-dev-lib
   isSpecifiedHubSpotAuthError,
 } = require('./errorHandlers/apiErrors');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('./constants');

package/lib/sandbox-create.js

@@ -16,7 +16,7 @@ const {
 const {
   isMissingScopeError,
   isSpecifiedError,
-} = require('./errorHandlers/apiErrors');
+} = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { getEnv, getAccountId } = require('@hubspot/local-dev-lib/config');
 const { createSandbox } = require('@hubspot/local-dev-lib/sandboxes');
@@ -101,6 +101,22 @@ const buildSandbox = async ({
         })
       );
       logger.log('');
+    } else if (
+      isSpecifiedError(err, {
+        statusCode: 403,
+        category: 'BANNED',
+        subCategory: 'SandboxErrors.DEVELOPMENT_SANDBOX_ACCESS_NOT_ALLOWED',
+      })
+    ) {
+      logger.log('');
+      logger.error(
+        i18n(`${i18nKey}.failure.403Gating`, {
+          accountName: name,
+          parentAccountName: accountConfig.name || accountId,
+          accountId,
+        })
+      );
+      logger.log('');
     } else if (
       isSpecifiedError(err, {
         statusCode: 400,

package/lib/sandbox-sync.js

@@ -18,7 +18,7 @@ const {
 const {
   isSpecifiedError,
   isMissingScopeError,
-} = require('./errorHandlers/apiErrors');
+} = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('./ui');

package/lib/sandboxes.js

@@ -237,7 +237,7 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
  */
 const saveSandboxToConfig = async (env, result, force = false) => {
   let personalAccessKey = result.personalAccessKey;
-  if (personalAccessKey) {
+  if (!personalAccessKey) {
     const configData = await personalAccessKeyPrompt({
       env,
       account: result.sandbox.sandboxHubId,

package/lib/validation.js

@@ -14,7 +14,7 @@ const {
   loadConfigFromEnvironment,
 } = require('@hubspot/local-dev-lib/config');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
-const { getOauthManager } = require('@hubspot/cli-lib/oauth');
+const { getOauthManager } = require('@hubspot/local-dev-lib/oauth');
 const {
   accessTokenForPersonalAccessKey,
 } = require('@hubspot/local-dev-lib/personalAccessKey');
@@ -118,7 +118,7 @@ async function validateAccount(options) {
       logger.error(
         `The OAuth2 configuration for account ${accountId} is incorrect`
       );
-      logger.error('Run "hscms auth oauth2" to reauthenticate');
+      logger.error('Run "hs auth --type=oauth2" to reauthenticate');
       return false;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.2",
+  "version": "5.1.3-beta.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,10 +8,10 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^8.0.2",
-    "@hubspot/local-dev-lib": "^0.2.1",
-    "@hubspot/serverless-dev-runtime": "5.1.2",
-    "@hubspot/ui-extensions-dev-server": "0.8.6",
+    "@hubspot/cli-lib": "^9.0.0",
+    "@hubspot/local-dev-lib": "^0.3.0",
+    "@hubspot/serverless-dev-runtime": "5.1.3-beta.1",
+    "@hubspot/ui-extensions-dev-server": "0.8.9",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16ae446c55bb019fe01eb15944d80577a654aa02"
+  "gitHead": "4b53ba30127c3d8c12e5ccd6d4dc3833cc87e7b1"
 }

package/lib/logCallbacks.js

@@ -1,20 +0,0 @@
-const { logger } = require('@hubspot/cli-lib/logger');
-const { i18n } = require('./lang');
-
-function buildLogCallbacks(logData) {
-  const callbacksObject = {};
-  for (let key in logData) {
-    if (typeof logData[key] === 'string') {
-      callbacksObject[key] = interpolationData =>
-        logger.log(i18n(logData[key], interpolationData));
-    } else {
-      callbacksObject[key] = interpolationData =>
-        logData[key].logger(i18n(logData[key].key, interpolationData));
-    }
-  }
-  return callbacksObject;
-}
-
-module.exports = {
-  buildLogCallbacks,
-};