refactor: adjust pingap workspace member

Author: vicanso

Cargo.lock

@@ -29,6 +29,7 @@ tokio = { workspace = true }
 pingap-util = { path = "../pingap-util" }
 pingap-service = { path = "../pingap-service" }
 pingap-config = { path = "../pingap-config" }
+pingap-webhook = { path = "../pingap-webhook" }
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"

pingap-certificate/Cargo.toml

@@ -20,6 +20,7 @@ mod chain;
 mod dynamic_certificate;
 mod self_signed;
 mod tls_certificate;
+mod validity_checker;
 
 pub static LOG_CATEGORY: &str = "certificate";
 
@@ -187,6 +188,7 @@ pub use dynamic_certificate::{
 };
 pub use self_signed::new_self_signed_certificate_validity_service;
 pub use tls_certificate::TlsCertificate;
+pub use validity_checker::new_certificate_validity_service;
 
 #[cfg(test)]
 mod tests {

pingap-certificate/src/lib.rs

@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::LOG_CATEGORY;
-use pingap_certificate::{get_certificate_info_list, Certificate};
+use super::{get_certificate_info_list, Certificate};
 use pingap_service::Error as ServiceError;
-use pingap_service::SimpleServiceTaskFuture;
+use pingap_service::{SimpleServiceTaskFuture, LOG_CATEGORY};
 use snafu::Snafu;
 use tracing::error;
 
@@ -133,8 +132,7 @@ pub fn new_certificate_validity_service() -> (String, SimpleServiceTaskFuture) {
 
 #[cfg(test)]
 mod tests {
-    use super::validity_check;
-    use pingap_certificate::Certificate;
+    use super::*;
     use pretty_assertions::assert_eq;
     use x509_parser::time::ASN1Time;
 

src/proxy/validity_checker.rs pingap-certificate/src/validity_checker.rs

@@ -16,7 +16,10 @@ use acme::new_lets_encrypt_service;
 use clap::Parser;
 use crossbeam_channel::Sender;
 use pingap_cache::new_storage_clear_service;
-use pingap_certificate::new_self_signed_certificate_validity_service;
+use pingap_certificate::{
+    new_certificate_validity_service,
+    new_self_signed_certificate_validity_service,
+};
 use pingap_config::{get_config_storage, ETCD_PROTOCOL};
 use pingap_config::{LoadConfigOptions, PingapConf};
 use pingap_location::try_init_locations;
@@ -28,7 +31,6 @@ use pingap_upstream::{new_upstream_health_check_task, try_init_upstreams};
 use pingora::server;
 use pingora::server::configuration::Opt;
 use pingora::services::background::background_service;
-use proxy::new_certificate_validity_service;
 use proxy::{Server, ServerConf};
 use service::{new_auto_restart_service, new_observer_service};
 use state::{get_admin_addr, get_start_time, set_admin_addr};

src/main.rs

@@ -15,7 +15,6 @@
 mod logger;
 mod server;
 mod server_conf;
-mod validity_checker;
 
 pub static LOG_CATEGORY: &str = "proxy";
 
@@ -24,4 +23,3 @@ pub static LOG_CATEGORY: &str = "proxy";
 pub use logger::Parser;
 pub use server::*;
 pub use server_conf::{parse_from_conf, ServerConf};
-pub use validity_checker::new_certificate_validity_service;