Merge pull request #418 from kazk/update-tower-for-option-layer

Update tower for `option_layer`
kube-rs · Feb 12, 2021 · 6311728 · 6311728
2 parents 170a11b + 0a69fd4
commit 6311728
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 41 deletions.
diff --git a/kube/Cargo.toml b/kube/Cargo.toml
@@ -59,7 +59,7 @@ hyper = { version = "0.14.2", features = ["client", "http1", "stream", "tcp"] }
 hyper-tls = { version = "0.5.0", optional = true }
 hyper-rustls = { version = "0.22.1", optional = true }
 tokio-tungstenite = { version = "0.13.0", optional = true }
-tower = { version = "0.4.4", features = ["buffer", "util"] }
+tower = { version = "0.4.5", features = ["buffer", "util"] }
 async-compression = { version = "0.3.7", features = ["gzip", "tokio"], optional = true }
 hyper-timeout = "0.4.1"
 tame-oauth = { version = "0.4.7", features = ["gcp"], optional = true }

diff --git a/kube/src/service/builder_ext.rs b/kube/src/service/builder_ext.rs
diff --git a/kube/src/service/mod.rs b/kube/src/service/mod.rs
@@ -1,7 +1,6 @@
 //! Abstracts the connection to Kubernetes API server.
 
 mod auth;
-mod builder_ext;
 #[cfg(feature = "gzip")] mod compression;
 mod headers;
 mod log;
@@ -10,7 +9,6 @@ mod url;
 
 use self::{log::LogRequest, url::set_cluster_url};
 use auth::AuthLayer;
-use builder_ext::ServiceBuilderExt;
 #[cfg(feature = "gzip")] use compression::{accept_compressed, maybe_decompress};
 use headers::set_default_headers;
 use tls::HttpsConnector;
@@ -120,7 +118,7 @@ impl TryFrom<Config> for Service {
 
         let inner = ServiceBuilder::new()
             .layer(common)
-            .optional_layer(maybe_auth)
+            .option_layer(maybe_auth)
             .layer(tower::layer::layer_fn(LogRequest::new))
             .service(client);
         Ok(Self::new(inner))