@hubspot/cli 3.0.10-beta.11 → 3.0.10-beta.15

package/README.md

@@ -1,6 +1,6 @@
 # @hubspot/cli
 
-Provides an `hs` command for interacting with the HubSpot. [Learn more about building on HubSpot](https://developers.hubspot.com).
+Provides an `hs` command for interacting with HubSpot. [Learn more about building on HubSpot](https://developers.hubspot.com).
 
 ## Getting started
 

package/bin/cli.js

@@ -10,7 +10,6 @@ const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { trackHelpUsage } = require('../lib/usageTracking');
 const pkg = require('../package.json');
 
-const appCommand = require('../commands/app');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
 const logsCommand = require('../commands/logs');
@@ -75,7 +74,6 @@ const argv = yargs
     describe: 'set log level to debug',
     type: 'boolean',
   })
-  .command(appCommand)
   .command(authCommand)
   .command(initCommand)
   .command(logsCommand)

package/bin/hubspot

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('./cli');

package/commands/auth.js

@@ -18,13 +18,13 @@ const {
   getConfigPath,
 } = require('@hubspot/cli-lib/lib/config');
 const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
+const { promptUser } = require('../lib/prompts/promptUtils');
 const {
-  promptUser,
   personalAccessKeyPrompt,
   OAUTH_FLOW,
   API_KEY_FLOW,
   ACCOUNT_NAME,
-} = require('../lib/prompts');
+} = require('../lib/prompts/personalAccessKeyPrompt');
 const {
   addConfigOptions,
   setLogLevel,
@@ -85,7 +85,7 @@ exports.handler = async options => {
 
   const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
   loadConfig(configPath);
-  checkAndWarnGitInclusion();
+  checkAndWarnGitInclusion(getConfigPath());
 
   trackCommandUsage('auth');
 

package/commands/config/set/allowUsageTracking.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateAllowUsageTracking } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
@@ -11,7 +11,7 @@ const i18nKey =
   'cli.commands.config.subcommands.set.subcommands.allowUsageTracking';
 
 const enableOrDisableUsageTracking = async () => {
-  const { isEnabled } = await inquirer.prompt([
+  const { isEnabled } = await promptUser([
     {
       type: 'list',
       look: false,

package/commands/config/set/defaultAccount.js

@@ -4,18 +4,18 @@ const {
   getConfigPath,
   updateDefaultAccount,
 } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey =
   'cli.commands.config.subcommands.set.subcommands.defaultAccount';
 
 const selectAccountFromConfig = async config => {
-  const { default: selectedDefault } = await inquirer.prompt([
+  const { default: selectedDefault } = await promptUser([
     {
       type: 'list',
       look: false,

package/commands/config/set/defaultMode.js

@@ -1,11 +1,11 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateDefaultMode } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 const { Mode } = require('@hubspot/cli-lib');
 const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
@@ -14,7 +14,7 @@ const i18nKey = 'cli.commands.config.subcommands.set.subcommands.defaultMode';
 const ALL_MODES = Object.values(Mode);
 
 const selectMode = async () => {
-  const { mode } = await inquirer.prompt([
+  const { mode } = await promptUser([
     {
       type: 'list',
       look: false,

package/commands/create/api-sample.js

@@ -1,5 +1,9 @@
-const { createApiSamplePrompt } = require('../../lib/createApiSamplePrompt');
-const { folderOverwritePrompt } = require('../../lib/prompts');
+const {
+  createApiSamplePrompt,
+} = require('../../lib/prompts/createApiSamplePrompt');
+const {
+  folderOverwritePrompt,
+} = require('../../lib/prompts/folderOverwritePrompt');
 const { logger } = require('@hubspot/cli-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');

package/commands/create/function.js

@@ -1,5 +1,7 @@
 const { createFunction } = require('@hubspot/cli-lib/functions');
-const { createFunctionPrompt } = require('../../lib/createFunctionPrompt');
+const {
+  createFunctionPrompt,
+} = require('../../lib/prompts/createFunctionPrompt');
 
 module.exports = {
   dest: ({ name }) => name,

package/commands/create/index.js

@@ -3,7 +3,6 @@ module.exports = {
   app: require('./app'),
   function: require('./function'),
   module: require('./module'),
-  project: require('./project'),
   'react-app': require('./react-app'),
   template: require('./template'),
   'vue-app': require('./vue-app'),

package/commands/create/module.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { createModulePrompt } = require('../../lib/createModulePrompt');
+const { createModulePrompt } = require('../../lib/prompts/createModulePrompt');
 const fs = require('fs-extra');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');

package/commands/create/template.js

@@ -1,4 +1,6 @@
-const { createTemplatePrompt } = require('../../lib/createTemplatePrompt');
+const {
+  createTemplatePrompt,
+} = require('../../lib/prompts/createTemplatePrompt');
 const { logger } = require('@hubspot/cli-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');

package/commands/functions/deploy.js

@@ -83,7 +83,7 @@ exports.handler = async options => {
     spinner.stop();
     await outputBuildLog(successResp.cdnUrl);
     logger.success(
-      i18n(`${i18nKey}.success.deploy`, {
+      i18n(`${i18nKey}.success.deployed`, {
         accountId,
         buildTimeSeconds,
         functionPath,

package/commands/init.js

@@ -26,13 +26,13 @@ const {
 const { getCwd } = require('@hubspot/cli-lib/path');
 const { trackCommandUsage, trackAuthAction } = require('../lib/usageTracking');
 const { setLogLevel, addTestingOptions } = require('../lib/commonOpts');
+const { promptUser } = require('../lib/prompts/promptUtils');
 const {
   OAUTH_FLOW,
   API_KEY_FLOW,
   ACCOUNT_NAME,
   personalAccessKeyPrompt,
-  promptUser,
-} = require('../lib/prompts');
+} = require('../lib/prompts/personalAccessKeyPrompt');
 const { logDebugInfo } = require('../lib/debugInfo');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');

package/commands/open.js

@@ -6,14 +6,14 @@ const {
 } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { logSiteLinks, getSiteLinksAsArray, openLink } = require('../lib/links');
-const inquirer = require('inquirer');
+const { promptUser } = require('../lib/prompts/promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.open';
 
 const separator = ' => ';
 const createListPrompt = async accountId =>
-  inquirer.prompt([
+  promptUser([
     {
       type: 'rawlist',
       look: false,

package/commands/project/create.js

@@ -8,9 +8,10 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { getCwd } = require('@hubspot/cli-lib/path');
 const path = require('path');
-const { prompt } = require('inquirer');
+const {
+  createProjectPrompt,
+} = require('../../lib/prompts/createProjectPrompt');
 const { createProjectConfig } = require('../../lib/projects');
-const { PROJECT_TEMPLATES } = require('@hubspot/cli-lib/lib/constants');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.project.subcommands.create';
@@ -23,58 +24,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  const { name, template, location } = await prompt([
-    {
-      name: 'name',
-      message: '[--name] Give your project a name:',
-      when: !options.name,
-      validate: input => {
-        if (!input) {
-          return 'A project name is required';
-        }
-        return true;
-      },
-    },
-    {
-      name: 'location',
-      message: '[--location] Where should the project be created?',
-      when: !options.location,
-      default: answers => {
-        return path.resolve(getCwd(), answers.name || options.name);
-      },
-      validate: input => {
-        if (!input) {
-          return 'A project location is required';
-        }
-        return true;
-      },
-    },
-    {
-      name: 'template',
-      message: () => {
-        return options.template &&
-          !PROJECT_TEMPLATES.find(t => t.name === options.template)
-          ? `[--template] Could not find template ${options.template}. Please choose an available template.`
-          : '[--template] Start from a template?';
-      },
-      when:
-        !options.template ||
-        !PROJECT_TEMPLATES.find(t => t.name === options.template),
-      type: 'list',
-      choices: [
-        {
-          name: 'No template',
-          value: 'none',
-        },
-        ...PROJECT_TEMPLATES.map(template => {
-          return {
-            name: template.label,
-            value: template.name,
-          };
-        }),
-      ],
-    },
-  ]);
+  const { name, template, location } = await createProjectPrompt(options);
 
   trackCommandUsage('project-create', { projectName: name }, accountId);
 

package/commands/project/listBuilds.js

@@ -29,7 +29,7 @@ const {
   validateProjectConfig,
 } = require('../../lib/projects');
 const moment = require('moment');
-const { prompt } = require('inquirer');
+const { promptUser } = require('../../lib/prompts/promptUtils');
 
 exports.command = 'list-builds [path]';
 exports.describe = false;
@@ -111,7 +111,7 @@ exports.handler = async options => {
       );
     }
     if (paging && paging.next) {
-      await prompt({
+      await promptUser({
         name: 'more',
         message: 'Press <enter> to load more, or ctrl+c to exit',
       });

package/commands/project/logs.js

@@ -13,9 +13,14 @@ const {
   getProjectAppFunctionLogs,
   getLatestProjectAppFunctionLog,
 } = require('@hubspot/cli-lib/api/functions');
+const {
+  getFunctionLogs,
+  getLatestFunctionLog,
+} = require('@hubspot/cli-lib/api/results');
 const { getProjectConfig } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { tailLogs } = require('../../lib/serverlessLogs');
+const { uiAccountDescription } = require('../../lib/ui');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.project.subcommands.logs';
@@ -24,17 +29,23 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const handleLogsError = (e, accountId, projectName, appPath, functionName) => {
   if (e.statusCode === 404) {
     logger.error(
-      i18n(`${i18nKey}.errors.logs`, {
-        accountId,
-        appPath,
-        functionName,
-        projectName,
-      })
+      appPath
+        ? i18n(`${i18nKey}.errors.noAppFunctionLogs`, {
+            accountId,
+            appPath,
+            functionName,
+            projectName,
+          })
+        : i18n(`${i18nKey}.errors.noEndpointLogs`, {
+            accountId,
+            functionName,
+            projectName,
+          })
     );
   }
 };
 
-const appFunctionLog = async (accountId, options) => {
+const functionLog = async (accountId, options) => {
   const {
     latest,
     follow,
@@ -46,28 +57,43 @@ const appFunctionLog = async (accountId, options) => {
 
   let logsResp;
 
+  const tailCall = async after => {
+    try {
+      return appPath
+        ? getProjectAppFunctionLogs(
+            accountId,
+            functionName,
+            projectName,
+            appPath,
+            {
+              after,
+            }
+          )
+        : getFunctionLogs(accountId, functionName, { after });
+    } catch (e) {
+      handleLogsError(e, accountId, projectName, appPath, functionName);
+    }
+  };
+  const fetchLatest = async () => {
+    return appPath
+      ? getLatestProjectAppFunctionLog(
+          accountId,
+          functionName,
+          projectName,
+          appPath
+        )
+      : getLatestFunctionLog(accountId, functionName);
+  };
+
   if (follow) {
     const spinnies = new Spinnies();
 
     spinnies.add('tailLogs', {
-      text: i18n(`${i18nKey}.loading`),
+      text: i18n(`${i18nKey}.loading`, {
+        functionName,
+        accountId: uiAccountDescription(accountId),
+      }),
     });
-    const tailCall = after =>
-      getProjectAppFunctionLogs(accountId, functionName, projectName, appPath, {
-        after,
-      });
-    const fetchLatest = () => {
-      try {
-        return getLatestProjectAppFunctionLog(
-          accountId,
-          functionName,
-          projectName,
-          appPath
-        );
-      } catch (e) {
-        handleLogsError(e, accountId, projectName, appPath, functionName);
-      }
-    };
 
     await tailLogs({
       accountId,
@@ -78,24 +104,13 @@ const appFunctionLog = async (accountId, options) => {
     });
   } else if (latest) {
     try {
-      logsResp = await getLatestProjectAppFunctionLog(
-        accountId,
-        functionName,
-        projectName,
-        appPath
-      );
+      logsResp = await fetchLatest();
     } catch (e) {
       handleLogsError(e, accountId, projectName, appPath, functionName);
     }
   } else {
     try {
-      logsResp = await getProjectAppFunctionLogs(
-        accountId,
-        functionName,
-        projectName,
-        appPath,
-        {}
-      );
+      logsResp = await tailCall();
     } catch (e) {
       handleLogsError(e, accountId, projectName, appPath, functionName);
     }
@@ -106,50 +121,47 @@ const appFunctionLog = async (accountId, options) => {
   }
 };
 
-exports.command = 'logs [functionName]';
+exports.command = 'logs';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);
 
-  const { latest, functionName, appPath } = options;
+  const { latest, functionName } = options;
   let projectName = options.projectName;
 
   if (!functionName) {
     logger.error(i18n(`${i18nKey}.errors.functionNameRequired`));
     process.exit(EXIT_CODES.ERROR);
   } else if (!projectName) {
-    const projectConfig = await getProjectConfig(getCwd());
+    const { projectConfig } = await getProjectConfig(getCwd());
     if (projectConfig && projectConfig.name) {
       projectName = projectConfig.name;
     } else {
       logger.error(i18n(`${i18nKey}.errors.projectNameRequired`));
       process.exit(EXIT_CODES.ERROR);
     }
-  } else if (!appPath) {
-    logger.error(i18n(`${i18nKey}.errors.appPathRequired`));
-    process.exit(EXIT_CODES.ERROR);
   }
 
   const accountId = getAccountId(options);
 
   trackCommandUsage('project-logs', { latest }, accountId);
 
-  appFunctionLog(accountId, { ...options, projectName });
+  functionLog(accountId, { ...options, projectName });
 };
 
 exports.builder = yargs => {
-  yargs.positional('functionName', {
-    describe: i18n(`${i18nKey}.positionals.functionName.describe`),
-    type: 'string',
-    demandOption: true,
-  });
   yargs
     .options({
+      functionName: {
+        alias: 'function',
+        describe: i18n(`${i18nKey}.positionals.functionName.describe`),
+        type: 'string',
+        demandOption: true,
+      },
       appPath: {
         describe: i18n(`${i18nKey}.options.appPath.describe`),
         type: 'string',
-        demandOption: true,
       },
       projectName: {
         describe: i18n(`${i18nKey}.options.projectName.describe`),
@@ -179,7 +191,7 @@ exports.builder = yargs => {
 
   yargs.example([
     [
-      '$0 project logs my-function --appName="app" --projectName="my-project"',
+      '$0 project logs --function=my-function --appPath="app" --projectName="my-project"',
       i18n(`${i18nKey}.examples.default`),
     ],
   ]);

package/commands/sandbox/create.js

@@ -9,7 +9,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
 
 const { createSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { createSandbox: prompt } = require('../../lib/prompts/sandboxes');
+const { createSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
@@ -27,7 +27,7 @@ exports.handler = async options => {
   trackCommandUsage('sandbox-create', {}, accountId);
 
   if (!name) {
-    namePrompt = await prompt();
+    namePrompt = await createSandboxPrompt();
   }
 
   const sandboxName = name || namePrompt.name;

package/commands/secrets/addSecret.js

@@ -14,7 +14,7 @@ const {
   addUseEnvironmentOptions,
   getAccountId,
 } = require('../../lib/commonOpts');
-const { secretValuePrompt } = require('../../lib/secretPrompt');
+const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.secrets.subcommands.add';

package/commands/secrets/updateSecret.js

@@ -14,7 +14,7 @@ const {
   addUseEnvironmentOptions,
   getAccountId,
 } = require('../../lib/commonOpts');
-const { secretValuePrompt } = require('../../lib/secretPrompt');
+const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.secrets.subcommands.update';

package/commands/server.js

@@ -5,6 +5,7 @@ const {
   loadConfig,
   validateConfig,
   checkAndWarnGitInclusion,
+  getConfigPath,
 } = require('@hubspot/cli-lib');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { getCwd } = require('@hubspot/cli-lib/path');
@@ -38,7 +39,7 @@ function configureServerCommand(program) {
       logDebugInfo(options);
       const { config: configPath, serverConfig, contextDir } = options;
       loadConfig(configPath, options);
-      checkAndWarnGitInclusion();
+      checkAndWarnGitInclusion(getConfigPath());
 
       if (!validateConfig()) {
         process.exit(EXIT_CODES.ERROR);

package/lib/projects.js

@@ -3,7 +3,6 @@ const path = require('path');
 
 const chalk = require('chalk');
 const findup = require('findup-sync');
-const { prompt } = require('inquirer');
 const Spinnies = require('spinnies');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { getEnv } = require('@hubspot/cli-lib/lib/config');
@@ -29,6 +28,7 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 const { getCwd } = require('@hubspot/cli-lib/path');
+const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { uiLine, uiAccountDescription } = require('../lib/ui');
 
@@ -103,7 +103,7 @@ const createProjectConfig = async (projectPath, projectName, template) => {
         : `Found an existing project definition in ${projectDir}.`
     );
 
-    const { shouldContinue } = await prompt([
+    const { shouldContinue } = await promptUser([
       {
         name: 'shouldContinue',
         message: () => {
@@ -182,7 +182,7 @@ const ensureProjectExists = async (accountId, projectName, forceCreate) => {
       let shouldCreateProject = forceCreate;
 
       if (!shouldCreateProject) {
-        const promptResult = await prompt([
+        const promptResult = await promptUser([
           {
             name: 'shouldCreateProject',
             message: `The project ${projectName} does not exist in ${uiAccountDescription(
@@ -271,6 +271,7 @@ const makeGetTaskStatus = taskType => {
     const spinnies = new Spinnies({
       succeedColor: 'white',
       failColor: 'white',
+      failPrefix: chalk.bold('!'),
     });
 
     spinnies.add('overallTaskStatus', { text: 'Beginning' });

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

@@ -1,9 +1,12 @@
-const inquirer = require('inquirer');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.createApiSamplePrompt';
 
 const getSampleTypesPrompt = choices => ({
   type: 'rawlist',
   name: 'sampleType',
-  message: 'Please, select API sample app',
+  message: i18n(`${i18nKey}.selectApiSampleApp`),
   choices: choices.map(choice => ({
     name: `${choice.name} - ${choice.description}`,
     value: choice.id,
@@ -13,7 +16,7 @@ const getSampleTypesPrompt = choices => ({
       if (input.length > 0) {
         resolve(true);
       }
-      reject('Please select API sample app');
+      reject(i18n(`${i18nKey}.errors.apiSampleAppRequired`));
     });
   },
 });
@@ -21,7 +24,7 @@ const getSampleTypesPrompt = choices => ({
 const getLanguagesPrompt = choices => ({
   type: 'rawlist',
   name: 'sampleLanguage',
-  message: "Please, select sample app's language",
+  message: i18n(`${i18nKey}.selectLanguage`),
   choices: choices.map(choice => ({
     name: choice,
     value: choice,
@@ -31,7 +34,7 @@ const getLanguagesPrompt = choices => ({
       if (input.length > 0) {
         resolve(true);
       }
-      reject("Please select API sample app's language");
+      reject(i18n(`${i18nKey}.errors.languageRequired`));
     });
   },
 });
@@ -39,16 +42,12 @@ const getLanguagesPrompt = choices => ({
 const createApiSamplePrompt = async samplesConfig => {
   try {
     const { samples } = samplesConfig;
-    const sampleTypeAnswer = await inquirer.prompt(
-      getSampleTypesPrompt(samples)
-    );
+    const sampleTypeAnswer = await promptUser(getSampleTypesPrompt(samples));
     const chosenSample = samples.find(
       sample => sample.id === sampleTypeAnswer.sampleType
     );
     const { languages } = chosenSample;
-    const languagesAnswer = await inquirer.prompt(
-      getLanguagesPrompt(languages)
-    );
+    const languagesAnswer = await promptUser(getLanguagesPrompt(languages));
     return {
       ...sampleTypeAnswer,
       ...languagesAnswer,