Merge branch 'main' into dependabot/cargo/tokio-tungstenite-0.28.0

Author: clux

examples/crd_derive.rs

@@ -3,7 +3,7 @@ use kube::{
     core::object::{HasSpec, HasStatus},
     CustomResource, CustomResourceExt, Resource,
 };
-use schemars::JsonSchema;
+use schemars::{json_schema, JsonSchema};
 use serde::{Deserialize, Serialize};
 
 /// Our spec for Foo
@@ -63,7 +63,7 @@ fn main() {
 }
 
 fn conditions(_: &mut schemars::generate::SchemaGenerator) -> schemars::Schema {
-    serde_json::from_value(serde_json::json!({
+    json_schema!({
         "type": "array",
         "x-kubernetes-list-type": "map",
         "x-kubernetes-list-map-keys": ["type"],
@@ -85,8 +85,7 @@ fn conditions(_: &mut schemars::generate::SchemaGenerator) -> schemars::Schema {
                 "type"
             ],
         },
-    }))
-    .unwrap()
+    })
 }
 
 // some tests

examples/crd_derive_schema.rs

@@ -9,6 +9,7 @@ use kube::{
     runtime::wait::{await_condition, conditions},
     Client, CustomResource, CustomResourceExt, KubeSchema,
 };
+use schemars::json_schema;
 use serde::{Deserialize, Serialize};
 
 // This example shows how the generated schema affects defaulting and validation.
@@ -121,16 +122,15 @@ impl FooSpec {
 
 // https://kubernetes.io/docs/reference/using-api/server-side-apply/#merge-strategy
 fn set_listable_schema(_: &mut schemars::generate::SchemaGenerator) -> schemars::Schema {
-    serde_json::from_value(serde_json::json!({
+    json_schema!({
         "type": "array",
         "items": {
             "format": "u32",
             "minium": 0,
             "type": "integer"
         },
         "x-kubernetes-list-type": "set"
-    }))
-    .unwrap()
+    })
 }
 
 fn default_value() -> String {

kube-client/src/api/util/mod.rs

@@ -79,10 +79,10 @@ mod test {
 
         let node_name = "fakenode";
         let fake_node = serde_json::from_value(json!({
-        "apiVersion": "v1",
-        "kind": "Node",
-        "metadata": {
-            "name": node_name,
+            "apiVersion": "v1",
+            "kind": "Node",
+            "metadata": {
+                "name": node_name,
             },
         }))?;
 

kube-core/src/duration.rs

@@ -283,12 +283,10 @@ impl schemars::JsonSchema for Duration {
     }
 
     fn json_schema(_: &mut schemars::generate::SchemaGenerator) -> schemars::Schema {
-        use schemars::json_schema;
-
         // the format should *not* be "duration", because "duration" means
         // the duration is formatted in ISO 8601, as described here:
         // https://datatracker.ietf.org/doc/html/draft-handrews-json-schema-validation-02#section-7.3.1
-        json_schema!({
+        schemars::json_schema!({
             "type": "string",
         })
     }

kube-derive/tests/ui/union_fails.stderr

@@ -5,8 +5,8 @@ error: Unions can not #[derive(CustomResource)]
   |       ^^^^^^^
 
 error: Serde does not support derive for unions
- --> tests/ui/union_fails.rs:8:1
-  |
+  --> tests/ui/union_fails.rs:8:1
+   |
  8 | / union FooSpec {
  9 | |     int: u32,
 10 | | }