Skip to content

delete objects with encoding-type url2 #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

delete objects with encoding-type url2 #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion oss/bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,12 @@ func (bucket Bucket) DeleteMultipleObjectsXml(xmlData string, options ...Option)
options = append(options, ContentMD5(b64))
params := map[string]interface{}{}
params["delete"] = nil
params["encoding-type"] = "url"
isOptSet, encoding, _ := IsOptionSet(options, "encoding-type")
if isOptSet {
params["encoding-type"] = encoding.(string)
} else {
params["encoding-type"] = "url"
}
resp, err := bucket.doInner("POST", "", params, options, buffer, nil)
if err != nil {
return "", err
Expand Down
64 changes: 64 additions & 0 deletions oss/bucket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2080,6 +2080,21 @@ func (s *OssBucketSuite) TestDeleteObjectsNormal(c *C) {
c.Assert(err, IsNil)
c.Assert(len(ress.Objects), Equals, 0)

key = objectNamePrefix + "\f"
err = s.bucket.PutObject(key, strings.NewReader("value \f"))
c.Assert(err, IsNil)

key = objectNamePrefix + "\v"
err = s.bucket.PutObject(key, strings.NewReader("value \v"))
c.Assert(err, IsNil)

_, err = s.bucket.DeleteObjects([]string{url.QueryEscape(objectNamePrefix + "\f"), url.QueryEscape(objectNamePrefix + "\v")}, EncodingType("url2"))
c.Assert(err, IsNil)

ress, err = s.bucket.ListObjects(Prefix(objectNamePrefix))
c.Assert(err, IsNil)
c.Assert(len(ress.Objects), Equals, 0)

key = "\x01\x02\x03\x04\x05\x06\a\b\t\n\v\f\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"
err = s.bucket.PutObject(key, strings.NewReader("value test 0x20 \v"))
c.Assert(err, IsNil)
Expand Down Expand Up @@ -4888,6 +4903,55 @@ func (s *OssBucketSuite) TestVersioningBatchDeleteDefaultVersionObjects(c *C) {
deleteResult, err = bucket.DeleteObjectVersions(versionIds)
c.Assert(err, IsNil)

err = bucket.PutObject(objectName1, strings.NewReader(contextV1), GetResponseHeader(&respHeader))
c.Assert(err, IsNil)
versionIdV1 = GetVersionId(respHeader)

err = bucket.PutObject(objectName2, strings.NewReader(contextV2), GetResponseHeader(&respHeader))
c.Assert(err, IsNil)
versionIdV2 = GetVersionId(respHeader)

//batch delete objects
versionIds = []DeleteObject{{Key: objectName1, VersionId: ""},
{Key: objectName2, VersionId: ""}}
deleteResult, err = bucket.DeleteObjectVersions(versionIds, EncodingType("url2"))
c.Assert(err, IsNil)

// check delete detail info:key
deleteDetailMap = map[string]DeletedKeyInfo{}
deleteDetailMap[deleteResult.DeletedObjectsDetail[0].Key] = deleteResult.DeletedObjectsDetail[0]
deleteDetailMap[deleteResult.DeletedObjectsDetail[1].Key] = deleteResult.DeletedObjectsDetail[1]
keyInfo1, ok = deleteDetailMap[objectName1]
c.Assert(ok, Equals, true)
c.Assert(keyInfo1.Key, Equals, objectName1)
c.Assert(keyInfo1.VersionId, Equals, "")
c.Assert(keyInfo1.DeleteMarker, Equals, true)
c.Assert(keyInfo1.DeleteMarkerVersionId != versionIdV1, Equals, true)

keyInfo2, ok = deleteDetailMap[objectName2]
c.Assert(ok, Equals, true)
c.Assert(keyInfo2.Key, Equals, objectName2)
c.Assert(keyInfo2.VersionId, Equals, "")
c.Assert(keyInfo2.DeleteMarker, Equals, true)
c.Assert(keyInfo2.DeleteMarkerVersionId != versionIdV2, Equals, true)

// list bucket versions
listResult, err = bucket.ListObjectVersions()
c.Assert(err, IsNil)
c.Assert(len(listResult.ObjectDeleteMarkers), Equals, 2)
c.Assert(len(listResult.ObjectVersions), Equals, 2)

versionIds = []DeleteObject{{Key: objectName1, VersionId: versionIdV1},
{Key: objectName2, VersionId: versionIdV2}}
deleteResult, err = bucket.DeleteObjectVersions(versionIds, EncodingType("url2"))
c.Assert(err, IsNil)

// delete deleteMark object
versionIds = []DeleteObject{{Key: objectName1, VersionId: keyInfo1.DeleteMarkerVersionId},
{Key: objectName2, VersionId: keyInfo2.DeleteMarkerVersionId}}
deleteResult, err = bucket.DeleteObjectVersions(versionIds, EncodingType("url2"))
c.Assert(err, IsNil)

ForceDeleteBucket(client, bucketName, c)
}

Expand Down