chore: update CLI options (#350)

* `invoke-function`: By default, output only the invoked function's response. If `--verbose` is specified, also output details of the function call
* `invoke`/`put`/`list` function(s): Make `--cache-name` optional. Default to `~/.momento/config`'s cache name

Author: kirmar

momento-cli-opts/src/lib.rs

@@ -126,26 +126,34 @@ pub enum AccountCommand {
 pub enum FunctionCommand {
     #[command(about = "Create or update a Momento Function")]
     PutFunction {
-        #[arg(long = "cache-name", short, help = "Cache namespace")]
-        cache_name: String,
-        #[arg(long = "name", short, help = "Function name")]
+        #[arg(
+            long = "cache-name",
+            short,
+            help = "Cache namespace",
+            value_name = "CACHE"
+        )]
+        cache_name: Option<String>,
+        #[arg(long = "name", short, help = "Function name", value_name = "FUNCTION")]
         name: String,
         #[arg(
             long = "wasm-file",
             short,
-            help = ".wasm file compiled with wasm32-wasip2"
+            help = ".wasm file compiled with wasm32-wasip2",
+            value_name = "WASM"
         )]
         wasm_file: Option<String>,
         #[arg(
             long = "id-uploaded-wasm",
             short,
-            help = "ID of a Wasm binary previously uploaded to Momento Functions"
+            help = "ID of a Wasm binary previously uploaded to Momento Functions",
+            value_name = "WASM"
         )]
         id_uploaded_wasm: Option<String>,
         #[arg(
             long = "version-uploaded-wasm",
             short,
-            help = "Version number of a Wasm binary previously uploaded to Momento Functions"
+            help = "Version number of a Wasm binary previously uploaded to Momento Functions",
+            value_name = "WASM"
         )]
         version_uploaded_wasm: Option<u32>,
         #[arg(long = "description", short, help = "Description")]
@@ -154,7 +162,8 @@ pub enum FunctionCommand {
             long = "env-var",
             short = 'E',
             value_parser = parse_env::<String, String>,
-            help = "Environment variables to provide to the Function. Example: -E KEY1=value_1 -E KEY2=value_2"
+            help = "Environment variables to provide to the Function. Example: -E KEY1=value_1 -E KEY2=value_2",
+            value_name = "WASM"
         )]
         environment_variables: Vec<(String, String)>,
     },
@@ -165,25 +174,36 @@ pub enum FunctionCommand {
         #[arg(
             long = "wasm-file",
             short,
-            help = ".wasm file compiled with wasm32-wasip2"
+            help = ".wasm file compiled with wasm32-wasip2",
+            value_name = "WASM"
         )]
         wasm_file: String,
         #[arg(long = "description", short, help = "Description")]
         description: Option<String>,
     },
     #[command(about = "Call a Momento Function")]
     InvokeFunction {
-        #[arg(long = "cache-name", short, help = "Cache namespace")]
-        cache_name: String,
-        #[arg(long = "name", short, help = "Function name")]
+        #[arg(
+            long = "cache-name",
+            short,
+            help = "Cache namespace",
+            value_name = "CACHE"
+        )]
+        cache_name: Option<String>,
+        #[arg(long = "name", short, help = "Function name", value_name = "FUNCTION")]
         name: String,
         #[arg(long = "data", short, help = "HTTP POST payload body")]
         data: Option<String>,
     },
     #[command(about = "List all Momento Functions in the given cache namespace")]
     ListFunctions {
-        #[arg(long = "cache-name", short, help = "Cache namespace")]
-        cache_name: String,
+        #[arg(
+            long = "cache-name",
+            short,
+            help = "Cache namespace",
+            value_name = "CACHE"
+        )]
+        cache_name: Option<String>,
     },
     #[command(about = "List all versions of a Momento Function")]
     ListFunctionVersions {

momento/src/commands/functions/function_cli.rs

@@ -10,6 +10,7 @@ use crate::{
     commands::functions::utils::read_wasm_file, error::CliError, utils::console::console_data,
 };
 
+use log::info;
 use reqwest;
 use reqwest::StatusCode;
 use serde::Deserialize;
@@ -52,9 +53,9 @@ pub async fn invoke_function(
     let data = data.unwrap_or_default();
     let function_info = format!("Name: {name}, Cache Namespace: {cache_name}");
     if data.is_empty() {
-        console_data!("Invoking function. {function_info}");
+        info!("Invoking function. {function_info}");
     } else {
-        console_data!("Sending data to function. {function_info}, Payload: {data}");
+        info!("Sending data to function. {function_info}, Payload: {data}");
     };
 
     let request_url = format!("{endpoint}/functions/{cache_name}/{name}");
@@ -67,7 +68,7 @@ pub async fn invoke_function(
         .await?;
     let status = response.status();
     if status.is_success() {
-        console_data!("  Response:\n{}", response.text().await?);
+        console_data!("{}", response.text().await?);
         Ok(())
     } else {
         Err(CliError {

momento/src/main.rs

@@ -228,7 +228,7 @@ async fn run_momento_command(args: momento_cli_opts::Momento) -> Result<(), CliE
                 .await?;
             }
             PreviewCommand::Function { operation } => {
-                let (creds, _) = get_creds_and_config(&args.profile).await?;
+                let (creds, config) = get_creds_and_config(&args.profile).await?;
                 let credential_provider = creds.authenticate()?;
                 let endpoint = credential_provider.cache_http_endpoint().to_string();
                 let auth_token = credential_provider.auth_token().to_string();
@@ -247,6 +247,7 @@ async fn run_momento_command(args: momento_cli_opts::Momento) -> Result<(), CliE
                         description,
                         environment_variables,
                     } => {
+                        let cache_name = cache_name.unwrap_or(config.cache);
                         let wasm_source = determine_wasm_source(
                             wasm_file,
                             id_uploaded_wasm,
@@ -280,12 +281,14 @@ async fn run_momento_command(args: momento_cli_opts::Momento) -> Result<(), CliE
                         name,
                         data,
                     } => {
+                        let cache_name = cache_name.unwrap_or(config.cache);
                         commands::functions::function_cli::invoke_function(
                             endpoint, auth_token, cache_name, name, data,
                         )
                         .await?
                     }
                     momento_cli_opts::FunctionCommand::ListFunctions { cache_name } => {
+                        let cache_name = cache_name.unwrap_or(config.cache);
                         commands::functions::function_cli::list_functions(client, cache_name)
                             .await?
                     }