Merge pull request #100 from influxdata/serde_json_path

chore: Use serde_json_path library

Cargo.toml

@@ -14,16 +14,21 @@ futures = "0.3"
 kube = { version = "0.85.0", features = ["runtime", "derive"] }
 kube-derive = "0.84.0"
 k8s-openapi = { version = "0.19.0", features = ["v1_26"] }
-kubert = { version = "0.19.0", features = ["clap", "runtime", "server", "rustls-tls"] }
+kubert = { version = "0.19.0", features = [
+    "clap",
+    "runtime",
+    "server",
+    "rustls-tls",
+] }
 tokio = { version = "1.26", features = ["full"] }
 anyhow = { version = "1", features = ["backtrace"] }
 tracing = "0.1"
 schemars = "0.8.15"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9.25"
-jsonpath_lib = "0.3.0"
 thiserror = "1"
+serde_json_path = "0.6.3"
 
 [dev-dependencies]
 rstest = "0.17.0"

src/controller.rs

@@ -1,4 +1,5 @@
 use futures::StreamExt;
+use serde_json_path::JsonPath;
 use std::{collections::BTreeMap, sync::Arc, time::Duration};
 
 use k8s_openapi::api::core::v1::Secret;
@@ -356,11 +357,11 @@ where
     } else {
         "$".to_string()
     };
-    match jsonpath_lib::select(&resource_json, &from_field_path)?.as_slice() {
-        [] => Ok(json!(null)),
-        [subtree] => Ok((*subtree).clone()),
-        _ => Err(Error::JsonPathExactlyOneValue(from_field_path.to_owned())),
-    }
+    let subtree = JsonPath::parse(&from_field_path)?
+        .query(&resource_json)
+        .at_most_one()
+        .map_err(|_| Error::JsonPathExactlyOneValue(from_field_path.to_owned()))?;
+    Ok(subtree.cloned().unwrap_or(json!(null)))
 }
 
 #[cfg(test)]

src/lib.rs

@@ -18,7 +18,7 @@ pub enum Error {
     SerializationError(#[from] serde_json::Error),
 
     #[error("JsonPathError: {0}")]
-    JsonPathError(#[from] jsonpath_lib::JsonPathError),
+    JsonPathError(#[from] serde_json_path::ParseError),
 
     #[error("Namespace is required")]
     NamespaceRequired,