Rename inner builder() to start_builder()

Author: sbernauer

crates/stackable-certs/src/ca/ca_builder.rs

@@ -71,7 +71,7 @@ where
 ///     .expect("failed to build CA");
 /// ```
 #[derive(Builder)]
-#[builder(finish_fn = finish_builder)]
+#[builder(start_fn = start_builder, finish_fn = finish_builder)]
 pub struct CertificateAuthorityBuilder<'a, SKP>
 where
     SKP: CertificateKeypair,
@@ -195,7 +195,7 @@ mod tests {
 
     #[test]
     fn minimal_ca() {
-        let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthorityBuilder::builder()
+        let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthority::builder()
             .build()
             .expect("failed to build CA");
 
@@ -209,7 +209,7 @@ mod tests {
 
     #[test]
     fn customized_ca() {
-        let ca = CertificateAuthorityBuilder::builder()
+        let ca = CertificateAuthority::builder()
             .subject("CN=Test")
             .serial_number(42)
             .signing_key_pair(rsa::SigningKey::new().unwrap())

crates/stackable-certs/src/ca/mod.rs

@@ -34,7 +34,7 @@ where
     }
 
     pub fn builder() -> CertificateAuthorityBuilderBuilder<'static, SK> {
-        CertificateAuthorityBuilder::builder()
+        CertificateAuthorityBuilder::start_builder()
     }
 
     pub fn signing_key(&self) -> &SK::SigningKey {

crates/stackable-certs/src/cert_builder.rs

@@ -86,7 +86,7 @@ where
 ///     .expect("failed to build certificate");
 /// ```
 #[derive(Builder)]
-#[builder(finish_fn = finish_builder)]
+#[builder(start_fn = start_builder, finish_fn = finish_builder)]
 pub struct CertificateBuilder<'a, KP>
 where
     KP: CertificateKeypair,
@@ -241,18 +241,15 @@ mod tests {
     };
 
     use super::*;
-    use crate::{
-        ca::CertificateAuthorityBuilder,
-        keys::{ecdsa, rsa},
-    };
+    use crate::keys::{ecdsa, rsa};
 
     #[test]
     fn minimal_certificate() {
-        let ca = CertificateAuthorityBuilder::<ecdsa::SigningKey>::builder()
+        let ca = CertificateAuthority::<ecdsa::SigningKey>::builder()
             .build()
             .expect("failed to build CA");
 
-        let certificate = CertificateBuilder::builder()
+        let certificate = CertificatePair::builder()
             .subject("CN=trino-coordinator-default-0")
             .signed_by(&ca)
             .build()
@@ -270,7 +267,7 @@ mod tests {
 
     #[test]
     fn customized_certificate() {
-        let ca = CertificateAuthorityBuilder::builder()
+        let ca = CertificateAuthority::builder()
             .build()
             .expect("failed to build CA");
 
@@ -280,7 +277,7 @@ mod tests {
         ];
         let san_ips = ["10.0.0.1".parse().unwrap(), "fe80::42".parse().unwrap()];
 
-        let certificate = CertificateBuilder::builder()
+        let certificate = CertificatePair::builder()
             .subject("CN=trino-coordinator-default-0")
             .subject_alterative_dns_names(&sans)
             .subject_alterative_ip_addresses(&san_ips)

crates/stackable-certs/src/lib.rs

@@ -122,7 +122,7 @@ where
     }
 
     pub fn builder() -> CertificateBuilderBuilder<'static, S> {
-        CertificateBuilder::builder()
+        CertificateBuilder::start_builder()
     }
 
     /// Returns a reference to the [`Certificate`].