Make content-type optional, guessed using file ext

Signed-off-by: Didier Wenzek <[email protected]>

Author: didier-wenzek

crates/core/tedge/src/cli/http/cli.rs

@@ -27,14 +27,14 @@ pub enum TEdgeHttpCli {
         content: Content,
 
         /// MIME type of the content
-        #[clap(long, default_value = "application/json")]
+        #[clap(long)]
         #[arg(value_parser = parse_mime_type)]
-        content_type: String,
+        content_type: Option<String>,
 
         /// MIME type of the expected content
-        #[clap(long, default_value = "application/json")]
+        #[clap(long)]
         #[arg(value_parser = parse_mime_type)]
-        accept_type: String,
+        accept_type: Option<String>,
 
         /// Optional c8y cloud profile
         #[clap(long)]
@@ -51,9 +51,14 @@ pub enum TEdgeHttpCli {
         content: Content,
 
         /// MIME type of the content
-        #[clap(long, default_value = "application/json")]
+        #[clap(long)]
         #[arg(value_parser = parse_mime_type)]
-        content_type: String,
+        content_type: Option<String>,
+
+        /// MIME type of the expected content
+        #[clap(long)]
+        #[arg(value_parser = parse_mime_type)]
+        accept_type: Option<String>,
 
         /// Optional c8y cloud profile
         #[clap(long)]
@@ -66,9 +71,9 @@ pub enum TEdgeHttpCli {
         uri: String,
 
         /// MIME type of the expected content
-        #[clap(long, default_value = "application/json")]
+        #[clap(long)]
         #[arg(value_parser = parse_mime_type)]
-        accept_type: String,
+        accept_type: Option<String>,
 
         /// Optional c8y cloud profile
         #[clap(long)]
@@ -172,10 +177,12 @@ impl From<TEdgeHttpCli> for HttpAction {
             TEdgeHttpCli::Put {
                 content,
                 content_type,
+                accept_type,
                 ..
             } => HttpAction::Put {
                 content,
                 content_type,
+                accept_type,
             },
             TEdgeHttpCli::Get { accept_type, .. } => HttpAction::Get { accept_type },
             TEdgeHttpCli::Delete { .. } => HttpAction::Delete,
@@ -219,3 +226,26 @@ fn http_client(
     };
     Ok(builder.build()?)
 }
+
+impl Content {
+    pub fn length(&self) -> Option<usize> {
+        if let Some(content) = &self.arg2 {
+            Some(content.len())
+        } else if let Some(data) = &self.data {
+            Some(data.len())
+        } else if let Some(file) = &self.file {
+            Some(std::fs::metadata(file).ok()?.len().try_into().ok()?)
+        } else {
+            None
+        }
+    }
+
+    pub fn mime_type(&self) -> Option<String> {
+        let file = self.file.as_ref()?;
+        Some(
+            mime_guess::from_path(file)
+                .first_or_octet_stream()
+                .to_string(),
+        )
+    }
+}

crates/core/tedge/src/cli/http/command.rs

@@ -2,7 +2,9 @@ use crate::cli::http::cli::Content;
 use crate::command::Command;
 use crate::log::MaybeFancy;
 use anyhow::Error;
+use hyper::http::HeaderValue;
 use reqwest::blocking;
+use reqwest::header::HeaderMap;
 
 pub struct HttpCommand {
     /// HTTP client
@@ -18,15 +20,16 @@ pub struct HttpCommand {
 pub enum HttpAction {
     Post {
         content: Content,
-        content_type: String,
-        accept_type: String,
+        content_type: Option<String>,
+        accept_type: Option<String>,
     },
     Put {
         content: Content,
-        content_type: String,
+        content_type: Option<String>,
+        accept_type: Option<String>,
     },
     Get {
-        accept_type: String,
+        accept_type: Option<String>,
     },
     Delete,
 }
@@ -53,25 +56,18 @@ impl HttpCommand {
     fn request(&self) -> Result<blocking::RequestBuilder, Error> {
         let client = &self.client;
         let url = &self.url;
+        let headers = self.action.headers();
         let request = match &self.action {
-            HttpAction::Post {
-                content,
-                content_type,
-                accept_type,
-            } => client
+            HttpAction::Post { content, .. } => client
                 .post(url)
-                .header("Accept", accept_type)
-                .header("Content-Type", content_type)
+                .headers(headers)
                 .body(blocking::Body::try_from(content.clone())?),
-            HttpAction::Put {
-                content,
-                content_type,
-            } => client
+            HttpAction::Put { content, .. } => client
                 .put(url)
-                .header("Content-Type", content_type)
+                .headers(headers)
                 .body(blocking::Body::try_from(content.clone())?),
-            HttpAction::Get { accept_type } => client.get(url).header("Accept", accept_type),
-            HttpAction::Delete => client.delete(url),
+            HttpAction::Get { .. } => client.get(url).headers(headers),
+            HttpAction::Delete => client.delete(url).headers(headers),
         };
 
         Ok(request)
@@ -84,3 +80,66 @@ impl HttpCommand {
         Ok(())
     }
 }
+
+impl HttpAction {
+    pub fn headers(&self) -> HeaderMap {
+        let mut headers = HeaderMap::new();
+
+        if let Some(content_length) = self.content_length() {
+            headers.insert("Content-Length", content_length);
+        }
+        if let Some(content_type) = self.content_type() {
+            headers.insert("Content-Type", content_type);
+        }
+        if let Some(accept_type) = self.accept_type() {
+            headers.insert("Accept", accept_type);
+        }
+
+        headers
+    }
+
+    pub fn content_type(&self) -> Option<HeaderValue> {
+        match self {
+            HttpAction::Post {
+                content,
+                content_type,
+                ..
+            }
+            | HttpAction::Put {
+                content,
+                content_type,
+                ..
+            } => content_type
+                .as_ref()
+                .cloned()
+                .or(content.mime_type())
+                .or(Some("application/json".to_string()))
+                .and_then(|s| HeaderValue::from_str(&s).ok()),
+
+            _ => None,
+        }
+    }
+
+    pub fn accept_type(&self) -> Option<HeaderValue> {
+        match self {
+            HttpAction::Post { accept_type, .. }
+            | HttpAction::Put { accept_type, .. }
+            | HttpAction::Get { accept_type } => accept_type
+                .as_ref()
+                .and_then(|s| HeaderValue::from_str(s).ok()),
+
+            _ => None,
+        }
+    }
+
+    pub fn content_length(&self) -> Option<HeaderValue> {
+        match self {
+            HttpAction::Post { content, .. } | HttpAction::Put { content, .. } => content
+                .length()
+                .map(|length| length.to_string())
+                .and_then(|s| HeaderValue::from_str(&s).ok()),
+
+            _ => None,
+        }
+    }
+}