@hubspot/cli 5.2.1-beta.9 → 5.3.0

package/lib/projects.js

@@ -60,8 +60,10 @@ const writeProjectConfig = (configPath, config) => {
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
     logger.debug(`Wrote project config at ${configPath}`);
   } catch (e) {
-    logger.error(`Could not write project config at ${configPath}`);
+    logger.debug(e);
+    return false;
   }
+  return true;
 };
 
 const getIsInProject = _dir => {
@@ -326,17 +328,19 @@ const getProjectDetailUrl = (projectName, accountId) => {
   return `${getProjectHomeUrl(accountId)}/project/${projectName}`;
 };
 
+const getProjectActivityUrl = (projectName, accountId) => {
+  if (!projectName) return;
+  return `${getProjectDetailUrl(projectName, accountId)}/activity`;
+};
+
 const getProjectBuildDetailUrl = (projectName, buildId, accountId) => {
   if (!projectName || !buildId || !accountId) return;
-  return `${getProjectDetailUrl(projectName, accountId)}/build/${buildId}`;
+  return `${getProjectActivityUrl(projectName, accountId)}/build/${buildId}`;
 };
 
 const getProjectDeployDetailUrl = (projectName, deployId, accountId) => {
   if (!projectName || !deployId || !accountId) return;
-  return `${getProjectDetailUrl(
-    projectName,
-    accountId
-  )}/activity/deploy/${deployId}`;
+  return `${getProjectActivityUrl(projectName, accountId)}/deploy/${deployId}`;
 };
 
 const uploadProjectFiles = async (
@@ -405,7 +409,7 @@ const pollProjectBuildAndDeploy = async (
   buildId,
   silenceLogs = false
 ) => {
-  const buildStatus = await pollBuildStatus(
+  let buildStatus = await pollBuildStatus(
     accountId,
     projectConfig.name,
     buildId,
@@ -413,16 +417,6 @@ const pollProjectBuildAndDeploy = async (
     silenceLogs
   );
 
-  const {
-    autoDeployId,
-    isAutoDeployEnabled,
-    deployStatusTaskLocator,
-  } = buildStatus;
-
-  // autoDeployId of 0 indicates a skipped deploy
-  const isDeploying =
-    isAutoDeployEnabled && autoDeployId > 0 && deployStatusTaskLocator;
-
   if (!silenceLogs) {
     uiLine();
   }
@@ -437,7 +431,7 @@ const pollProjectBuildAndDeploy = async (
   if (buildStatus.status === 'FAILURE') {
     result.succeeded = false;
     return result;
-  } else if (isDeploying) {
+  } else if (buildStatus.isAutoDeployEnabled) {
     if (!silenceLogs) {
       logger.log(
         i18n(
@@ -452,17 +446,45 @@ const pollProjectBuildAndDeploy = async (
       displayWarnLogs(accountId, projectConfig.name, buildId);
     }
 
-    const deployStatus = await pollDeployStatus(
-      accountId,
-      projectConfig.name,
-      deployStatusTaskLocator.id,
-      buildId,
-      silenceLogs
-    );
-    result.deployResult = deployStatus;
+    // autoDeployId of 0 indicates a skipped deploy
+    const getIsDeploying = () =>
+      buildStatus.autoDeployId > 0 && buildStatus.deployStatusTaskLocator;
+
+    // Sometimes the deploys do not immediately initiate, give them a chance to kick off
+    if (!getIsDeploying()) {
+      buildStatus = await pollBuildAutodeployStatus(
+        accountId,
+        projectConfig.name,
+        buildId
+      );
+    }
+
+    if (getIsDeploying()) {
+      const deployStatus = await pollDeployStatus(
+        accountId,
+        projectConfig.name,
+        buildStatus.deployStatusTaskLocator.id,
+        buildId,
+        silenceLogs
+      );
+      result.deployResult = deployStatus;
 
-    if (deployStatus.status === 'FAILURE') {
-      result.succeeded = false;
+      if (deployStatus.status === 'FAILURE') {
+        result.succeeded = false;
+      }
+    } else if (!silenceLogs) {
+      logger.log(
+        i18n(
+          `${i18nKey}.pollProjectBuildAndDeploy.unableToFindAutodeployStatus`,
+          {
+            buildId,
+            viewDeploysLink: uiLink(
+              i18n(`${i18nKey}.pollProjectBuildAndDeploy.viewDeploys`),
+              getProjectActivityUrl(projectConfig.name, accountId)
+            ),
+          }
+        )
+      );
     }
   }
 
@@ -588,17 +610,6 @@ const makePollTaskStatusFunc = ({
   statusStrings,
   linkToHubSpot,
 }) => {
-  const isTaskComplete = task => {
-    if (
-      !task[statusText.SUBTASK_KEY].length ||
-      task.status === statusText.STATES.FAILURE
-    ) {
-      return true;
-    } else if (task.status === statusText.STATES.SUCCESS) {
-      return task.isAutoDeployEnabled ? !!task.deployStatusTaskLocator : true;
-    }
-  };
-
   return async (
     accountId,
     taskName,
@@ -635,9 +646,9 @@ const makePollTaskStatusFunc = ({
 
     const tasksById = initialTaskStatus[statusText.SUBTASK_KEY].reduce(
       (acc, task) => {
-        const type = task[statusText.TYPE_KEY];
-        if (type !== 'APP_ID' && type !== 'SERVERLESS_PKG') {
-          acc[task.id] = task;
+        const { id, visible } = task;
+        if (visible) {
+          acc[id] = task;
         }
         return acc;
       },
@@ -677,7 +688,7 @@ const makePollTaskStatusFunc = ({
         const formattedTaskType = PROJECT_TASK_TYPES[taskType]
           ? `[${PROJECT_TASK_TYPES[taskType]}]`
           : '';
-        const text = `${statusText.STATUS_TEXT} ${chalk.bold(
+        const text = `${indent <= 2 ? statusText.STATUS_TEXT : ''} ${chalk.bold(
           taskName
         )} ${formattedTaskType} ...${newline ? '\n' : ''}`;
 
@@ -703,13 +714,7 @@ const makePollTaskStatusFunc = ({
         try {
           taskStatus = await statusFn(accountId, taskName, taskId);
         } catch (e) {
-          logApiErrorInstance(
-            e,
-            new ApiErrorContext({
-              accountId,
-              projectName: taskName,
-            })
-          );
+          logger.debug(e);
           return reject(
             new Error(
               i18n(
@@ -785,61 +790,64 @@ const makePollTaskStatusFunc = ({
             }
           });
 
-          if (isTaskComplete(taskStatus)) {
-            if (status === statusText.STATES.SUCCESS) {
-              SpinniesManager.succeed(overallTaskSpinniesKey, {
-                text: statusStrings.SUCCESS(taskName, displayId),
-              });
-            } else if (status === statusText.STATES.FAILURE) {
-              SpinniesManager.fail(overallTaskSpinniesKey, {
-                text: statusStrings.FAIL(taskName, displayId),
-              });
-
-              if (!silenceLogs) {
-                const failedSubtasks = subTaskStatus.filter(
-                  subtask => subtask.status === 'FAILURE'
-                );
-
-                uiLine();
+          if (status === statusText.STATES.SUCCESS) {
+            SpinniesManager.succeed(overallTaskSpinniesKey, {
+              text: statusStrings.SUCCESS(taskName, displayId),
+            });
+            clearInterval(pollInterval);
+            resolve(taskStatus);
+          } else if (status === statusText.STATES.FAILURE) {
+            SpinniesManager.fail(overallTaskSpinniesKey, {
+              text: statusStrings.FAIL(taskName, displayId),
+            });
+
+            if (!silenceLogs) {
+              const failedSubtasks = subTaskStatus.filter(
+                subtask => subtask.status === 'FAILURE'
+              );
+
+              uiLine();
+              logger.log(
+                `${statusStrings.SUBTASK_FAIL(
+                  displayId,
+                  failedSubtasks.length === 1
+                    ? failedSubtasks[0][statusText.SUBTASK_NAME_KEY]
+                    : failedSubtasks.length + ' components'
+                )}\n`
+              );
+              logger.log('See below for a summary of errors.');
+              uiLine();
+
+              const displayErrors = failedSubtasks.filter(
+                subtask =>
+                  subtask.standardError.subCategory !==
+                    PROJECT_ERROR_TYPES.SUBBUILD_FAILED &&
+                  subtask.standardError.subCategory !==
+                    PROJECT_ERROR_TYPES.SUBDEPLOY_FAILED
+              );
+
+              displayErrors.forEach(subTask => {
                 logger.log(
-                  `${statusStrings.SUBTASK_FAIL(
-                    displayId,
-                    failedSubtasks.length === 1
-                      ? failedSubtasks[0][statusText.SUBTASK_NAME_KEY]
-                      : failedSubtasks.length + ' components'
-                  )}\n`
-                );
-                logger.log('See below for a summary of errors.');
-                uiLine();
-
-                const displayErrors = failedSubtasks.filter(
-                  subtask =>
-                    subtask.standardError.subCategory !==
-                      PROJECT_ERROR_TYPES.SUBBUILD_FAILED &&
-                    subtask.standardError.subCategory !==
-                      PROJECT_ERROR_TYPES.SUBDEPLOY_FAILED
+                  `\n--- ${chalk.bold(
+                    subTask[statusText.SUBTASK_NAME_KEY]
+                  )} failed with the following error ---`
                 );
-
-                displayErrors.forEach(subTask => {
-                  logger.log(
-                    `\n--- ${chalk.bold(
-                      subTask[statusText.SUBTASK_NAME_KEY]
-                    )} failed with the following error ---`
-                  );
-                  logger.error(subTask.errorMessage);
-
-                  // Log nested errors
-                  if (subTask.standardError && subTask.standardError.errors) {
-                    logger.log();
-                    subTask.standardError.errors.forEach(error => {
-                      logger.log(error.message);
-                    });
-                  }
-                });
-              }
+                logger.error(subTask.errorMessage);
+
+                // Log nested errors
+                if (subTask.standardError && subTask.standardError.errors) {
+                  logger.log();
+                  subTask.standardError.errors.forEach(error => {
+                    logger.log(error.message);
+                  });
+                }
+              });
             }
             clearInterval(pollInterval);
             resolve(taskStatus);
+          } else if (!subTaskStatus.length) {
+            clearInterval(pollInterval);
+            resolve(taskStatus);
           }
         }
       }, POLLING_DELAY);
@@ -847,6 +855,41 @@ const makePollTaskStatusFunc = ({
   };
 };
 
+const pollBuildAutodeployStatus = (accountId, taskName, buildId) => {
+  return new Promise((resolve, reject) => {
+    let maxIntervals = (30 * 1000) / POLLING_DELAY; // Num of intervals in ~30s
+
+    const pollInterval = setInterval(async () => {
+      let taskStatus;
+      try {
+        taskStatus = await getBuildStatus(accountId, taskName, buildId);
+      } catch (e) {
+        logger.debug(e);
+        return reject(
+          new Error(
+            i18n(`${i18nKey}.pollBuildAutodeployStatusError`, { buildId })
+          )
+        );
+      }
+
+      if (!taskStatus || !taskStatus.status) {
+        return reject(
+          new Error(
+            i18n(`${i18nKey}.pollBuildAutodeployStatusError`, { buildId })
+          )
+        );
+      }
+
+      if (taskStatus.deployStatusTaskLocator || maxIntervals <= 0) {
+        clearInterval(pollInterval);
+        resolve(taskStatus);
+      } else {
+        maxIntervals -= 1;
+      }
+    }, POLLING_DELAY);
+  });
+};
+
 const pollBuildStatus = makePollTaskStatusFunc({
   linkToHubSpot: (accountId, taskName, taskId) =>
     uiLink(

package/lib/prompts/accountNamePrompt.js

@@ -45,9 +45,6 @@ const hubspotAccountNamePrompt = ({ accountType, currentPortalCount = 0 }) => {
     promptMessageString = isDevelopmentSandbox
       ? i18n(`${i18nKey}.enterDevelopmentSandboxName`)
       : i18n(`${i18nKey}.enterStandardSandboxName`);
-    defaultName = i18n(`${i18nKey}.sandboxDefaultName`, {
-      sandboxType: isDevelopmentSandbox ? 'development' : 'standard',
-    });
   } else if (isDeveloperTestAccount) {
     promptMessageString = i18n(`${i18nKey}.enterDeveloperTestAccountName`);
     defaultName = i18n(`${i18nKey}.developerTestAccountDefaultName`, {
@@ -62,7 +59,7 @@ const hubspotAccountNamePrompt = ({ accountType, currentPortalCount = 0 }) => {
       validate(val) {
         if (typeof val !== 'string') {
           return i18n(`${i18nKey}.errors.invalidName`);
-        } else if (!val.length) {
+        } else if (!val.trim().length) {
           return i18n(`${i18nKey}.errors.nameRequired`);
         }
         return accountNameExistsInConfig(val)

package/lib/prompts/createProjectPrompt.js

@@ -1,6 +1,10 @@
 const fs = require('fs');
 const path = require('path');
-const { getCwd } = require('@hubspot/local-dev-lib/path');
+const {
+  getCwd,
+  sanitizeFileName,
+  isValidPath,
+} = require('@hubspot/local-dev-lib/path');
 const { PROJECT_COMPONENT_TYPES } = require('../../lib/constants');
 const { promptUser } = require('./promptUtils');
 const { fetchFileFromRepository } = require('@hubspot/local-dev-lib/github');
@@ -79,7 +83,10 @@ const createProjectPrompt = async (
       message: i18n(`${i18nKey}.enterLocation`),
       when: !promptOptions.location,
       default: answers => {
-        return path.resolve(getCwd(), answers.name || promptOptions.name);
+        const projectName = sanitizeFileName(
+          answers.name || promptOptions.name
+        );
+        return path.resolve(getCwd(), projectName);
       },
       validate: input => {
         if (!input) {
@@ -88,6 +95,9 @@ const createProjectPrompt = async (
         if (fs.existsSync(input)) {
           return i18n(`${i18nKey}.errors.invalidLocation`);
         }
+        if (!isValidPath(input)) {
+          return i18n(`${i18nKey}.errors.invalidCharacters`);
+        }
         return true;
       },
     },

package/lib/prompts/deployBuildIdPrompt.js

@@ -0,0 +1,22 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+
+const i18nKey = 'lib.prompts.deployBuildIdPrompt';
+
+const deployBuildIdPrompt = (latestBuildId, deployedBuildId, validate) => {
+  return promptUser({
+    name: 'buildId',
+    message: i18n(`${i18nKey}.enterBuildId`),
+    default: () => {
+      if (latestBuildId === deployedBuildId) {
+        return;
+      }
+      return latestBuildId;
+    },
+    validate,
+  });
+};
+
+module.exports = {
+  deployBuildIdPrompt,
+};

package/lib/prompts/installPublicAppPrompt.js

@@ -12,20 +12,29 @@ const installPublicAppPrompt = async (
   targetAccountId,
   clientId,
   scopes,
-  redirectUrls
+  redirectUrls,
+  isReinstall = false
 ) => {
   logger.log('');
-  logger.log(i18n(`${i18nKey}.explanation`));
+  if (isReinstall) {
+    logger.log(i18n(`${i18nKey}.reinstallExplanation`));
+  } else {
+    logger.log(i18n(`${i18nKey}.explanation`));
+  }
 
   const { shouldOpenBrowser } = await promptUser({
     name: 'shouldOpenBrowser',
     type: 'confirm',
-    message: i18n(`${i18nKey}.prompt`),
+    message: i18n(
+      isReinstall ? `${i18nKey}.reinstallPrompt` : `${i18nKey}.prompt`
+    ),
   });
 
-  if (!shouldOpenBrowser) {
+  if (!isReinstall && !shouldOpenBrowser) {
     logger.log(i18n(`${i18nKey}.decline`));
     process.exit(EXIT_CODES.SUCCESS);
+  } else if (!shouldOpenBrowser) {
+    return;
   }
 
   const websiteOrigin = getHubSpotWebsiteOrigin(env);

package/lib/prompts/selectPublicAppPrompt.js

@@ -10,17 +10,35 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'lib.prompts.selectPublicAppPrompt';
 
-const fetchPublicAppOptions = async (accountId, accountName) => {
+const fetchPublicAppOptions = async (
+  accountId,
+  accountName,
+  isMigratingApp = false
+) => {
   try {
     const publicApps = await fetchPublicAppsForPortal(accountId);
     const filteredPublicApps = publicApps.filter(
       app => !app.projectId && !app.sourceId
     );
 
-    if (!filteredPublicApps.length) {
+    if (
+      !filteredPublicApps.length ||
+      (isMigratingApp &&
+        !filteredPublicApps.some(
+          app => !app.preventProjectMigrations || !app.listingInfo
+        ))
+    ) {
+      const headerTranslationKey = isMigratingApp
+        ? 'noAppsMigration'
+        : 'noAppsClone';
+      const messageTranslationKey = isMigratingApp
+        ? 'noAppsMigrationMessage'
+        : 'noAppsCloneMessage';
       uiLine();
-      logger.error(i18n(`${i18nKey}.errors.noApps`));
-      logger.log(i18n(`${i18nKey}.errors.noAppsMessage`, { accountName }));
+      logger.error(i18n(`${i18nKey}.errors.${headerTranslationKey}`));
+      logger.log(
+        i18n(`${i18nKey}.errors.${messageTranslationKey}`, { accountName })
+      );
       uiLine();
       process.exit(EXIT_CODES.SUCCESS);
     }
@@ -35,10 +53,16 @@ const fetchPublicAppOptions = async (accountId, accountName) => {
 const selectPublicAppPrompt = async ({
   accountId,
   accountName,
-  migrateApp = false,
+  isMigratingApp = false,
 }) => {
-  const publicApps = await fetchPublicAppOptions(accountId, accountName);
-  const translationKey = migrateApp ? 'selectAppIdMigrate' : 'selectAppIdClone';
+  const publicApps = await fetchPublicAppOptions(
+    accountId,
+    accountName,
+    isMigratingApp
+  );
+  const translationKey = isMigratingApp
+    ? 'selectAppIdMigrate'
+    : 'selectAppIdClone';
 
   return promptUser([
     {
@@ -48,10 +72,11 @@ const selectPublicAppPrompt = async ({
       }),
       type: 'list',
       choices: publicApps.map(app => {
-        if (app.listingInfo) {
+        const { preventProjectMigrations, listingInfo } = app;
+        if (isMigratingApp && preventProjectMigrations && listingInfo) {
           return {
             name: `${app.name} (${app.id})`,
-            disabled: i18n(`${i18nKey}.errors.marketplaceApp`),
+            disabled: i18n(`${i18nKey}.errors.cannotBeMigrated`),
           };
         }
         return {
@@ -64,6 +89,5 @@ const selectPublicAppPrompt = async ({
 };
 
 module.exports = {
-  fetchPublicAppOptions,
   selectPublicAppPrompt,
 };