Offer convenience functions

Author: sbernauer

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

@@ -68,7 +68,6 @@ where
 /// };
 ///
 /// let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthorityBuilder::builder()
-///     .build()
 ///     .build_ca()
 ///     .expect("failed to build CA");
 /// ```
@@ -99,6 +98,20 @@ where
     signing_key_pair: Option<SKP>,
 }
 
+impl<SKP, S> CertificateAuthorityBuilderBuilder<'_, SKP, S>
+where
+    SKP: CertificateKeypair,
+    <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(
+        self: Self,
+    ) -> Result<CertificateAuthority<SKP>, CreateCertificateAuthorityError<SKP::Error>> {
+        self.build().build_ca()
+    }
+}
+
 impl<SKP> CertificateAuthorityBuilder<'_, SKP>
 where
     SKP: CertificateKeypair,

crates/stackable-certs/src/cert_builder.rs

@@ -74,14 +74,12 @@ where
 /// };
 ///
 /// let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthorityBuilder::builder()
-///     .build()
 ///     .build_ca()
 ///     .expect("failed to build CA");
 ///
 /// let certificate = CertificateBuilder::builder()
 ///     .subject("CN=trino-coordinator-default-0")
 ///     .signed_by(&ca)
-///     .build()
 ///     .build_certificate()
 ///     .expect("failed to build certificate");
 /// ```
@@ -119,6 +117,20 @@ where
     signed_by: &'a CertificateAuthority<KP>,
 }
 
+impl<KP, S> CertificateBuilderBuilder<'_, KP, S>
+where
+    KP: CertificateKeypair,
+    <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()
+    }
+}
+
 impl<KP> CertificateBuilder<'_, KP>
 where
     KP: CertificateKeypair,

crates/stackable-webhook/src/tls.rs

@@ -111,14 +111,12 @@ impl TlsServer {
         let task = tokio::task::spawn_blocking(move || {
             let ca: CertificateAuthority<ecdsa::SigningKey> =
                 CertificateAuthorityBuilder::builder()
-                    .build()
                     .build_ca()
                     .context(CreateCertificateAuthoritySnafu)?;
 
             let certificate = CertificateBuilder::builder()
                 .subject("CN=webhook")
                 .signed_by(&ca)
-                .build()
                 .build_certificate()
                 .context(CreateCertificateSnafu)?;