@hubspot/cli 5.1.3 → 5.1.4-beta.1

package/lib/sandboxes.js

@@ -1,49 +1,39 @@
-const chalk = require('chalk');
-const { i18n } = require('./lang');
+const { i18n, MISSING_LANGUAGE_DATA_PREFIX } = require('./lang');
 const { handleExit, handleKeypress } = require('./process');
 const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  getAccessToken,
-  updateConfigWithAccessToken,
-} = require('@hubspot/local-dev-lib/personalAccessKey');
 const { EXIT_CODES } = require('./enums/exitCodes');
-const { enterAccountNamePrompt } = require('./prompts/enterAccountNamePrompt');
 const {
   fetchTaskStatus,
   fetchTypes,
   getSandboxUsageLimits,
 } = require('@hubspot/local-dev-lib/sandboxes');
-const {
-  accountNameExistsInConfig,
-  getConfig,
-  writeConfig,
-  updateAccountConfig,
-  getAccountId,
-} = require('@hubspot/local-dev-lib/config');
+const { getConfig, getAccountId } = require('@hubspot/local-dev-lib/config');
 const CliProgressMultibarManager = require('./CliProgressMultibarManager');
 const { promptUser } = require('./prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
-  personalAccessKeyPrompt,
-} = require('./prompts/personalAccessKeyPrompt');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
-
-const STANDARD_SANDBOX = 'standard';
-const DEVELOPER_SANDBOX = 'developer';
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+const {
+  STANDARD_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX,
+  STANDARD_SANDBOX,
+} = require('./constants');
 
 const syncTypes = {
   OBJECT_RECORDS: 'object-records',
 };
 
 const sandboxTypeMap = {
-  DEV: DEVELOPER_SANDBOX,
-  dev: DEVELOPER_SANDBOX,
-  DEVELOPER: DEVELOPER_SANDBOX,
-  developer: DEVELOPER_SANDBOX,
-  DEVELOPMENT: DEVELOPER_SANDBOX,
-  development: DEVELOPER_SANDBOX,
-  STANDARD: STANDARD_SANDBOX,
-  standard: STANDARD_SANDBOX,
+  DEV: DEVELOPER_SANDBOX_TYPE,
+  dev: DEVELOPER_SANDBOX_TYPE,
+  DEVELOPER: DEVELOPER_SANDBOX_TYPE,
+  developer: DEVELOPER_SANDBOX_TYPE,
+  DEVELOPMENT: DEVELOPER_SANDBOX_TYPE,
+  development: DEVELOPER_SANDBOX_TYPE,
+  STANDARD: STANDARD_SANDBOX_TYPE,
+  standard: STANDARD_SANDBOX_TYPE,
 };
 
 const sandboxApiTypeMap = {
@@ -51,23 +41,26 @@ const sandboxApiTypeMap = {
   developer: 2,
 };
 
-const getSandboxTypeAsString = type =>
-  type === 'DEVELOPER' ? 'development' : 'standard';
-
-const isSandbox = config =>
-  config.sandboxAccountType && config.sandboxAccountType !== null;
+const getSandboxTypeAsString = accountType => {
+  if (
+    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX ||
+    accountType === DEVELOPER_SANDBOX // remove line once sandboxAccountType is removed
+  ) {
+    return 'development'; // Only place we're using this specific name
+  }
+  return STANDARD_SANDBOX_TYPE;
+};
 
-function getAccountName(config, bold = true) {
-  const sandboxName = `[${getSandboxTypeAsString(
-    config.sandboxAccountType
+const getSandboxName = config =>
+  `[${getSandboxTypeAsString(
+    config.accountType || config.sandboxAccountType
   )} sandbox] `;
 
-  const message = `${config.name} ${isSandbox(config) ? sandboxName : ''}(${
-    config.portalId
-  })`;
-
-  return bold ? chalk.bold(message) : message;
-}
+const isSandbox = config =>
+  config.accountType
+    ? config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
+      config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
+    : config.sandboxAccountType && config.sandboxAccountType !== null;
 
 function getHasSandboxesByType(parentAccountConfig, type) {
   const config = getConfig();
@@ -153,13 +146,13 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
   if (!usage) {
     throw new Error('Unable to fetch sandbox usage limits. Please try again.');
   }
-  if (sandboxType === DEVELOPER_SANDBOX) {
-    if (usage['DEVELOPER'].available === 0) {
-      const devSandboxLimit = usage['DEVELOPER'].limit;
+  if (sandboxType === DEVELOPER_SANDBOX_TYPE) {
+    if (usage[DEVELOPER_SANDBOX].available === 0) {
+      const devSandboxLimit = usage[DEVELOPER_SANDBOX].limit;
       const plural = devSandboxLimit !== 1;
       const hasDevelopmentSandboxes = getHasSandboxesByType(
         accountConfig,
-        DEVELOPER_SANDBOX
+        DEVELOPER_SANDBOX_TYPE
       );
       if (hasDevelopmentSandboxes) {
         throw new Error(
@@ -190,13 +183,13 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
       }
     }
   }
-  if (sandboxType === STANDARD_SANDBOX) {
-    if (usage['STANDARD'].available === 0) {
-      const standardSandboxLimit = usage['STANDARD'].limit;
+  if (sandboxType === STANDARD_SANDBOX_TYPE) {
+    if (usage[STANDARD_SANDBOX].available === 0) {
+      const standardSandboxLimit = usage[STANDARD_SANDBOX].limit;
       const plural = standardSandboxLimit !== 1;
       const hasStandardSandboxes = getHasSandboxesByType(
         accountConfig,
-        STANDARD_SANDBOX
+        STANDARD_SANDBOX_TYPE
       );
       if (hasStandardSandboxes) {
         throw new Error(
@@ -229,78 +222,6 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
   }
 };
 
-/**
- * @param {String} env - Environment (QA/Prod)
- * @param {Object} result - Sandbox instance returned from API
- * @param {Boolean} force - Force flag to skip prompt
- * @returns {String} validName saved into config
- */
-const saveSandboxToConfig = async (env, result, force = false) => {
-  let personalAccessKey = result.personalAccessKey;
-  if (!personalAccessKey) {
-    const configData = await personalAccessKeyPrompt({
-      env,
-      account: result.sandbox.sandboxHubId,
-    });
-    personalAccessKey = configData.personalAccessKey;
-  }
-
-  let updatedConfig;
-
-  try {
-    const token = await getAccessToken(personalAccessKey, env);
-    updatedConfig = await updateConfigWithAccessToken(
-      token,
-      personalAccessKey,
-      env
-    );
-  } catch (e) {
-    logErrorInstance(e);
-  }
-
-  if (!updatedConfig) {
-    throw new Error('Failed to update config with personal access key.');
-  }
-
-  let validName = updatedConfig.name;
-  if (!updatedConfig.name) {
-    const nameForConfig = result.sandbox.name
-      .toLowerCase()
-      .split(' ')
-      .join('-');
-    validName = nameForConfig;
-    const invalidAccountName = accountNameExistsInConfig(nameForConfig);
-    if (invalidAccountName) {
-      if (!force) {
-        logger.log('');
-        logger.warn(
-          i18n(
-            `cli.lib.prompts.enterAccountNamePrompt.errors.accountNameExists`,
-            { name: nameForConfig }
-          )
-        );
-        const { name: promptName } = await enterAccountNamePrompt(
-          nameForConfig + `_${result.sandbox.sandboxHubId}`
-        );
-        validName = promptName;
-      } else {
-        // Basic invalid name handling when force flag is passed
-        validName = nameForConfig + `_${result.sandbox.sandboxHubId}`;
-      }
-    }
-  }
-  updateAccountConfig({
-    ...updatedConfig,
-    environment: updatedConfig.env,
-    tokenInfo: updatedConfig.auth.tokenInfo,
-    name: validName,
-  });
-  writeConfig();
-
-  logger.log('');
-  return validName;
-};
-
 const ACTIVE_TASK_POLL_INTERVAL = 1000;
 
 const isTaskComplete = task => {
@@ -332,7 +253,6 @@ function pollSyncTaskStatus(
   const mergeTasks = {
     'lead-flows': 'forms', // lead-flows are a subset of forms. We combine these in the UI as a single item, so we want to merge here for consistency.
   };
-  const ignoreTasks = ['gates'];
   let progressCounter = {};
   let pollInterval;
   // Handle manual exit for return key and ctrl+c
@@ -368,16 +288,16 @@ function pollSyncTaskStatus(
         // Array of sync tasks, eg: workflows, pipelines, object-schemas, etc. with each task containing a status of 'PENDING', 'IN_PROGRESS', 'COMPLETE', and 'FAILURE'
         for (const task of taskResult.tasks) {
           // For each sync task, show a progress bar and increment bar each time we run this interval until status is 'COMPLETE'
-          const taskType = task.type;
-          if (
-            !progressBar.get(taskType) &&
-            !mergeTasks[taskType] &&
-            !ignoreTasks.includes(taskType)
-          ) {
+          let taskType = task.type;
+          const taskTypeLabel = i18n(`${i18nKey}.${taskType}.label`);
+          if (taskTypeLabel.startsWith(MISSING_LANGUAGE_DATA_PREFIX)) {
+            continue;
+          }
+          if (!progressBar.get(taskType) && !mergeTasks[taskType]) {
             // skip creation of lead-flows bar because we're combining lead-flows into the forms bar, otherwise create a bar instance for the type
             progressCounter[taskType] = 0;
             progressBar.create(taskType, 100, 0, {
-              label: i18n(`${i18nKey}.${taskType}.label`),
+              label: taskTypeLabel,
             });
           } else if (mergeTasks[taskType]) {
             // It's a lead-flow here, merge status into the forms progress bar
@@ -408,7 +328,7 @@ function pollSyncTaskStatus(
           }
           if (progressBar.get(taskType) && task.status === 'COMPLETE') {
             progressBar.update(taskType, 100, {
-              label: i18n(`${i18nKey}.${taskType}.label`),
+              label: taskTypeLabel,
             });
           } else if (
             // Do not start incrementing for tasks still in PENDING state
@@ -421,7 +341,7 @@ function pollSyncTaskStatus(
               taskType === syncTypes.OBJECT_RECORDS ? 2 : 3 // slower progress for object-records, sync can take up to a few minutes
             );
             progressBar.update(taskType, progressCounter[taskType], {
-              label: i18n(`${i18nKey}.${taskType}.label`),
+              label: taskTypeLabel,
             });
           }
         }
@@ -440,15 +360,12 @@ function pollSyncTaskStatus(
 }
 
 module.exports = {
-  STANDARD_SANDBOX,
-  DEVELOPER_SANDBOX,
   sandboxTypeMap,
   sandboxApiTypeMap,
   syncTypes,
   isSandbox,
+  getSandboxName,
   getSandboxTypeAsString,
-  getAccountName,
-  saveSandboxToConfig,
   getHasSandboxesByType,
   getSandboxLimit,
   validateSandboxUsageLimits,

package/lib/schema.js

@@ -1,7 +1,9 @@
 const chalk = require('chalk');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { table, getBorderCharacters } = require('table');
-const { fetchSchemas } = require('@hubspot/cli-lib/api/schema');
+const {
+  fetchObjectSchemas,
+} = require('@hubspot/local-dev-lib/api/customObjects');
 
 const logSchemas = schemas => {
   const data = schemas
@@ -22,7 +24,7 @@ const logSchemas = schemas => {
 };
 
 const listSchemas = async accountId => {
-  const response = await fetchSchemas(accountId);
+  const response = await fetchObjectSchemas(accountId);
   logSchemas(response.results);
 };
 

package/lib/ui.js

@@ -4,6 +4,11 @@ const supportsColor = require('../lib/supportsColor');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { isSandbox, getSandboxName } = require('./sandboxes');
+const {
+  isDeveloperTestAccount,
+  DEV_TEST_ACCOUNT_STRING,
+} = require('./developerTestAccounts');
 
 const UI_COLORS = {
   SORBET: '#FF8F59',
@@ -65,16 +70,22 @@ const uiLink = (linkText, url) => {
 };
 
 /**
- * Returns formatted account name and ID
+ * Returns formatted account name, account type (if applicable), and ID
  *
  * @param {number} accountId
+ * @param {boolean} bold
  * @returns {string}
  */
-const uiAccountDescription = accountId => {
+const uiAccountDescription = (accountId, bold = true) => {
   const account = getAccountConfig(accountId);
-  return chalk.bold(
-    account.name ? `${account.name} (${account.portalId})` : account.portalId
-  );
+  let accountTypeString = '';
+  if (isSandbox(account)) {
+    accountTypeString = getSandboxName(account);
+  } else if (isDeveloperTestAccount(account)) {
+    accountTypeString = `[${DEV_TEST_ACCOUNT_STRING}] `;
+  }
+  const message = `${account.name} ${accountTypeString}(${account.portalId})`;
+  return bold ? chalk.bold(message) : message;
 };
 
 const uiInfoSection = (title, logContent) => {

package/lib/validation.js

@@ -206,29 +206,31 @@ const fileExists = _path => {
   return true;
 };
 
-const isFileValidJSON = _path => {
+const checkAndConvertToJson = _path => {
   const filePath = getAbsoluteFilePath(_path);
   if (!fileExists(filePath)) return false;
 
   if (getExt(_path) !== 'json') {
     logger.error(`The file "${_path}" must be a valid JSON file`);
-    return false;
+    return null;
   }
 
+  let result;
+
   try {
-    JSON.parse(fs.readFileSync(filePath));
+    result = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
   } catch (e) {
     logger.error(`The file "${_path}" contains invalid JSON`);
-    return false;
+    result = null;
   }
 
-  return true;
+  return result;
 };
 
 module.exports = {
   validateMode,
   validateAccount,
-  isFileValidJSON,
+  checkAndConvertToJson,
   fileExists,
   loadAndValidateOptions,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.3",
+  "version": "5.1.4-beta.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@hubspot/cli-lib": "^9.0.0",
-    "@hubspot/local-dev-lib": "^0.3.0",
-    "@hubspot/serverless-dev-runtime": "5.1.3",
+    "@hubspot/local-dev-lib": "^0.3.4",
+    "@hubspot/serverless-dev-runtime": "5.1.4-beta.1",
     "@hubspot/ui-extensions-dev-server": "0.8.9",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a6b8f2aa5d3585913fb74932d13c3e1891582a84"
+  "gitHead": "8c66f7e80438c191d2e5148d9cc08e64dca7cf6e"
 }