@hubspot/cli 5.1.3 → 5.1.4-beta.1

package/commands/sandbox/create.js

@@ -9,13 +9,11 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
-const { buildSandbox } = require('../../lib/sandbox-create');
-const { uiFeatureHighlight } = require('../../lib/ui');
+const { buildSandbox } = require('../../lib/sandboxCreate');
+const { uiFeatureHighlight, uiAccountDescription } = require('../../lib/ui');
 const {
   sandboxTypeMap,
-  DEVELOPER_SANDBOX,
   getSandboxTypeAsString,
-  getAccountName,
   getAvailableSyncTypes,
   syncTypes,
   validateSandboxUsageLimits,
@@ -31,12 +29,13 @@ const {
   sandboxNamePrompt,
 } = require('../../lib/prompts/sandboxesPrompt');
 const { promptUser } = require('../../lib/prompts/promptUtils');
-const { syncSandbox } = require('../../lib/sandbox-sync');
+const { syncSandbox } = require('../../lib/sandboxSync');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const {
   isMissingScopeError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
+const { DEVELOPER_SANDBOX_TYPE } = require('../../lib/constants');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
 
@@ -123,7 +122,7 @@ exports.handler = async options => {
         name: 'sandboxSyncPrompt',
         type: 'confirm',
         message: i18n(`${syncI18nKey}.confirm.createFlow.${sandboxType}`, {
-          parentAccountName: getAccountName(accountConfig),
+          parentAccountName: uiAccountDescription(accountId),
           sandboxName,
         }),
       },
@@ -192,7 +191,7 @@ exports.handler = async options => {
     }
 
     const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
-    if (sandboxType === DEVELOPER_SANDBOX) {
+    if (sandboxType === DEVELOPER_SANDBOX_TYPE) {
       highlightItems.push('projectDevCommand');
     } else {
       highlightItems.push('projectUploadCommand');

package/commands/sandbox/delete.js

@@ -22,7 +22,6 @@ const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
   getConfig,
   getEnv,
-  getAccountConfig,
   removeSandboxAccountFromConfig,
   updateDefaultAccount,
 } = require('@hubspot/local-dev-lib/config');
@@ -33,8 +32,8 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 
-const { getAccountName } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
+const { uiAccountDescription } = require('../../lib/ui');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.delete';
 
@@ -69,7 +68,6 @@ exports.handler = async options => {
   const sandboxAccountId = getAccountId({
     account: account || accountPrompt.account,
   });
-  const accountConfig = getAccountConfig(sandboxAccountId);
   const isDefaultAccount =
     sandboxAccountId === getAccountId(config.defaultPortal);
 
@@ -94,7 +92,6 @@ exports.handler = async options => {
     }
   }
 
-  const parentAccount = getAccountConfig(parentAccountId);
   const url = `${baseUrl}/sandboxes/${parentAccountId}`;
   const command = `hs auth ${
     getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''
@@ -115,14 +112,14 @@ exports.handler = async options => {
 
   logger.debug(
     i18n(`${i18nKey}.debug.deleting`, {
-      account: getAccountName(accountConfig),
+      account: uiAccountDescription(sandboxAccountId),
     })
   );
 
   if (isDefaultAccount) {
     logger.info(
       i18n(`${i18nKey}.defaultAccountWarning`, {
-        account: getAccountName(accountConfig),
+        account: uiAccountDescription(sandboxAccountId),
       })
     );
     logger.log('');
@@ -135,7 +132,7 @@ exports.handler = async options => {
           name: 'confirmSandboxDeletePrompt',
           type: 'confirm',
           message: i18n(`${i18nKey}.confirm`, {
-            account: getAccountName(accountConfig),
+            account: uiAccountDescription(sandboxAccountId),
           }),
         },
       ]);
@@ -177,7 +174,7 @@ exports.handler = async options => {
       logger.log('');
       logger.error(
         i18n(`${i18nKey}.failure.invalidKey`, {
-          account: getAccountName(parentAccount),
+          account: uiAccountDescription(parentAccountId),
         })
       );
     } else if (
@@ -190,8 +187,8 @@ exports.handler = async options => {
       logger.log('');
       logger.error(
         i18n(`${i18nKey}.failure.invalidUser`, {
-          accountName: getAccountName(accountConfig),
-          parentAccountName: getAccountName(parentAccount),
+          accountName: uiAccountDescription(sandboxAccountId),
+          parentAccountName: uiAccountDescription(parentAccountId),
         })
       );
       logger.log('');
@@ -205,7 +202,7 @@ exports.handler = async options => {
       logger.log('');
       logger.warn(
         i18n(`${i18nKey}.failure.objectNotFound`, {
-          account: getAccountName(accountConfig),
+          account: uiAccountDescription(sandboxAccountId),
         })
       );
       logger.log('');

package/commands/sandbox/sync.js

@@ -13,19 +13,20 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { promptUser } = require('../../lib/prompts/promptUtils');
-const { uiLine } = require('../../lib/ui');
+const { uiLine, uiAccountDescription } = require('../../lib/ui');
 const {
-  getAccountName,
   sandboxTypeMap,
-  DEVELOPER_SANDBOX,
-  STANDARD_SANDBOX,
   getAvailableSyncTypes,
   getSyncTypesWithContactRecordsPrompt,
 } = require('../../lib/sandboxes');
-const { syncSandbox } = require('../../lib/sandbox-sync');
+const { syncSandbox } = require('../../lib/sandboxSync');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const {
+  DEVELOPER_SANDBOX_TYPE,
+  STANDARD_SANDBOX_TYPE,
+} = require('../../lib/constants');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.sync';
 
@@ -62,7 +63,7 @@ exports.handler = async options => {
     logger.log('');
     logger.error(
       i18n(`${i18nKey}.failure.missingParentPortal`, {
-        sandboxName: getAccountName(accountConfig),
+        sandboxName: uiAccountDescription(accountId),
       })
     );
     process.exit(EXIT_CODES.ERROR);
@@ -70,9 +71,9 @@ exports.handler = async options => {
 
   const parentAccountConfig = getAccountConfig(parentAccountId);
   const isDevelopmentSandbox =
-    sandboxTypeMap[accountConfig.sandboxAccountType] === DEVELOPER_SANDBOX;
+    sandboxTypeMap[accountConfig.sandboxAccountType] === DEVELOPER_SANDBOX_TYPE;
   const isStandardSandbox =
-    sandboxTypeMap[accountConfig.sandboxAccountType] === STANDARD_SANDBOX;
+    sandboxTypeMap[accountConfig.sandboxAccountType] === STANDARD_SANDBOX_TYPE;
 
   let availableSyncTasks;
   try {
@@ -90,7 +91,7 @@ exports.handler = async options => {
     ) {
       logger.error(
         i18n('cli.lib.sandbox.sync.failure.objectNotFound', {
-          account: getAccountName(accountConfig),
+          account: uiAccountDescription(accountId),
         })
       );
     } else {
@@ -103,8 +104,8 @@ exports.handler = async options => {
     logger.log(i18n(`${i18nKey}.info.developmentSandbox`));
     logger.log(
       i18n(`${i18nKey}.info.sync`, {
-        parentAccountName: getAccountName(parentAccountConfig),
-        sandboxName: getAccountName(accountConfig),
+        parentAccountName: uiAccountDescription(parentAccountId),
+        sandboxName: uiAccountDescription(accountId),
       })
     );
     uiLine();
@@ -119,8 +120,8 @@ exports.handler = async options => {
           name: 'confirmSandboxSyncPrompt',
           type: 'confirm',
           message: i18n(`${i18nKey}.confirm.developmentSandbox`, {
-            parentAccountName: getAccountName(parentAccountConfig),
-            sandboxName: getAccountName(accountConfig),
+            parentAccountName: uiAccountDescription(parentAccountId),
+            sandboxName: uiAccountDescription(accountId),
           }),
         },
       ]);
@@ -140,8 +141,8 @@ exports.handler = async options => {
     );
     logger.log(
       i18n(`${i18nKey}.info.sync`, {
-        parentAccountName: getAccountName(parentAccountConfig),
-        sandboxName: getAccountName(accountConfig),
+        parentAccountName: uiAccountDescription(parentAccountId),
+        sandboxName: uiAccountDescription(accountId),
       })
     );
     uiLine();
@@ -156,8 +157,8 @@ exports.handler = async options => {
           name: 'confirmSandboxSyncPrompt',
           type: 'confirm',
           message: i18n(`${i18nKey}.confirm.standardSandbox`, {
-            parentAccountName: getAccountName(parentAccountConfig),
-            sandboxName: getAccountName(accountConfig),
+            parentAccountName: uiAccountDescription(parentAccountId),
+            sandboxName: uiAccountDescription(accountId),
           }),
         },
       ]);

package/commands/secrets/addSecret.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  logServerlessFunctionApiErrorInstance,
+  logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { addSecret } = require('@hubspot/cli-lib/api/secrets');
+const { addSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -41,15 +41,14 @@ exports.handler = async options => {
         secretName,
       })
     );
-  } catch (e) {
+  } catch (err) {
     logger.error(
       i18n(`${i18nKey}.errors.add`, {
         secretName,
       })
     );
-    await logServerlessFunctionApiErrorInstance(
-      accountId,
-      e,
+    logApiErrorInstance(
+      err,
       new ApiErrorContext({
         request: 'add secret',
         accountId,

package/commands/secrets/deleteSecret.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  logServerlessFunctionApiErrorInstance,
   ApiErrorContext,
+  logApiErrorInstance,
 } = require('../../lib/errorHandlers/apiErrors');
-const { deleteSecret } = require('@hubspot/cli-lib/api/secrets');
+const { deleteSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -38,15 +38,14 @@ exports.handler = async options => {
         secretName,
       })
     );
-  } catch (e) {
+  } catch (err) {
     logger.error(
       i18n(`${i18nKey}.errors.delete`, {
         secretName,
       })
     );
-    await logServerlessFunctionApiErrorInstance(
-      accountId,
-      e,
+    logApiErrorInstance(
+      err,
       new ApiErrorContext({
         request: 'delete a secret',
         accountId,

package/commands/secrets/listSecrets.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  logServerlessFunctionApiErrorInstance,
+  logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { fetchSecrets } = require('@hubspot/cli-lib/api/secrets');
+const { fetchSecrets } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -36,11 +36,10 @@ exports.handler = async options => {
     logger.group(groupLabel);
     results.forEach(secret => logger.log(secret));
     logger.groupEnd(groupLabel);
-  } catch (e) {
+  } catch (err) {
     logger.error(i18n(`${i18nKey}.errors.list`));
-    await logServerlessFunctionApiErrorInstance(
-      accountId,
-      e,
+    logApiErrorInstance(
+      err,
       new ApiErrorContext({
         request: 'add secret',
         accountId,

package/commands/secrets/updateSecret.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  logServerlessFunctionApiErrorInstance,
   ApiErrorContext,
+  logApiErrorInstance,
 } = require('../../lib/errorHandlers/apiErrors');
-const { updateSecret } = require('@hubspot/cli-lib/api/secrets');
+const { updateSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -42,15 +42,14 @@ exports.handler = async options => {
       })
     );
     logger.log(i18n(`${i18nKey}.success.updateExplanation`));
-  } catch (e) {
+  } catch (err) {
     logger.error(
       i18n(`${i18nKey}.errors.update`, {
         secretName,
       })
     );
-    await logServerlessFunctionApiErrorInstance(
-      accountId,
-      e,
+    logApiErrorInstance(
+      err,
       new ApiErrorContext({
         request: 'update secret',
         accountId,

package/lang/en.lyaml

@@ -467,7 +467,7 @@ en:
               projectMustExistExplanation: "The project {{ projectName }} does not exist in the target account {{ accountIdentifier}}. This command requires the project to exist in the target account."
               choseNotToCreateProject: "Exiting because this command requires the project to exist in the target account."
               initialUploadMessage: "HubSpot Local Dev Server Startup"
-              declineDefaultSandboxExplanation: "To develop on a different account, run {{ useCommand }} to change your default account, then re-run {{ devCommand }}."
+              declineDefaultAccountExplanation: "To develop on a different account, run {{ useCommand }} to change your default account, then re-run {{ devCommand }}."
             status:
               creatingProject: "Creating project {{ projectName }} in {{ accountIdentifier }}"
               createdProject: "Created project {{ projectName }} in {{ accountIdentifier }}"
@@ -933,6 +933,7 @@ en:
           fileFiltered: "Ignore rule triggered for \"{{ filename }}\""
         ensureProjectExists:
           createPrompt: "The project {{ projectName }} does not exist in {{ accountIdentifier }}. Would you like to create it?"
+          createPromptUpload: "[--forceCreate] The project {{ projectName }} does not exist in {{ accountIdentifier }}. Would you like to create it?"
           createSuccess: "New project {{#bold}}{{ projectName }}{{/bold}} successfully created in {{#bold}}{{ accountIdentifier }}{{/bold}}."
           notFound: "Your project {{#bold}}{{ projectName }}{{/bold}} could not be found in {{#bold}}{{ accountIdentifier }}{{/bold}}."
         pollFetchProject:
@@ -1028,7 +1029,7 @@ en:
           promptMessage: "[--account] Choose a sandbox under {{ accountIdentifier }} to test with:"
           sandboxLimit: "Your account reached the limit of {{ limit }} development sandboxes"
           sandboxLimitWithSuggestion: "Your account reached the limit of {{ limit }} development sandboxes. Run {{ authCommand }} to add an existing one to the config."
-          confirmDefaultSandboxAccount: "Continue testing on {{#bold}}{{ accountName }} ({{ accountType }}){{/bold}}? (Y/n)"
+          confirmDefaultAccount: "Continue testing on {{#bold}}{{ accountName }} ({{ accountType }}){{/bold}}? (Y/n)"
         projectLogsPrompt:
           projectName:
             message: "[--project] Enter the project name:"

package/lib/DevServerManager.js

@@ -9,6 +9,11 @@ const {
   stopPortManagerServer,
   requestPorts,
 } = require('@hubspot/local-dev-lib/portManager');
+const {
+  getHubSpotApiOrigin,
+  getHubSpotWebsiteOrigin,
+} = require('@hubspot/local-dev-lib/urls');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.lib.DevServerManager';
 
@@ -29,7 +34,6 @@ class DevServerManager {
         serverInterface: DevModeInterface,
       },
     };
-    this.debug = false;
   }
 
   async iterateDevServers(callback) {
@@ -62,19 +66,22 @@ class DevServerManager {
     }, {});
   }
 
-  async setup({ components, debug, onUploadRequired }) {
-    this.debug = debug;
+  async setup({ components, onUploadRequired, accountId }) {
     this.componentsByType = this.arrangeComponentsByType(components);
-
+    const { env } = getAccountConfig(accountId);
     await startPortManagerServer();
     await this.iterateDevServers(
       async (serverInterface, compatibleComponents) => {
         if (serverInterface.setup) {
           await serverInterface.setup({
             components: compatibleComponents,
-            debug,
             onUploadRequired,
             promptUser,
+            logger,
+            urls: {
+              api: getHubSpotApiOrigin(env),
+              web: getHubSpotWebsiteOrigin(env),
+            },
           });
         }
       }
@@ -89,7 +96,6 @@ class DevServerManager {
         if (serverInterface.start) {
           await serverInterface.start({
             accountId,
-            debug: this.debug,
             projectConfig,
             requestPorts,
           });

package/lib/LocalDevManager.js

@@ -322,8 +322,8 @@ class LocalDevManager {
     try {
       await DevServerManager.setup({
         components,
-        debug: this.debug,
         onUploadRequired: this.logUploadWarning.bind(this),
+        accountId: this.targetAccountId,
       });
       return true;
     } catch (e) {

package/lib/constants.js

@@ -2,7 +2,18 @@ const HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH =
   'HubSpot/hubspot-project-components';
 const DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 
+// Sandboxes
+const STANDARD_SANDBOX_TYPE = 'standard';
+const DEVELOPER_SANDBOX_TYPE = 'developer';
+
+const STANDARD_SANDBOX = 'STANDARD';
+const DEVELOPER_SANDBOX = 'DEVELOPER';
+
 module.exports = {
   HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
   DEFAULT_PROJECT_TEMPLATE_BRANCH,
+  STANDARD_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX_TYPE,
+  STANDARD_SANDBOX,
+  DEVELOPER_SANDBOX,
 };

package/lib/developerTestAccounts.js

@@ -0,0 +1,14 @@
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+
+const DEV_TEST_ACCOUNT_STRING = 'developer test account';
+
+const isDeveloperTestAccount = config =>
+  config.accountType &&
+  config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
+
+module.exports = {
+  DEV_TEST_ACCOUNT_STRING,
+  isDeveloperTestAccount,
+};

package/lib/lang.js

@@ -52,11 +52,12 @@ const getTextValue = lookupDotNotation => {
       previouslyCheckedProp = prop;
     });
   } catch (e) {
-    logger.error(
+    logger.debug(
       `Unable to access language property: ${lookupProps.join(
         '.'
       )}. Failed to access prop "${previouslyCheckedProp}".`
     );
+    logger.error('Unable to access language property.');
     return missingTextData;
   }
 
@@ -92,4 +93,5 @@ const setLangData = (newLocale, newLangObj) => {
 module.exports = {
   i18n,
   setLangData,
+  MISSING_LANGUAGE_DATA_PREFIX,
 };

package/lib/marketplace-validate.js

@@ -5,7 +5,7 @@ const {
   requestValidation,
   getValidationStatus,
   getValidationResults,
-} = require('@hubspot/cli-lib/api/marketplaceValidation');
+} = require('@hubspot/local-dev-lib/api/marketplaceValidation');
 const { i18n } = require('./lang');
 const { EXIT_CODES } = require('./enums/exitCodes');
 

package/lib/projects.js

@@ -28,7 +28,8 @@ const {
   getDeployStructure,
   fetchProject,
   uploadProject,
-} = require('@hubspot/cli-lib/api/dfs');
+} = require('@hubspot/local-dev-lib/api/projects');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { getCwd, getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { downloadGitHubRepoContents } = require('@hubspot/cli-lib/github');
@@ -40,7 +41,6 @@ const SpinniesManager = require('./SpinniesManager');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-  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');
@@ -238,6 +238,7 @@ const ensureProjectExists = async (
     allowCreate = true,
     noLogs = false,
     withPolling = false,
+    uploadCommand = false,
   } = {}
 ) => {
   const accountIdentifier = uiAccountDescription(accountId);
@@ -247,14 +248,14 @@ const ensureProjectExists = async (
       : await fetchProject(accountId, projectName);
     return !!project;
   } catch (err) {
-    if (err.statusCode === 404) {
+    if (isSpecifiedError(err, { statusCode: 404 })) {
       let shouldCreateProject = forceCreate;
-
       if (allowCreate && !shouldCreateProject) {
+        const promptKey = uploadCommand ? 'createPromptUpload' : 'createPrompt';
         const promptResult = await promptUser([
           {
             name: 'shouldCreateProject',
-            message: i18n(`${i18nKey}.ensureProjectExists.createPrompt`, {
+            message: i18n(`${i18nKey}.ensureProjectExists.${promptKey}`, {
               projectName,
               accountIdentifier,
             }),