Enable --expired-object-all-versions (#1927)

shtripat · web-flow · commit 72b90536ab64 · 2024-02-09T14:18:59.000-08:00
Signed-off-by: Shubhendu Ram Tripathi &lt;shubhendu@minio.io&gt;
diff --git a/pkg/lifecycle/lifecycle.go b/pkg/lifecycle/lifecycle.go
@@ -402,7 +402,7 @@ func (e Expiration) IsDeleteMarkerExpirationEnabled() bool {
 
 // IsNull returns true if both date and days fields are null
 func (e Expiration) IsNull() bool {
-	return e.IsDaysNull() && e.IsDateNull() && !e.IsDeleteMarkerExpirationEnabled()
+	return e.IsDaysNull() && e.IsDateNull() && !e.IsDeleteMarkerExpirationEnabled() && !e.DeleteAll.IsEnabled()
 }
 
 // MarshalXML is expiration is non null

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ func (e Expiration) IsDeleteMarkerExpirationEnabled() bool {`
`402`	`402`
`403`	`403`	`// IsNull returns true if both date and days fields are null`
`404`	`404`	`func (e Expiration) IsNull() bool {`
`405`		`- return e.IsDaysNull() && e.IsDateNull() && !e.IsDeleteMarkerExpirationEnabled()`
	`405`	`+ return e.IsDaysNull() && e.IsDateNull() && !e.IsDeleteMarkerExpirationEnabled() && !e.DeleteAll.IsEnabled()`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`// MarshalXML is expiration is non null`