refactor: Always send the content-type header when sending JSON

Author: tomasol

activity/fly-http/impl/src/app.rs

@@ -1,4 +1,5 @@
 use crate::generated::exports::obelisk_flyio::activity_fly_http::apps;
+use crate::wstd_util::JsonRequest as _;
 use crate::{API_BASE_URL, AppName, OrgSlug, request_with_api_token};
 use anyhow::anyhow;
 use serde::{Deserialize, Serialize};
@@ -43,7 +44,7 @@ async fn put(org_slug: OrgSlug, app_name: AppName) -> Result<apps::App, anyhow::
     let post_request = request_with_api_token()?
         .method(Method::POST)
         .uri(format!("{API_BASE_URL}/apps"))
-        .body(Body::from_json(&request_body)?)?;
+        .json(&request_body)?;
 
     let mut response = client.send(post_request).await?;
 

activity/fly-http/impl/src/ips.rs

@@ -4,6 +4,7 @@ use crate::generated::exports::obelisk_flyio::activity_fly_http::ips::{
     self, IpVariant, Ipv4Config, Ipv6Config,
 };
 use crate::generated::obelisk_flyio::activity_fly_http::regions::Region;
+use crate::wstd_util::JsonRequest as _;
 use crate::{API_BASE_URL, AppName, request_with_api_token};
 use anyhow::anyhow;
 use serde::{Deserialize, Deserializer, Serialize};
@@ -45,8 +46,7 @@ async fn allocate_ip(app_name: &AppName, config: &IpVariant) -> Result<String, a
     let request = request_with_api_token()?
         .method(Method::POST)
         .uri(format!("{API_BASE_URL}/apps/{app_name}/ip_assignments"))
-        .header("content-type", "application/json")
-        .body(Body::from_json(&body)?)?;
+        .json(&body)?;
 
     let response = Client::new().send(request).await?;
     let resp_status = response.status();

activity/fly-http/impl/src/lib.rs

@@ -3,6 +3,7 @@ mod ips;
 mod machine;
 mod secret;
 mod volume;
+mod wstd_util;
 mod generated {
     #![allow(clippy::empty_line_after_outer_attr)]
     include!(concat!(env!("OUT_DIR"), "/generated.rs"));

activity/fly-http/impl/src/machine.rs

@@ -2,6 +2,7 @@ use crate::generated::exports::obelisk_flyio::activity_fly_http::machines::{
     ExecResponse, Guest, Machine, MachineConfig,
 };
 use crate::generated::obelisk_flyio::activity_fly_http::regions::Region;
+use crate::wstd_util::JsonRequest as _;
 use crate::{API_BASE_URL, AppName, Component, MachineId, request_with_api_token};
 use anyhow::{Context, anyhow, bail, ensure};
 use ser::{
@@ -134,7 +135,7 @@ async fn create(
         let request = request_with_api_token()?
             .method(Method::POST)
             .uri(url)
-            .body(Body::from_json(&request_payload)?)?;
+            .json(&request_payload)?;
 
         let response = Client::new().send(request).await?;
         let resp_status = response.status();
@@ -175,7 +176,7 @@ async fn update(
         let request = request_with_api_token()?
             .method(Method::POST)
             .uri(url)
-            .body(Body::from_json(&request_payload)?)?;
+            .json(&request_payload)?;
 
         let response = Client::new().send(request).await?;
         let resp_status = response.status();
@@ -208,7 +209,7 @@ async fn exec(
     let request = request_with_api_token()?
         .method(Method::POST)
         .uri(url)
-        .body(Body::from_json(&body)?)?;
+        .json(&body)?;
     let response = Client::new().send(request).await?;
     let resp_status = response.status();
     let mut response = response.into_body();

activity/fly-http/impl/src/volume.rs

@@ -1,6 +1,7 @@
 use crate::generated::exports::obelisk_flyio::activity_fly_http::volumes::{
     Volume, VolumeCreateRequest,
 };
+use crate::wstd_util::JsonRequest as _;
 use crate::{API_BASE_URL, AppName, Component, VolumeId, request_with_api_token};
 use anyhow::{Context, anyhow};
 use wstd::http::{Body, Client, Method};
@@ -31,7 +32,7 @@ async fn create(app_name: AppName, request: VolumeCreateRequest) -> Result<Volum
     let http_request = request_with_api_token()?
         .method(Method::POST)
         .uri(url)
-        .body(Body::from_json(&request)?)?;
+        .json(&request)?;
 
     let response = Client::new().send(http_request).await?;
     let resp_status = response.status();
@@ -97,7 +98,7 @@ async fn extend(
     let request = request_with_api_token()?
         .method(Method::PUT)
         .uri(url)
-        .body(Body::from_json(&body)?)?;
+        .json(&body)?;
 
     let response = Client::new().send(request).await?;
     let resp_status = response.status();

activity/fly-http/impl/src/wstd_util.rs

@@ -0,0 +1,13 @@
+use wstd::http::{Body, Request, request};
+
+pub trait JsonRequest {
+    fn json<T: serde::Serialize>(self, value: &T) -> Result<Request<Body>, anyhow::Error>;
+}
+
+impl JsonRequest for request::Builder {
+    fn json<T: serde::Serialize>(self, value: &T) -> Result<Request<Body>, anyhow::Error> {
+        Ok(self
+            .header("content-type", "application/json")
+            .body(Body::from_json(value)?)?)
+    }
+}

webhook/fly-secrets-updater/impl/src/lib.rs

@@ -1,3 +1,6 @@
+mod wstd_util;
+
+use crate::wstd_util::JsonRequest as _;
 use anyhow::{Context, anyhow};
 use serde::{Deserialize, Serialize};
 use wstd::http::body::Body;
@@ -31,7 +34,7 @@ async fn put_secret(
         .uri(format!(
             "{API_BASE_URL}/apps/{app_name}/secrets/{secret_name}"
         ))
-        .body(Body::from_json(&body)?)?;
+        .json(&body)?;
 
     let response = client.send(request).await?;
 

webhook/fly-secrets-updater/impl/src/wstd_util.rs

@@ -0,0 +1,13 @@
+use wstd::http::{Body, Request, request};
+
+pub trait JsonRequest {
+    fn json<T: serde::Serialize>(self, value: &T) -> Result<Request<Body>, anyhow::Error>;
+}
+
+impl JsonRequest for request::Builder {
+    fn json<T: serde::Serialize>(self, value: &T) -> Result<Request<Body>, anyhow::Error> {
+        Ok(self
+            .header("content-type", "application/json")
+            .body(Body::from_json(value)?)?)
+    }
+}