Make audit webhook and kafka config dynamic (#14390)

internal/logger/target/http/http.go

@@ -30,6 +30,7 @@ import (
 	"time"
 
 	xhttp "github.com/minio/minio/internal/http"
+	"github.com/minio/minio/internal/logger/target/types"
 )
 
 // Timeout for the webhook http call
@@ -222,3 +223,8 @@ func (h *Target) Cancel() {
 	}
 	h.wg.Wait()
 }
+
+// Type - returns type of the target
+func (h *Target) Type() types.TargetType {
+	return types.TargetHTTP
+}

internal/logger/target/kafka/kafka.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 MinIO, Inc.
+// Copyright (c) 2015-2022 MinIO, Inc.
 //
 // This file is part of MinIO Object Storage stack
 //
@@ -24,16 +24,22 @@ import (
 	"encoding/json"
 	"errors"
 	"net"
+	"sync"
+	"sync/atomic"
 
 	sarama "github.com/Shopify/sarama"
 	saramatls "github.com/Shopify/sarama/tools/tls"
 
 	"github.com/minio/minio/internal/logger/message/audit"
+	"github.com/minio/minio/internal/logger/target/types"
 	xnet "github.com/minio/pkg/net"
 )
 
 // Target - Kafka target.
 type Target struct {
+	status int32
+	wg     sync.WaitGroup
+
 	// Channel of log entries
 	logCh chan interface{}
 
@@ -55,30 +61,37 @@ func (h *Target) Send(entry interface{}, errKind string) error {
 	return nil
 }
 
+func (h *Target) logEntry(entry interface{}) {
+	h.wg.Add(1)
+	defer h.wg.Done()
+
+	logJSON, err := json.Marshal(&entry)
+	if err != nil {
+		return
+	}
+
+	ae, ok := entry.(audit.Entry)
+	if ok {
+		msg := sarama.ProducerMessage{
+			Topic: h.kconfig.Topic,
+			Key:   sarama.StringEncoder(ae.RequestID),
+			Value: sarama.ByteEncoder(logJSON),
+		}
+
+		_, _, err = h.producer.SendMessage(&msg)
+		if err != nil {
+			h.kconfig.LogOnce(context.Background(), err, h.kconfig.Topic)
+			return
+		}
+	}
+}
+
 func (h *Target) startKakfaLogger() {
 	// Create a routine which sends json logs received
 	// from an internal channel.
 	go func() {
 		for entry := range h.logCh {
-			logJSON, err := json.Marshal(&entry)
-			if err != nil {
-				continue
-			}
-
-			ae, ok := entry.(audit.Entry)
-			if ok {
-				msg := sarama.ProducerMessage{
-					Topic: h.kconfig.Topic,
-					Key:   sarama.StringEncoder(ae.RequestID),
-					Value: sarama.ByteEncoder(logJSON),
-				}
-
-				_, _, err = h.producer.SendMessage(&msg)
-				if err != nil {
-					h.kconfig.LogOnce(context.Background(), err, h.kconfig.Topic)
-					continue
-				}
-			}
+			h.logEntry(entry)
 		}
 	}()
 }
@@ -193,12 +206,17 @@ func (h *Target) Init() error {
 
 	h.producer = producer
 
+	h.status = 1
 	go h.startKakfaLogger()
 	return nil
 }
 
 // Cancel - cancels the target
 func (h *Target) Cancel() {
+	if atomic.CompareAndSwapInt32(&h.status, 1, 0) {
+		close(h.logCh)
+	}
+	h.wg.Wait()
 }
 
 // New initializes a new logger target which
@@ -210,3 +228,8 @@ func New(config Config) *Target {
 	}
 	return target
 }
+
+// Type - returns type of the target
+func (h *Target) Type() types.TargetType {
+	return types.TargetKafka
+}

internal/logger/target/types/types.go

@@ -0,0 +1,29 @@
+// Copyright (c) 2015-2022 MinIO, Inc.
+//
+// This file is part of MinIO Object Storage stack
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package types
+
+// TargetType indicates type of the target e.g. console, http, kafka
+type TargetType uint8
+
+// Constants for target types
+const (
+	_ TargetType = iota
+	TargetConsole
+	TargetHTTP
+	TargetKafka
+)