Bump serde_yaml to 0.9 (#1188)

* Bump `serde_yaml` to 0.9 Closes #980 Signed-off-by: clux <sszynrae@gmail.com> * minor serialization changes + fn removal in serde_yaml Signed-off-by: clux <sszynrae@gmail.com> --------- Signed-off-by: clux <sszynrae@gmail.com>
kube-rs · Apr 8, 2023 · 111f2bc · 111f2bc
1 parent c30b376
commit 111f2bc
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -34,7 +34,7 @@ kube-derive = { path = "../kube-derive", version = "^0.81.0", default-features =
 k8s-openapi = { version = "0.17.0", default-features = false }
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.68"
-serde_yaml = "0.8.21"
+serde_yaml = "0.9.19"
 tokio = { version = "1.14.0", features = ["full"] }
 either = "1.6.1"
 schemars = "0.8.6"

diff --git a/examples/crd_derive.rs b/examples/crd_derive.rs
@@ -218,12 +218,12 @@ async fn verify_url_gen() {
 fn verify_default() {
     let fdef = FooCrd::default();
     let ser = serde_yaml::to_string(&fdef).unwrap();
-    let exp = r#"---
+    let exp = r#"
 apiVersion: clux.dev/v1
 kind: Foo
 metadata: {}
 spec:
-  name: ""
+  name: ''
 "#;
-    assert_eq!(exp, ser);
+    assert_eq!(exp.trim(), ser.trim());
 }
diff --git a/kube-client/Cargo.toml b/kube-client/Cargo.toml
@@ -41,7 +41,7 @@ chrono = { version = "0.4.23", optional = true, default-features = false }
 dirs = { package = "dirs-next", optional = true, version = "2.0.0" }
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.68"
-serde_yaml = { version = "0.8.21", optional = true }
+serde_yaml = { version = "0.9.19", optional = true }
 http = "0.2.5"
 http-body = { version = "0.4.2", optional = true }
 either = { version = "1.6.1", optional = true }

diff --git a/kube-core/Cargo.toml b/kube-core/Cargo.toml
@@ -48,4 +48,4 @@ features = ["v1_26"]
 [dev-dependencies]
 assert-json-diff = "2.0.1"
 kube = { path = "../kube", version = "<1.0.0, >=0.53.0" }
-serde_yaml = "0.8.23"
+serde_yaml = "0.9.19"
diff --git a/kube-derive/Cargo.toml b/kube-derive/Cargo.toml
@@ -27,7 +27,7 @@ proc-macro = true
 
 [dev-dependencies]
 serde = { version = "1.0.130", features = ["derive"] }
-serde_yaml = "0.8.21"
+serde_yaml = "0.9.19"
 kube = { path = "../kube", version = "<1.0.0, >=0.61.0", features = ["derive", "client"] }
 k8s-openapi = { version = "0.17.0", default-features = false, features = ["v1_26"] }
 schemars = { version = "0.8.6", features = ["chrono"] }

diff --git a/kube-derive/src/lib.rs b/kube-derive/src/lib.rs
@@ -54,8 +54,7 @@ mod custom_resource;
 ///  # let client: Client = todo!();
 ///  let foos: Api<Foo> = Api::default_namespaced(client.clone());
 ///  let crds: Api<CustomResourceDefinition> = Api::all(client.clone());
-///  let crd_yaml = serde_yaml::to_vec(&Foo::crd())?;
-///  crds.patch("foos.clux.dev", &PatchParams::apply("myapp"), &Patch::Apply(crd_yaml)).await;
+///  crds.patch("foos.clux.dev", &PatchParams::apply("myapp"), &Patch::Apply(Foo::crd())).await;
 /// # Ok(())
 /// # }
 ///  ```