restructure

ok separated config now

Author: dotansimha

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "yaml.schemas": {
-    "./src/config/conductor.schema.json": "*.yaml"
+    "./crates/config/conductor.schema.json": "*.yaml"
   },
   "rust-analyzer.linkedProjects": ["./Cargo.toml"]
 }

Cargo.lock

@@ -1,49 +1,11 @@
-[package]
-name = "conductor"
-version = "0.1.0"
-edition = "2021"
-default-run = "conductor"
+[workspace]
+members = ["crates/*"]
+resolver = "2"
 
-[[bin]]
-name = "conductor"
-path = "src/main.rs"
-bench = false
-
-[[test]]
-name = "generate-config-schema"
-path = "src/config/generate-json-schema.rs"
-bench = false
-
-[dependencies]
+[workspace.dependencies]
+futures = "0.3.29"
 serde = { version = "1.0.192", features = ["derive"] }
 serde_json = "1.0.108"
 tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] }
 hyper = { version = "0.14.27", features = ["http1", "http2", "client"] }
-axum = { version = "0.6.20", features = ["headers"] }
-serde_yaml = "0.9.27"
 tracing = "0.1.40"
-tracing-subscriber = "0.3.18"
-async-trait = "0.1.74"
-hyper-tls = "0.5.0"
-axum-macros = "0.3.8"
-tokio-util = { version = "0.7.10", features = ["io", "compat"] }
-tower-http = { version = "0.4.4", features = ["cors"] }
-http = "0.2.11"
-mime = "0.3.17"
-url = "2.4.1"
-graphql-parser = "0.4.0"
-futures = "0.3.29"
-axum-test = "13.1.1"
-openssl = { version = "0.10", features = ["vendored"] }
-schemars = "0.8.16"
-
-[dev-dependencies]
-criterion = { version = "0.5.1", features = ["html_reports"] }
-httpmock = "0.6"
-
-[lib]
-bench = false
-
-[[bench]]
-name = "bench"
-harness = false

Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "benches"
+version = "0.0.0"
+edition = "2021"
+
+[dependencies]
+criterion = { version = "0.5.1", features = ["html_reports"] }
+conductor = { path = "../conductor" }
+futures = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+hyper = { workspace = true }
+
+[[bench]]
+name = "bench"
+path = "bench.rs"
+harness = false

crates/benches/Cargo.toml

@@ -0,0 +1,38 @@
+[package]
+name = "conductor"
+version = "0.1.0"
+edition = "2021"
+default-run = "conductor"
+
+[[bin]]
+name = "conductor"
+path = "src/main.rs"
+bench = false
+
+[dependencies]
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+hyper = { workspace = true }
+conductor_config = { path = "../config" }
+axum = { version = "0.6.20", features = ["headers"] }
+tracing = { workspace = true }
+tracing-subscriber = "0.3.18"
+async-trait = "0.1.74"
+hyper-tls = "0.5.0"
+axum-macros = "0.3.8"
+tokio-util = { version = "0.7.10", features = ["io", "compat"] }
+tower-http = { version = "0.4.4", features = ["cors"] }
+http = "0.2.11"
+mime = "0.3.17"
+url = "2.4.1"
+graphql-parser = "0.4.0"
+futures = { workspace = true }
+axum-test = "13.1.1"
+openssl = { version = "0.10", features = ["vendored"] }
+
+[dev-dependencies]
+httpmock = "0.6"
+
+[lib]
+path = "src/lib.rs"

benches/bench.rs crates/benches/bench.rsbenches/bench.rs renamed to crates/benches/bench.rs

@@ -1,5 +1,4 @@
 use crate::{
-    config::EndpointDefinition,
     graphql_utils::GraphQLResponse,
     plugins::{flow_context::FlowContext, plugin_manager::PluginManager},
     source::base_source::{SourceError, SourceService},
@@ -8,6 +7,7 @@ use axum::{
     body::{Body, BoxBody},
     response::IntoResponse,
 };
+use conductor_config::EndpointDefinition;
 use http::StatusCode;
 use std::sync::Arc;