fix: removed list of operation from sdk

Signed-off-by: Amr-Shams <amr.shams2015.as@gmail.com>

Author: Amr-Shams

api.go

@@ -563,9 +563,6 @@ type requestMetadata struct {
 	trailer          http.Header // (http.Request).Trailer. Requires v4 signature.
 
 	expect200OKWithError bool
-
-	// s3 operation name
-	s3Operation string
 }
 
 // dumpHTTP - dump HTTP request and response.
@@ -721,16 +718,11 @@ func (c *Client) executeMethod(ctx context.Context, method string, metadata requ
 		metadata.trailer.Set(metadata.addCrc.Key(), base64.StdEncoding.EncodeToString(crc.Sum(nil)))
 	}
 
-	opt := metadata.s3Operation
-	if opt == "" {
-		opt = resolveS3Operation(method, metadata)
-	}
-	metadata.s3Operation = opt
-
 	execCtx := ExecutionContext{
-		Operation:  opt,
-		BucketName: metadata.bucketName,
-		ObjectName: metadata.objectName,
+		Method:      method,
+		BucketName:  metadata.bucketName,
+		ObjectName:  metadata.objectName,
+		QueryValues: metadata.queryValues,
 	}
 
 	for _, m := range c.middlewares {
@@ -946,12 +938,10 @@ func (c *Client) newRequest(ctx context.Context, method string, metadata request
 		return nil, err
 	}
 	execCtx := ExecutionContext{
-		Operation:  metadata.s3Operation,
-		BucketName: metadata.bucketName,
-		ObjectName: metadata.objectName,
-	}
-	if execCtx.Operation == "" {
-		execCtx.Operation = resolveS3Operation(method, metadata)
+		Method:      method,
+		BucketName:  metadata.bucketName,
+		ObjectName:  metadata.objectName,
+		QueryValues: metadata.queryValues,
 	}
 	for _, m := range c.middlewares {
 		if serializeM, ok := m.(SerializeMiddleware); ok {
@@ -1236,150 +1226,4 @@ func (c *Client) GetCreds() (credentials.Value, error) {
 	return c.credsProvider.GetWithContext(c.CredContext())
 }
 
-func resolveS3Operation(method string, metadata requestMetadata) string {
-	if metadata.s3Operation != "" {
-		return metadata.s3Operation
-	}
-
-	hasQuery := func(key string) bool {
-		return metadata.queryValues.Get(key) != "" || metadata.queryValues.Has(key)
-	}
-
-	isObject := metadata.objectName != ""
 
-	switch method {
-	case http.MethodGet:
-		if isObject {
-			if hasQuery("tagging") {
-				return "GetObjectTagging"
-			}
-			if hasQuery("acl") {
-				return "GetObjectAcl"
-			}
-			if hasQuery("legal-hold") {
-				return "GetObjectLegalHold"
-			}
-			if hasQuery("retention") {
-				return "GetObjectRetention"
-			}
-			return "GetObject"
-		} else {
-			if hasQuery("lifecycle") {
-				return "GetBucketLifecycle"
-			}
-			if hasQuery("policy") {
-				return "GetBucketPolicy"
-			}
-			if hasQuery("notification") {
-				return "GetBucketNotification"
-			}
-			if hasQuery("cors") {
-				return "GetBucketCors"
-			}
-			if hasQuery("encryption") {
-				return "GetBucketEncryption"
-			}
-			if hasQuery("tagging") {
-				return "GetBucketTagging"
-			}
-			if hasQuery("versioning") {
-				return "GetBucketVersioning"
-			}
-			if metadata.bucketName != "" {
-				return "ListObjectsV2"
-			}
-			return "ListBuckets"
-		}
-
-	case http.MethodPut:
-		if isObject {
-			if hasQuery("tagging") {
-				return "PutObjectTagging"
-			}
-			if hasQuery("acl") {
-				return "PutObjectAcl"
-			}
-			if hasQuery("legal-hold") {
-				return "PutObjectLegalHold"
-			}
-			if hasQuery("retention") {
-				return "PutObjectRetention"
-			}
-			return "PutObject"
-		} else {
-			if hasQuery("lifecycle") {
-				return "PutBucketLifecycle"
-			}
-			if hasQuery("policy") {
-				return "PutBucketPolicy"
-			}
-			if hasQuery("notification") {
-				return "PutBucketNotification"
-			}
-			if hasQuery("cors") {
-				return "PutBucketCors"
-			}
-			if hasQuery("encryption") {
-				return "PutBucketEncryption"
-			}
-			if hasQuery("tagging") {
-				return "PutBucketTagging"
-			}
-			if hasQuery("versioning") {
-				return "PutBucketVersioning"
-			}
-			return "CreateBucket"
-		}
-
-	case http.MethodDelete:
-		if isObject {
-			if hasQuery("tagging") {
-				return "DeleteObjectTagging"
-			}
-			return "DeleteObject"
-		} else {
-			if hasQuery("lifecycle") {
-				return "DeleteBucketLifecycle"
-			}
-			if hasQuery("policy") {
-				return "DeleteBucketPolicy"
-			}
-			if hasQuery("cors") {
-				return "DeleteBucketCors"
-			}
-			if hasQuery("encryption") {
-				return "DeleteBucketEncryption"
-			}
-			if hasQuery("tagging") {
-				return "DeleteBucketTagging"
-			}
-			return "DeleteBucket"
-		}
-
-	case http.MethodHead:
-		if isObject {
-			return "HeadObject"
-		}
-		return "HeadBucket"
-
-	case http.MethodPost:
-		if isObject {
-			if hasQuery("uploads") {
-				return "CreateMultipartUpload"
-			}
-			if hasQuery("restore") {
-				return "RestoreObject"
-			}
-			if hasQuery("select") {
-				return "SelectObjectContent"
-			}
-			return "PostObject"
-		} else {
-			if hasQuery("delete") {
-				return "DeleteObjects"
-			}
-		}
-	}
-
-	return method
-}

middleware.go

@@ -3,13 +3,15 @@ package minio
 import (
 	"context"
 	"net/http"
+	"net/url"
 )
 
 // ExecutionContext provides context metadata about the S3 operation currently running.
 type ExecutionContext struct {
-	Operation  string // e.g. "GetObject", "PutObject", "ListBuckets"
-	BucketName string
-	ObjectName string
+	Method      string     // e.g. "GET", "PUT", "DELETE"
+	BucketName  string
+	ObjectName  string
+	QueryValues url.Values // e.g. ?policy, ?tagging, ?versioning
 }
 
 // Middleware is the base interface for all pipeline interceptors.
@@ -30,8 +32,7 @@ type InitializeMiddleware interface {
 // SerializeMiddleware runs AFTER the request is created, but BEFORE it is signed.
 // It can mutate headers, query parameters, etc.
 //
-// NOTE: This fires on EVERY retry attempt (new request per attempt).
-// Only InitializeMiddleware runs once per API call.
+// NOTE: This fires on every retry attempt. Only Initialize runs once.
 type SerializeMiddleware interface {
 	Middleware
 	Serialize(ctx context.Context, execCtx ExecutionContext, req *http.Request) error
@@ -40,8 +41,7 @@ type SerializeMiddleware interface {
 // FinalizeMiddleware runs AFTER the request is signed and ready to go out.
 // Ideal for logging request sizes, outbound traffic, or tracing.
 //
-// NOTE: This fires on EVERY retry attempt inside the retry loop, not once per
-// top-level API call. Only InitializeMiddleware runs once.
+// NOTE: This fires on every retry attempt. Only Initialize runs once.
 type FinalizeMiddleware interface {
 	Middleware
 	Finalize(ctx context.Context, execCtx ExecutionContext, req *http.Request) error
@@ -50,11 +50,10 @@ type FinalizeMiddleware interface {
 // DeserializeMiddleware runs AFTER the HTTP response is received from the server.
 // It can inspect status codes, headers, or modify/log errors.
 //
-// NOTE: This fires on EVERY retry attempt inside the retry loop.
-// Only InitializeMiddleware runs once per API call.
+// NOTE: This fires on every retry attempt. Only Initialize runs once.
 // Errors from all Deserialize middleware stack via errors.Join with the transport
 // error. If any middleware returns a non-nil error, the request aborts even on
-// 2xx responses. Use this for response validation.
+// 2xx responses.
 type DeserializeMiddleware interface {
 	Middleware
 	Deserialize(ctx context.Context, execCtx ExecutionContext, resp *http.Response, err error) error

middleware_test.go

@@ -4,18 +4,26 @@ import (
 	"context"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"sync"
 	"testing"
 
 	"github.com/minio/minio-go/v7/pkg/credentials"
 )
 
+type recordedPhase struct {
+	method      string
+	bucketName  string
+	objectName  string
+	queryValues url.Values
+}
+
 type mockMiddleware struct {
 	mu           sync.Mutex
-	initialized  []string
-	serialized   []string
-	finalized    []string
-	deserialized []string
+	initialized  []recordedPhase
+	serialized   []recordedPhase
+	finalized    []recordedPhase
+	deserialized []recordedPhase
 }
 
 func (m *mockMiddleware) ID() string {
@@ -25,36 +33,34 @@ func (m *mockMiddleware) ID() string {
 func (m *mockMiddleware) Initialize(ctx context.Context, execCtx ExecutionContext) (context.Context, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	m.initialized = append(m.initialized, execCtx.Operation)
+	m.initialized = append(m.initialized, recordedPhase{method: execCtx.Method, bucketName: execCtx.BucketName, objectName: execCtx.ObjectName, queryValues: execCtx.QueryValues})
 	return ctx, nil
 }
 
 func (m *mockMiddleware) Serialize(ctx context.Context, execCtx ExecutionContext, req *http.Request) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	m.serialized = append(m.serialized, execCtx.Operation)
+	m.serialized = append(m.serialized, recordedPhase{method: execCtx.Method, bucketName: execCtx.BucketName, objectName: execCtx.ObjectName, queryValues: execCtx.QueryValues})
 	req.Header.Set("X-Mock-Header", "Hello")
 	return nil
 }
 
 func (m *mockMiddleware) Finalize(ctx context.Context, execCtx ExecutionContext, req *http.Request) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	m.finalized = append(m.finalized, execCtx.Operation)
+	m.finalized = append(m.finalized, recordedPhase{method: execCtx.Method, bucketName: execCtx.BucketName, objectName: execCtx.ObjectName, queryValues: execCtx.QueryValues})
 	return nil
 }
 
 func (m *mockMiddleware) Deserialize(ctx context.Context, execCtx ExecutionContext, resp *http.Response, err error) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	m.deserialized = append(m.deserialized, execCtx.Operation)
+	m.deserialized = append(m.deserialized, recordedPhase{method: execCtx.Method, bucketName: execCtx.BucketName, objectName: execCtx.ObjectName, queryValues: execCtx.QueryValues})
 	return nil
 }
 
 func TestMiddlewareIntegration(t *testing.T) {
-	// Start local mock S3 server
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Verify custom header was injected by Serialize middleware
 		if r.Header.Get("X-Mock-Header") != "Hello" {
 			t.Errorf("Expected X-Mock-Header: 'Hello', got '%s'", r.Header.Get("X-Mock-Header"))
 		}
@@ -64,38 +70,43 @@ func TestMiddlewareIntegration(t *testing.T) {
 
 	mw := &mockMiddleware{}
 
-	// Instantiate client with middleware options
 	client, err := New(server.URL[7:], &Options{
-		Creds:        credentials.NewStaticV4("mockkey", "mocksecret", ""),
-		Secure:       false,
-		Region:       "us-east-1",
-		Middlewares:  []Middleware{mw},
+		Creds:       credentials.NewStaticV4("mockkey", "mocksecret", ""),
+		Secure:      false,
+		Region:      "us-east-1",
+		Middlewares: []Middleware{mw},
 	})
 	if err != nil {
 		t.Fatalf("Failed to create minio client: %v", err)
 	}
 
-	// Make a GetBucketPolicy request (which uses executeMethod under the hood)
 	_, err = client.GetBucketPolicy(context.Background(), "mybucket")
-	// Since the mock server returns 200 OK but empty payload, GetBucketPolicy may return XML parsing error or nil, but HTTP request was triggered.
 
 	mw.mu.Lock()
 	defer mw.mu.Unlock()
 
-	// Verify the S3 Operation was correctly resolved by resolveS3Operation (GetBucketPolicy)
-	if len(mw.initialized) != 1 || mw.initialized[0] != "GetBucketPolicy" {
-		t.Errorf("Expected initialized operation to be 'GetBucketPolicy', got %v", mw.initialized)
+	if len(mw.initialized) != 1 {
+		t.Fatalf("Expected 1 initialized call, got %d", len(mw.initialized))
+	}
+	if mw.initialized[0].method != "GET" {
+		t.Errorf("Expected method GET, got %s", mw.initialized[0].method)
+	}
+	if !mw.initialized[0].queryValues.Has("policy") {
+		t.Errorf("Expected queryValues to have 'policy', got %v", mw.initialized[0].queryValues)
 	}
 
-	if len(mw.serialized) != 1 || mw.serialized[0] != "GetBucketPolicy" {
-		t.Errorf("Expected serialized operation to be 'GetBucketPolicy', got %v", mw.serialized)
+	if len(mw.serialized) != 1 {
+		t.Fatalf("Expected 1 serialized call, got %d", len(mw.serialized))
+	}
+	if mw.serialized[0].method != "GET" {
+		t.Errorf("Expected method GET, got %s", mw.serialized[0].method)
 	}
 
-	if len(mw.finalized) != 1 || mw.finalized[0] != "GetBucketPolicy" {
-		t.Errorf("Expected finalized operation to be 'GetBucketPolicy', got %v", mw.finalized)
+	if len(mw.finalized) != 1 {
+		t.Fatalf("Expected 1 finalized call, got %d", len(mw.finalized))
 	}
 
-	if len(mw.deserialized) != 1 || mw.deserialized[0] != "GetBucketPolicy" {
-		t.Errorf("Expected deserialized operation to be 'GetBucketPolicy', got %v", mw.deserialized)
+	if len(mw.deserialized) != 1 {
+		t.Fatalf("Expected 1 deserialized call, got %d", len(mw.deserialized))
 	}
 }