Merge pull request #214 from dfinity/igor/adapt-new-ic-bn-lib

Adapt to `ic-bn-lib` changes, update crates

Author: blind-oracle

Cargo.lock

@@ -35,15 +35,13 @@ http = "1.3.1"
 http-body = "1.0.1"
 http-body-util = "0.1.2"
 humantime = "2.2.0"
-ic-bn-lib = { version = "0.2.4", features = [
-    "acme",
-    "vector",
+ic-bn-lib = { version = "0.4", features = [
     "cert-providers",
+    "lb",
     "clients-hyper",
+    "custom-domains",
+    "vector",
 ] }
-ic-bn-lib-common = "0.2.4"
-ic-custom-domains-backend = "0.2.6"
-ic-custom-domains-base = "0.2.6"
 ic-http-certification = { version = "3.1.0", optional = true }
 ic-transport-types = "0.47"
 ic-http-gateway-protocol = { package = "ic-http-gateway-protocol", git = "https://github.com/dfinity/ic-http-gateway-protocol", tag = "v0.5.1" }

Cargo.toml

@@ -2,14 +2,13 @@ use std::sync::Arc;
 
 use criterion::{Criterion, criterion_group, criterion_main};
 use fqdn::fqdn;
-use ic_bn_lib_common::{principal, types::CustomDomain};
-use prometheus::Registry;
-use rand::{Rng, seq::SliceRandom, thread_rng};
-
+use ic_bn_lib::{custom_domains::CustomDomain, principal};
 use ic_gateway::{
     routing::domain::{CustomDomainStorage, ResolvesDomain},
     test::FakeDomainProvider,
 };
+use prometheus::Registry;
+use rand::{Rng, seq::SliceRandom, thread_rng};
 
 fn criterion_benchmark(c: &mut Criterion) {
     let mut rng = thread_rng();

benches/domain_lookup.rs

@@ -15,15 +15,15 @@ use http::{
 };
 use http_body_util::BodyExt;
 use ic_bn_lib::{
-    http::body::buffer_body,
+    http::{body::buffer_body, server::conn::ConnInfo},
     hval,
     ic_agent::{
         Agent, AgentError,
         agent::{HttpService, route_provider::RoundRobinRouteProvider},
     },
+    principal,
     uuid::Uuid,
 };
-use ic_bn_lib_common::{principal, types::http::ConnInfo};
 use ic_http_certification::HttpRequest;
 use ic_http_gateway_protocol::{CanisterRequest, HttpGatewayClientBuilder};
 

benches/http_gateway.rs

@@ -3,11 +3,9 @@ use std::{sync::Arc, time::Duration};
 use axum::{body::Body, extract::Request};
 use criterion::{Criterion, criterion_group, criterion_main};
 use http::Uri;
-use ic_bn_lib::tasks::TaskManager;
-use ic_bn_lib_common::types::http::ConnInfo;
-use rand::{seq::SliceRandom, thread_rng};
-
+use ic_bn_lib::{http::server::conn::ConnInfo, tasks::TaskManager};
 use ic_gateway::test::setup_test_router;
+use rand::{seq::SliceRandom, thread_rng};
 use tower::Service;
 
 fn create_request(domain: &str, path: &str) -> Request {

benches/router.rs

@@ -9,8 +9,10 @@ use axum::{
 };
 use derive_new::new;
 use http::{Method, StatusCode, header::AUTHORIZATION};
-use ic_bn_lib::http::middleware::waf::{self, WafLayer};
-use ic_bn_lib_common::traits::Healthy;
+use ic_bn_lib::{
+    health::Healthy,
+    http::middleware::waf::{self, WafLayer},
+};
 use tokio_util::sync::CancellationToken;
 use tracing::Level;
 use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
@@ -123,7 +125,7 @@ mod test {
     use axum::body::Body;
     use clap::Parser;
     use http::{HeaderValue, Request, Uri};
-    use ic_bn_lib::{hval, utils::health_manager::HealthManager};
+    use ic_bn_lib::{health::HealthManager, hval};
     use tower::ServiceExt;
     use tracing_subscriber::reload;
 

src/api.rs

@@ -3,25 +3,27 @@
 
 use std::{net::SocketAddr, path::PathBuf, time::Duration};
 
-use ::http::HeaderValue;
 use clap::{Args, Parser};
 use fqdn::FQDN;
-use http::Uri;
+use http::{HeaderValue, Uri};
 use humantime::parse_duration;
 #[cfg(feature = "smtp")]
 use ic_bn_lib::smtp::cli::SmtpServerCli;
 #[cfg(feature = "acme")]
-use ic_bn_lib::tls::acme::dns::cloudflare::DEFAULT_CLOUDFLARE_URL;
-#[cfg(feature = "acme")]
-use ic_bn_lib_common::types::acme::{AcmeUrl, Challenge, DnsBackend};
-use ic_bn_lib_common::{
-    parse_size, parse_size_decimal, parse_size_usize,
-    types::{
-        dns::DnsCli,
-        http::{HttpClientCli, HttpServerCli, ProxyProtocolMode, WafCli},
+use ic_bn_lib::tls::acme::{
+    AcmeUrl, Challenge, DnsBackend, dns::cloudflare::DEFAULT_CLOUDFLARE_URL,
+};
+use ic_bn_lib::{
+    custom_domains::base::cli::CustomDomainsCli,
+    dns::cli::DnsCli,
+    http::{
+        client::cli::HttpClientCli,
+        middleware::waf::WafCli,
+        server::{ProxyProtocolMode, cli::HttpServerCli},
         shed::{ShedShardedCli, ShedSystemCli},
-        vector::VectorCli,
     },
+    parse_size, parse_size_decimal, parse_size_usize,
+    vector::cli::VectorCli,
 };
 use reqwest::Url;
 
@@ -66,7 +68,7 @@ pub struct Cli {
     pub domain: Domain,
 
     #[command(flatten, next_help_heading = "Custom Domains")]
-    pub custom_domains: Option<ic_custom_domains_base::cli::CustomDomainsCli>,
+    pub custom_domains: Option<CustomDomainsCli>,
 
     #[command(flatten, next_help_heading = "Policy")]
     pub policy: Policy,
@@ -117,7 +119,7 @@ pub struct Cli {
 
     #[cfg(all(target_os = "linux", feature = "sev-snp"))]
     #[command(flatten, next_help_heading = "SEV-SNP")]
-    pub sev_snp: ic_bn_lib_common::types::utils::SevSnpCli,
+    pub sev_snp: ic_bn_lib::sev_snp::SevSnpCli,
 }
 
 #[derive(Args)]

src/cli.rs

@@ -6,20 +6,24 @@ use std::{
 use anyhow::{Context, Error, anyhow};
 use axum::Router;
 use ic_bn_lib::{
-    custom_domains::{self},
-    http::{self as bnhttp, dns::ApiBnResolver, middleware::waf::WafLayer, redirect_to_https},
+    MAINNET_ROOT_SUBNET_ID,
+    custom_domains::{self, ProvidesCustomDomains, base::cli::CustomDomainsCli},
+    dns::{
+        Options as DnsOptions,
+        resolvers::{ApiBnResolver, Resolver},
+    },
+    health::HealthManager,
+    http::{
+        self as bnhttp,
+        client::ClientOptions,
+        middleware::waf::WafLayer,
+        redirect_to_https,
+        server::{ServerOptions, metrics::Metrics},
+    },
     tasks::TaskManager,
-    tls::{prepare_client_config, verify::NoopServerCertVerifier},
-    utils::health_manager::HealthManager,
+    tls::{ProvidesCertificates, prepare_client_config, verify::NoopServerCertVerifier},
     vector::{self, VectorOptions, client::Vector},
 };
-use ic_bn_lib_common::{
-    traits::{custom_domains::ProvidesCustomDomains, tls::ProvidesCertificates},
-    types::{
-        dns::Options as DnsOptions,
-        http::{ClientOptions, Metrics, ServerOptions},
-    },
-};
 use itertools::Itertools;
 use prometheus::Registry;
 use tokio_util::sync::CancellationToken;
@@ -33,7 +37,7 @@ use crate::{
         self,
         domain::CustomDomainStorage,
         ic::{
-            MAINNET_ROOT_SUBNET_ID, create_agent,
+            create_agent,
             http_service::AgentHttpService,
             route_provider::{RouteProviderWrapper, setup_route_provider},
             routing_table_manager::RoutingTableManager,
@@ -103,7 +107,7 @@ pub async fn main(
     // DNS resolver
     let dns_options: DnsOptions = (&cli.dns).into();
     let dns_resolver =
-        bnhttp::dns::Resolver::new(dns_options.clone()).context("unable to create DNS Resolver")?;
+        Resolver::new(dns_options.clone()).context("unable to create DNS Resolver")?;
 
     // HTTP client
     let mut http_client_opts: ClientOptions = (&cli.http_client).into();
@@ -446,7 +450,7 @@ pub async fn main(
 }
 
 async fn setup_custom_domains(
-    cli: &ic_custom_domains_base::cli::CustomDomainsCli,
+    cli: &CustomDomainsCli,
     dns_options: DnsOptions,
     metrics_registry: &Registry,
     tasks: &mut TaskManager,
@@ -455,7 +459,7 @@ async fn setup_custom_domains(
     rate_limiter_bypass_token: Option<String>,
 ) -> Result<Router, Error> {
     let token = tasks.token();
-    let (workers, router, client) = ic_custom_domains_backend::setup(
+    let (workers, router, client) = custom_domains::backend::setup(
         cli,
         dns_options,
         token,

src/core.rs

@@ -19,7 +19,7 @@ pub mod test;
 mod tls;
 
 pub use crate::cli::Cli;
-pub use ic_bn_lib::ic_bn_lib_common::traits::custom_domains::ProvidesCustomDomains;
+pub use ic_bn_lib::custom_domains::ProvidesCustomDomains;
 
 pub use core::main;
 pub use routing::setup_router;

src/lib.rs

@@ -17,13 +17,13 @@ use http::header::{CONTENT_TYPE, ORIGIN, REFERER, USER_AGENT};
 use ic_bn_lib::{
     http::{
         body::CountingBody, cache::CacheStatus, calc_headers_size, extract_host, http_method,
-        http_version,
+        http_version, server::conn::ConnInfo,
     },
     ic_agent::agent::route_provider::RouteProvider,
+    network::TlsInfo,
     tasks::TaskManager,
     vector::client::Vector,
 };
-use ic_bn_lib_common::types::http::{ConnInfo, TlsInfo};
 use prometheus::{
     HistogramVec, IntCounterVec, Registry, register_histogram_vec_with_registry,
     register_int_counter_vec_with_registry,