stash code

Author: chuntaojun

Cargo.toml

@@ -1,16 +1,33 @@
 [package]
+edition = "2021"
 name = "polaris-rust"
 version = "0.1.0"
-edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-serde = { version = "1.0.198", features = ["derive"] }
-serde_json = "1.0.116"
-serde-duration-ext = "0.1.0"
-schemars = "0.8.16"
-serde_yaml = "0.9.34"
 bytes = {version = "1.4.0"}
-prost = {version = "0.12.4" }
-prost-types = {version = "0.12.4" }
-prost-build = {version = "0.12.4" }
+schemars = {version = "0.8.16"}
+serde = {version = "1.0.198", features = ["derive"]}
+serde-duration-ext = {version = "0.1.0"}
+serde_json = {version = "1.0.116"}
+serde_yaml = {version = "0.9.34"}
+
+uuid = {version = "1.8.0", features = [
+  "v4", # Lets you generate random UUIDs
+  "fast-rng", # Use a faster (but still sufficiently random) RNG
+  "macro-diagnostics", # Enable better diagnostics for compile-time UUIDs
+]}
+
+# async
+tokio = {version = "1.37.0", features = ["full"]}
+
+tower = {version = "0.4.13"}
+
+# gRPC dep
+log = {version = "0.4.21"}
+once_cell = {version = "1.19.0"}
+prost = {version = "0.12.4"}
+prost-build = {version = "0.12.4"}
+prost-types = {version = "0.12.4"}
+tonic = {version = "0.11.0"}
+futures = "0.3.30"

src/core/config/config.rs

