Add builder() convenience function

Author: sbernauer

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

@@ -63,11 +63,10 @@ where
 ///
 /// ```no_run
 /// use stackable_certs::{
-///     keys::ecdsa,
-///     ca::{CertificateAuthority, CertificateAuthorityBuilder},
+///     keys::ecdsa, ca::CertificateAuthority,
 /// };
 ///
-/// let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthorityBuilder::builder()
+/// let ca = CertificateAuthority::<ecdsa::SigningKey>::builder()
 ///     .build_ca()
 ///     .expect("failed to build CA");
 /// ```

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

@@ -24,16 +24,20 @@ where
     certificate_pair: CertificatePair<SK>,
 }
 
-impl<S> CertificateAuthority<S>
+impl<SK> CertificateAuthority<SK>
 where
-    S: CertificateKeypair,
-    <S::SigningKey as signature::Keypair>::VerifyingKey: EncodePublicKey,
+    SK: CertificateKeypair,
+    <SK::SigningKey as signature::Keypair>::VerifyingKey: EncodePublicKey,
 {
-    pub fn new(certificate_pair: CertificatePair<S>) -> Self {
+    pub fn new(certificate_pair: CertificatePair<SK>) -> Self {
         Self { certificate_pair }
     }
 
-    pub fn signing_key(&self) -> &S::SigningKey {
+    pub fn builder() -> CertificateAuthorityBuilderBuilder<'static, SK> {
+        CertificateAuthorityBuilder::builder()
+    }
+
+    pub fn signing_key(&self) -> &SK::SigningKey {
         self.certificate_pair.key_pair().signing_key()
     }
 

crates/stackable-certs/src/cert_builder.rs

@@ -69,15 +69,15 @@ where
 /// ```no_run
 /// use stackable_certs::{
 ///     keys::ecdsa,
-///     ca::{CertificateAuthority, CertificateAuthorityBuilder},
-///     CertificateBuilder,
+///     ca::CertificateAuthority,
+///     CertificatePair,
 /// };
 ///
-/// let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthorityBuilder::builder()
+/// let ca = CertificateAuthority::<ecdsa::SigningKey>::builder()
 ///     .build_ca()
 ///     .expect("failed to build CA");
 ///
-/// let certificate = CertificateBuilder::builder()
+/// let certificate = CertificatePair::builder()
 ///     .subject("CN=trino-coordinator-default-0")
 ///     .signed_by(&ca)
 ///     .build_certificate()

crates/stackable-certs/src/lib.rs

@@ -121,6 +121,10 @@ where
         }
     }
 
+    pub fn builder() -> CertificateBuilderBuilder<'static, S> {
+        CertificateBuilder::builder()
+    }
+
     /// Returns a reference to the [`Certificate`].
     pub fn certificate(&self) -> &Certificate {
         &self.certificate

crates/stackable-webhook/src/tls.rs

@@ -9,8 +9,8 @@ use hyper_util::rt::{TokioExecutor, TokioIo};
 use opentelemetry::trace::{FutureExt, SpanKind};
 use snafu::{ResultExt, Snafu};
 use stackable_certs::{
-    CertificateBuilder, CertificatePairError, CreateCertificateError,
-    ca::{CertificateAuthority, CertificateAuthorityBuilder, CreateCertificateAuthorityError},
+    CertificatePair, CertificatePairError, CreateCertificateError,
+    ca::{CertificateAuthority, CreateCertificateAuthorityError},
     keys::ecdsa,
 };
 use tokio::net::TcpListener;
@@ -109,12 +109,11 @@ impl TlsServer {
         // blocked.
         // See https://docs.rs/tokio/latest/tokio/task/fn.spawn_blocking.html
         let task = tokio::task::spawn_blocking(move || {
-            let ca: CertificateAuthority<ecdsa::SigningKey> =
-                CertificateAuthorityBuilder::builder()
-                    .build_ca()
-                    .context(CreateCertificateAuthoritySnafu)?;
+            let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthority::builder()
+                .build_ca()
+                .context(CreateCertificateAuthoritySnafu)?;
 
-            let certificate = CertificateBuilder::builder()
+            let certificate = CertificatePair::builder()
                 .subject("CN=webhook")
                 .signed_by(&ca)
                 .build_certificate()