Set content type posted by tedge http post

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

Author: didier-wenzek

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

@@ -26,6 +26,16 @@ pub enum TEdgeHttpCli {
         #[command(flatten)]
         content: Content,
 
+        /// MIME type of the content
+        #[clap(long, default_value = "application/json")]
+        #[arg(value_parser = parse_mime_type)]
+        content_type: String,
+
+        /// MIME type of the expected content
+        #[clap(long, default_value = "application/json")]
+        #[arg(value_parser = parse_mime_type)]
+        accept_type: String,
+
         /// Optional c8y cloud profile
         #[clap(long)]
         profile: Option<ProfileName>,
@@ -40,6 +50,11 @@ pub enum TEdgeHttpCli {
         #[command(flatten)]
         content: Content,
 
+        /// MIME type of the content
+        #[clap(long, default_value = "application/json")]
+        #[arg(value_parser = parse_mime_type)]
+        content_type: String,
+
         /// Optional c8y cloud profile
         #[clap(long)]
         profile: Option<ProfileName>,
@@ -50,6 +65,11 @@ pub enum TEdgeHttpCli {
         /// Source URI
         uri: String,
 
+        /// MIME type of the expected content
+        #[clap(long, default_value = "application/json")]
+        #[arg(value_parser = parse_mime_type)]
+        accept_type: String,
+
         /// Optional c8y cloud profile
         #[clap(long)]
         profile: Option<ProfileName>,
@@ -82,6 +102,10 @@ pub struct Content {
     file: Option<Utf8PathBuf>,
 }
 
+fn parse_mime_type(input: &str) -> Result<String, Error> {
+    Ok(input.parse::<mime_guess::mime::Mime>()?.to_string())
+}
+
 impl TryFrom<Content> for blocking::Body {
     type Error = std::io::Error;
 
@@ -121,13 +145,7 @@ impl BuildCommand for TEdgeHttpCli {
         let url = format!("{protocol}://{host}:{port}{uri}");
         let identity = config.http.client.auth.identity()?;
         let client = http_client(config.cloud_root_certs(), identity.as_ref())?;
-
-        let action = match self {
-            TEdgeHttpCli::Post { content, .. } => HttpAction::Post(content),
-            TEdgeHttpCli::Put { content, .. } => HttpAction::Put(content),
-            TEdgeHttpCli::Get { .. } => HttpAction::Get,
-            TEdgeHttpCli::Delete { .. } => HttpAction::Delete,
-        };
+        let action = self.into();
 
         Ok(HttpCommand {
             client,
@@ -138,6 +156,33 @@ impl BuildCommand for TEdgeHttpCli {
     }
 }
 
+impl From<TEdgeHttpCli> for HttpAction {
+    fn from(value: TEdgeHttpCli) -> Self {
+        match value {
+            TEdgeHttpCli::Post {
+                content,
+                content_type,
+                accept_type,
+                ..
+            } => HttpAction::Post {
+                content,
+                content_type,
+                accept_type,
+            },
+            TEdgeHttpCli::Put {
+                content,
+                content_type,
+                ..
+            } => HttpAction::Put {
+                content,
+                content_type,
+            },
+            TEdgeHttpCli::Get { accept_type, .. } => HttpAction::Get { accept_type },
+            TEdgeHttpCli::Delete { .. } => HttpAction::Delete,
+        }
+    }
+}
+
 impl TEdgeHttpCli {
     fn uri(&self) -> &str {
         match self {

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

@@ -16,18 +16,27 @@ pub struct HttpCommand {
 }
 
 pub enum HttpAction {
-    Post(Content),
-    Put(Content),
-    Get,
+    Post {
+        content: Content,
+        content_type: String,
+        accept_type: String,
+    },
+    Put {
+        content: Content,
+        content_type: String,
+    },
+    Get {
+        accept_type: String,
+    },
     Delete,
 }
 
 impl Command for HttpCommand {
     fn description(&self) -> String {
         let verb = match self.action {
-            HttpAction::Post(_) => "POST",
-            HttpAction::Put(_) => "PUT",
-            HttpAction::Get => "GET",
+            HttpAction::Post { .. } => "POST",
+            HttpAction::Put { .. } => "PUT",
+            HttpAction::Get { .. } => "GET",
             HttpAction::Delete => "DELETE",
         };
         format!("{verb} {}", self.url)
@@ -45,16 +54,23 @@ impl HttpCommand {
         let client = &self.client;
         let url = &self.url;
         let request = match &self.action {
-            HttpAction::Post(content) => client
+            HttpAction::Post {
+                content,
+                content_type,
+                accept_type,
+            } => client
                 .post(url)
-                .header("Accept", "application/json")
-                .header("Content-Type", "application/json")
+                .header("Accept", accept_type)
+                .header("Content-Type", content_type)
                 .body(blocking::Body::try_from(content.clone())?),
-            HttpAction::Put(content) => client
+            HttpAction::Put {
+                content,
+                content_type,
+            } => client
                 .put(url)
-                .header("Content-Type", "application/json")
+                .header("Content-Type", content_type)
                 .body(blocking::Body::try_from(content.clone())?),
-            HttpAction::Get => client.get(url).header("Accept", "application/json"),
+            HttpAction::Get { accept_type } => client.get(url).header("Accept", accept_type),
             HttpAction::Delete => client.delete(url),
         };