Remove XMLName field for CompleteMultipartUpload (#1077)

nspcc-dev · Mar 3, 2025 · 04b2c71 · 04b2c71
2 parents 879cbd5 + c1ff1f0
commit 04b2c71
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 13 deletions.
diff --git a/api/data/info.go b/api/data/info.go
@@ -93,7 +93,7 @@ type (
 
 	// CORSConfiguration stores CORS configuration of a request.
 	CORSConfiguration struct {
-		XMLName   xml.Name   `xml:"http://s3.amazonaws.com/doc/2006-03-01/ CORSConfiguration" json:"-"`
+		XMLName   xml.Name   `xml:"CORSConfiguration" json:"-"`
 		CORSRules []CORSRule `xml:"CORSRule" json:"CORSRules"`
 	}
 

diff --git a/api/data/locking.go b/api/data/locking.go
@@ -7,7 +7,7 @@ import (
 
 type (
 	ObjectLockConfiguration struct {
-		XMLName           xml.Name        `xml:"http://s3.amazonaws.com/doc/2006-03-01/ ObjectLockConfiguration" json:"-"`
+		XMLName           xml.Name        `xml:"ObjectLockConfiguration" json:"-"`
 		ObjectLockEnabled string          `xml:"ObjectLockEnabled" json:"ObjectLockEnabled"`
 		Rule              *ObjectLockRule `xml:"Rule" json:"Rule"`
 	}
@@ -23,12 +23,12 @@ type (
 	}
 
 	LegalHold struct {
-		XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ LegalHold" json:"-"`
+		XMLName xml.Name `xml:"LegalHold" json:"-"`
 		Status  string   `xml:"Status" json:"Status"`
 	}
 
 	Retention struct {
-		XMLName         xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ Retention" json:"-"`
+		XMLName         xml.Name `xml:"Retention" json:"-"`
 		Mode            string   `xml:"Mode" json:"Mode"`
 		RetainUntilDate string   `xml:"RetainUntilDate" json:"RetainUntilDate"`
 	}

diff --git a/api/handler/acl.go b/api/handler/acl.go
@@ -1525,12 +1525,12 @@ func permissionToOperations(permission amazonS3Permission) []eacl.Operation {
 	return nil
 }
 
-func encodeObjectACL(log *zap.Logger, bucketACL *layer.BucketACL, bucketName, objectVersion string) *AccessControlPolicy {
+func encodeObjectACL(log *zap.Logger, bucketACL *layer.BucketACL, bucketName, objectVersion string) *AccessControlPolicyResponse {
 	ownerGrantee := NewGrantee(granteeCanonicalUser)
 	ownerGrantee.ID = bucketACL.Info.Owner.String()
 	ownerGrantee.DisplayName = bucketACL.Info.Owner.String()
 
-	res := &AccessControlPolicy{
+	res := &AccessControlPolicyResponse{
 		Owner: Owner{
 			ID:          bucketACL.Info.Owner.String(),
 			DisplayName: bucketACL.Info.Owner.String(),
@@ -1631,7 +1631,7 @@ func generateGrant(key string, bucketACL *layer.BucketACL, permission amazonS3Pe
 	}
 }
 
-func (h *handler) encodeBucketACL(bucketName string, bucketACL *layer.BucketACL) *AccessControlPolicy {
+func (h *handler) encodeBucketACL(bucketName string, bucketACL *layer.BucketACL) *AccessControlPolicyResponse {
 	return encodeObjectACL(h.log, bucketACL, bucketName, "")
 }
 

diff --git a/api/handler/multipart_upload.go b/api/handler/multipart_upload.go
@@ -76,7 +76,7 @@ type (
 	}
 
 	CompleteMultipartUpload struct {
-		XMLName xml.Name               `xml:"http://s3.amazonaws.com/doc/2006-03-01/ CompleteMultipartUpload"`
+		XMLName xml.Name               `xml:"CompleteMultipartUpload"`
 		Parts   []*layer.CompletedPart `xml:"Part"`
 	}
 

diff --git a/api/handler/notifications.go b/api/handler/notifications.go
@@ -26,7 +26,7 @@ type (
 	}
 
 	NotificationConfiguration struct {
-		XMLName                   xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ NotificationConfiguation"`
+		XMLName                   xml.Name `xml:"NotificationConfiguation"`
 		NotificationConfiguration data.NotificationConfiguration
 	}
 )

diff --git a/api/handler/put.go b/api/handler/put.go
@@ -177,7 +177,7 @@ const (
 )
 
 type createBucketParams struct {
-	XMLName            xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ CreateBucketConfiguration" json:"-"`
+	XMLName            xml.Name `xml:"CreateBucketConfiguration" json:"-"`
 	LocationConstraint string
 }
 

diff --git a/api/handler/response.go b/api/handler/response.go
@@ -57,6 +57,13 @@ type Bucket struct {
 
 // AccessControlPolicy contains ACL.
 type AccessControlPolicy struct {
+	XMLName           xml.Name `xml:"AccessControlPolicy" json:"-"`
+	Owner             Owner
+	AccessControlList []*Grant `xml:"AccessControlList>Grant"`
+}
+
+// AccessControlPolicyResponse is used for gate response and contains xmlns definition.
+type AccessControlPolicyResponse struct {
 	XMLName           xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ AccessControlPolicy" json:"-"`
 	Owner             Owner
 	AccessControlList []*Grant `xml:"AccessControlList>Grant"`
@@ -251,14 +258,14 @@ type ListObjectsVersionsResponse struct {
 
 // VersioningConfiguration contains VersioningConfiguration XML representation.
 type VersioningConfiguration struct {
-	XMLName   xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ VersioningConfiguration"`
+	XMLName   xml.Name `xml:"VersioningConfiguration"`
 	Status    string   `xml:"Status,omitempty"`
 	MfaDelete string   `xml:"MfaDelete,omitempty"`
 }
 
 // Tagging contains tag set.
 type Tagging struct {
-	XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ Tagging"`
+	XMLName xml.Name `xml:"Tagging"`
 	TagSet  []Tag    `xml:"TagSet>Tag"`
 }
 

diff --git a/api/handler/response_test.go b/api/handler/response_test.go
@@ -14,7 +14,7 @@ func TestAccessControlPolicyXML(t *testing.T) {
 	// https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html
 	var policyTemplate = `
 <?xml version="1.0" encoding="UTF-8"?>
-<AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+<AccessControlPolicy>
   <Owner>
     <ID>%[1]s</ID>
     <DisplayName>display-name</DisplayName>