merge: #2952

2952: feat(sdf): sync crdt across sdf instances with nats r=paulocsanz a=paulocsanz Co-authored-by: Paulo Cabral <[email protected]>
systeminit · Nov 14, 2023 · 3c5929e · 3c5929e
2 parents 1446f1e + e9099bd
commit 3c5929e
Show file tree

Hide file tree

Showing 9 changed files with 508 additions and 588 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/sdf-server/BUCK b/lib/sdf-server/BUCK
@@ -22,6 +22,7 @@ rust_library(
         "//third-party/rust:convert_case",
         "//third-party/rust:derive_builder",
         "//third-party/rust:futures",
+        "//third-party/rust:futures-lite",
         "//third-party/rust:hyper",
         "//third-party/rust:names",
         "//third-party/rust:nix",
@@ -60,6 +61,7 @@ rust_test(
         "//lib/dal-test:dal-test",
         "//lib/dal:dal",
         "//lib/si-posthog-rs:si-posthog",
+        "//lib/si-data-nats:si-data-nats",
         "//lib/si-std:si-std",
         "//lib/telemetry-rs:telemetry",
         "//third-party/rust:axum",
@@ -70,7 +72,11 @@ rust_test(
         "//third-party/rust:serde_json",
         "//third-party/rust:serde_url_params",
         "//third-party/rust:tokio",
+        "//third-party/rust:tokio-tungstenite",
+        "//third-party/rust:y-sync",
+        "//third-party/rust:yrs",
         "//third-party/rust:tower",
+        "//third-party/rust:futures",
         ":sdf-server",
     ],
     crate_root = "tests/api.rs",

diff --git a/lib/sdf-server/Cargo.toml b/lib/sdf-server/Cargo.toml
@@ -16,6 +16,7 @@ once_cell = { workspace = true }
 dal = { path = "../../lib/dal" }
 derive_builder = { workspace = true }
 futures = { workspace = true }
+futures-lite = { workspace = true }
 hyper = { workspace = true }
 names = { workspace = true }
 nix = { workspace = true }

diff --git a/lib/sdf-server/src/lib.rs b/lib/sdf-server/src/lib.rs
@@ -12,7 +12,7 @@
     clippy::module_name_repetitions
 )]
 
-mod server;
+pub mod server;
 pub use server::{
     build_service, build_service_for_tests, detect_and_configure_development,
     job_processor::JobProcessorClientCloser, job_processor::JobProcessorConnector, service, Config,

diff --git a/lib/sdf-server/src/server.rs b/lib/sdf-server/src/server.rs
@@ -14,7 +14,7 @@ pub(crate) mod job_processor;
 mod routes;
 mod server;
 pub mod service;
-mod state;
+pub mod state;
 pub mod tracking;
 mod uds;