ok separated config now

Author: dotansimha

.vscode/settings.json

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

Cargo.lock

@@ -8,3 +8,4 @@ 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"] }
+tracing = "0.1.40"

Cargo.toml

@@ -12,11 +12,7 @@ serde_json = { workspace = true }
 tokio = { workspace = true }
 hyper = { workspace = true }
 
-[lib]
-name = "benches"
-path = "src/bench.rs"
-
 [[bench]]
 name = "bench"
-path = "src/bench.rs"
+path = "bench.rs"
 harness = false

crates/benches/Cargo.toml

@@ -9,19 +9,14 @@ name = "conductor"
 path = "src/main.rs"
 bench = false
 
-[[test]]
-name = "generate-config-schema"
-path = "src/config/generate-json-schema.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"] }
-serde_yaml = "0.9.27"
-tracing = "0.1.40"
+tracing = { workspace = true }
 tracing-subscriber = "0.3.17"
 async-trait = "0.1.74"
 hyper-tls = "0.5.0"
@@ -35,7 +30,6 @@ graphql-parser = "0.4.0"
 futures = { workspace = true }
 axum-test = "13.1.1"
 openssl = { version = "0.10", features = ["vendored"] }
-schemars = "0.8.16"
 
 [dev-dependencies]
 httpmock = "0.6"

crates/benches/src/bench.rs crates/benches/bench.rscrates/benches/src/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;
 

crates/conductor/Cargo.toml

@@ -1,17 +1,15 @@
-pub mod config;
 pub mod endpoint;
 pub mod graphql_utils;
 pub mod http_utils;
 pub mod plugins;
 pub mod source;
 pub mod test;
-pub mod utils;
 
 use std::sync::Arc;
 
 use axum::{Extension, Router, Server};
 use axum_macros::debug_handler;
-use config::{load_config, ConductorConfig};
+use conductor_config::{load_config, ConductorConfig};
 use endpoint::endpoint_runtime::EndpointRuntime;
 
 use axum::http::Request;
@@ -24,11 +22,11 @@ use hyper::Body;
 use plugins::flow_context::FlowContext;
 use tracing::{debug, info};
 
-use crate::config::SourceDefinition;
 use crate::graphql_utils::ParsedGraphQLRequest;
 use crate::http_utils::extract_graphql_from_post_request;
 use crate::plugins::plugin_manager::PluginManager;
 use crate::source::graphql_source::GraphQLSourceService;
+use conductor_config::SourceDefinition;
 
 pub struct RouterState {
     pub plugin_manager: Arc<PluginManager>,

crates/conductor/src/endpoint/endpoint_runtime.rs

@@ -1,71 +1,12 @@
-use std::time::Duration;
-
+use conductor_config::plugins::{CorsListStringConfig, CorsPluginConfig, CorsStringConfig};
 use http::{HeaderValue, Method};
-use schemars::JsonSchema;
-use serde::{Deserialize, Deserializer};
 use tower_http::cors::{Any, CorsLayer};
 use tracing::{debug, info};
 
 use super::core::Plugin;
 
 pub struct CorsPlugin(pub CorsPluginConfig);
 
-#[derive(Deserialize, Debug, Clone, JsonSchema)]
-#[serde(untagged)]
-pub enum CorsListStringConfig {
-    #[serde(deserialize_with = "deserialize_wildcard")]
-    Wildcard,
-    List(Vec<String>),
-}
-
-#[derive(Deserialize, Debug, Clone, JsonSchema)]
-#[serde(untagged)]
-pub enum CorsStringConfig {
-    #[serde(deserialize_with = "deserialize_wildcard")]
-    Wildcard,
-    Value(String),
-}
-
-fn deserialize_wildcard<'de, D>(deserializer: D) -> Result<(), D::Error>
-where
-    D: Deserializer<'de>,
-{
-    #[derive(Deserialize)]
-    enum Helper {
-        #[serde(rename = "*")]
-        Wildcard,
-    }
-
-    Helper::deserialize(deserializer).map(|_| ())
-}
-
-#[derive(Deserialize, Debug, Clone, JsonSchema)]
-pub struct CorsPluginConfig {
-    /// Access-Control-Allow-Credentials (default: false)
-    allow_credentials: Option<bool>,
-    /// Access-Control-Allow-Methods (default: Any)
-    allowed_methods: Option<CorsListStringConfig>,
-    /// Access-Control-Allow-Origin (default: Any)
-    allowed_origin: Option<CorsStringConfig>,
-    /// Access-Control-Allow-Headers (default: Any)
-    allowed_headers: Option<CorsListStringConfig>,
-    /// Access-Control-Allow-Origin (default: false)
-    allow_private_network: Option<bool>,
-    /// Access-Control-Max-Age (default: empty)
-    max_age: Option<Duration>,
-}
-
-impl CorsPluginConfig {
-    pub fn is_empty_config(&self) -> bool {
-        self.allow_credentials.is_none()
-            && self.allowed_methods.is_none()
-            && self.allowed_origin.is_none()
-            && self.allowed_headers.is_none()
-            && self.allow_private_network.is_none()
-            && self.max_age.is_none()
-    }
-}
-
 #[async_trait::async_trait]
 impl Plugin for CorsPlugin {
     fn on_endpoint_creation(

crates/conductor/src/lib.rs

@@ -92,7 +92,7 @@ async fn graphiql_plugin_input_output() {
 
 #[tokio::test]
 async fn graphiql_plugin_render_cases() {
-    use crate::config::{EndpointDefinition, PluginDefinition};
+    use conductor_config::{EndpointDefinition, PluginDefinition};
     use http::{header::CONTENT_TYPE, StatusCode};
 
     let server = crate::test::utils::ConductorTest::empty()