chore: bump json_patch_ext, add more to sk_core::prelude, fix up imports

Author: drmorr0

Cargo.lock

@@ -39,7 +39,7 @@ derive_setters = "0.1.6"
 dirs = "5.0.1"
 either = "1.13.0"
 futures = "0.3.31"
-json-patch-ext = "0.1.0"
+json-patch-ext = "0.1.1"
 k8s-openapi = { version = "0.23.0", features = ["v1_27"] }
 lazy_static = "1.5.0"
 object_store = { version = "0.11.1", features = ["aws", "gcp", "azure", "http"] }

Cargo.toml

@@ -4,11 +4,11 @@ use std::collections::{
 };
 use std::slice;
 
-use kube::api::DynamicObject;
 use sk_core::external_storage::{
     ObjectStoreWrapper,
     SkObjectStore,
 };
+use sk_core::prelude::*;
 use sk_store::{
     TraceEvent,
     TraceStorable,

sk-cli/src/validation/annotated_trace.rs

@@ -1,5 +1,4 @@
 use assertables::*;
-use kube::api::DynamicObject;
 use serde_json::json;
 use sk_store::TraceEvent;
 

sk-cli/src/validation/tests/status_field_populated_test.rs

@@ -1,5 +1,4 @@
 use chrono::TimeDelta;
-use kube::api::DynamicObject;
 use lazy_static::lazy_static;
 use ratatui::prelude::*;
 use sk_core::prelude::*;

sk-cli/src/xray/view/helpers.rs

@@ -2,11 +2,7 @@ use std::borrow::Cow;
 use std::fmt;
 use std::ops::Deref;
 
-use kube::api::{
-    DynamicObject,
-    GroupVersionKind,
-    TypeMeta,
-};
+use kube::api::GroupVersionKind;
 use serde::{
     de,
     Deserialize,

sk-core/src/k8s/gvk.rs

@@ -1,5 +1,4 @@
 use clockabilly::Utc;
-use kube::api::DynamicObject;
 use serde_json as json;
 
 use super::*;

sk-core/src/k8s/tests/util_test.rs

@@ -1,4 +1,3 @@
-use kube::api::DynamicObject;
 use kube::discovery::ApiResource;
 use rstest::*;
 use serde_json::json;

sk-core/src/k8s/testutils/objs.rs

@@ -1,10 +1,6 @@
 use std::collections::BTreeMap;
 
-use kube::api::{
-    DynamicObject,
-    Resource,
-    TypeMeta,
-};
+use kube::api::Resource;
 use serde_json as json;
 
 use super::*;

sk-core/src/k8s/util.rs

@@ -11,6 +11,10 @@ pub mod time;
 pub mod prelude {
     pub use k8s_openapi::api::core::v1 as corev1;
     pub use k8s_openapi::apimachinery::pkg::apis::meta::v1 as metav1;
+    pub use kube::api::{
+        DynamicObject,
+        TypeMeta,
+    };
     pub use kube::{
         CustomResourceExt,
         ResourceExt,

sk-core/src/lib.rs

@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;
 
-use kube::api::TypeMeta;
 use kube::discovery::ApiResource;
 use schemars::JsonSchema;
 use serde::{

sk-ctrl/src/cert_manager.rs

@@ -1,13 +1,7 @@
 use std::collections::HashMap;
 use std::sync::Mutex;
 
-use json_patch_ext::{
-    add_operation,
-    escape,
-    format_ptr,
-    Patch,
-    PatchOperation,
-};
+use json_patch_ext::prelude::*;
 use kube::core::admission::{
     AdmissionRequest,
     AdmissionResponse,

sk-driver/src/mutation.rs

@@ -10,13 +10,7 @@ use clockabilly::{
     UtcClock,
 };
 use either::Either;
-use json_patch_ext::{
-    add_operation,
-    escape,
-    format_ptr,
-    patch_ext,
-    remove_operation,
-};
+use json_patch_ext::prelude::*;
 use kube::api::{
     DeleteParams,
     DynamicObject,

sk-driver/src/runner.rs

@@ -1,10 +1,6 @@
 use std::collections::HashMap;
 
-use json_patch_ext::{
-    patch_ext,
-    Patch,
-};
-use kube::api::TypeMeta;
+use json_patch_ext::prelude::*;
 use kube::core::admission::{
     AdmissionRequest,
     AdmissionResponse,

sk-driver/src/tests/mutation_test.rs

@@ -1,7 +1,6 @@
 use std::collections::VecDeque;
 use std::ops::Index;
 
-use kube::api::DynamicObject;
 use sk_core::prelude::*;
 use tracing::*;
 

sk-store/src/event_list.rs

@@ -1,4 +1,3 @@
-use kube::api::DynamicObject;
 use sk_api::v1::ExportFilters;
 use sk_core::prelude::*;
 

sk-store/src/filter.rs

@@ -133,7 +133,6 @@ impl PodOwnersMap {
 
     // Given an index of "owning objects", get a list of all the pods between a given start and end
     // time that belong to one of those owning objects.
-    #[allow(dead_code)]
     pub(crate) fn filter(
         &self,
         start_ts: i64,

sk-store/src/pod_owners_map.rs

@@ -5,7 +5,6 @@ use clockabilly::{
     Clockable,
     UtcClock,
 };
-use kube::api::DynamicObject;
 use sk_api::v1::ExportFilters;
 use sk_core::jsonutils;
 use sk_core::k8s::{

sk-store/src/store.rs

@@ -7,12 +7,10 @@ use clockabilly::mock::MockUtcClock;
 use futures::stream;
 use futures::stream::StreamExt;
 use k8s_openapi::apimachinery::pkg::apis::meta::v1 as metav1;
-use kube::api::DynamicObject;
 use kube::runtime::watcher::Event;
 use kube::ResourceExt;
 use sk_api::v1::ExportFilters;
 use sk_core::macros::*;
-use sk_core::prelude::*;
 
 use super::*;
 use crate::watchers::{

sk-store/src/tests/import_export_test.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use assertables::*;
-use kube::api::DynamicObject;
 use sk_api::v1::ExportFilters;
 use sk_core::k8s::GVK;
 

sk-store/src/tests/trace_store_test.rs

@@ -8,7 +8,6 @@ use futures::{
     StreamExt,
     TryStreamExt,
 };
-use kube::api::DynamicObject;
 use kube::runtime::watcher::watcher;
 use kube::runtime::WatchStreamExt;
 use sk_core::errors::*;
@@ -17,6 +16,7 @@ use sk_core::k8s::{
     ApiSet,
     GVK,
 };
+use sk_core::prelude::*;
 
 use crate::watchers::{
     EventHandler,

sk-store/src/watchers/dyn_obj_watcher.rs

@@ -1,7 +1,6 @@
 mod pod_watcher_test;
 
 use futures::stream;
-use kube::api::DynamicObject;
 use mockall::predicate;
 use rstest::*;
 use sk_core::prelude::*;