Rename the convenience function ro build()

Author: sbernauer

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

@@ -67,10 +67,11 @@ where
 /// };
 ///
 /// let ca = CertificateAuthority::<ecdsa::SigningKey>::builder()
-///     .build_ca()
+///     .build()
 ///     .expect("failed to build CA");
 /// ```
 #[derive(Builder)]
+#[builder(finish_fn = finish_builder)]
 pub struct CertificateAuthorityBuilder<'a, SKP>
 where
     SKP: CertificateKeypair,
@@ -103,11 +104,11 @@ where
     <SKP::SigningKey as signature::Keypair>::VerifyingKey: EncodePublicKey,
     S: certificate_authority_builder_builder::IsComplete,
 {
-    /// Convenience function to avoid calling `builder().build().build_ca()`
-    pub fn build_ca(
+    /// Convenience function to avoid calling `builder().finish_builder().build()`
+    pub fn build(
         self: Self,
     ) -> Result<CertificateAuthority<SKP>, CreateCertificateAuthorityError<SKP::Error>> {
-        self.build().build_ca()
+        self.finish_builder().build()
     }
 }
 
@@ -116,7 +117,7 @@ where
     SKP: CertificateKeypair,
     <SKP::SigningKey as signature::Keypair>::VerifyingKey: EncodePublicKey,
 {
-    pub fn build_ca(
+    pub fn build(
         self,
     ) -> Result<CertificateAuthority<SKP>, CreateCertificateAuthorityError<SKP::Error>> {
         let serial_number =
@@ -196,7 +197,6 @@ mod tests {
     fn minimal_ca() {
         let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthorityBuilder::builder()
             .build()
-            .build_ca()
             .expect("failed to build CA");
 
         assert_ca_cert_attributes(
@@ -215,7 +215,6 @@ mod tests {
             .signing_key_pair(rsa::SigningKey::new().unwrap())
             .validity(Duration::from_days_unchecked(13))
             .build()
-            .build_ca()
             .expect("failed to build CA");
 
         assert_ca_cert_attributes(

crates/stackable-certs/src/cert_builder.rs

@@ -74,16 +74,17 @@ where
 /// };
 ///
 /// let ca = CertificateAuthority::<ecdsa::SigningKey>::builder()
-///     .build_ca()
+///     .build()
 ///     .expect("failed to build CA");
 ///
 /// let certificate = CertificatePair::builder()
 ///     .subject("CN=trino-coordinator-default-0")
 ///     .signed_by(&ca)
-///     .build_certificate()
+///     .build()
 ///     .expect("failed to build certificate");
 /// ```
 #[derive(Builder)]
+#[builder(finish_fn = finish_builder)]
 pub struct CertificateBuilder<'a, KP>
 where
     KP: CertificateKeypair,
@@ -123,11 +124,9 @@ where
     <KP::SigningKey as signature::Keypair>::VerifyingKey: EncodePublicKey,
     S: certificate_builder_builder::IsComplete,
 {
-    /// Convenience function to avoid calling `builder().build().build_certificate()`
-    pub fn build_certificate(
-        self,
-    ) -> Result<CertificatePair<KP>, CreateCertificateError<KP::Error>> {
-        self.build().build_certificate()
+    /// Convenience function to avoid calling `builder().finish_builder().build()`
+    pub fn build(self) -> Result<CertificatePair<KP>, CreateCertificateError<KP::Error>> {
+        self.finish_builder().build()
     }
 }
 
@@ -136,9 +135,7 @@ where
     KP: CertificateKeypair,
     <KP::SigningKey as signature::Keypair>::VerifyingKey: EncodePublicKey,
 {
-    pub fn build_certificate(
-        self,
-    ) -> Result<CertificatePair<KP>, CreateCertificateError<KP::Error>> {
+    pub fn build(self) -> Result<CertificatePair<KP>, CreateCertificateError<KP::Error>> {
         let serial_number =
             SerialNumber::from(self.serial_number.unwrap_or_else(|| rand::random::<u64>()));
 
@@ -241,7 +238,6 @@ mod tests {
             .subject("CN=trino-coordinator-default-0")
             .signed_by(&ca)
             .build()
-            .build_certificate()
             .expect("failed to build certificate");
 
         assert_certificate_attributes(
@@ -268,7 +264,6 @@ mod tests {
             .key_pair(rsa::SigningKey::new().unwrap())
             .signed_by(&ca)
             .build()
-            .build_certificate()
             .expect("failed to build certificate");
 
         assert_certificate_attributes(
@@ -329,14 +324,12 @@ mod tests {
     fn get_ecdsa_ca() -> CertificateAuthority<ecdsa::SigningKey> {
         CertificateAuthorityBuilder::builder()
             .build()
-            .build_ca()
             .expect("failed to build CA")
     }
 
     fn get_rsa_ca() -> CertificateAuthority<rsa::SigningKey> {
         CertificateAuthorityBuilder::builder()
             .build()
-            .build_ca()
             .expect("failed to build CA")
     }
 }

crates/stackable-webhook/src/tls.rs

@@ -110,13 +110,13 @@ impl TlsServer {
         // See https://docs.rs/tokio/latest/tokio/task/fn.spawn_blocking.html
         let task = tokio::task::spawn_blocking(move || {
             let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthority::builder()
-                .build_ca()
+                .build()
                 .context(CreateCertificateAuthoritySnafu)?;
 
             let certificate = CertificatePair::builder()
                 .subject("CN=webhook")
                 .signed_by(&ca)
-                .build_certificate()
+                .build()
                 .context(CreateCertificateSnafu)?;
 
             let certificate_der = certificate