upgrade jsonpath-rust to 0.5.0

examples/Cargo.toml

@@ -30,7 +30,7 @@ assert-json-diff = "2.0.1"
 garde = { version = "0.18.0", default-features = false, features = ["derive"] }
 anyhow = "1.0.44"
 futures = "0.3.17"
-jsonpath-rust = "0.4.0"
+jsonpath-rust = "0.5.0"
 kube = { path = "../kube", version = "^0.88.1", default-features = false, features = ["admission"] }
 kube-derive = { path = "../kube-derive", version = "^0.88.1", default-features = false } # only needed to opt out of schema
 k8s-openapi = { version = "0.21.0", default-features = false }

examples/dynamic_jsonpath.rs

@@ -34,7 +34,7 @@ async fn main() -> anyhow::Result<()> {
 
     // Use the given JSONPATH to filter the ObjectList
     let list_json = serde_json::to_value(&list)?;
-    for res in jsonpath.find_slice(&list_json) {
+    for res in jsonpath.find_slice(&list_json, Default::default()) {
         info!("\t\t {}", *res);
     }
     Ok(())

kube-client/Cargo.toml

@@ -57,7 +57,7 @@ rustls-pemfile = { version = "1.0.0", optional = true }
 bytes = { version = "1.1.0", optional = true }
 tokio = { version = "1.14.0", features = ["time", "signal", "sync"], optional = true }
 kube-core = { path = "../kube-core", version = "=0.88.1" }
-jsonpath-rust = { version = "0.4.0", optional = true }
+jsonpath-rust = { version = "0.5.0", optional = true }
 tokio-util = { version = "0.7.0", optional = true, features = ["io", "codec"] }
 hyper = { version = "0.14.13", optional = true, features = ["client", "http1", "stream", "tcp"] }
 hyper-rustls = { version = "0.24.0", optional = true }

kube-client/src/client/auth/mod.rs

@@ -10,7 +10,7 @@
     header::{InvalidHeaderValue, AUTHORIZATION},
     HeaderValue, Request,
 };
-use jsonpath_rust::JsonPathInst;
+use jsonpath_rust::{path::config::JsonPathConfig, JsonPathInst};
 use secrecy::{ExposeSecret, SecretString};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
@@ -130,12 +130,12 @@
             path: path.as_ref().to_owned(),
             token: SecretString::from(token),
             // Try to reload at least once a minute
             expires_at: Utc::now() + Duration::seconds(60),
         })
     }
 
     fn is_expiring(&self) -> bool {
         Utc::now() + Duration::seconds(10) > self.expires_at
     }
 
     /// Get the cached token. Returns `None` if it's expiring.
@@ -153,7 +153,7 @@
             if let Ok(token) = std::fs::read_to_string(&self.path) {
                 self.token = SecretString::from(token);
             }
             self.expires_at = Utc::now() + Duration::seconds(60);
         }
         self.token.expose_secret()
     }
@@ -205,7 +205,7 @@
                 let mut locked_data = data.lock().await;
                 // Add some wiggle room onto the current timestamp so we don't get any race
                 // conditions where the token expires while we are refreshing
                 if Utc::now() + Duration::seconds(60) >= locked_data.1 {
                     // TODO Improve refreshing exec to avoid `Auth::try_from`
                     match Auth::try_from(&locked_data.2)? {
                         Auth::None | Auth::Basic(_, _) | Auth::Bearer(_) | Auth::Certificate(_, _) => {
@@ -410,7 +410,7 @@
             let expiry_date = expiry
                 .parse::<DateTime<Utc>>()
                 .map_err(Error::MalformedTokenExpirationDate)?;
             if Utc::now() + Duration::seconds(60) < expiry_date {
                 return Ok(ProviderToken::GcpCommand(access_token.clone(), Some(expiry_date)));
             }
         }
@@ -479,6 +479,7 @@
 }
 
 fn extract_value(json: &serde_json::Value, context: &str, path: &str) -> Result<String, Error> {
+    let cfg = JsonPathConfig::default(); // no need for regex caching here
     let parsed_path = path
         .trim_matches(|c| c == '"' || c == '{' || c == '}')
         .parse::<JsonPathInst>()
@@ -489,7 +490,7 @@
             ))
         })?;
 
-    let res = parsed_path.find_slice(json);
+    let res = parsed_path.find_slice(json, cfg);
 
     let Some(res) = res.into_iter().next() else {
         return Err(Error::AuthExec(format!(