@hubspot/cli 3.0.12 → 3.0.13-beta.2

package/commands/project/logs.js

@@ -1,5 +1,6 @@
-const Spinnies = require('spinnies');
-const { getCwd } = require('@hubspot/cli-lib/path');
+const { getEnv } = require('@hubspot/cli-lib/lib/config');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
+const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -9,6 +10,11 @@ const {
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
+const { fetchProject } = require('@hubspot/cli-lib/api/dfs');
+const {
+  getTableContents,
+  getTableHeader,
+} = require('@hubspot/cli-lib/lib/table');
 const {
   getProjectAppFunctionLogs,
   getLatestProjectAppFunctionLog,
@@ -17,35 +23,32 @@ const {
   getFunctionLogs,
   getLatestFunctionLog,
 } = require('@hubspot/cli-lib/api/results');
-const { getProjectConfig } = require('../../lib/projects');
+const { ensureProjectExists } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
+const { uiLine, uiLink } = require('../../lib/ui');
+const { projectLogsPrompt } = require('../../lib/prompts/projectsLogsPrompt');
 const { tailLogs } = require('../../lib/serverlessLogs');
-const { uiAccountDescription } = require('../../lib/ui');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.logs';
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-const handleLogsError = (e, accountId, projectName, appPath, functionName) => {
+const getPrivateAppsUrl = accountId => {
+  const baseUrl = getHubSpotWebsiteOrigin(
+    getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
+  );
+
+  return `${baseUrl}/private-apps/${accountId}`;
+};
+
+const handleLogsError = (e, name) => {
+  logger.debug(`Log fetch error: ${e.message}`);
   if (e.statusCode === 404) {
-    logger.error(
-      appPath
-        ? i18n(`${i18nKey}.errors.noAppFunctionLogs`, {
-            accountId,
-            appPath,
-            functionName,
-            projectName,
-          })
-        : i18n(`${i18nKey}.errors.noEndpointLogs`, {
-            accountId,
-            functionName,
-            projectName,
-          })
-    );
+    logger.log(i18n(`${i18nKey}.logs.noLogsFound`, { name }));
   }
 };
 
-const functionLog = async (accountId, options) => {
+const handleFunctionLog = async (accountId, options) => {
   const {
     latest,
     follow,
@@ -71,9 +74,10 @@ const functionLog = async (accountId, options) => {
           )
         : getFunctionLogs(accountId, functionName, { after });
     } catch (e) {
-      handleLogsError(e, accountId, projectName, appPath, functionName);
+      handleLogsError(e, functionName);
     }
   };
+
   const fetchLatest = async () => {
     return appPath
       ? getLatestProjectAppFunctionLog(
@@ -86,85 +90,145 @@ const functionLog = async (accountId, options) => {
   };
 
   if (follow) {
-    const spinnies = new Spinnies();
-
-    spinnies.add('tailLogs', {
-      text: i18n(`${i18nKey}.loading`, {
-        functionName,
-        accountId: uiAccountDescription(accountId),
-      }),
-    });
-
     await tailLogs({
       accountId,
       compact,
-      spinnies,
       tailCall,
       fetchLatest,
+      name: functionName,
     });
   } else if (latest) {
     try {
       logsResp = await fetchLatest();
     } catch (e) {
-      handleLogsError(e, accountId, projectName, appPath, functionName);
+      handleLogsError(e, functionName);
+      return true;
     }
   } else {
     try {
       logsResp = await tailCall();
     } catch (e) {
-      handleLogsError(e, accountId, projectName, appPath, functionName);
+      handleLogsError(e, functionName);
+      return true;
     }
   }
 
   if (logsResp) {
-    return outputLogs(logsResp, options);
+    outputLogs(logsResp, options);
+    return true;
   }
+  return false;
 };
 
-exports.command = 'logs';
+exports.command = 'logs [--project] [--app] [--function]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
   await loadAndValidateOptions(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());
-    if (projectConfig && projectConfig.name) {
-      projectName = projectConfig.name;
-    } else {
-      logger.error(i18n(`${i18nKey}.errors.projectNameRequired`));
-      process.exit(EXIT_CODES.ERROR);
+  const accountId = getAccountId(options);
+
+  logger.log(options);
+  const {
+    projectName: promptProjectName,
+    appName: promptAppName,
+    functionName: promptFunctionName,
+  } = await projectLogsPrompt(accountId, options);
+
+  const projectName = options.project || promptProjectName;
+  const appName = options.app || promptAppName;
+  const functionName =
+    options.function || promptFunctionName || options.endpoint;
+
+  let relativeAppPath;
+
+  if (appName && !options.endpoint) {
+    await ensureProjectExists(accountId, projectName, {
+      allowCreate: false,
+    });
+    const { deployedBuild } = await fetchProject(accountId, projectName);
+
+    if (deployedBuild && deployedBuild.subbuildStatuses) {
+      const appSubbuild = deployedBuild.subbuildStatuses.find(
+        subbuild => subbuild.buildName === appName
+      );
+      if (appSubbuild) {
+        relativeAppPath = appSubbuild.rootPath;
+      } else {
+        logger.error(
+          i18n(`${i18nKey}.errors.invalidAppName`, {
+            appName: options.app,
+            projectName,
+          })
+        );
+        process.exit(EXIT_CODES.ERROR);
+      }
     }
   }
 
-  const accountId = getAccountId(options);
+  trackCommandUsage('project-logs', { latest: options.latest }, accountId);
 
-  trackCommandUsage('project-logs', { latest }, accountId);
+  const logsInfo = [
+    [accountId, `"${projectName}"`, `"${appName}"`, functionName],
+  ];
 
-  functionLog(accountId, { ...options, projectName });
+  logsInfo.unshift(
+    getTableHeader([
+      i18n(`${i18nKey}.table.accountHeader`),
+      i18n(`${i18nKey}.table.projectHeader`),
+      i18n(`${i18nKey}.table.appHeader`),
+      i18n(`${i18nKey}.table.functionHeader`),
+    ])
+  );
+
+  logger.log(i18n(`${i18nKey}.logs.showingLogs`));
+  logger.log(getTableContents(logsInfo, { border: { bodyLeft: '  ' } }));
+
+  logger.log(
+    uiLink(
+      i18n(`${i18nKey}.logs.hubspotLogsLink`),
+      getPrivateAppsUrl(accountId)
+    )
+  );
+  logger.log();
+  uiLine();
+
+  const showFinalMessage = await handleFunctionLog(accountId, {
+    ...options,
+    projectName,
+    appPath: relativeAppPath,
+    functionName,
+  });
+
+  if (showFinalMessage) {
+    uiLine();
+  }
 };
 
 exports.builder = yargs => {
   yargs
     .options({
-      functionName: {
+      function: {
         alias: 'function',
-        describe: i18n(`${i18nKey}.positionals.functionName.describe`),
+        describe: i18n(`${i18nKey}.options.function.describe`),
+        requiresArg: true,
+        type: 'string',
+      },
+      endpoint: {
+        alias: 'endpoint',
+        describe: i18n(`${i18nKey}.options.endpoint.describe`),
+        hidden: true,
+        requiresArg: true,
         type: 'string',
-        demandOption: true,
       },
-      appPath: {
-        describe: i18n(`${i18nKey}.options.appPath.describe`),
+      app: {
+        describe: i18n(`${i18nKey}.options.app.describe`),
+        requiresArg: true,
         type: 'string',
       },
-      projectName: {
-        describe: i18n(`${i18nKey}.options.projectName.describe`),
+      project: {
+        describe: i18n(`${i18nKey}.options.project.describe`),
+        requiresArg: true,
         type: 'string',
       },
       latest: {
@@ -191,7 +255,7 @@ exports.builder = yargs => {
 
   yargs.example([
     [
-      '$0 project logs --function=my-function --appPath="app" --projectName="my-project"',
+      '$0 project logs --project="my-project" --app="app" --function=my-function',
       i18n(`${i18nKey}.examples.default`),
     ],
   ]);

package/commands/project/open.js

@@ -0,0 +1,75 @@
+const open = require('open');
+const {
+  addAccountOptions,
+  addConfigOptions,
+  getAccountId,
+  addUseEnvironmentOptions,
+  addTestingOptions,
+} = require('../../lib/commonOpts');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  getProjectConfig,
+  getProjectDetailUrl,
+  ensureProjectExists,
+} = require('../../lib/projects');
+const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+
+const i18nKey = 'cli.commands.project.subcommands.open';
+
+exports.command = 'open [--project]';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+
+  const accountId = getAccountId(options);
+  const { project } = options;
+  const { projectConfig } = await getProjectConfig();
+
+  let projectName = project;
+
+  if (projectName) {
+    const projectExists = await ensureProjectExists(accountId, projectName, {
+      allowCreate: false,
+    });
+
+    if (!projectExists) {
+      process.exit(EXIT_CODES.ERROR);
+    }
+  } else if (!projectName && projectConfig) {
+    projectName = projectConfig.name;
+  } else if (!projectName && !projectConfig) {
+    const namePrompt = await projectNamePrompt(accountId, projectConfig);
+
+    if (!namePrompt.projectName) {
+      process.exit(EXIT_CODES.ERROR);
+    }
+    projectName = namePrompt.projectName;
+  }
+
+  const url = getProjectDetailUrl(projectName, accountId);
+  open(url, { url: true });
+  logger.success(i18n(`${i18nKey}.success`, { projectName }));
+  process.exit(EXIT_CODES.SUCCESS);
+};
+
+exports.builder = yargs => {
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+  addUseEnvironmentOptions(yargs, true);
+  addTestingOptions(yargs, true);
+
+  yargs.options({
+    project: {
+      describe: i18n(`${i18nKey}.options.project.describe`),
+      type: 'string',
+    },
+  });
+
+  yargs.example([['$0 project open', i18n(`${i18nKey}.examples.default`)]]);
+
+  return yargs;
+};

package/commands/project.js

@@ -6,6 +6,7 @@ const listBuilds = require('./project/listBuilds');
 const logs = require('./project/logs');
 const watch = require('./project/watch');
 const download = require('./project/download');
+const open = require('./project/open');
 
 exports.command = 'project';
 exports.describe = false; //'Commands for working with projects';
@@ -22,6 +23,7 @@ exports.builder = yargs => {
   yargs.command(listBuilds).demandCommand(0, '');
   yargs.command(logs).demandCommand(1, '');
   yargs.command(download).demandCommand(0, '');
+  yargs.command(open).demandCommand(0, '');
 
   return yargs;
 };

package/commands/sandbox/create.js

@@ -15,7 +15,7 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
 
 exports.command = 'create [name]';
-exports.describe = false;
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);
@@ -41,7 +41,7 @@ exports.handler = async options => {
   return createSandbox(accountId, sandboxName).then(
     ({ name, sandboxHubId }) => {
       logger.success(
-        i18n(`${i18nKey}.describe`, {
+        i18n(`${i18nKey}.success.create`, {
           name,
           sandboxHubId,
         })

package/commands/sandbox.js

@@ -1,8 +1,10 @@
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const create = require('./sandbox/create');
 
+// const i18nKey = 'cli.commands.sandbox';
+
 exports.command = 'sandbox';
-exports.describe = false; //'Commands for working with sandboxes';
+exports.describe = false; // i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
   addConfigOptions(yargs, true);

package/commands/theme/marketplace-validate.js

@@ -16,7 +16,9 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const {
   logValidatorResults,
 } = require('../../lib/validators/logValidatorResults');
-const { applyValidators } = require('../../lib/validators/applyValidators');
+const {
+  applyAbsoluteValidators,
+} = require('../../lib/validators/applyValidators');
 const MARKETPLACE_VALIDATORS = require('../../lib/validators');
 const { VALIDATION_RESULT } = require('../../lib/validators/constants');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
@@ -65,7 +67,7 @@ exports.handler = async options => {
 
   const themeFiles = await walk(absoluteSrcPath);
 
-  applyValidators(
+  applyAbsoluteValidators(
     MARKETPLACE_VALIDATORS.theme,
     absoluteSrcPath,
     themeFiles,

package/commands/upload.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const { uploadFolder } = require('@hubspot/cli-lib');
+const { uploadFolder, hasUploadErrors } = require('@hubspot/cli-lib');
 const { getFileMapperQueryValues } = require('@hubspot/cli-lib/fileMapper');
 const { upload } = require('@hubspot/cli-lib/api/fileMapper');
 const {
@@ -55,7 +55,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   if (!validateMode(options)) {
-    process.exit(EXIT_CODES.ERROR);
+    process.exit(EXIT_CODES.WARNING);
   }
 
   const accountId = getAccountId(options);
@@ -98,7 +98,7 @@ exports.handler = async options => {
 
   if (srcDestIssues.length) {
     srcDestIssues.forEach(({ message }) => logger.error(message));
-    process.exit(EXIT_CODES.ERROR);
+    process.exit(EXIT_CODES.WARNING);
   }
   if (stats.isFile()) {
     if (!isAllowedExtension(src)) {
@@ -150,6 +150,7 @@ exports.handler = async options => {
             payload: src,
           })
         );
+        process.exit(EXIT_CODES.WARNING);
       });
   } else {
     logger.log(
@@ -162,13 +163,22 @@ exports.handler = async options => {
     uploadFolder(accountId, absoluteSrcPath, dest, {
       mode,
     })
-      .then(() => {
-        logger.success(
-          i18n(`${i18nKey}.success.uploadComplete`, {
-            dest,
-          })
-        );
-        logThemePreview(src, accountId);
+      .then(results => {
+        if (!hasUploadErrors(results)) {
+          logger.success(
+            i18n(`${i18nKey}.success.uploadComplete`, {
+              dest,
+            })
+          );
+          logThemePreview(src, accountId);
+        } else {
+          logger.error(
+            i18n(`${i18nKey}.errors.someFilesFailed`, {
+              dest,
+            })
+          );
+          process.exit(EXIT_CODES.WARNING);
+        }
       })
       .catch(error => {
         logger.error(
@@ -180,6 +190,7 @@ exports.handler = async options => {
         logErrorInstance(error, {
           accountId,
         });
+        process.exit(EXIT_CODES.WARNING);
       });
   }
 };

package/lib/projects.js

@@ -29,7 +29,7 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
-const { getCwd } = require('@hubspot/cli-lib/path');
+const { getCwd, getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
 const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { uiLine, uiLink, uiAccountDescription } = require('../lib/ui');
@@ -45,13 +45,13 @@ const writeProjectConfig = (configPath, config) => {
   }
 };
 
-const getIsInProject = async _dir => {
-  const configPath = await getProjectConfigPath(_dir);
+const getIsInProject = _dir => {
+  const configPath = getProjectConfigPath(_dir);
   return !!configPath;
 };
 
-const getProjectConfigPath = async _dir => {
-  const projectDir = _dir ? path.resolve(getCwd(), _dir) : getCwd();
+const getProjectConfigPath = _dir => {
+  const projectDir = _dir ? getAbsoluteFilePath(_dir) : getCwd();
 
   const configPath = findup(PROJECT_CONFIG_FILE, {
     cwd: projectDir,
@@ -168,7 +168,8 @@ const ensureProjectExists = async (
   { forceCreate = false, allowCreate = true } = {}
 ) => {
   try {
-    await fetchProject(accountId, projectName);
+    const project = await fetchProject(accountId, projectName);
+    return !!project;
   } catch (err) {
     if (err.statusCode === 404) {
       let shouldCreateProject = forceCreate;
@@ -193,14 +194,16 @@ const ensureProjectExists = async (
           return logApiErrorInstance(err, new ApiErrorContext({ accountId }));
         }
       } else {
-        return logger.log(
+        logger.log(
           `Your project ${chalk.bold(
             projectName
           )} could not be found in ${chalk.bold(accountId)}.`
         );
+        return false;
       }
     }
     logApiErrorInstance(err, new ApiErrorContext({ accountId }));
+    return false;
   }
 };
 

package/lib/prompts/personalAccessKeyPrompt.js

@@ -107,7 +107,7 @@ const PERSONAL_ACCESS_KEY = {
   name: 'personalAccessKey',
   message: i18n(`${i18nKey}.enterPersonalAccessKey`),
   validate(val) {
-    if (typeof val !== 'string') {
+    if (!val || typeof val !== 'string') {
       return i18n(`${i18nKey}.errors.invalidPersonalAccessKey`);
     } else if (val[0] === '•') {
       return i18n(`${i18nKey}.errors.invalidPersonalAccessKeyCopy`);

package/lib/prompts/projectNamePrompt.js

@@ -0,0 +1,29 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { ensureProjectExists } = require('../projects');
+
+const i18nKey = 'cli.lib.prompts.projectNamePrompt';
+
+const projectNamePrompt = accountId => {
+  return promptUser({
+    name: 'projectName',
+    message: i18n(`${i18nKey}.enterName`),
+    validate: async val => {
+      if (typeof val !== 'string') {
+        return i18n(`${i18nKey}.errors.invalidName`);
+      }
+      const projectExists = await ensureProjectExists(accountId, val, {
+        allowCreate: false,
+      });
+
+      if (!projectExists) {
+        return false;
+      }
+      return true;
+    },
+  });
+};
+
+module.exports = {
+  projectNamePrompt,
+};

package/lib/prompts/projectsLogsPrompt.js

@@ -0,0 +1,57 @@
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { fetchProject } = require('@hubspot/cli-lib/api/dfs');
+const { promptUser } = require('./promptUtils');
+const { getProjectConfig, ensureProjectExists } = require('../projects');
+const { logger } = require('@hubspot/cli-lib/logger');
+const { EXIT_CODES } = require('../enums/exitCodes');
+
+const i18nKey = 'cli.lib.prompts.projectLogsPrompt';
+
+const projectLogsPrompt = (accountId, promptOptions = {}) => {
+  return promptUser([
+    {
+      name: 'projectName',
+      message: i18n(`${i18nKey}.projectName`),
+      when: !promptOptions.project,
+      default: async () => {
+        const { projectConfig } = await getProjectConfig();
+        return projectConfig && projectConfig.name ? projectConfig.name : null;
+      },
+    },
+    {
+      name: 'appName',
+      type: 'list',
+      message: i18n(`${i18nKey}.appName`),
+      when: !promptOptions.app && !promptOptions.endpoint,
+      choices: async ({ projectName }) => {
+        const name = projectName || promptOptions.project;
+
+        await ensureProjectExists(accountId, name, {
+          allowCreate: false,
+        });
+        const { deployedBuild } = await fetchProject(accountId, name);
+
+        if (deployedBuild && deployedBuild.subbuildStatuses) {
+          return deployedBuild.subbuildStatuses
+            .filter(subbuild => subbuild.buildType === 'APP')
+            .map(subbuild => ({
+              name: subbuild.buildName,
+              value: subbuild.buildName,
+            }));
+        } else {
+          logger.debug('Failed to fetch project');
+          process.exit(EXIT_CODES.ERROR);
+        }
+      },
+    },
+    {
+      name: 'functionName',
+      message: i18n(`${i18nKey}.functionName`),
+      when: !promptOptions.function && !promptOptions.endpoint,
+    },
+  ]);
+};
+
+module.exports = {
+  projectLogsPrompt,
+};