MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-19 10:07:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix error message wording for PutObjectLockConfig (#8759)

Browse Source 
Co-Authored-By: kannappanr <30541348+kannappanr@users.noreply.github.com>
Co-authored-by: Harshavardhana <harsha@minio.io>
This commit is contained in:
poornas 2020-01-08 15:36:23 -08:00 committed by Harshavardhana
parent 3d318bae76
commit fd56aa42a6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/api-errors.go
View File

@ -143,6 +143,7 @@ const (
ErrBadRequest ErrBadRequest
ErrKeyTooLongError ErrKeyTooLongError
ErrInvalidBucketObjectLockConfiguration ErrInvalidBucketObjectLockConfiguration
ErrObjectLockConfigurationNotAllowed
ErrObjectLocked ErrObjectLocked
ErrInvalidRetentionDate ErrInvalidRetentionDate
ErrPastObjectLockRetainDate ErrPastObjectLockRetainDate
@ -732,6 +733,11 @@ var errorCodes = errorCodeMap{
Description: "Bucket is missing ObjectLockConfiguration", Description: "Bucket is missing ObjectLockConfiguration",
HTTPStatusCode: http.StatusBadRequest, HTTPStatusCode: http.StatusBadRequest,
}, },
ErrObjectLockConfigurationNotAllowed: {
Code: "InvalidBucketState",
Description: "Object Lock configuration cannot be enabled on existing buckets.",
HTTPStatusCode: http.StatusConflict,
},
ErrObjectLocked: { ErrObjectLocked: {
Code: "InvalidRequest", Code: "InvalidRequest",
Description: "Object is WORM protected and cannot be overwritten", Description: "Object is WORM protected and cannot be overwritten",

2
cmd/bucket-handlers.go
View File

@ -1017,7 +1017,7 @@ func (api objectAPIHandlers) PutBucketObjectLockConfigHandler(w http.ResponseWri
if err != nil { if err != nil {
aerr := toAPIError(ctx, err) aerr := toAPIError(ctx, err)
if err == errConfigNotFound { if err == errConfigNotFound {
aerr = errorCodes.ToAPIErr(ErrMethodNotAllowed) aerr = errorCodes.ToAPIErr(ErrObjectLockConfigurationNotAllowed)
} }
writeErrorResponse(ctx, w, aerr, r.URL, guessIsBrowserReq(r)) writeErrorResponse(ctx, w, aerr, r.URL, guessIsBrowserReq(r))
return return