From aa08cc301050260921fb793f9b051930ace86c40 Mon Sep 17 00:00:00 2001
From: jiuker <jiuker@minio.io>
Date: Thu, 20 Feb 2025 13:08:38 +0800
Subject: [PATCH 1/2] fix: use tags package instead

fix: use tags package instead
---
 cmd/common-methods.go | 11 +++++------
 go.mod                |  2 +-
 go.sum                |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cmd/common-methods.go b/cmd/common-methods.go
index 06b9ebeb52..6196ae6b96 100644
--- a/cmd/common-methods.go
+++ b/cmd/common-methods.go
@@ -22,7 +22,6 @@ import (
 	"errors"
 	"io"
 	"net/http"
-	"net/url"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -36,7 +35,7 @@ import (
 	"github.com/minio/mc/pkg/probe"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/encrypt"
-	"github.com/minio/minio-go/v7/pkg/s3utils"
+	"github.com/minio/minio-go/v7/pkg/tags"
 	"github.com/minio/pkg/v3/env"
 )
 
@@ -463,12 +462,12 @@ func uploadSourceToTargetURL(ctx context.Context, uploadOpts uploadSourceToTarge
 		}
 
 		if content.Tags != nil {
-			tags, err := url.PathUnescape(s3utils.TagEncode(content.Tags))
-			if err != nil {
+			if tags, err := tags.NewTags(content.Tags, true); err != nil {
 				return uploadOpts.urls.WithError(probe.NewError(err))
+			} else {
+				metadata["X-Amz-Tagging"] = tags.String()
+				delete(metadata, "X-Amz-Tagging-Count")
 			}
-			metadata["X-Amz-Tagging"] = tags
-			delete(metadata, "X-Amz-Tagging-Count")
 		}
 
 		var e error
diff --git a/go.mod b/go.mod
index fe3461b95b..55a87e2122 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/minio/colorjson v1.0.8
 	github.com/minio/filepath v1.0.0
 	github.com/minio/madmin-go/v3 v3.0.91
-	github.com/minio/minio-go/v7 v7.0.86
+	github.com/minio/minio-go/v7 v7.0.87
 	github.com/minio/pkg/v3 v3.0.30
 	github.com/minio/selfupdate v0.6.0
 	github.com/mitchellh/go-homedir v1.1.0
diff --git a/go.sum b/go.sum
index 9559116450..66cc08ec67 100644
--- a/go.sum
+++ b/go.sum
@@ -146,8 +146,8 @@ github.com/minio/madmin-go/v3 v3.0.91 h1:ixa64WnPNeysO77Bk0OoYP8dl1jz4FVOfJ56+3C
 github.com/minio/madmin-go/v3 v3.0.91/go.mod h1:pMLdj9OtN0CANNs5tdm6opvOlDFfj0WhbztboZAjRWE=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.86 h1:DcgQ0AUjLJzRH6y/HrxiZ8CXarA70PAIufXHodP4s+k=
-github.com/minio/minio-go/v7 v7.0.86/go.mod h1:VbfO4hYwUu3Of9WqGLBZ8vl3Hxnxo4ngxK4hzQDf4x4=
+github.com/minio/minio-go/v7 v7.0.87 h1:nkr9x0u53PespfxfUqxP3UYWiE2a41gaofgNnC4Y8WQ=
+github.com/minio/minio-go/v7 v7.0.87/go.mod h1:33+O8h0tO7pCeCWwBVa07RhVVfB/3vS4kEX7rwYKmIg=
 github.com/minio/mux v1.9.0 h1:dWafQFyEfGhJvK6AwLOt83bIG5bxKxKJnKMCi0XAaoA=
 github.com/minio/mux v1.9.0/go.mod h1:1pAare17ZRL5GpmNL+9YmqHoWnLmMZF9C/ioUCfy0BQ=
 github.com/minio/pkg/v3 v3.0.30 h1:mdptT6jdM/dFu7dnWImgNdVTJQSmFI8x3yohPwD8el8=

From 0898be5c6e35fdd4f382808eb46f36ea01acf379 Mon Sep 17 00:00:00 2001
From: jiuker <jiuker@minio.io>
Date: Thu, 20 Feb 2025 13:16:01 +0800
Subject: [PATCH 2/2] remove else

remove else
---
 cmd/common-methods.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/common-methods.go b/cmd/common-methods.go
index 6196ae6b96..5472b4b46c 100644
--- a/cmd/common-methods.go
+++ b/cmd/common-methods.go
@@ -462,12 +462,12 @@ func uploadSourceToTargetURL(ctx context.Context, uploadOpts uploadSourceToTarge
 		}
 
 		if content.Tags != nil {
-			if tags, err := tags.NewTags(content.Tags, true); err != nil {
+			tags, err := tags.NewTags(content.Tags, true)
+			if err != nil {
 				return uploadOpts.urls.WithError(probe.NewError(err))
-			} else {
-				metadata["X-Amz-Tagging"] = tags.String()
-				delete(metadata, "X-Amz-Tagging-Count")
 			}
+			metadata["X-Amz-Tagging"] = tags.String()
+			delete(metadata, "X-Amz-Tagging-Count")
 		}
 
 		var e error