diff options
Diffstat (limited to 'weed/s3api/s3api_object_handlers_put.go')
| -rw-r--r-- | weed/s3api/s3api_object_handlers_put.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/weed/s3api/s3api_object_handlers_put.go b/weed/s3api/s3api_object_handlers_put.go index 50d308566..c601fbe36 100644 --- a/weed/s3api/s3api_object_handlers_put.go +++ b/weed/s3api/s3api_object_handlers_put.go @@ -555,11 +555,14 @@ func (s3a *S3ApiServer) validateObjectLockHeaders(r *http.Request, versioningEna func mapValidationErrorToS3Error(err error) s3err.ErrorCode { switch { case errors.Is(err, ErrObjectLockVersioningRequired): - return s3err.ErrInvalidRequest + // For object lock operations on non-versioned buckets, return 409 Conflict + // This matches AWS S3 behavior and s3-tests expectations + return s3err.ErrBucketNotEmpty // This maps to 409 Conflict case errors.Is(err, ErrInvalidObjectLockMode): return s3err.ErrInvalidRequest case errors.Is(err, ErrInvalidLegalHoldStatus): - return s3err.ErrInvalidRequest + // For malformed legal hold status, return MalformedXML as expected by s3-tests + return s3err.ErrMalformedXML case errors.Is(err, ErrInvalidRetentionDateFormat): return s3err.ErrMalformedDate case errors.Is(err, ErrRetentionDateMustBeFuture), |