diff --git a/Cargo.toml b/Cargo.toml index f93c3463b..7ce3bf89e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,6 @@ [workspace] default-members = ["kube"] +resolver = "1" members = [ "kube", "kube-client", diff --git a/kube-client/src/client/auth/oidc.rs b/kube-client/src/client/auth/oidc.rs index 77a211fae..ed2906135 100644 --- a/kube-client/src/client/auth/oidc.rs +++ b/kube-client/src/client/auth/oidc.rs @@ -152,7 +152,7 @@ pub struct Oidc { impl Oidc { /// Config key for the ID token. - const CONFIG_ID_TOKEN: &str = "id-token"; + const CONFIG_ID_TOKEN: &'static str = "id-token"; /// How many seconds before ID token expiration we want to refresh it. const EXPIRY_DELTA_SECONDS: i64 = 10; @@ -278,13 +278,13 @@ struct Refresher { impl Refresher { /// Config key for the client ID. - const CONFIG_CLIENT_ID: &str = "client-id"; + const CONFIG_CLIENT_ID: &'static str = "client-id"; /// Config key for the client secret. - const CONFIG_CLIENT_SECRET: &str = "client-secret"; + const CONFIG_CLIENT_SECRET: &'static str = "client-secret"; /// Config key for the issuer url. - const CONFIG_ISSUER_URL: &str = "idp-issuer-url"; + const CONFIG_ISSUER_URL: &'static str = "idp-issuer-url"; /// Config key for the refresh token. - const CONFIG_REFRESH_TOKEN: &str = "refresh-token"; + const CONFIG_REFRESH_TOKEN: &'static str = "refresh-token"; /// Create a new instance of this struct from the provider config. fn from_config(config: &HashMap) -> Result { diff --git a/kube/src/mock_tests.rs b/kube/src/mock_tests.rs index 1d43e455d..8bfbb818a 100644 --- a/kube/src/mock_tests.rs +++ b/kube/src/mock_tests.rs @@ -8,7 +8,7 @@ use crate::{ use anyhow::Result; use futures::{poll, StreamExt, TryStreamExt}; use http::{Request, Response}; -use hyper::{body::to_bytes, Body}; +use hyper::Body; use kube_derive::CustomResource; use schemars::JsonSchema; use serde::{Deserialize, Serialize};