Github-Mirror/seaweedfs
1
0 Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-11-12 06:48:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

address comments

Browse Source
This commit is contained in:
chrislu committed 2025-07-12 12:10:37 -07:00
1 parent b9b480e605
commit 638715e590
2 files changed
+30 -587
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

weed/s3api/s3api_object_retention.go
+4 -3
View File
@@ -158,9 +158,10 @@ func validateObjectLockConfiguration(config *ObjectLockConfiguration) error {
// Validate Rule if present
if config.Rule != nil {
if config.Rule.DefaultRetention != nil {
return validateDefaultRetention(config.Rule.DefaultRetention)
if config.Rule.DefaultRetention == nil {
return fmt.Errorf("rule configuration must specify DefaultRetention")
}
return validateDefaultRetention(config.Rule.DefaultRetention)
}
return nil
@@ -242,7 +243,7 @@ func (s3a *S3ApiServer) getObjectRetention(bucket, object, versionId string) (*O
}
}
if retention.Mode == "" && retention.RetainUntilDate == nil {
if retention.Mode == "" || retention.RetainUntilDate == nil {
return nil, fmt.Errorf("no retention configuration found")
}