move kernel_dto to kernel_common

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["kernel","kernel-dto","services/*","admin"]
+members = ["kernel", "kernel-common","services/*","admin"]
 resolver="2"
 
 [profile.release]

admin/Cargo.toml

@@ -13,14 +13,14 @@ edition.workspace = true
 readme = "./README.md"
 
 [features]
-k8s = ["kube", "k8s-openapi", "k8s-gateway-api","kernel-dto/k8s"]
+k8s = ["kube", "k8s-openapi", "k8s-gateway-api","kernel-common/k8s"]
 
 [dependencies]
 tardis = { workspace = true ,features = ["web-server"]}
 serde.workspace = true
 serde_json.workspace = true
 
-kernel-dto={path = "../kernel-dto",features = ["admin-support"]}
+kernel-common={path = "../kernel-common",features = ["admin-support"]}
 kube = { workspace = true, optional = true }
 k8s-openapi = { workspace = true, optional = true }
 k8s-gateway-api = { workspace = true, optional = true }

admin/src/api/gateway_api.rs

@@ -1,6 +1,6 @@
 use crate::dto::query_dto::GatewayQueryDto;
 use crate::service::gateway_service::GatewayService;
-use kernel_dto::dto::gateway_dto::SgGateway;
+use kernel_common::dto::gateway_dto::SgGateway;
 use tardis::web::poem_openapi;
 use tardis::web::poem_openapi::param::Query;
 use tardis::web::poem_openapi::payload::Json;

admin/src/service/gateway_service.rs

@@ -12,8 +12,8 @@ use k8s_openapi::api::core::v1::Secret;
 #[cfg(feature = "k8s")]
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::OwnerReference;
 #[cfg(feature = "k8s")]
-use kernel_dto::constants::DEFAULT_NAMESPACE;
-use kernel_dto::dto::gateway_dto::{SgGateway, SgListener, SgParameters, SgProtocol, SgTlsConfig, SgTlsMode};
+use kernel_common::constants::DEFAULT_NAMESPACE;
+use kernel_common::dto::gateway_dto::{SgGateway, SgListener, SgParameters, SgProtocol, SgTlsConfig, SgTlsMode};
 #[cfg(feature = "k8s")]
 use kube::api::{DeleteParams, PostParams};
 

admin/src/service/plugin_service.rs

@@ -4,12 +4,12 @@ use crate::dto::ToFields;
 #[cfg(feature = "k8s")]
 use crate::helper::{get_k8s_client, WarpKubeResult};
 #[cfg(feature = "k8s")]
-use kernel_dto::constants::DEFAULT_NAMESPACE;
-use kernel_dto::dto::plugin_filter_dto::SgRouteFilter;
+use kernel_common::constants::DEFAULT_NAMESPACE;
+use kernel_common::dto::plugin_filter_dto::SgRouteFilter;
 #[cfg(feature = "k8s")]
-use kernel_dto::dto::plugin_filter_dto::SgSingeFilter;
+use kernel_common::dto::plugin_filter_dto::SgSingeFilter;
 #[cfg(feature = "k8s")]
-use kernel_dto::k8s_crd::sg_filter::SgFilter;
+use kernel_common::k8s_crd::sg_filter::SgFilter;
 #[cfg(feature = "k8s")]
 use kube::{api::ListParams, api::PostParams, Api, ResourceExt};
 use std::collections::HashMap;

kernel-dto/Cargo.toml → kernel-common/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "kernel-dto"
+name = "kernel-common"
 version.workspace = true
 authors.workspace = true
 description.workspace = true

kernel-dto/src/dto/gateway_dto.rs → kernel-common/src/dto/gateway_dto.rs

@@ -6,6 +6,7 @@ use k8s_openapi::api::core::v1::Secret;
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::ObjectMeta;
 #[cfg(feature = "k8s")]
 use k8s_openapi::ByteString;
+#[cfg(feature = "k8s")]
 use std::collections::BTreeMap;
 use std::{fmt::Display, str::FromStr};
 
@@ -20,6 +21,7 @@ use serde::{Deserialize, Serialize};
 use tardis::basic::error::TardisError;
 #[cfg(feature = "admin-support")]
 use tardis::web::poem_openapi;
+#[cfg(feature = "k8s")]
 use tardis::TardisFuns;
 
 /// Gateway represents an instance of a service-traffic handling infrastructure

kernel/Cargo.toml

@@ -20,7 +20,7 @@ path = "src/lib.rs"
 local = ["tardis/fs"]
 cache = ["tardis/cache"]
 ws = ["tardis/ws-client"]
