MINOR: add interface to delete certificates via runtime

and also delete a certificate from a crt-list

Author: hdurand0710

runtime/crt-lists.go

@@ -160,8 +160,12 @@ func (s *SingleRuntime) AddCrtListEntry(crtList string, entry CrtListEntry) erro
 }
 
 // DeleteCrtListEntry deletes all the CrtList entries from the CrtList by its id
-func (s *SingleRuntime) DeleteCrtListEntry(crtList, certFile string, lineNumber int) error {
-	cmd := fmt.Sprintf("del ssl crt-list %s %s:%v", crtList, certFile, lineNumber)
+func (s *SingleRuntime) DeleteCrtListEntry(crtList, certFile string, lineNumber *int64) error {
+	lineNumberPart := ""
+	if lineNumber != nil {
+		lineNumberPart = fmt.Sprintf(":%v", *lineNumber)
+	}
+	cmd := fmt.Sprintf("del ssl crt-list %s %s%s", crtList, certFile, lineNumberPart)
 	response, err := s.ExecuteWithResponse(cmd)
 	if err != nil {
 		return fmt.Errorf("%s %w", err.Error(), native_errors.ErrNotFound)

runtime/crt-lists_test.go

@@ -3,6 +3,8 @@ package runtime
 import (
 	"reflect"
 	"testing"
+
+	"github.com/haproxytech/client-native/v5/misc"
 )
 
 func TestSingleRuntime_ShowCrtLists(t *testing.T) {
@@ -404,7 +406,7 @@ func TestSingleRuntime_DeleteCrtListEntry(t *testing.T) {
 				t.Errorf("SingleRuntime.Init() error = %v", err)
 				return
 			}
-			if err := s.DeleteCrtListEntry(tt.args.crtList, tt.args.certFile, tt.args.lineNumber); (err != nil) != tt.wantErr {
+			if err := s.DeleteCrtListEntry(tt.args.crtList, tt.args.certFile, misc.Int64P(tt.args.lineNumber)); (err != nil) != tt.wantErr {
 				t.Errorf("SingleRuntime.DeleteCrtListEntry() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

runtime/interface.go

@@ -144,6 +144,8 @@ type Cert interface {
 	CommitCertEntry(filename string) error
 	AbortCertEntry(filename string) error
 	AddCrtListEntry(crtList string, entry CrtListEntry) error
+	DeleteCrtListEntry(crtList, filename string, lineNumber *int64) error
+	DeleteCertEntry(filename string) error
 }
 
 type Runtime interface {

runtime/runtime_client.go

@@ -1304,3 +1304,37 @@ func (c *client) AddCrtListEntry(crtList string, entry CrtListEntry) error {
 	}
 	return nil
 }
+
+func (c *client) DeleteCrtListEntry(crtList, filename string, lineNumber *int64) error {
+	if len(c.runtimes) == 0 {
+		return fmt.Errorf("no valid runtimes found")
+	}
+	var lastErr error
+	for _, runtime := range c.runtimes {
+		err := runtime.DeleteCrtListEntry(crtList, filename, lineNumber)
+		if err != nil {
+			lastErr = err
+		}
+	}
+	if lastErr != nil {
+		return lastErr
+	}
+	return nil
+}
+
+func (c *client) DeleteCertEntry(filename string) error {
+	if len(c.runtimes) == 0 {
+		return fmt.Errorf("no valid runtimes found")
+	}
+	var lastErr error
+	for _, runtime := range c.runtimes {
+		err := runtime.DeleteCertEntry(filename)
+		if err != nil {
+			lastErr = err
+		}
+	}
+	if lastErr != nil {
+		return lastErr
+	}
+	return nil
+}