oyd
/
minio
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bypass flag: Allow object retention removal (#9677)

Browse Source
master
Ashish Kumar Sinha 5 years ago committed by GitHub
parent e45c90060f
commit bede525dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      pkg/bucket/object/lock/lock.go

4
pkg/bucket/object/lock/lock.go
Unescape View File

@ -337,7 +337,7 @@ func ParseObjectRetention(reader io.Reader) (*ObjectRetention, error) {
if err := xml.NewDecoder(io.LimitReader(reader, maxObjectRetentionSize)).Decode(&ret); err != nil { if err := xml.NewDecoder(io.LimitReader(reader, maxObjectRetentionSize)).Decode(&ret); err != nil {
return nil, err return nil, err
} }
if !ret.Mode.Valid() { if ret.Mode != "" && !ret.Mode.Valid() {
return &ret, ErrUnknownWORMModeDirective return &ret, ErrUnknownWORMModeDirective
} }
@ -347,7 +347,7 @@ func ParseObjectRetention(reader io.Reader) (*ObjectRetention, error) {
return &ret, ErrPastObjectLockRetainDate return &ret, ErrPastObjectLockRetainDate
} }
if ret.RetainUntilDate.Before(t) { if !ret.RetainUntilDate.IsZero() && ret.RetainUntilDate.Before(t) {
return &ret, ErrPastObjectLockRetainDate return &ret, ErrPastObjectLockRetainDate
} }

Write Preview
Loading…
Cancel
Save