netlify-cli 17.5.3 → 17.6.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "17.5.3",
+  "version": "17.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "17.5.3",
+      "version": "17.6.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.5.3",
+  "version": "17.6.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {

package/src/commands/logs/functions.mjs

@@ -1,17 +1,28 @@
-import { Argument } from 'commander';
+import { Argument, Option } from 'commander';
 import inquirer from 'inquirer';
 import { chalk, log } from '../../utils/command-helpers.mjs';
 import { getWebSocket } from '../../utils/websockets/index.mjs';
+// Source: Source: https://docs.aws.amazon.com/lambda/latest/dg/monitoring-cloudwatchlogs.html#monitoring-cloudwatchlogs-advanced
+export const LOG_LEVELS = {
+    TRACE: 'TRACE',
+    DEBUG: 'DEBUG',
+    INFO: 'INFO',
+    WARN: 'WARN',
+    ERROR: 'ERROR',
+    FATAL: 'FATAL',
+};
+const LOG_LEVELS_LIST = Object.values(LOG_LEVELS).map((level) => level.toLowerCase());
+const CLI_LOG_LEVEL_CHOICES_STRING = LOG_LEVELS_LIST.map((level) => ` ${level}`);
 function getLog(logData) {
     let logString = '';
     switch (logData.level) {
-        case 'INFO':
+        case LOG_LEVELS.INFO:
             logString += chalk.blueBright(logData.level);
             break;
-        case 'WARN':
+        case LOG_LEVELS.WARN:
             logString += chalk.yellowBright(logData.level);
             break;
-        case 'ERROR':
+        case LOG_LEVELS.ERROR:
             logString += chalk.redBright(logData.level);
             break;
         default:
@@ -24,6 +35,10 @@ const logsFunction = async (functionName, options, command) => {
     const client = command.netlify.api;
     const { site } = command.netlify;
     const { id: siteId } = site;
+    if (options.level && !options.level.every((level) => LOG_LEVELS_LIST.includes(level))) {
+        log(`Invalid log level. Choices are:${CLI_LOG_LEVEL_CHOICES_STRING}`);
+    }
+    const levelsToPrint = options.level || LOG_LEVELS_LIST;
     const { functions = [] } = await client.searchSiteFunctions({ siteId });
     if (functions.length === 0) {
         log(`No functions found for the site`);
@@ -58,6 +73,9 @@ const logsFunction = async (functionName, options, command) => {
     });
     ws.on('message', (data) => {
         const logData = JSON.parse(data);
+        if (!levelsToPrint.includes(logData.level.toLowerCase())) {
+            return;
+        }
         log(getLog(logData));
     });
     ws.on('close', () => {
@@ -71,7 +89,12 @@ const logsFunction = async (functionName, options, command) => {
 export const createLogsFunctionCommand = (program) => program
     .command('logs:function')
     .alias('logs:functions')
+    .addOption(new Option('-l, --level <levels...>', `Log levels to stream. Choices are:${CLI_LOG_LEVEL_CHOICES_STRING}`))
     .addArgument(new Argument('[functionName]', 'Name of the function to stream logs for'))
-    .addExamples(['netlify logs:function my-function', 'netlify logs:function'])
+    .addExamples([
+    'netlify logs:function',
+    'netlify logs:function my-function',
+    'netlify logs:function my-function -l info warn',
+])
     .description('(Beta) Stream netlify function logs to the console')
     .action(logsFunction);