Use serde_json value for structure checks at comptime

Author: mineichen

pilatus-axum-rt/tests/import_export_with_web.rs

@@ -42,8 +42,7 @@ fn upload_zip() -> anyhow::Result<()> {
         });
     }
     TempRuntime::new()
-        .config_json(
-            br#"{
+        .config(serde_json::json!({
             "web": {
                 "socket": "0.0.0.0:0"
             },
@@ -59,8 +58,7 @@ fn upload_zip() -> anyhow::Result<()> {
                   "tower_http": "trace"
                 }
             }
-        }"#,
-        )
+        }))
         .register(pilatus_axum_rt::register)
         .register(register_test_services)
         .configure()?

pilatus-emulation-camera-rt/tests/record.rs

@@ -8,8 +8,7 @@ fn record_integration() -> anyhow::Result<()> {
     use serde_json::json;
 
     let configured = TempRuntime::new()
-        .config_json(
-            br#"{
+        .config(serde_json::json!({
             "web": {
                 "socket": "0.0.0.0:0"
             },
@@ -20,8 +19,7 @@ fn record_integration() -> anyhow::Result<()> {
                   "pilatus::image": "debug"
                 }
             }
-        }"#,
-        )
+        }))
         .register(pilatus_engineering_rt::register)
         .register(pilatus_axum_rt::register)
         .register(pilatus_emulation_camera_rt::register)

pilatus-emulation-camera-rt/tests/stop_streaming.rs

@@ -32,7 +32,9 @@ fn stops_streaming_when_all_subscribers_are_gone() -> anyhow::Result<()> {
     }
 
     let configured = TempRuntime::new()
-        .config_json(br#"{ "web": { "socket": "0.0.0.0:0" } }"#)
+        .config(serde_json::json!({
+            "web": { "socket": "0.0.0.0:0" }
+        }))
         .register(pilatus_emulation_camera_rt::register)
         .register(pilatus_engineering_rt::register)
         .register(pilatus_axum_rt::register)

pilatus-emulation-camera-rt/tests/upload_image.rs

@@ -8,7 +8,7 @@ fn upload_image_to_collection() -> anyhow::Result<()> {
     use serde_json::json;
 
     let configured = TempRuntime::new()
-        .config_json(br#"{ "web": { "socket": "0.0.0.0:0" } }"#)
+        .config(serde_json::json!({ "web": { "socket": "0.0.0.0:0" } }))
         .register(pilatus_emulation_camera_rt::register)
         .register(pilatus_engineering_rt::register)
         .register(pilatus_axum_rt::register)

pilatus-rt/src/runtime.rs

@@ -9,6 +9,7 @@ use tokio::runtime::Builder;
 use tracing::{error, info};
 
 use pilatus::{GenericConfig, HostedService, SystemTerminator};
+use serde_json::Value as JsonValue;
 
 use crate::metadata_future::MetadataFuture;
 
@@ -21,7 +22,7 @@ pub struct Runtime {
 /// Convenience wrapper for integration tests.
 /// Keeps the temporary directory alive for as long as the runtime is used.
 pub struct TempRuntime {
-    config_json: Option<Vec<u8>>,
+    config_json: Option<JsonValue>,
     steps: Vec<TempRuntimeStep>,
 }
 
@@ -40,8 +41,8 @@ impl TempRuntime {
     }
 
     /// Sets the `config.json` contents to be written during [`TempRuntime::configure`].
-    pub fn config_json(mut self, config_json: impl AsRef<[u8]>) -> Self {
-        self.config_json = Some(config_json.as_ref().to_vec());
+    pub fn config(mut self, config_json: JsonValue) -> Self {
+        self.config_json = Some(config_json);
         self
     }
 
@@ -66,6 +67,8 @@ impl TempRuntime {
     pub fn configure(self) -> Result<TempConfiguredRuntime, std::io::Error> {
         let dir = tempfile::tempdir()?;
         if let Some(cfg) = self.config_json {
+            let cfg = serde_json::to_vec(&cfg)
+                .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
             std::fs::write(dir.path().join("config.json"), cfg)?;
         }