refactor: Use json instead of body

Author: tomasol

fly-http/src/app.rs

@@ -2,7 +2,8 @@ use crate::exports::activity_flyio::fly_http::apps;
 use crate::{API_BASE_URL, request_with_api_token};
 use anyhow::anyhow;
 use serde::{Deserialize, Serialize};
-use wstd::http::{Client, IntoBody as _, Method, StatusCode};
+use wstd::http::request::JsonRequest as _;
+use wstd::http::{Client, Method, StatusCode};
 use wstd::runtime::block_on;
 
 async fn put(org_slug: String, app_name: String) -> Result<apps::App, anyhow::Error> {
@@ -19,13 +20,11 @@ async fn put(org_slug: String, app_name: String) -> Result<apps::App, anyhow::Er
         app_name: &app_name,
         org_slug: &org_slug,
     };
-    let body_bytes = serde_json::to_vec(&request_body)?;
 
     let post_request = request_with_api_token()?
         .method(Method::POST)
         .uri(format!("{API_BASE_URL}/apps"))
-        .header("Content-Type", "application/json")
-        .body(body_bytes.into_body())?;
+        .json(&request_body)?;
 
     let mut response = client.send(post_request).await?;
 

fly-http/src/machine.rs

@@ -11,7 +11,7 @@ use ser::{
     MachineUpdateRequestSer, ResponseErrorSer,
 };
 use wstd::http::request::JsonRequest;
-use wstd::http::{Client, IntoBody as _, Method, StatusCode};
+use wstd::http::{Client, Method, StatusCode};
 use wstd::runtime::block_on;
 
 // These structs are internal implementation details. They are designed to serialize
@@ -393,14 +393,11 @@ async fn create(
             config: fly_config,
             region,
         };
-        let body = serde_json::to_string(&request_payload).expect("must be serializable");
-
         let url = format!("{API_BASE_URL}/apps/{app_name}/machines");
         let request = request_with_api_token()?
             .method(Method::POST)
             .uri(url)
-            .header("Content-Type", "application/json")
-            .body(body.into_body())?;
+            .json(&request_payload)?;
 
         let response = Client::new().send(request).await?;
         if response.status().is_success() {
@@ -451,14 +448,11 @@ async fn update(
             config: machine_config,
             region,
         };
-        let body = serde_json::to_string(&request_payload).expect("must be serializable");
-
         let url = format!("{API_BASE_URL}/apps/{app_name}/machines/{machine_id}");
         let request = request_with_api_token()?
             .method(Method::POST)
             .uri(url)
-            .header("Content-Type", "application/json")
-            .body(body.into_body())?;
+            .json(&request_payload)?;
 
         let response = Client::new().send(request).await?;
         if response.status().is_success() {

fly-http/src/secret.rs

@@ -2,7 +2,8 @@ use crate::exports::activity_flyio::fly_http::secrets;
 use crate::{API_BASE_URL, request_with_api_token};
 use anyhow::anyhow;
 use serde::{Deserialize, Serialize};
-use wstd::http::{Client, IntoBody as _, Method};
+use wstd::http::request::JsonRequest as _;
+use wstd::http::{Client, Method};
 use wstd::runtime::block_on;
 
 async fn list_secrets(app_name: String) -> Result<Vec<secrets::Secret>, anyhow::Error> {
@@ -39,14 +40,12 @@ async fn put_secret(
     }
     let client = Client::new();
     let body = PutBody { value };
-    let body = serde_json::to_vec(&body)?;
     let request = request_with_api_token()?
         .method(Method::POST)
         .uri(format!(
             "{API_BASE_URL}/apps/{app_name}/secrets/{secret_name}"
         ))
-        .header("Content-Type", "application/json")
-        .body(body.into_body())?;
+        .json(&body)?;
 
     let mut response = client.send(request).await?;