add more opts

Author: Praveenrajmani

api-events.go

@@ -25,31 +25,39 @@ import (
 	"errors"
 	"io"
 	"net/http"
-	"net/url"
+	"time"
 
 	"github.com/minio/madmin-go/v3/event"
 )
 
+// APIEventOpts represents the options for the APIEventOpts
+type APIEventOpts struct {
+	Node       string
+	API        string
+	Bucket     string
+	Object     string
+	StatusCode int
+	Interval   time.Duration
+}
+
 // GetAPIEvents fetches the persisted API events from MinIO
-func (adm AdminClient) GetAPIEvents(ctx context.Context, node string, api string) <-chan event.API {
+func (adm AdminClient) GetAPIEvents(ctx context.Context, opts APIEventOpts) (<-chan event.API, error) {
+	apiOpts, err := json.Marshal(opts)
+	if err != nil {
+		return nil, err
+	}
 	eventCh := make(chan event.API)
-
-	// Only success, start a routine to start reading line by line.
 	go func(eventCh chan<- event.API) {
 		defer close(eventCh)
-		urlValues := make(url.Values)
-		urlValues.Set("node", node)
-		urlValues.Set("api", api)
 		reqData := requestData{
-			relPath:     adminAPIPrefix + "/events/api",
-			queryValues: urlValues,
+			relPath: adminAPIPrefix + "/events/api",
+			content: apiOpts,
 		}
-		resp, err := adm.executeMethod(ctx, http.MethodGet, reqData)
+		resp, err := adm.executeMethod(ctx, http.MethodPost, reqData)
 		if err != nil {
 			closeResponse(resp)
 			return
 		}
-
 		if resp.StatusCode != http.StatusOK {
 			return
 		}
@@ -68,8 +76,7 @@ func (adm AdminClient) GetAPIEvents(ctx context.Context, node string, api string
 			case eventCh <- info:
 			}
 		}
-
 	}(eventCh)
 
-	return eventCh
+	return eventCh, nil
 }

event/api.go

@@ -52,7 +52,7 @@ type API struct {
 
 // CallInfo represents the info for the external call
 type CallInfo struct {
-	HttpStatusCode  int                    `json:"httpStatusCode,omitempty"`
+	HTTPStatusCode  int                    `json:"httpStatusCode,omitempty"`
 	InputBytes      int64                  `json:"rx"`
 	OutputBytes     int64                  `json:"tx"`
 	HeaderBytes     int64                  `json:"txHeaders,omitempty"`

examples/api-events.go

@@ -19,42 +19,12 @@ func main() {
 	if err != nil {
 		log.Fatalln(err)
 	}
-	// madmClnt.SetCustomTransport(&http.Transport{
-	// 	Proxy: http.ProxyFromEnvironment,
-	// 	DialContext: (&net.Dialer{
-	// 		Timeout:       5 * time.Second,
-	// 		KeepAlive:     15 * time.Second,
-	// 		FallbackDelay: 100 * time.Millisecond,
-	// 	}).DialContext,
-	// 	MaxIdleConns:          1024,
-	// 	MaxIdleConnsPerHost:   1024,
-	// 	ResponseHeaderTimeout: 60 * time.Second,
-	// 	IdleConnTimeout:       60 * time.Second,
-	// 	TLSHandshakeTimeout:   10 * time.Second,
-	// 	ExpectContinueTimeout: 1 * time.Second,
-	// 	// Set this value so that the underlying transport round-tripper
-	// 	// doesn't try to auto decode the body of objects with
-	// 	// content-encoding set to `gzip`.
-	// 	//
-	// 	// Refer:
-	// 	//    https://golang.org/src/net/http/transport.go?h=roundTrip#L1843
-	// 	DisableCompression: true,
-	// 	TLSClientConfig: &tls.Config{
-	// 		// Can't use SSLv3 because of POODLE and BEAST
-	// 		// Can't use TLSv1.0 because of POODLE and BEAST using CBC cipher
-	// 		// Can't use TLSv1.1 because of RC4 cipher usage
-	// 		MinVersion:         tls.VersionTLS12,
-	// 		InsecureSkipVerify: true,
-	// 	},
-	// })
+	eventCh, err := madmClnt.GetAPIEvents(context.Background(), madmin.APIEventOpts{})
+	if err != nil {
+		log.Fatalln(err)
+	}
 
-	eventCh := madmClnt.GetAPIEvents(context.Background(), "", "PutObject")
-	i := 1
 	for event := range eventCh {
-		fmt.Printf("count: %d\n", i)
-		i++
-		fmt.Println("************************")
-		fmt.Println(event)
-		fmt.Println("************************")
+		fmt.Printf("Event: %+v\n", event)
 	}
 }