Close -> Stop

Author: Ananth Bhaskararaman

cmd/bf/ca.go

@@ -103,7 +103,7 @@ var caServeCmd = &cli.Command{
 			bifrost.Logger().ErrorContext(ctx, "error creating CA", "error", err)
 			return cli.Exit("Error creating CA", 1)
 		}
-		defer ca.Close()
+		defer ca.Stop()
 
 		mux := http.NewServeMux()
 		ca.AddRoutes(mux, exposeMetrics)
@@ -184,7 +184,7 @@ var caIssueCmd = &cli.Command{
 			bifrost.Logger().ErrorContext(ctx, "error creating CA", "error", err)
 			return cli.Exit("Error creating CA", 1)
 		}
-		defer ca.Close()
+		defer ca.Stop()
 
 		clientKey, err := cafiles.GetPrivateKey(ctx, clientPrivKeyUri)
 		if err != nil {

cmd/bf/proxy.go

@@ -195,7 +195,7 @@ func issueTLSCert(
 	if err != nil {
 		return nil, err
 	}
-	defer ca.Close()
+	defer ca.Stop()
 
 	caNs := caCert.Namespace
 	csr := x509.CertificateRequest{

tinyca/ca.go

@@ -38,10 +38,8 @@ const (
 // The CA issues client certificates signed by a root certificate and private key.
 // The CA provides an HTTP handler to issue certificates.
 // The CA also provides a [Gauntlet] function to customize the certificate template.
-// Call Close to release resources when done.
+// Call Stop to release resources when done.
 type CA struct {
-	io.Closer
-
 	cert *bifrost.Certificate
 	key  *bifrost.PrivateKey
 	gh   *gauntletThrower
@@ -254,10 +252,11 @@ func (ca *CA) IssueCertificate(asn1CSR []byte, notBefore, notAfter time.Time) ([
 	return certBytes, nil
 }
 
-// Close releases resources held by the CA.
-// Multiple calls to Close are safe.
-func (ca *CA) Close() error {
-	return ca.gh.Close()
+// Stop releases resources held by the CA.
+func (ca *CA) Stop() {
+	if ca.gh != nil {
+		ca.gh.wg.Wait()
+	}
 }
 
 func readCsr(contentType string, body []byte) ([]byte, error) {

tinyca/ca_test.go

@@ -217,7 +217,7 @@ func TestCA_ServeHTTP(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			defer ca.Close()
+			defer ca.Stop()
 
 			method := http.MethodPost
 			if tc.requestMethod != "" {
@@ -309,7 +309,7 @@ func TestCA_gauntlet_panic(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer ca.Close()
+	defer ca.Stop()
 
 	rr := httptest.NewRecorder()
 	req, err := http.NewRequest(http.MethodPost, "/", bytes.NewReader([]byte(validCsr)))

tinyca/gauntlet.go

@@ -156,11 +156,3 @@ func (gh *gauntletThrower) throw(csr *bifrost.CertificateRequest) (*x509.Certifi
 		return tmpl, nil
 	}
 }
-
-func (gh *gauntletThrower) Close() error {
-	if gh.wg != nil {
-		gh.wg.Wait()
-	}
-
-	return nil
-}