MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

azure: Return success when deleting non-existent object (#9981)

Browse Source
This commit is contained in:
kannappanr 2020-07-10 08:30:23 -07:00 committed by GitHub
parent 30c251efd3
commit efe9fe6124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/api-datatypes.go
View File

@ -22,7 +22,7 @@ import (
// DeletedObject objects deleted // DeletedObject objects deleted
type DeletedObject struct { type DeletedObject struct {
DeleteMarker bool `xml:"DeleteMarker"` DeleteMarker bool `xml:"DeleteMarker,omitempty"`
DeleteMarkerVersionID string `xml:"DeleteMarkerVersionId,omitempty"` DeleteMarkerVersionID string `xml:"DeleteMarkerVersionId,omitempty"`
ObjectName string `xml:"Key,omitempty"` ObjectName string `xml:"Key,omitempty"`
VersionID string `xml:"VersionId,omitempty"` VersionID string `xml:"VersionId,omitempty"`

7
cmd/bucket-handlers.go
View File

@ -377,6 +377,13 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter,
return return
} }
// Before proceeding validate if bucket exists.
_, err := objectAPI.GetBucketInfo(ctx, bucket)
if err != nil {
writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r))
return
}
deleteObjectsFn := objectAPI.DeleteObjects deleteObjectsFn := objectAPI.DeleteObjects
if api.CacheAPI() != nil { if api.CacheAPI() != nil {
deleteObjectsFn = api.CacheAPI().DeleteObjects deleteObjectsFn = api.CacheAPI().DeleteObjects

13
cmd/gateway/azure/gateway-azure.go
View File

@ -462,6 +462,8 @@ func azureToObjectError(err error, params ...string) error {
func azureCodesToObjectError(err error, serviceCode string, statusCode int, bucket string, object string) error { func azureCodesToObjectError(err error, serviceCode string, statusCode int, bucket string, object string) error {
switch serviceCode { switch serviceCode {
case "ContainerNotFound":
err = minio.BucketNotFound{Bucket: bucket}
case "ContainerAlreadyExists": case "ContainerAlreadyExists":
err = minio.BucketExists{Bucket: bucket} err = minio.BucketExists{Bucket: bucket}
case "InvalidResourceName": case "InvalidResourceName":
@ -970,7 +972,10 @@ func (a *azureObjects) DeleteObject(ctx context.Context, bucket, object string,
blob := a.client.NewContainerURL(bucket).NewBlobURL(object) blob := a.client.NewContainerURL(bucket).NewBlobURL(object)
_, err := blob.Delete(ctx, azblob.DeleteSnapshotsOptionNone, azblob.BlobAccessConditions{}) _, err := blob.Delete(ctx, azblob.DeleteSnapshotsOptionNone, azblob.BlobAccessConditions{})
if err != nil { if err != nil {
return minio.ObjectInfo{}, azureToObjectError(err, bucket, object) err = azureToObjectError(err, bucket, object)
if !errors.Is(err, minio.ObjectNotFound{Bucket: bucket, Object: object}) {
return minio.ObjectInfo{}, err
}
} }
return minio.ObjectInfo{ return minio.ObjectInfo{
Bucket: bucket, Bucket: bucket,
@ -983,10 +988,8 @@ func (a *azureObjects) DeleteObjects(ctx context.Context, bucket string, objects
dobjects := make([]minio.DeletedObject, len(objects)) dobjects := make([]minio.DeletedObject, len(objects))
for idx, object := range objects { for idx, object := range objects {
_, errs[idx] = a.DeleteObject(ctx, bucket, object.ObjectName, opts) _, errs[idx] = a.DeleteObject(ctx, bucket, object.ObjectName, opts)
if errs[idx] == nil { dobjects[idx] = minio.DeletedObject{
dobjects[idx] = minio.DeletedObject{ ObjectName: object.ObjectName,
ObjectName: object.ObjectName,
}
} }
} }
return dobjects, errs return dobjects, errs