From fd56aa42a68535bcdc716ca211d6b90d68f496eb Mon Sep 17 00:00:00 2001 From: poornas Date: Wed, 8 Jan 2020 15:36:23 -0800 Subject: [PATCH] Fix error message wording for PutObjectLockConfig (#8759) Co-Authored-By: kannappanr <30541348+kannappanr@users.noreply.github.com> Co-authored-by: Harshavardhana --- cmd/api-errors.go | 6 ++++++ cmd/bucket-handlers.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/api-errors.go b/cmd/api-errors.go index af30bd01c..7a874f001 100644 --- a/cmd/api-errors.go +++ b/cmd/api-errors.go @@ -143,6 +143,7 @@ const ( ErrBadRequest ErrKeyTooLongError ErrInvalidBucketObjectLockConfiguration + ErrObjectLockConfigurationNotAllowed ErrObjectLocked ErrInvalidRetentionDate ErrPastObjectLockRetainDate @@ -732,6 +733,11 @@ var errorCodes = errorCodeMap{ Description: "Bucket is missing ObjectLockConfiguration", HTTPStatusCode: http.StatusBadRequest, }, + ErrObjectLockConfigurationNotAllowed: { + Code: "InvalidBucketState", + Description: "Object Lock configuration cannot be enabled on existing buckets.", + HTTPStatusCode: http.StatusConflict, + }, ErrObjectLocked: { Code: "InvalidRequest", Description: "Object is WORM protected and cannot be overwritten", diff --git a/cmd/bucket-handlers.go b/cmd/bucket-handlers.go index a8311beaa..86a37c8ad 100644 --- a/cmd/bucket-handlers.go +++ b/cmd/bucket-handlers.go @@ -1017,7 +1017,7 @@ func (api objectAPIHandlers) PutBucketObjectLockConfigHandler(w http.ResponseWri if err != nil { aerr := toAPIError(ctx, err) if err == errConfigNotFound { - aerr = errorCodes.ToAPIErr(ErrMethodNotAllowed) + aerr = errorCodes.ToAPIErr(ErrObjectLockConfigurationNotAllowed) } writeErrorResponse(ctx, w, aerr, r.URL, guessIsBrowserReq(r)) return