2 files changed, 26 insertions, 6 deletions
diff --git a/vendor/github.com/minio/minio-go/v7/pkg/lifecycle/lifecycle.go b/vendor/github.com/minio/minio-go/v7/pkg/lifecycle/lifecycle.go
index 55b0d716f..830061b8e 100644
--- a/vendor/github.com/minio/minio-go/v7/pkg/lifecycle/lifecycle.go
+++ b/vendor/github.com/minio/minio-go/v7/pkg/lifecycle/lifecycle.go
@@ -308,19 +308,27 @@ func (eDate ExpirationDate) MarshalXML(e *xml.Encoder, startElement xml.StartEle
 }
 
 // ExpireDeleteMarker represents value of ExpiredObjectDeleteMarker field in Expiration XML element.
-type ExpireDeleteMarker bool
+type ExpireDeleteMarker ExpirationBoolean
+
+// IsEnabled returns true if the auto delete-marker expiration is enabled
+func (e ExpireDeleteMarker) IsEnabled() bool {
+	return bool(e)
+}
+
+// ExpirationBoolean represents an XML version of 'bool' type
+type ExpirationBoolean bool
 
 // MarshalXML encodes delete marker boolean into an XML form.
-func (b ExpireDeleteMarker) MarshalXML(e *xml.Encoder, startElement xml.StartElement) error {
+func (b ExpirationBoolean) MarshalXML(e *xml.Encoder, startElement xml.StartElement) error {
 	if !b {
 		return nil
 	}
-	type expireDeleteMarkerWrapper ExpireDeleteMarker
-	return e.EncodeElement(expireDeleteMarkerWrapper(b), startElement)
+	type booleanWrapper ExpirationBoolean
+	return e.EncodeElement(booleanWrapper(b), startElement)
 }
 
-// IsEnabled returns true if the auto delete-marker expiration is enabled
-func (b ExpireDeleteMarker) IsEnabled() bool {
+// IsEnabled returns true if the expiration boolean is enabled
+func (b ExpirationBoolean) IsEnabled() bool {
 	return bool(b)
 }
 
@@ -330,6 +338,7 @@ type Expiration struct {
 	Date         ExpirationDate     `xml:"Date,omitempty" json:"Date,omitempty"`
 	Days         ExpirationDays     `xml:"Days,omitempty" json:"Days,omitempty"`
 	DeleteMarker ExpireDeleteMarker `xml:"ExpiredObjectDeleteMarker,omitempty" json:"ExpiredObjectDeleteMarker,omitempty"`
+	DeleteAll    ExpirationBoolean  `xml:"ExpiredObjectAllVersions,omitempty" json:"ExpiredObjectAllVersions,omitempty"`
 }
 
 // MarshalJSON customizes json encoding by removing empty day/date specification.
@@ -338,10 +347,12 @@ func (e Expiration) MarshalJSON() ([]byte, error) {
 		Date         *ExpirationDate    `json:"Date,omitempty"`
 		Days         *ExpirationDays    `json:"Days,omitempty"`
 		DeleteMarker ExpireDeleteMarker `json:"ExpiredObjectDeleteMarker,omitempty"`
+		DeleteAll    ExpirationBoolean  `json:"ExpiredObjectAllVersions,omitempty"`
 	}
 
 	newexp := expiration{
 		DeleteMarker: e.DeleteMarker,
+		DeleteAll:    e.DeleteAll,
 	}
 	if !e.IsDaysNull() {
 		newexp.Days = &e.Days
diff --git a/vendor/github.com/minio/minio-go/v7/pkg/tags/tags.go b/vendor/github.com/minio/minio-go/v7/pkg/tags/tags.go
index 98ae17efa..7a84a6f34 100644
--- a/vendor/github.com/minio/minio-go/v7/pkg/tags/tags.go
+++ b/vendor/github.com/minio/minio-go/v7/pkg/tags/tags.go
@@ -203,6 +203,10 @@ func (tags *tagSet) set(key, value string, failOnExist bool) error {
 	return nil
 }
 
+func (tags tagSet) count() int {
+	return len(tags.tagMap)
+}
+
 func (tags tagSet) toMap() map[string]string {
 	m := make(map[string]string, len(tags.tagMap))
 	for key, value := range tags.tagMap {
@@ -279,6 +283,11 @@ func (tags *Tags) Set(key, value string) error {
 	return tags.TagSet.set(key, value, false)
 }
 
+// Count - return number of tags accounted for
+func (tags Tags) Count() int {
+	return tags.TagSet.count()
+}
+
 // ToMap returns copy of tags.
 func (tags Tags) ToMap() map[string]string {
 	return tags.TagSet.toMap()