Simply noop branch

Author: sbernauer

crates/stackable-versioned-macros/src/codegen/container/struct/k8s.rs

@@ -362,6 +362,7 @@ impl Struct {
 
         let struct_ident = &self.common.idents.kubernetes;
         let version_enum_ident = &self.common.idents.kubernetes_version;
+        let version_idents = versions.iter().map(|v| &v.idents.variant);
 
         let kube_client_path = &*kubernetes_arguments.crates.kube_client;
         let serde_json_path = &*kubernetes_arguments.crates.serde_json;
@@ -373,7 +374,6 @@ impl Struct {
         // Generate conversion paths and the match arms for these paths
         let conversion_match_arms =
             self.generate_kubernetes_conversion_match_arms(versions, kubernetes_arguments);
-        let noop_match_arm = self.generate_kubernetes_noop_match_arm(versions);
 
         // TODO (@Techassi): Make this a feature, drop the option from the macro arguments
         // Generate tracing attributes and events if tracing is enabled
@@ -484,9 +484,17 @@ impl Struct {
 
                     match (current_object, desired_api_version) {
                         #(#conversion_match_arms,)*
+                        // In case the desired version matches the current object api version, we
+                        // don't need to do anything.
+                        //
                         // We explicitly list the remaining no-op cases, so the compiler ensures we
                         // did not miss a conversion.
-                        #noop_match_arm,
+                        //
+                        // NOTE (@Techassi): I'm curious if this will ever happen? In theory the K8s
+                        // apiserver should never send such a conversion review.
+                        #(
+                            (Self::#version_idents(_), #version_enum_ident::#version_idents)
+                        )|* => converted_objects.push(object)
                     }
                 }
 
@@ -579,20 +587,6 @@ impl Struct {
             .collect()
     }
 
-    fn generate_kubernetes_noop_match_arm(&self, versions: &[VersionDefinition]) -> TokenStream {
-        let version_enum_ident = &self.common.idents.kubernetes_version;
-        let version_idents = versions.iter().map(|v| &v.idents.variant);
-
-        quote! {
-            // This is the case if the desired version matches the current object api version.
-            // NOTE (@Techassi): I'm curious if this will ever happen? In theory the K8s
-            // apiserver should never send such a conversion review.
-            #(
-                (Self::#version_idents(_), #version_enum_ident::#version_idents)
-            )|* => converted_objects.push(object)
-        }
-    }
-
     fn generate_kubernetes_conversion_tracing(
         &self,
         kubernetes_arguments: &KubernetesArguments,