@hubspot/cli 5.4.0 → 6.0.0

package/lib/prompts/projectsLogsPrompt.js

@@ -1,120 +1,29 @@
 const { i18n } = require('../lang');
-const { fetchProject } = require('@hubspot/local-dev-lib/api/projects');
 const { promptUser } = require('./promptUtils');
-const { getAccountId } = require('../commonOpts');
-const { getProjectConfig, ensureProjectExists } = require('../projects');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('../../lib/errorHandlers/apiErrors');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { EXIT_CODES } = require('../enums/exitCodes');
 
 const i18nKey = 'lib.prompts.projectLogsPrompt';
 
-const SERVERLESS_FUNCTION_TYPES = {
-  APP_FUNCTION: 'app-function',
-  PUBLIC_ENDPOINT: 'public-endpoint',
-};
+const projectLogsPrompt = async ({
+  functionChoices,
+  promptOptions,
+  projectName = {},
+}) => {
+  if (!functionChoices) {
+    return {};
+  }
+  if (functionChoices && functionChoices.length === 1) {
+    return { functionName: functionChoices[0] };
+  }
 
-const projectLogsPrompt = (accountId, promptOptions = {}) => {
   return promptUser([
-    {
-      name: 'projectName',
-      message: i18n(`${i18nKey}.projectName.message`),
-      when: !promptOptions.project,
-      default: async () => {
-        const { projectConfig } = await getProjectConfig();
-        return projectConfig && projectConfig.name ? projectConfig.name : null;
-      },
-      validate: name =>
-        !name.length ? i18n(`${i18nKey}.projectName.error`) : true,
-    },
-    {
-      name: 'logType',
-      type: 'list',
-      message: i18n(`${i18nKey}.logType.message`),
-      when:
-        !promptOptions.app &&
-        !promptOptions.function &&
-        !promptOptions.endpoint,
-      choices: [
-        {
-          name: i18n(`${i18nKey}.logType.function`),
-          value: SERVERLESS_FUNCTION_TYPES.APP_FUNCTION,
-        },
-        {
-          name: i18n(`${i18nKey}.logType.endpoint`),
-          value: SERVERLESS_FUNCTION_TYPES.PUBLIC_ENDPOINT,
-        },
-      ],
-    },
-    {
-      name: 'appName',
-      type: 'list',
-      message: i18n(`${i18nKey}.appName`),
-      when: ({ logType }) => {
-        return (
-          (promptOptions.function ||
-            logType === SERVERLESS_FUNCTION_TYPES.APP_FUNCTION) &&
-          !promptOptions.app &&
-          !promptOptions.endpoint
-        );
-      },
-      choices: async ({ projectName }) => {
-        const name = projectName || promptOptions.project;
-
-        try {
-          await ensureProjectExists(accountId, name, {
-            allowCreate: false,
-          });
-          const { deployedBuild } = await fetchProject(accountId, name);
-
-          if (deployedBuild && deployedBuild.subbuildStatuses) {
-            return deployedBuild.subbuildStatuses
-              .filter(subbuild => subbuild.buildType === 'PRIVATE_APP')
-              .map(subbuild => ({
-                name: subbuild.buildName,
-                value: subbuild.buildName,
-              }));
-          } else {
-            logger.debug('Failed to fetch project');
-            process.exit(EXIT_CODES.ERROR);
-          }
-        } catch (e) {
-          const { projectConfig } = await getProjectConfig();
-          const projectName = projectConfig.name;
-
-          logApiErrorInstance(
-            e,
-            new ApiErrorContext({ accountId: getAccountId(), projectName })
-          );
-          process.exit(EXIT_CODES.ERROR);
-        }
-      },
-    },
     {
       name: 'functionName',
-      message: i18n(`${i18nKey}.functionName`),
-      when: ({ logType }) => {
-        return (
-          (promptOptions.app ||
-            logType === SERVERLESS_FUNCTION_TYPES.APP_FUNCTION) &&
-          !promptOptions.function &&
-          !promptOptions.endpoint
-        );
-      },
-    },
-    {
-      name: 'endpointName',
-      message: i18n(`${i18nKey}.endpointName`),
-      when: ({ logType }) => {
-        return (
-          logType === SERVERLESS_FUNCTION_TYPES.PUBLIC_ENDPOINT &&
-          !promptOptions.function &&
-          !promptOptions.endpoint
-        );
-      },
+      type: 'list',
+      message: i18n(`${i18nKey}.functionName`, { projectName }),
+      when: () =>
+        (!promptOptions || !promptOptions.function) &&
+        functionChoices.length > 0,
+      choices: functionChoices,
     },
   ]);
 };

package/lib/sandboxSync.js

@@ -4,14 +4,12 @@ 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 {
-  debugErrorAndContext,
-  logErrorInstance,
-} = require('./errorHandlers/standardErrors');
-const {
-  isSpecifiedError,
-  isMissingScopeError,
-} = require('@hubspot/local-dev-lib/errors/apiErrors');
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('./errorHandlers/apiErrors');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const {
@@ -97,13 +95,7 @@ const syncSandbox = async ({
     });
 
     logger.log('');
-    if (isMissingScopeError(err)) {
-      logger.error(
-        i18n(`${i18nKey}.failure.missingScopes`, {
-          accountName: uiAccountDescription(parentAccountId),
-        })
-      );
-    } else if (
+    if (
       isSpecifiedError(err, {
         statusCode: 403,
         category: 'BANNED',
@@ -163,7 +155,13 @@ const syncSandbox = async ({
         'https://app.hubspot.com/l/docs/guides/crm/project-cli-commands#developer-projects-cli-commands-beta'
       );
     } else {
-      logErrorInstance(err);
+      logApiErrorInstance(
+        err,
+        new ApiErrorContext({
+          accountId: parentAccountId,
+          request: 'sandbox sync',
+        })
+      );
     }
     logger.log('');
     throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.4.0",
+  "version": "6.0.0",
   "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/local-dev-lib": "1.10.0",
-    "@hubspot/serverless-dev-runtime": "5.3.0",
+    "@hubspot/local-dev-lib": "1.13.0",
+    "@hubspot/serverless-dev-runtime": "6.0.0",
     "@hubspot/theme-preview-dev-server": "0.0.7",
-    "@hubspot/ui-extensions-dev-server": "0.8.30",
+    "@hubspot/ui-extensions-dev-server": "0.8.33",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -37,7 +37,7 @@
     "mock-stdin": "^1.0.0"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "bin": {
     "hs": "./bin/hs",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb76ce9051e5f44c45e8c763930439c168a489ec"
+  "gitHead": "d01e7f7c6222133ffac7c6dd757fb95247a04b25"
 }

package/commands/sandbox/sync.js

@@ -1,225 +0,0 @@
-const {
-  addAccountOptions,
-  addConfigOptions,
-  getAccountId,
-  addUseEnvironmentOptions,
-  addTestingOptions,
-} = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-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 { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { promptUser } = require('../../lib/prompts/promptUtils');
-const {
-  uiLine,
-  uiAccountDescription,
-  uiDeprecatedMessage,
-  uiDeprecatedDescription,
-} = require('../../lib/ui');
-const {
-  isSandbox,
-  isStandardSandbox,
-  isDevelopmentSandbox,
-} = require('../../lib/accountTypes');
-const {
-  getAvailableSyncTypes,
-  getSyncTypesWithContactRecordsPrompt,
-} = require('../../lib/sandboxes');
-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 {
-  HUBSPOT_ACCOUNT_TYPE_STRINGS,
-  HUBSPOT_ACCOUNT_TYPES,
-} = require('@hubspot/local-dev-lib/constants/config');
-
-const i18nKey = 'commands.sandbox.subcommands.sync';
-
-exports.command = 'sync';
-exports.describe = uiDeprecatedDescription(
-  i18n(`${i18nKey}.describe`),
-  'hs sandbox sync'
-);
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
-
-  uiDeprecatedMessage('hs sandbox sync');
-
-  const { force } = options; // For scripting purposes
-  const accountId = getAccountId(options);
-  const accountConfig = getAccountConfig(accountId);
-  const env = getValidEnv(getEnv(accountId));
-
-  trackCommandUsage(
-    'sandbox-sync',
-    { type: accountConfig.accountType },
-    accountId
-  );
-
-  if (
-    // Check if default account is a sandbox, otherwise exit
-    !isSandbox(accountConfig)
-  ) {
-    logger.error(
-      i18n(`${i18nKey}.failure.invalidAccountType`, {
-        accountType:
-          HUBSPOT_ACCOUNT_TYPE_STRINGS[
-            HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]
-          ],
-      })
-    );
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  // Verify parent account exists in the config
-  let parentAccountId = accountConfig.parentAccountId || undefined;
-  if (!parentAccountId || !getAccountId({ account: parentAccountId })) {
-    logger.log('');
-    logger.error(
-      i18n(`${i18nKey}.failure.missingParentPortal`, {
-        sandboxName: uiAccountDescription(accountId),
-      })
-    );
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  const parentAccountConfig = getAccountConfig(parentAccountId);
-
-  let availableSyncTasks;
-  try {
-    availableSyncTasks = await getAvailableSyncTypes(
-      parentAccountConfig,
-      accountConfig
-    );
-  } catch (error) {
-    if (
-      isSpecifiedError(error, {
-        statusCode: 404,
-        category: 'OBJECT_NOT_FOUND',
-        subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
-      })
-    ) {
-      logger.error(
-        i18n('lib.sandbox.sync.failure.objectNotFound', {
-          account: uiAccountDescription(accountId),
-        })
-      );
-    } else {
-      logErrorInstance(error);
-    }
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  if (isDevelopmentSandbox(accountConfig)) {
-    logger.log(i18n(`${i18nKey}.info.developmentSandbox`));
-    logger.log(
-      i18n(`${i18nKey}.info.sync`, {
-        parentAccountName: uiAccountDescription(parentAccountId),
-        sandboxName: uiAccountDescription(accountId),
-      })
-    );
-    uiLine();
-    logger.warn(i18n(`${i18nKey}.warning.developmentSandbox`));
-    uiLine();
-    logger.log('');
-
-    if (!force) {
-      // Skip confirmation if force flag is present.
-      const { confirmSandboxSyncPrompt: confirmed } = await promptUser([
-        {
-          name: 'confirmSandboxSyncPrompt',
-          type: 'confirm',
-          message: i18n(`${i18nKey}.confirm.developmentSandbox`, {
-            parentAccountName: uiAccountDescription(parentAccountId),
-            sandboxName: uiAccountDescription(accountId),
-          }),
-        },
-      ]);
-      if (!confirmed) {
-        process.exit(EXIT_CODES.SUCCESS);
-      }
-    }
-  } else if (isStandardSandbox(accountConfig)) {
-    const standardSyncUrl = `${getHubSpotWebsiteOrigin(
-      env
-    )}/sandboxes-developer/${parentAccountId}/sync?step=select_sync_path&id=${parentAccountId}_${accountId}`;
-
-    logger.log(
-      i18n(`${i18nKey}.info.standardSandbox`, {
-        url: standardSyncUrl,
-      })
-    );
-    logger.log(
-      i18n(`${i18nKey}.info.sync`, {
-        parentAccountName: uiAccountDescription(parentAccountId),
-        sandboxName: uiAccountDescription(accountId),
-      })
-    );
-    uiLine();
-    logger.warn(i18n(`${i18nKey}.warning.standardSandbox`));
-    uiLine();
-    logger.log('');
-
-    if (!force) {
-      // Skip confirmation if force flag is present.
-      const { confirmSandboxSyncPrompt: confirmed } = await promptUser([
-        {
-          name: 'confirmSandboxSyncPrompt',
-          type: 'confirm',
-          message: i18n(`${i18nKey}.confirm.standardSandbox`, {
-            parentAccountName: uiAccountDescription(parentAccountId),
-            sandboxName: uiAccountDescription(accountId),
-          }),
-        },
-      ]);
-      if (!confirmed) {
-        process.exit(EXIT_CODES.SUCCESS);
-      }
-    }
-  } else {
-    logger.error('Sync must be run in a sandbox account.');
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  try {
-    const syncTasks = await getSyncTypesWithContactRecordsPrompt(
-      accountConfig,
-      availableSyncTasks,
-      force
-    );
-
-    await syncSandbox({
-      accountConfig,
-      parentAccountConfig,
-      env,
-      syncTasks,
-      allowEarlyTermination: true,
-    });
-
-    process.exit(EXIT_CODES.SUCCESS);
-  } catch (error) {
-    process.exit(EXIT_CODES.ERROR);
-  }
-};
-
-exports.builder = yargs => {
-  yargs.option('f', {
-    type: 'boolean',
-    alias: 'force',
-    describe: i18n(`${i18nKey}.examples.force`),
-  });
-
-  yargs.example([['$0 sandbox sync', i18n(`${i18nKey}.examples.default`)]]);
-
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-  addTestingOptions(yargs);
-
-  return yargs;
-};