support serialize for cases where we already support deserialize

plabayo · Sep 12, 2024 · f6fe967 · f6fe967
1 parent 856e789
commit f6fe967
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/rama-cli/src/cmd/fp/endpoints.rs b/rama-cli/src/cmd/fp/endpoints.rs
@@ -15,7 +15,7 @@ use rama::{
     },
     Context,
 };
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use serde_json::json;
 
 type Html = rama::http::response::Html<String>;
@@ -123,7 +123,7 @@ pub(super) async fn get_report(mut ctx: Context<State>, req: Request) -> Result<
 // endpoints: ACME
 //------------------------------------------
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub(super) struct AcmeChallengeParams {
     token: String,
 }
@@ -149,7 +149,7 @@ pub(super) async fn get_acme_challenge(
 // endpoints: XHR
 //------------------------------------------
 
-#[derive(Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub(super) struct APINumberParams {
     number: usize,
 }

diff --git a/rama-dns/src/in_memory.rs b/rama-dns/src/in_memory.rs
@@ -1,7 +1,7 @@
 use crate::DnsResolver;
 use rama_net::address::Domain;
 use rama_utils::macros::{error::static_str_error, impl_deref};
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
@@ -29,6 +29,18 @@ impl<'de> Deserialize<'de> for DnsOverwrite {
     }
 }
 
+impl Serialize for DnsOverwrite {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        match self.0.map.as_ref() {
+            Some(map) => map.serialize(serializer),
+            None => HashMap::<Domain, Vec<IpAddr>>::default().serialize(serializer),
+        }
+    }
+}
+
 #[derive(Debug, Clone)]
 /// in-memory Dns that can be used as a simplistic cache,
 /// or wrapped in [`DnsOverwrite`] to indicate dns overwrites.

diff --git a/rama-net/src/asn.rs b/rama-net/src/asn.rs
@@ -2,7 +2,7 @@
 //!
 //! See [`Asn`] and its methods for more information.
 
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use std::fmt;
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -122,6 +122,18 @@ impl venndb::Any for Asn {
     }
 }
 
+impl Serialize for Asn {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        match self.0 {
+            AsnData::Unspecified => 0u32.serialize(serializer),
+            AsnData::Specified(u) => u.serialize(serializer),
+        }
+    }
+}
+
 impl<'de> Deserialize<'de> for Asn {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where

diff --git a/rama-proxy/src/proxydb/mod.rs b/rama-proxy/src/proxydb/mod.rs
@@ -1,7 +1,7 @@
 use rama_core::error::{BoxError, ErrorContext, OpaqueError};
 use rama_net::{asn::Asn, transport::TransportContext};
 use rama_utils::str::NonEmptyString;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use std::{fmt, future::Future};
 
 #[cfg(feature = "live-update")]
@@ -57,7 +57,7 @@ impl From<NonEmptyString> for ProxyID {
     }
 }
 
-#[derive(Debug, Default, Clone, Deserialize, PartialEq, Eq, Hash)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
 /// Filter to select a specific kind of proxy.
 ///
 /// If the `id` is specified the other fields are used