@hubspot/cli 3.0.10-beta.10 → 3.0.10-beta.14

package/commands/auth.js

@@ -85,7 +85,7 @@ exports.handler = async options => {
 
   const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
   loadConfig(configPath);
-  checkAndWarnGitInclusion();
+  checkAndWarnGitInclusion(getConfigPath());
 
   trackCommandUsage('auth');
 

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/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

@@ -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/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,
@@ -31,7 +31,7 @@ async function loadAndValidateOptions(options) {
   logDebugInfo(options);
   const { config: configPath } = options;
   loadConfig(configPath, options);
-  checkAndWarnGitInclusion();
+  checkAndWarnGitInclusion(getConfigPath());
 
   if (!(validateConfig() && (await validateAccount(options)))) {
     process.exit(EXIT_CODES.ERROR);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.10-beta.10",
+  "version": "3.0.10-beta.14",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,14 +8,14 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^3.0.10-beta.10",
-    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.10",
+    "@hubspot/cli-lib": "^3.0.10-beta.13",
+    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.13",
     "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",
@@ -23,7 +23,7 @@
     "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": {
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8422c53ea645c2159b9b143393513cab4e8500a9"
+  "gitHead": "e77b37281411b7eed123974eefd2b839d92376c8"
 }