Update project logs

packages/cli/commands/logs.js

@@ -77,7 +77,7 @@ const endpointLog = async (accountId, options) => {
 };
 
 exports.command = 'logs [endpoint]';
-exports.describe = 'get logs for a function';
+exports.describe = 'get logs for a function within a project';
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

packages/cli/commands/project/logs.js

@@ -13,19 +13,25 @@ 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 handleLogsError = (e, accountId, projectName, appPath, functionName) => {
   if (e.statusCode === 404) {
     logger.error(
-      `No logs were found for the function name '${functionName}' in the app path '${appPath}' within the project '${projectName}' in account ${accountId}.`
+      appPath
+        ? `No logs were found for the function name '${functionName}' in the app path '${appPath}' within the project '${projectName}' in account ${accountId}.`
+        : `No logs were found for the function name '${functionName}' within the project '${projectName}' in account ${accountId}.`
     );
   }
 };
 
-const appFunctionLog = async (accountId, options) => {
+const functionLog = async (accountId, options) => {
   const {
     latest,
     follow,
@@ -37,28 +43,40 @@ 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: `Waiting for log entries for '${functionName}' on account '${accountId}'.\n`,
     });
-    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,
@@ -69,24 +87,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);
     }
@@ -97,7 +104,7 @@ const appFunctionLog = async (accountId, options) => {
   }
 };
 
-exports.command = 'logs [functionName]';
+exports.command = 'logs';
 exports.describe = 'get logs for a function within a project';
 
 exports.handler = async options => {
@@ -110,7 +117,7 @@ exports.handler = async options => {
     logger.error('You must pass a function name to retrieve logs for.');
     process.exit(1);
   } else if (!projectName) {
-    const projectConfig = await getProjectConfig(getCwd());
+    const { projectConfig } = await getProjectConfig(getCwd());
     if (projectConfig.name) {
       projectName = projectConfig.name;
     } else {
@@ -128,22 +135,22 @@ exports.handler = async options => {
 
   trackCommandUsage('project-logs', { latest }, accountId);
 
-  appFunctionLog(accountId, { ...options, projectName });
+  functionLog(accountId, { ...options, projectName });
 };
 
 exports.builder = yargs => {
-  yargs.positional('functionName', {
-    describe: 'Serverless app function name',
-    type: 'string',
-    demandOption: true,
-  });
   yargs
     .options({
-      appPath: {
-        describe: 'path to the app',
+      functionName: {
+        alias: 'function',
+        describe: 'Serverless app function name or endpoint route',
         type: 'string',
         demandOption: true,
       },
+      appPath: {
+        describe: 'Path to app folder, relative to project',
+        type: 'string',
+      },
       projectName: {
         describe: 'name of the project',
         type: 'string',
@@ -172,7 +179,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"',
       'Get 5 most recent logs for function named "my-function" within the app named "app" within the project named "my-project"',
     ],
   ]);