@@ -13,14 +13,15 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-use std::{fs, io};
+use std::{env, fs, io};
+use std::path::Path;
 use serde::Deserialize;
 use crate::core::config::config_file::ConfigFileConfig;
 use crate::core::config::consumer::ConsumerConfig;
 use crate::core::config::global::GlobalConfig;
 use crate::core::config::provider::ProviderConfig;
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct Configuration {
     pub global: GlobalConfig,
@@ -29,12 +30,23 @@ pub struct Configuration {
     pub config: ConfigFileConfig,
 }
 
-pub fn load(path: String) -> Result<*const Configuration, io::Error> {
+pub fn load_default<'a>() -> Result<Configuration, io::Error> {
+    let mut path = Path::new("./polaris.yaml");
+    if !path.exists() {
+        path = Path::new("./polaris.yml");
+    }
+    if env::var("POLARIS_RUST_CONFIG").is_ok() {
+        return load(env::var("POLARIS_RUST_CONFIG").unwrap())
+    }
+    return load(path)
+}
+
+pub fn load<P: AsRef<Path>>(path: P) -> Result<Configuration, io::Error> {
     let val = fs::read_to_string(path);
     if val.is_ok() {
         let data = val.ok().unwrap();
         let config: Configuration = serde_yaml::from_str(&*data).expect(&format!("failure to format yaml str {}", &data));
-        return Ok(&config)
+        return Ok(config)
     }
     return Err(val.err().unwrap())
 }

src/core/config/config_file.rs

@@ -15,7 +15,7 @@
 
 use serde::Deserialize;
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct ConfigFileConfig {
     pub properties_value_cache_size: u32,

src/core/config/consumer.rs

@@ -13,40 +13,39 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-use std::time::Duration;
 use schemars::Map;
 use serde::Deserialize;
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct ConsumerConfig {
     pub service_router: ServiceRouterConfig,
     pub circuit_breaker: CircuitBreakerConfig,
     pub load_balancer: LoadBalancerConfig,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct ServiceRouterConfig {
     pub before_chain: Vec<ServiceRouterPluginConfig>,
     pub core_chain: Vec<ServiceRouterPluginConfig>,
     pub after_chain: Vec<ServiceRouterPluginConfig>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct ServiceRouterPluginConfig {
     pub name: String,
     pub options: Option<Map<String, String>>
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct LoadBalancerConfig {
     pub plugins: Option<Vec<String>>
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct CircuitBreakerConfig {
     pub enable: bool,

src/core/config/global.rs

@@ -1,45 +1,51 @@
 // Tencent is pleased to support the open source community by making Polaris available.
-// 
+//
 // Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
-// 
+//
 // Licensed under the BSD 3-Clause License (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 // https://opensource.org/licenses/BSD-3-Clause
-// 
+//
 // Unless required by applicable law or agreed to in writing, software distributed
 // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-
-use std::collections::{BTreeMap, HashMap};
+use serde::Deserialize;
+use std::collections::HashMap;
 use std::time::Duration;
-use schemars::Map;
-use serde::{Serialize, Deserialize};
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct GlobalConfig {
     pub system: SystemConfig,
     pub api: APIConfig,
-    pub server_connectors: Map<String, ServerConnectorConfig>,
+    pub server_connectors: HashMap<String, ServerConnectorConfig>,
     pub stat_reporter: StatReporterConfig,
     pub location: LocationConfig,
-    pub local_cache: LocalCacheConfig
+    pub local_cache: LocalCacheConfig,
+}
+
+impl GlobalConfig {
+    pub fn update_server_connector_address(&mut self, name: &str, addresses: Vec<String>) {
+        let mut binding = self.server_connectors.get_mut(name);
+        let mut connector = binding.unwrap();
+        connector.update_addresses(addresses);
+    }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct SystemConfig {
     pub discover_cluster: Option<ClusterConfig>,
     pub config_cluster: Option<ClusterConfig>,
     pub health_check_cluster: Option<ClusterConfig>,
-    pub variables: Option<Map<String, String>>,
+    pub variables: Option<HashMap<String, String>>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct APIConfig {
     #[serde(with = "serde_duration_ext")]
@@ -53,7 +59,10 @@ pub struct APIConfig {
     pub report_interval: Duration,
 }
 
-#[derive(Deserialize)]
+pub static DISCOVER_SERVER_CONNECTOR: &str = "discover";
+pub static CONFIG_SERVER_CONNECTOR: &str = "config";
+
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct ServerConnectorConfig {
     pub addresses: Vec<String>,
@@ -68,56 +77,68 @@ pub struct ServerConnectorConfig {
     pub connection_idle_timeout: Duration,
     #[serde(with = "serde_duration_ext")]
     pub reconnect_interval: Duration,
-    pub metadata: Option<Map<String, String>>,
+    pub metadata: Option<HashMap<String, String>>,
     pub ssl: Option<SSL>,
     pub token: Option<String>,
 }
 
-#[derive(Deserialize)]
+impl ServerConnectorConfig {
+
+    pub fn get_protocol(&self) -> String {
+        return self.protocol.clone()
+    }
+
+    pub fn update_addresses(&mut self, addresses: Vec<String>) {
+        self.addresses.clear();
+        self.addresses.extend(addresses);
+    }
+}
+
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct SSL {
     pub trusted_ca_file: String,
     pub cert_file: String,
     pub key_file: String,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct StatReporterConfig {
     pub enable: bool,
     pub chain: Option<Vec<StatReporterPluginConfig>>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct StatReporterPluginConfig {
     pub name: String,
-    pub options: Option<Map<String, String>>
+    pub options: Option<HashMap<String, String>>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct LocationConfig {
-    pub providers: Option<Vec<LocationProviderConfig>>
+    pub providers: Option<Vec<LocationProviderConfig>>,
 }
 
 fn default_location_providers() -> Vec<LocationProviderConfig> {
     let mut providers = Vec::new();
-    providers.push(LocationProviderConfig{
+    providers.push(LocationProviderConfig {
         name: "local".to_string(),
-        options: BTreeMap::new(),
+        options: HashMap::new(),
     });
     return providers;
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct LocationProviderConfig {
     pub name: String,
-    pub options: Map<String, String>,
+    pub options: HashMap<String, String>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct ClusterConfig {
     pub namespace: Option<String>,
@@ -128,7 +149,7 @@ pub struct ClusterConfig {
     pub lb_policy: String,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct LocalCacheConfig {
     #[serde(default = "default_local_cache_name")]

src/core/config/mod.rs

@@ -12,8 +12,8 @@
 // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
-mod config;
-mod consumer;
-mod global;
-mod provider;
-mod config_file;
+pub mod config;
+pub mod consumer;
+pub mod global;
+pub mod provider;
+pub mod config_file;

src/core/config/provider.rs

@@ -17,7 +17,7 @@
 use std::time::Duration;
 use serde::Deserialize;
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct ProviderConfig {
     pub rate_limit: RateLimitConfig,
@@ -31,7 +31,7 @@ fn default_min_register_interval() -> Duration {
     Duration::from_secs(30)
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct RateLimitConfig {
     pub enable: bool,
@@ -47,7 +47,7 @@ pub struct RateLimitConfig {
     pub report_metrics: bool
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 pub struct LosslessConfig {
     pub enable: bool,