WIP: prototyping apply patch wrapper

Signed-off-by: Danil-Grigorev <[email protected]>

Author: Danil-Grigorev

kube-client/src/client/client_ext.rs

@@ -1,16 +1,14 @@
 use crate::{Client, Error, Result};
 use k8s_openapi::{
-    api::{
-        core::v1::{LocalObjectReference, Namespace as k8sNs, ObjectReference},
-    },
+    api::core::v1::{LocalObjectReference, Namespace as k8sNs, ObjectReference},
     apimachinery::pkg::apis::meta::v1::OwnerReference,
 };
 use kube_core::{
     object::ObjectList,
     params::{GetParams, ListParams, Patch, PatchParams},
     request::Request,
-    ApiResource, ClusterResourceScope, DynamicResourceScope, NamespaceResourceScope, ObjectMeta, Resource,
-    ResourceExt,
+    ApiResource, ClusterResourceScope, DynamicResourceScope, NamespaceResourceScope, Resource, ResourceExt,
+    TypeMeta,
 };
 use serde::{de::DeserializeOwned, Serialize};
 use std::fmt::Debug;
@@ -233,6 +231,18 @@ pub enum NamespaceError {
     MissingName,
 }
 
+#[derive(Serialize, Clone, Debug)]
+/// ApplyObject allows to wrap an object into Patch::Apply compatible structure,
+/// with populated TypeMeta.
+pub struct ApplyObject<R: Serialize> {
+    /// Contains the API version and type of the request.
+    #[serde(flatten)]
+    pub types: TypeMeta,
+    /// Contains the object data.
+    #[serde(flatten)]
+    pub data: R,
+}
+
 /// Generic client extensions for the `unstable-client` feature
 ///
 /// These methods allow users to query across a wide-array of resources without needing
@@ -390,7 +400,7 @@ impl Client {
     /// Perform apply patch on the provided `Resource` implementing type `K`
     ///
     /// ```no_run
-    /// # use k8s_openapi::api::core::v1::;
+    /// # use k8s_openapi::api::core::v1::Pod;
     /// # use k8s_openapi::api::core::v1::Service;
     /// # use kube::client::scope::Namespace;
     /// # use kube::prelude::*;
@@ -404,7 +414,7 @@ impl Client {
     /// # Ok(())
     /// # }
     /// ```
-    pub async fn apply<K, P: Serialize + Debug>(&self, resource: &K, pp: &PatchParams) -> Result<K>
+    pub async fn apply<K>(&self, resource: &K, pp: &PatchParams) -> Result<K>
     where
         K: ResourceExt + Serialize + DeserializeOwned + Clone + Debug,
         <K as Resource>::DynamicType: Default,
@@ -414,10 +424,17 @@ impl Client {
         let url = K::url_path(&Default::default(), meta.namespace.as_deref());
         let req = Request::new(url);
 
-        let mut resource = resource.clone();
-        resource.meta_mut().managed_fields = None;
-        let patch = &Patch::Apply(resource);
-        let req = req.patch(name, pp, patch).map_err(Error::BuildRequest)?;
+        let apply = ApplyObject::<K> {
+            types: TypeMeta::resource::<K>(),
+            data: {
+                let mut resource = resource.clone();
+                resource.meta_mut().managed_fields = None;
+                resource
+            },
+        };
+        let req = req
+            .patch(name, pp, &Patch::Apply(apply))
+            .map_err(Error::BuildRequest)?;
         self.request::<K>(req).await
     }
 
@@ -438,7 +455,7 @@ impl Client {
     /// # Ok(())
     /// # }
     /// ```
-    pub async fn apply_status<K, P: Serialize + Debug>(&self, resource: &K, pp: &PatchParams) -> Result<K>
+    pub async fn apply_status<K>(&self, resource: &K, pp: &PatchParams) -> Result<K>
     where
         K: ResourceExt + Serialize + DeserializeOwned + Clone + Debug,
         <K as Resource>::DynamicType: Default,
@@ -448,11 +465,16 @@ impl Client {
         let url = K::url_path(&Default::default(), meta.namespace.as_deref());
         let req = Request::new(url);
 
-        let mut resource = resource.clone();
-        resource.meta_mut().managed_fields = None;
-        let patch = &Patch::Apply(resource);
+        let apply = ApplyObject::<K> {
+            types: TypeMeta::resource::<K>(),
+            data: {
+                let mut resource = resource.clone();
+                resource.meta_mut().managed_fields = None;
+                resource
+            },
+        };
         let req = req
-            .patch_subresource("status", name, pp, patch)
+            .patch_subresource("status", name, pp, &Patch::Apply(apply))
             .map_err(Error::BuildRequest)?;
         self.request::<K>(req).await
     }

kube-core/src/metadata.rs

@@ -45,10 +45,10 @@ impl TypeMeta {
     /// assert_eq!(type_meta.kind, "Pod");
     /// assert_eq!(type_meta.api_version, "v1");
     /// ```
-    pub fn resource<K: Resource<DynamicType = ()>>() -> Self {
+    pub fn resource<K: Resource<DynamicType = impl Default>>() -> Self {
         TypeMeta {
-            api_version: K::api_version(&()).into(),
-            kind: K::kind(&()).into(),
+            api_version: K::api_version(&Default::default()).into(),
+            kind: K::kind(&Default::default()).into(),
         }
     }
 }