-k8s = ["kube", "k8s-openapi", "k8s-gateway-api", "schemars", "cache","kernel-dto/k8s"]
+k8s = ["kube", "k8s-openapi", "k8s-gateway-api", "schemars", "cache","kernel-common/k8s"]
 
 [dependencies]
 serde.workspace = true
@@ -31,7 +31,7 @@ itertools.workspace = true
 urlencoding.workspace = true
 async-compression.workspace = true
 
-kernel-dto={path = "../kernel-dto"}
+kernel-common={path = "../kernel-common" }
 tardis = { workspace = true, features = ["future", "crypto", "tls"] }
 http.workspace = true
 rustls = { workspace = true, features = ["dangerous_configuration"] }

kernel/src/config.rs

@@ -3,9 +3,9 @@ use tardis::{
     log,
 };
 
-use kernel_dto::dto::gateway_dto::SgGateway;
+use kernel_common::dto::gateway_dto::SgGateway;
 
-use kernel_dto::dto::http_route_dto::SgHttpRoute;
+use kernel_common::dto::http_route_dto::SgHttpRoute;
 
 #[cfg(feature = "k8s")]
 pub mod config_by_k8s;

kernel/src/config/config_by_k8s.rs

@@ -22,9 +22,9 @@ use crate::{do_startup, functions::http_route, shutdown};
 use crate::constants::{BANCKEND_KIND_EXTERNAL, BANCKEND_KIND_EXTERNAL_HTTP, BANCKEND_KIND_EXTERNAL_HTTPS};
 use crate::helpers::k8s_helper;
 use crate::plugins::filters::header_modifier::SgFilterHeaderModifierKind;
