@hubspot/cli 3.0.10-beta.6 → 3.0.10

package/lib/{prompts.js → prompts/personalAccessKeyPrompt.js}

@@ -1,4 +1,3 @@
-const inquirer = require('inquirer');
 const open = require('open');
 const {
   OAUTH_SCOPES,
@@ -6,12 +5,11 @@ const {
 } = require('@hubspot/cli-lib/lib/constants');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { API_KEY_REGEX, STRING_WITH_NO_SPACES_REGEX } = require('./regex');
+const { API_KEY_REGEX, STRING_WITH_NO_SPACES_REGEX } = require('../regex');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
-const promptUser = async promptConfig => {
-  const prompt = inquirer.createPromptModule();
-  return prompt(promptConfig);
-};
+const i18nKey = 'cli.lib.prompts.personalAccessKeyPrompt';
 
 /**
  * Displays notification to user that we are about to open the browser,
@@ -25,7 +23,7 @@ const personalAccessKeyPrompt = async ({ env } = {}) => {
     open(url, { url: true });
   }
 
-  logger.log(`Opening ${url} in your web browser`);
+  logger.log(i18n(`${i18nKey}.logs.openingWebBrowser`, { url }));
   const { personalAccessKey } = await promptUser(PERSONAL_ACCESS_KEY);
 
   return {
@@ -36,25 +34,24 @@ const personalAccessKeyPrompt = async ({ env } = {}) => {
 
 const ACCOUNT_ID = {
   name: 'accountId',
-  message:
-    'Enter the account ID for your account (the number under the DOMAIN column at https://app.hubspot.com/myaccounts-beta ):',
+  message: i18n(`${i18nKey}.enterAccountId`),
   type: 'number',
   validate(val) {
     if (!Number.isNaN(val) && val > 0) {
       return true;
     }
-    return 'You did not enter a valid account ID. Please try again.';
+    return i18n(`${i18nKey}.errors.invalidAccountId`);
   },
 };
 
 const CLIENT_ID = {
   name: 'clientId',
-  message: 'Enter your OAuth2 client ID:',
+  message: i18n(`${i18nKey}.enterClientId`),
   validate(val) {
     if (typeof val !== 'string') {
-      return 'You entered an invalid OAuth2 client ID. Please try again.';
+      return i18n(`${i18nKey}.errors.invalidOauthClientId`);
     } else if (val.length !== 36) {
-      return 'The OAuth2 client ID must be 36 characters long. Please try again.';
+      return i18n(`${i18nKey}.errors.invalidOauthClientIdLength`);
     }
     return true;
   },
@@ -62,14 +59,14 @@ const CLIENT_ID = {
 
 const CLIENT_SECRET = {
   name: 'clientSecret',
-  message: 'Enter your OAuth2 client secret:',
+  message: i18n(`${i18nKey}.enterClientSecret`),
   validate(val) {
     if (typeof val !== 'string') {
-      return 'You entered an invalid OAuth2 client secret. Please try again.';
+      return i18n(`${i18nKey}.errors.invalidOauthClientSecret`);
     } else if (val.length !== 36) {
-      return 'The OAuth2 client secret must be 36 characters long. Please try again.';
+      return i18n(`${i18nKey}.errors.invalidOauthClientSecretLength`);
     } else if (val[0] === '*') {
-      return 'Please copy the actual OAuth2 client secret rather than the asterisks that mask it.';
+      return i18n(`${i18nKey}.errors.invalidOauthClientSecretCopy`);
     }
     return true;
   },
@@ -77,14 +74,14 @@ const CLIENT_SECRET = {
 
 const ACCOUNT_NAME = {
   name: 'name',
-  message: 'Enter a unique name to reference your account:',
+  message: i18n(`${i18nKey}.enterAccountName`),
   validate(val) {
     if (typeof val !== 'string') {
-      return 'You entered an invalid name. Please try again.';
+      return i18n(`${i18nKey}.errors.invalidName`);
     } else if (!val.length) {
-      return 'The name may not be blank. Please try again.';
+      return i18n(`${i18nKey}.errors.nameRequired`);
     } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
-      return 'The name may not contain spaces. Please try again.';
+      return i18n(`${i18nKey}.errors.spacesInName`);
     }
     return true;
   },
@@ -92,11 +89,10 @@ const ACCOUNT_NAME = {
 
 const ACCOUNT_API_KEY = {
   name: 'apiKey',
-  message:
-    'Enter the API key for your account (found at https://app.hubspot.com/l/api-key):',
+  message: i18n(`${i18nKey}.enterApiKey`),
   validate(val) {
     if (!API_KEY_REGEX.test(val)) {
-      return 'You did not enter a valid API key. Please try again.';
+      return i18n(`${i18nKey}.errors.invalidAPIKey`);
     }
     return true;
   },
@@ -104,18 +100,17 @@ const ACCOUNT_API_KEY = {
 
 const PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP = {
   name: 'personalAcessKeyBrowserOpenPrep',
-  message:
-    "When you're ready, we'll open a secure page in your default browser where you can view and copy your personal access key, which you'll need to complete the next step.\n<Press enter to open the page and generate your personal access key>",
+  message: i18n(`${i18nKey}.personalAccessKeyBrowserOpenPrep`),
 };
 
 const PERSONAL_ACCESS_KEY = {
   name: 'personalAccessKey',
-  message: 'Enter your personal access key:',
+  message: i18n(`${i18nKey}.enterPersonalAccessKey`),
   validate(val) {
     if (typeof val !== 'string') {
-      return 'You did not enter a valid access key. Please try again.';
+      return i18n(`${i18nKey}.errors.invalidPersonalAccessKey`);
     } else if (val[0] === '•') {
-      return 'Please copy the actual access key rather than the bullets that mask it.';
+      return i18n(`${i18nKey}.errors.invalidPersonalAccessKeyCopy`);
     }
     return true;
   },
@@ -124,8 +119,7 @@ const PERSONAL_ACCESS_KEY = {
 const SCOPES = {
   type: 'checkbox',
   name: 'scopes',
-  message:
-    'Select access scopes (see https://developers.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes)',
+  message: i18n(`${i18nKey}.selectScopes`),
   default: DEFAULT_OAUTH_SCOPES,
   choices: OAUTH_SCOPES,
 };
@@ -133,18 +127,7 @@ const SCOPES = {
 const OAUTH_FLOW = [ACCOUNT_NAME, ACCOUNT_ID, CLIENT_ID, CLIENT_SECRET, SCOPES];
 const API_KEY_FLOW = [ACCOUNT_NAME, ACCOUNT_ID, ACCOUNT_API_KEY];
 
-const folderOverwritePrompt = folderName => {
-  return promptUser({
-    type: 'confirm',
-    name: 'overwrite',
-    message: `The folder with name '${folderName}' already exists. Overwrite?`,
-    default: false,
-  });
-};
-
 module.exports = {
-  folderOverwritePrompt,
-  promptUser,
   personalAccessKeyPrompt,
   CLIENT_ID,
   CLIENT_SECRET,

package/lib/prompts/promptUtils.js

@@ -0,0 +1,10 @@
+const inquirer = require('inquirer');
+
+const promptUser = async promptConfig => {
+  const prompt = inquirer.createPromptModule();
+  return prompt(promptConfig);
+};
+
+module.exports = {
+  promptUser,
+};

package/lib/prompts/sandboxesPrompt.js

@@ -0,0 +1,24 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
+
+const createSandboxPrompt = () => {
+  return promptUser([
+    {
+      name: 'name',
+      message: i18n(`${i18nKey}.enterName`),
+      validate(val) {
+        if (typeof val !== 'string') {
+          return i18n(`${i18nKey}.errors.invalidName`);
+        }
+        return true;
+      },
+      default: 'New sandbox',
+    },
+  ]);
+};
+
+module.exports = {
+  createSandboxPrompt,
+};

package/lib/prompts/secretPrompt.js

@@ -0,0 +1,25 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.secretPrompt';
+
+const SECRET_VALUE_PROMPT = {
+  name: 'secretValue',
+  type: 'password',
+  mask: '*',
+  message: i18n(`${i18nKey}.enterValue`),
+  validate(val) {
+    if (typeof val !== 'string') {
+      return i18n(`${i18nKey}.errors.invalidValue`);
+    }
+    return true;
+  },
+};
+
+function secretValuePrompt() {
+  return promptUser([SECRET_VALUE_PROMPT]);
+}
+
+module.exports = {
+  secretValuePrompt,
+};

package/lib/serverlessLogs.js

@@ -9,6 +9,7 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 const { base64EncodeString } = require('@hubspot/cli-lib/lib/encoding');
+const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 const TAIL_DELAY = 5000;
 
@@ -33,7 +34,7 @@ const tailLogs = async ({
 
   try {
     const latestLog = await fetchLatest();
-    initialAfter = base64EncodeString(latestLog.id);
+    initialAfter = latestLog && base64EncodeString(latestLog.id);
   } catch (e) {
     // A 404 means no latest log exists(never executed)
     if (e.statusCode !== 404) {
@@ -61,7 +62,7 @@ const tailLogs = async ({
           })
         );
       }
-      process.exit();
+      process.exit(EXIT_CODES.SUCCESS);
     }
 
     if (latestLog && latestLog.results.length) {
@@ -79,7 +80,7 @@ const tailLogs = async ({
     spinnies.succeed('tailLogs', {
       text: `Stopped polling because "${exitKey}" was pressed.`,
     });
-    process.exit();
+    process.exit(EXIT_CODES.SUCCESS);
   });
   await tail(initialAfter);
 };

package/lib/ui.js

@@ -0,0 +1,48 @@
+const chalk = require('chalk');
+const supportsHyperlinks = require('supports-hyperlinks');
+const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { logger } = require('@hubspot/cli-lib/logger');
+
+/**
+ * Outputs horizontal line
+ *
+ * @returns
+ */
+const uiLine = () => {
+  logger.log('-'.repeat(50));
+};
+
+/**
+ * Returns a hyperlink or link and description
+ *
+ * @param {string} linkText
+ * @param {string} url
+ * @param {object} options
+ * @returns {string}
+ */
+const uiLink = (linkText, url, options = {}) => {
+  if (supportsHyperlinks.stdout) {
+    return ['\u001B]8;;', url, '\u0007', linkText, '\u001B]8;;\u0007'].join('');
+  } else {
+    return options.fallback ? `${linkText}: ${url}` : linkText;
+  }
+};
+
+/**
+ * Returns formatted account name and ID
+ *
+ * @param {number} accountId
+ * @returns {string}
+ */
+const uiAccountDescription = accountId => {
+  const account = getAccountConfig(accountId);
+  return chalk.bold(
+    account.name ? `${account.name} (${account.portalId})` : account.portalId
+  );
+};
+
+module.exports = {
+  uiLine,
+  uiLink,
+  uiAccountDescription,
+};

package/lib/validation.js

@@ -4,10 +4,10 @@ const {
   loadConfigFromEnvironment,
   Mode,
   loadConfig,
+  getConfigPath,
   validateConfig,
   checkAndWarnGitInclusion,
 } = require('@hubspot/cli-lib');
-const { getConfigPath } = require('@hubspot/cli-lib/lib/config');
 const {
   API_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
@@ -24,16 +24,17 @@ const { getAccountId, getMode, setLogLevel } = require('./commonOpts');
 const { logDebugInfo } = require('./debugInfo');
 const fs = require('fs');
 const path = require('path');
+const { EXIT_CODES } = require('./enums/exitCodes');
 
 async function loadAndValidateOptions(options) {
   setLogLevel(options);
   logDebugInfo(options);
   const { config: configPath } = options;
   loadConfig(configPath, options);
-  checkAndWarnGitInclusion();
+  checkAndWarnGitInclusion(getConfigPath());
 
   if (!(validateConfig() && (await validateAccount(options)))) {
-    process.exit(1);
+    process.exit(EXIT_CODES.ERROR);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.10-beta.6",
+  "version": "3.0.10",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,21 +8,22 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^3.0.10-beta.5",
-    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.5",
+    "@hubspot/cli-lib": "^3.0.10",
+    "@hubspot/serverless-dev-runtime": "^3.0.10",
     "archiver": "^5.3.0",
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.2",
     "express": "^4.17.1",
     "findup-sync": "^4.0.0",
     "fs-extra": "^8.1.0",
-    "inquirer": "^6.3.1",
+    "inquirer": "^8.2.0",
+    "moment": "^2.29.1",
     "open": "^7.0.3",
     "ora": "^4.0.3",
     "shelljs": "0.8.3",
     "spinnies": "^0.5.1",
     "supports-hyperlinks": "^2.2.0",
     "tmp": "^0.2.1",
-    "update-notifier": "3.0.1",
+    "update-notifier": "^5.1.0",
     "yargs": "15.4.1"
   },
   "devDependencies": {
@@ -38,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d61d0d5785c06c1e835bf474ad73ccb27cf2118e"
+  "gitHead": "cad6c92bb51a24a7958c3c77c3e5ffc4e6418580"
 }

package/commands/app/deploy.js

@@ -1,116 +0,0 @@
-const ora = require('ora');
-const {
-  getEnv,
-  loadConfig,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('@hubspot/cli-lib/errorHandlers');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
-const { logger } = require('@hubspot/cli-lib/logger');
-const { deployAppSync } = require('@hubspot/cli-lib/api/appPipeline');
-
-const {
-  setLogLevel,
-  getAccountId,
-  addUseEnvironmentOptions,
-} = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { logDebugInfo } = require('../../lib/debugInfo');
-const { validateAccount } = require('../../lib/validation');
-const { outputBuildLog } = require('../../lib/serverlessLogs');
-
-const loadAndValidateOptions = async options => {
-  setLogLevel(options);
-  logDebugInfo(options);
-  const { config: configPath } = options;
-  loadConfig(configPath, options);
-  checkAndWarnGitInclusion();
-
-  if (!(validateConfig() && (await validateAccount(options)))) {
-    process.exit(1);
-  }
-};
-
-const logServerlessBuildFailures = async errorDetails => {
-  const folderPaths = errorDetails.context.folderPath;
-  const buildLogUrls = errorDetails.context.serverlessBuildLogUrl;
-  for (let i = 0; i < buildLogUrls.length; i++) {
-    logger.log(`Building serverless functions in "${folderPaths[i]}":`);
-    await outputBuildLog(buildLogUrls[i]);
-  }
-  logger.error(
-    'Your app failed to build and deploy due to a problem building the serverless functions.'
-  );
-};
-
-exports.command = 'deploy <path>';
-exports.describe = false;
-
-exports.handler = async options => {
-  loadAndValidateOptions(options);
-
-  const { path: appPath } = options;
-  const accountId = getAccountId(options);
-
-  trackCommandUsage('app-deploy', {}, accountId);
-
-  let result;
-
-  const spinner = ora(`Building "${appPath}" in account ${accountId}`).start();
-  try {
-    result = await deployAppSync(accountId, appPath);
-  } catch (error) {
-    spinner.fail();
-    if (error.response && error.response.body) {
-      const errorDetails = error.response.body;
-      if (
-        errorDetails.subCategory === 'PipelineErrors.SERVERLESS_BUILD_ERROR' &&
-        errorDetails.context &&
-        Array.isArray(errorDetails.context.serverlessBuildLogUrl)
-      ) {
-        await logServerlessBuildFailures(errorDetails);
-      } else {
-        logApiErrorInstance(
-          error,
-          new ApiErrorContext({
-            accountId,
-            request: appPath,
-          })
-        );
-      }
-    } else {
-      logApiErrorInstance(
-        error,
-        new ApiErrorContext({
-          accountId,
-          request: appPath,
-        })
-      );
-    }
-    process.exit(1);
-  }
-
-  spinner.succeed();
-  logger.success(
-    `You app has been built and deployed. Go to ${getHubSpotWebsiteOrigin(
-      getEnv()
-    )}/private-apps/${accountId}/${result.appId} to see your app.`
-  );
-};
-
-exports.builder = yargs => {
-  yargs.positional('path', {
-    describe: 'Path to app folder',
-    type: 'string',
-  });
-
-  yargs.example([['$0 app deploy /example-app', 'Build and deploy app']]);
-
-  addUseEnvironmentOptions(yargs, true);
-
-  return yargs;
-};

package/commands/app.js

@@ -1,14 +0,0 @@
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
-const deploy = require('./app/deploy');
-
-exports.command = 'app';
-exports.describe = false;
-
-exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-
-  yargs.command(deploy).demandCommand(1, '');
-
-  return yargs;
-};

package/commands/create/project.js

@@ -1,25 +0,0 @@
-const path = require('path');
-const {
-  createProjectConfig,
-  createProjectTemplateFiles,
-} = require('@hubspot/cli-lib/projects');
-const { logger } = require('@hubspot/cli-lib/logger');
-const { createProjectPrompt } = require('../../lib/prompts/projects');
-
-module.exports = {
-  hidden: true,
-  dest: ({ name, dest }) => path.join(dest || './', name),
-  execute: async ({ dest, name }) => {
-    const { label, description, template } = await createProjectPrompt({
-      label: name,
-    });
-
-    createProjectConfig(dest, {
-      label,
-      description,
-    });
-    createProjectTemplateFiles(dest, template);
-
-    logger.success(`Project created in ${dest}`);
-  },
-};

package/lib/prompts/projects.js

@@ -1,40 +0,0 @@
-const inquirer = require('inquirer');
-const { PROJECT_TEMPLATE_TYPES } = require('@hubspot/cli-lib/lib/constants');
-
-const createProjectPrompt = (promptOptions = {}) => {
-  const prompt = inquirer.createPromptModule();
-  return prompt([
-    {
-      type: 'list',
-      name: 'template',
-      message: 'Select a project template to use',
-      default: PROJECT_TEMPLATE_TYPES.blank,
-      choices: Object.keys(PROJECT_TEMPLATE_TYPES),
-    },
-    {
-      name: 'label',
-      message: 'Enter a label for the project',
-      validate(val) {
-        if (typeof val !== 'string') {
-          return 'You entered an invalid label. Please try again.';
-        }
-        return true;
-      },
-      default: promptOptions.label || 'New project',
-    },
-    {
-      name: 'description',
-      message: 'Enter a description for the project',
-      validate(val) {
-        if (typeof val !== 'string') {
-          return 'You entered an invalid description. Please try again.';
-        }
-        return true;
-      },
-    },
-  ]);
-};
-
-module.exports = {
-  createProjectPrompt,
-};

package/lib/prompts/sandboxes.js

@@ -1,22 +0,0 @@
-const inquirer = require('inquirer');
-
-const createSandbox = () => {
-  const prompt = inquirer.createPromptModule();
-  return prompt([
-    {
-      name: 'name',
-      message: 'Enter a name to use for the sandbox: ',
-      validate(val) {
-        if (typeof val !== 'string') {
-          return 'You entered an invalid name. Please try again.';
-        }
-        return true;
-      },
-      default: 'New sandbox',
-    },
-  ]);
-};
-
-module.exports = {
-  createSandbox,
-};

package/lib/secretPrompt.js

@@ -1,22 +0,0 @@
-const inquirer = require('inquirer');
-
-const SECRET_VALUE_PROMPT = {
-  name: 'secretValue',
-  type: 'password',
-  mask: '*',
-  message: 'Enter a value for your secret',
-  validate(val) {
-    if (typeof val !== 'string') {
-      return 'You entered an invalid value. Please try again.';
-    }
-    return true;
-  },
-};
-
-function secretValuePrompt() {
-  const prompt = inquirer.createPromptModule();
-  return prompt([SECRET_VALUE_PROMPT]);
-}
-module.exports = {
-  secretValuePrompt,
-};