diff options
| -rw-r--r-- | weed/s3api/s3api_object_handlers_put.go | 4 | ||||
| -rw-r--r-- | weed/s3api/s3api_object_retention.go | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/weed/s3api/s3api_object_handlers_put.go b/weed/s3api/s3api_object_handlers_put.go index 07ddebf43..011a039d3 100644 --- a/weed/s3api/s3api_object_handlers_put.go +++ b/weed/s3api/s3api_object_handlers_put.go @@ -604,10 +604,6 @@ func mapValidationErrorToS3Error(err error) s3err.ErrorCode { // For invalid retention period (e.g., Days <= 0), return InvalidRetentionPeriod // This matches the test expectations return s3err.ErrInvalidRetentionPeriod - case errors.Is(err, ErrInvalidRetentionMode): - // For invalid retention mode, return InvalidRequest - // This matches the test expectations - return s3err.ErrInvalidRequest case errors.Is(err, ErrComplianceModeActive): // For compliance mode retention violations, return AccessDenied // This matches the test expectations diff --git a/weed/s3api/s3api_object_retention.go b/weed/s3api/s3api_object_retention.go index ce1955997..49092ef3e 100644 --- a/weed/s3api/s3api_object_retention.go +++ b/weed/s3api/s3api_object_retention.go @@ -32,7 +32,6 @@ var ( ErrObjectUnderLegalHold = errors.New("object is under legal hold and cannot be deleted or modified") ErrGovernanceBypassNotPermitted = errors.New("user does not have permission to bypass governance retention") ErrInvalidRetentionPeriod = errors.New("invalid retention period specified") - ErrInvalidRetentionMode = errors.New("invalid retention mode specified") ErrBothDaysAndYearsSpecified = errors.New("both days and years cannot be specified in the same retention configuration") ErrMalformedXML = errors.New("malformed XML in request body") @@ -228,7 +227,7 @@ func validateObjectLockConfiguration(config *ObjectLockConfiguration) error { // validateDefaultRetention validates default retention configuration func validateDefaultRetention(retention *DefaultRetention) error { - glog.Infof("validateDefaultRetention: Mode=%s, Days=%d (set=%v), Years=%d (set=%v)", retention.Mode, retention.Days, retention.DaysSet, retention.Years, retention.YearsSet) + glog.V(2).Infof("validateDefaultRetention: Mode=%s, Days=%d (set=%v), Years=%d (set=%v)", retention.Mode, retention.Days, retention.DaysSet, retention.Years, retention.YearsSet) // Mode is required if retention.Mode == "" { return ErrDefaultRetentionMissingMode |