Automated schema migration

crates/smtp/src/queue/mod.rs

@@ -25,7 +25,7 @@ pub mod throttle;
 
 pub type QueueId = u64;
 
-#[derive(Debug, Clone, rkyv::Serialize, rkyv::Deserialize, rkyv::Archive)]
+#[derive(Debug, Clone, rkyv::Serialize, rkyv::Deserialize, rkyv::Archive, serde::Deserialize)]
 pub struct Schedule<T> {
     pub due: u64,
     pub inner: T,
@@ -46,7 +46,16 @@ pub enum MessageSource {
     Autogenerated,
 }
 
-#[derive(rkyv::Serialize, rkyv::Deserialize, rkyv::Archive, Debug, Clone, PartialEq, Eq)]
+#[derive(
+    rkyv::Serialize,
+    rkyv::Deserialize,
+    rkyv::Archive,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    serde::Deserialize,
+)]
 pub struct Message {
     pub queue_id: QueueId,
     pub created: u64,
@@ -66,6 +75,7 @@ pub struct Message {
     pub quota_keys: Vec<QuotaKey>,
 
     #[rkyv(with = rkyv::with::Skip)]
+    #[serde(skip)]
     pub span_id: u64,
 }
 
@@ -75,13 +85,31 @@ impl SerializedVersion for Message {
     }
 }
 
-#[derive(rkyv::Serialize, rkyv::Deserialize, rkyv::Archive, Debug, Clone, PartialEq, Eq)]
+#[derive(
+    rkyv::Serialize,
+    rkyv::Deserialize,
+    rkyv::Archive,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    serde::Deserialize,
+)]
 pub enum QuotaKey {
     Size { key: Vec<u8>, id: u64 },
     Count { key: Vec<u8>, id: u64 },
 }
 
-#[derive(rkyv::Serialize, rkyv::Deserialize, rkyv::Archive, Debug, Clone, PartialEq, Eq)]
+#[derive(
+    rkyv::Serialize,
+    rkyv::Deserialize,
+    rkyv::Archive,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    serde::Deserialize,
+)]
 pub struct Domain {
     pub domain: String,
     pub retry: Schedule<u32>,
@@ -90,7 +118,16 @@ pub struct Domain {
     pub status: Status<(), Error>,
 }
 
-#[derive(rkyv::Serialize, rkyv::Deserialize, rkyv::Archive, Debug, Clone, PartialEq, Eq)]
+#[derive(
+    rkyv::Serialize,
+    rkyv::Deserialize,
+    rkyv::Archive,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    serde::Deserialize,
+)]
 pub struct Recipient {
     pub domain_idx: u32,
     pub address: String,
@@ -125,13 +162,31 @@ pub enum Status<T, E> {
     PermanentFailure(E),
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, rkyv::Serialize, rkyv::Deserialize, rkyv::Archive)]
+#[derive(
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    rkyv::Serialize,
+    rkyv::Deserialize,
+    rkyv::Archive,
+    serde::Deserialize,
+)]
 pub struct HostResponse<T> {
     pub hostname: T,
     pub response: Response<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, rkyv::Serialize, rkyv::Deserialize, rkyv::Archive)]
+#[derive(
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    rkyv::Serialize,
+    rkyv::Deserialize,
+    rkyv::Archive,
+    serde::Deserialize,
+)]
 pub enum Error {
     DnsError(String),
     UnexpectedResponse(HostResponse<ErrorDetails>),
@@ -145,7 +200,15 @@ pub enum Error {
 }
 
 #[derive(
-    Debug, Clone, PartialEq, Eq, rkyv::Serialize, rkyv::Deserialize, rkyv::Archive, Default,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    rkyv::Serialize,
+    rkyv::Deserialize,
+    rkyv::Archive,
+    Default,
+    serde::Deserialize,
 )]
 pub struct ErrorDetails {
     pub entity: String,

crates/smtp/src/reporting/analysis.rs

@@ -41,7 +41,9 @@ struct ReportData<'x> {
     data: &'x [u8],
 }
 
-#[derive(rkyv::Serialize, rkyv::Deserialize, rkyv::Archive, serde::Serialize)]
+#[derive(
+    rkyv::Serialize, rkyv::Deserialize, rkyv::Archive, serde::Serialize, serde::Deserialize,
+)]
 pub struct IncomingReport<T> {
     pub from: String,
     pub to: Vec<String>,