-use kernel_dto::constants::GATEWAY_CLASS_NAME;
-use kernel_dto::dto::plugin_filter_dto::SgHttpPathModifierType;
-use kernel_dto::dto::{
+use kernel_common::constants::GATEWAY_CLASS_NAME;
+use kernel_common::dto::plugin_filter_dto::SgHttpPathModifierType;
+use kernel_common::dto::{
     gateway_dto::{SgGateway, SgListener, SgParameters, SgProtocol, SgTlsConfig, SgTlsMode},
     http_route_dto::{
         SgBackendRef, SgHttpHeaderMatch, SgHttpHeaderMatchType, SgHttpPathMatch, SgHttpPathMatchType, SgHttpQueryMatch, SgHttpQueryMatchType, SgHttpRoute, SgHttpRouteMatch,
@@ -33,8 +33,8 @@ use kernel_dto::dto::{
     plugin_filter_dto,
     plugin_filter_dto::SgRouteFilter,
 };
-use kernel_dto::k8s_crd::http_spaceroute::HttpSpaceroute;
-use kernel_dto::k8s_crd::sg_filter::SgFilter;
+use kernel_common::k8s_crd::http_spaceroute::HttpSpaceroute;
+use kernel_common::k8s_crd::sg_filter::SgFilter;
 use lazy_static::lazy_static;
 
 lazy_static! {
@@ -696,10 +696,10 @@ async fn process_http_route_config(mut http_route_objs: Vec<HttpSpaceroute>) ->
             gateway_name: rel_gateway_name,
             hostnames: http_route_obj.spec.hostnames.clone(),
             filters: if let Some(name) = &http_route_obj.metadata.name {
-                let kind = if let Some(kind) = http_route_obj.annotations().get(kernel_dto::constants::RAW_HTTP_ROUTE_KIND) {
+                let kind = if let Some(kind) = http_route_obj.annotations().get(kernel_common::constants::RAW_HTTP_ROUTE_KIND) {
                     kind
                 } else {
-                    kernel_dto::constants::RAW_HTTP_ROUTE_KIND_SPACEROUTE
+                    kernel_common::constants::RAW_HTTP_ROUTE_KIND_SPACEROUTE
                 };
                 get_filters_from_cdr(kind, name, &http_route_obj.metadata.namespace).await?
             } else {

kernel/src/config/config_by_local.rs

@@ -9,7 +9,7 @@ use tardis::{
 
 use crate::{do_startup, functions::http_route, shutdown};
 
-use kernel_dto::dto::{gateway_dto::SgGateway, http_route_dto::SgHttpRoute};
+use kernel_common::dto::{gateway_dto::SgGateway, http_route_dto::SgHttpRoute};
 use lazy_static::lazy_static;
 
 lazy_static! {

kernel/src/config/config_by_redis.rs

@@ -10,7 +10,7 @@ use tardis::{
 
 use crate::{do_startup, functions::http_route, shutdown};
 
-use kernel_dto::dto::{gateway_dto::SgGateway, http_route_dto::SgHttpRoute};
+use kernel_common::dto::{gateway_dto::SgGateway, http_route_dto::SgHttpRoute};
 use lazy_static::lazy_static;
 
 lazy_static! {

kernel/src/functions/http_client.rs

@@ -7,7 +7,7 @@ use crate::plugins::context::SgRoutePluginContext;
 use http::{HeaderMap, HeaderValue, Method, Request, Response, StatusCode};
 use hyper::{client::HttpConnector, Body, Client, Error};
 use hyper_rustls::{ConfigBuilderExt, HttpsConnector};
-use kernel_dto::dto::gateway_dto::SgProtocol;
+use kernel_common::dto::gateway_dto::SgProtocol;
 use tardis::{
     basic::{error::TardisError, result::TardisResult},
     log,
@@ -172,7 +172,7 @@ mod tests {
     };
     use hyper::{client::HttpConnector, Client};
     use hyper_rustls::HttpsConnector;
-    use kernel_dto::dto::gateway_dto::SgProtocol;
+    use kernel_common::dto::gateway_dto::SgProtocol;
 
     #[tokio::test]
     async fn test_request() -> TardisResult<()> {

kernel/src/functions/http_route.rs

@@ -12,8 +12,8 @@ use http::{header::UPGRADE, HeaderValue, Request, Response};
 use hyper::{Body, StatusCode};
 
 use itertools::Itertools;
-use kernel_dto::dto::gateway_dto::{SgGateway, SgListener};
-use kernel_dto::dto::http_route_dto::{SgHttpHeaderMatchType, SgHttpPathMatchType, SgHttpQueryMatchType, SgHttpRoute};
+use kernel_common::dto::gateway_dto::{SgGateway, SgListener};
+use kernel_common::dto::http_route_dto::{SgHttpHeaderMatchType, SgHttpPathMatchType, SgHttpQueryMatchType, SgHttpRoute};
 use std::sync::{Arc, OnceLock};
 use std::vec::Vec;
 use tardis::tokio::sync::RwLock;
@@ -872,7 +872,7 @@ mod tests {
 
     use http::{Method, Request};
     use hyper::Body;
-    use kernel_dto::dto::http_route_dto::{SgHttpHeaderMatchType, SgHttpPathMatchType, SgHttpQueryMatchType};
+    use kernel_common::dto::http_route_dto::{SgHttpHeaderMatchType, SgHttpPathMatchType, SgHttpQueryMatchType};
     use tardis::regex::Regex;
 
     use crate::{

kernel/src/functions/server.rs

@@ -11,7 +11,7 @@ use hyper::server::conn::{AddrIncoming, AddrStream};
 use hyper::service::{make_service_fn, service_fn};
 use hyper::Server;
 use hyper::{server::accept::Accept, Body};
-use kernel_dto::dto::gateway_dto::{SgGateway, SgProtocol, SgTlsMode};
+use kernel_common::dto::gateway_dto::{SgGateway, SgProtocol, SgTlsMode};
 
 use lazy_static::lazy_static;
 use rustls::{PrivateKey, ServerConfig};

kernel/src/functions/websocket.rs

@@ -4,7 +4,7 @@ use http::header::{CONNECTION, SEC_WEBSOCKET_ACCEPT, SEC_WEBSOCKET_KEY, SEC_WEBS
 use hyper::header::HeaderValue;
 use hyper::{self};
 use hyper::{Body, Request, Response, StatusCode};
-use kernel_dto::dto::gateway_dto::SgProtocol;
+use kernel_common::dto::gateway_dto::SgProtocol;
 use std::sync::Arc;
 use tardis::basic::{error::TardisError, result::TardisResult};
 use tardis::futures::stream::StreamExt;

kernel/src/instance.rs

@@ -4,8 +4,8 @@ use http::Method;
 use hyper::{client::HttpConnector, Client};
 use hyper_rustls::HttpsConnector;
 
-use kernel_dto::dto::gateway_dto::{SgListener, SgProtocol};
-use kernel_dto::dto::http_route_dto::{SgHttpHeaderMatchType, SgHttpPathMatchType, SgHttpQueryMatchType};
+use kernel_common::dto::gateway_dto::{SgListener, SgProtocol};
+use kernel_common::dto::http_route_dto::{SgHttpHeaderMatchType, SgHttpPathMatchType, SgHttpQueryMatchType};
 use std::{fmt, vec::Vec};
 use tardis::regex::Regex;
 

kernel/src/lib.rs

@@ -23,7 +23,7 @@
 use functions::{http_route, server};
 pub use http;
 pub use hyper;
-use kernel_dto::dto::{gateway_dto::SgGateway, http_route_dto::SgHttpRoute};
+use kernel_common::dto::{gateway_dto::SgGateway, http_route_dto::SgHttpRoute};
 use plugins::filters::{self, SgPluginFilterDef};
 use tardis::{basic::result::TardisResult, log, tokio::signal};
 

kernel/src/plugins/context.rs

@@ -9,7 +9,7 @@ use tardis::basic::result::TardisResult;
 
 use tardis::TardisFuns;
 
-use kernel_dto::dto::gateway_dto::SgProtocol;
+use kernel_common::dto::gateway_dto::SgProtocol;
 
 use crate::instance::{SgBackendInst, SgHttpRouteMatchInst, SgHttpRouteRuleInst};
 

kernel/src/plugins/filters.rs

@@ -20,9 +20,9 @@ use tardis::url::Url;
 use tardis::{log, TardisFuns};
 
 use crate::instance::SgHttpRouteMatchInst;
-use kernel_dto::dto::gateway_dto::{SgGateway, SgParameters};
-use kernel_dto::dto::http_route_dto::{SgBackendRef, SgHttpPathMatchType, SgHttpRoute, SgHttpRouteRule};
-use kernel_dto::dto::plugin_filter_dto::{SgHttpPathModifier, SgHttpPathModifierType, SgRouteFilter};
+use kernel_common::dto::gateway_dto::{SgGateway, SgParameters};
+use kernel_common::dto::http_route_dto::{SgBackendRef, SgHttpPathMatchType, SgHttpRoute, SgHttpRouteRule};
+use kernel_common::dto::plugin_filter_dto::{SgHttpPathModifier, SgHttpPathModifierType, SgRouteFilter};
 
 use super::context::SgRoutePluginContext;
 
@@ -355,8 +355,8 @@ impl Default for SgPluginFilterAccept {
 #[cfg(test)]
 
 mod tests {
-    use kernel_dto::dto::http_route_dto::SgHttpPathMatchType;
-    use kernel_dto::dto::plugin_filter_dto::{SgHttpPathModifier, SgHttpPathModifierType};
+    use kernel_common::dto::http_route_dto::SgHttpPathMatchType;
+    use kernel_common::dto::plugin_filter_dto::{SgHttpPathModifier, SgHttpPathModifierType};
     use tardis::{basic::result::TardisResult, regex::Regex};
 
     use crate::{

kernel/src/plugins/filters/redirect.rs

@@ -7,7 +7,7 @@ use tardis::url::Url;
 use crate::def_filter;
 use crate::helpers::url_helper::UrlToUri;
 use crate::plugins::context::SgRouteFilterRequestAction;
-use kernel_dto::dto::plugin_filter_dto::SgHttpPathModifier;
+use kernel_common::dto::plugin_filter_dto::SgHttpPathModifier;
 
 use super::{http_common_modify_path, SgPluginFilter, SgPluginFilterInitDto, SgRoutePluginContext};
 
@@ -92,8 +92,8 @@ mod tests {
     use super::*;
     use http::{HeaderMap, Method, StatusCode, Uri, Version};
     use hyper::Body;
-    use kernel_dto::dto::http_route_dto::SgHttpPathMatchType;
-    use kernel_dto::dto::plugin_filter_dto::SgHttpPathModifierType;
+    use kernel_common::dto::http_route_dto::SgHttpPathMatchType;
+    use kernel_common::dto::plugin_filter_dto::SgHttpPathModifierType;
     use tardis::tokio;
 
     #[tokio::test]

kernel/src/plugins/filters/rewrite.rs

@@ -1,7 +1,7 @@
 use crate::def_filter;
 use crate::helpers::url_helper::UrlToUri;
 use async_trait::async_trait;
-use kernel_dto::dto::plugin_filter_dto::SgHttpPathModifier;
+use kernel_common::dto::plugin_filter_dto::SgHttpPathModifier;
 use serde::{Deserialize, Serialize};
 use tardis::basic::{error::TardisError, result::TardisResult};
 use tardis::url::Url;
@@ -67,8 +67,8 @@ mod tests {
     use super::*;
     use http::{HeaderMap, Method, StatusCode, Uri, Version};
     use hyper::Body;
-    use kernel_dto::dto::http_route_dto::SgHttpPathMatchType;
-    use kernel_dto::dto::plugin_filter_dto::SgHttpPathModifierType;
+    use kernel_common::dto::http_route_dto::SgHttpPathMatchType;
+    use kernel_common::dto::plugin_filter_dto::SgHttpPathModifierType;
     use tardis::tokio;
 
     #[tokio::test]

kernel/src/plugins/filters/status.rs

@@ -277,8 +277,8 @@ mod tests {
     use http::{HeaderMap, Method, StatusCode, Uri, Version};
     use hyper::Body;
 
-    use kernel_dto::dto::gateway_dto::SgParameters;
-    use kernel_dto::dto::http_route_dto::{SgBackendRef, SgHttpRouteRule};
+    use kernel_common::dto::gateway_dto::SgParameters;
+    use kernel_common::dto::http_route_dto::{SgBackendRef, SgHttpRouteRule};
     use tardis::{
         basic::{error::TardisError, result::TardisResult},
         test::test_container::TardisTestContainer,
@@ -314,7 +314,7 @@ mod tests {
             namespace: None,
             port: 80,
             timeout_ms: None,
-            protocol: Some(kernel_dto::dto::gateway_dto::SgProtocol::Http),
+            protocol: Some(kernel_common::dto::gateway_dto::SgProtocol::Http),
             weight: None,
             filters: None,
         };

kernel/tests/test_compression.rs

@@ -1,8 +1,8 @@
 use std::{env, time::Duration, vec};
 
-use kernel_dto::dto::gateway_dto::{SgGateway, SgListener, SgProtocol, SgTlsConfig, SgTlsMode};
-use kernel_dto::dto::http_route_dto::{SgBackendRef, SgHttpRoute, SgHttpRouteRule};
-use kernel_dto::dto::plugin_filter_dto::SgRouteFilter;
+use kernel_common::dto::gateway_dto::{SgGateway, SgListener, SgProtocol, SgTlsConfig, SgTlsMode};
+use kernel_common::dto::http_route_dto::{SgBackendRef, SgHttpRoute, SgHttpRouteRule};
+use kernel_common::dto::plugin_filter_dto::SgRouteFilter;
 use serde_json::{json, Value};
 use spacegate_kernel::plugins::filters::compression::{self};
 use tardis::{

kernel/tests/test_custom_plugin.rs

@@ -1,10 +1,10 @@
 use std::{env, time::Duration, vec};
 
 use async_trait::async_trait;
-use kernel_dto::dto::gateway_dto::SgProtocol::Https;
-use kernel_dto::dto::gateway_dto::{SgGateway, SgListener};
-use kernel_dto::dto::http_route_dto::{SgBackendRef, SgHttpRoute, SgHttpRouteRule};
-use kernel_dto::dto::plugin_filter_dto::SgRouteFilter;
+use kernel_common::dto::gateway_dto::SgProtocol::Https;
+use kernel_common::dto::gateway_dto::{SgGateway, SgListener};
+use kernel_common::dto::http_route_dto::{SgBackendRef, SgHttpRoute, SgHttpRouteRule};
+use kernel_common::dto::plugin_filter_dto::SgRouteFilter;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use spacegate_kernel::plugins::context::SgRoutePluginContext;

kernel/tests/test_https.rs

@@ -1,7 +1,7 @@
 use std::{env, time::Duration, vec};
 
-use kernel_dto::dto::gateway_dto::{SgGateway, SgListener, SgProtocol, SgTlsConfig, SgTlsMode};
-use kernel_dto::dto::http_route_dto::{SgBackendRef, SgHttpRoute, SgHttpRouteRule};
+use kernel_common::dto::gateway_dto::{SgGateway, SgListener, SgProtocol, SgTlsConfig, SgTlsMode};
+use kernel_common::dto::http_route_dto::{SgBackendRef, SgHttpRoute, SgHttpRouteRule};
 use serde_json::{json, Value};
 use tardis::{
     basic::result::TardisResult,

kernel/tests/test_websocket.rs

@@ -9,10 +9,10 @@ use std::{
     vec,
 };
 
-use kernel_dto::dto::gateway_dto::{SgGateway, SgListener};
-use kernel_dto::dto::http_route_dto::{SgBackendRef, SgHttpPathMatch, SgHttpPathMatchType, SgHttpRoute, SgHttpRouteMatch, SgHttpRouteRule};
-use kernel_dto::dto::plugin_filter_dto;
-use kernel_dto::dto::plugin_filter_dto::SgRouteFilter;
+use kernel_common::dto::gateway_dto::{SgGateway, SgListener};
+use kernel_common::dto::http_route_dto::{SgBackendRef, SgHttpPathMatch, SgHttpPathMatchType, SgHttpRoute, SgHttpRouteMatch, SgHttpRouteRule};
+use kernel_common::dto::plugin_filter_dto;
+use kernel_common::dto::plugin_filter_dto::SgRouteFilter;
 use lazy_static::lazy_static;
 use serde_json::json;
 use spacegate_kernel::plugins::filters;