Merge pull request #64 from kube-rs/typed-builder

Add optional typed-builder derives

Author: clux

Cargo.lock

@@ -44,3 +44,4 @@ features = ["derive"]
 [dev-dependencies]
 schemars = "0.8.8"
 serde_yaml = "0.8.23"
+typed-builder = "0.10.0"

Cargo.toml

@@ -34,7 +34,7 @@ test-mv:
 
 test-agent:
   kubectl apply -f tests/agent-crd.yaml
-  cargo run --bin kopium -- -iAf tests/agent-crd.yaml > tests/gen.rs
+  cargo run --bin kopium -- -ibAf tests/agent-crd.yaml > tests/gen.rs
   echo "pub type CR = Agent;" >> tests/gen.rs
   kubectl apply -f tests/agent.yaml
   cargo test --test runner -- --nocapture
@@ -69,7 +69,7 @@ test-linkerd-serverauth:
 
 test-linkerd-server:
   kubectl apply --server-side -f tests/server-crd.yaml
-  cargo run --bin kopium -- -iz servers.policy.linkerd.io > tests/gen.rs
+  cargo run --bin kopium -- -ibz servers.policy.linkerd.io > tests/gen.rs
   echo "pub type CR = Server;" >> tests/gen.rs
   kubectl apply -f tests/server.yaml
   cargo test --test runner -- --nocapture

justfile

@@ -105,6 +105,10 @@ struct Kopium {
     #[structopt(long, short = "d")]
     docs: bool,
 
+    /// Emit builder derives via the typed_builder crate
+    #[structopt(long, short = "b")]
+    builders: bool,
+
     /// Schema mode to use for kube-derive
     ///
     /// The default is --schema=disabled and will compile without a schema,
@@ -293,6 +297,15 @@ impl Kopium {
                             format_ident!("{}", name)
                         };
                         let spec_trimmed_type = m.type_.as_str().replace(&format!("{}Spec", kind), &kind);
+                        if self.builders {
+                            if spec_trimmed_type.starts_with("Option") {
+                                println!("#[builder(default, setter(strip_option))]");
+                            } else if spec_trimmed_type.starts_with("Vec")
+                                || spec_trimmed_type.starts_with("BTreeMap")
+                            {
+                                println!("#[builder(default)]");
+                            }
+                        }
                         println!("    pub {}: {},", safe_name, spec_trimmed_type);
                     }
                     println!("}}");
@@ -346,6 +359,9 @@ impl Kopium {
             // CustomResource first for root struct
             derives.insert(0, "CustomResource".to_string());
         }
+        if self.builders {
+            derives.push("TypedBuilder".to_string());
+        }
         derives.extend(self.derive.clone()); // user derives last in user order
         println!("#[derive({})]", derives.join(", "));
     }
@@ -358,6 +374,9 @@ impl Kopium {
         if !self.hide_kube {
             println!("use kube::CustomResource;");
         }
+        if self.builders {
+            println!("use typed_builder::TypedBuilder;");
+        }
         if self.derive.contains(&"JsonSchema".to_string()) {
             println!("use schemars::JsonSchema;");
         }