improve versioning status display and delete with versions when versioning is suspended (#2689)

models/bucket_versioning_response.go

@@ -24,7 +24,9 @@ package models
 
 import (
 	"context"
+	"strconv"
 
+	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 )
@@ -34,17 +36,90 @@ import (
 // swagger:model bucketVersioningResponse
 type BucketVersioningResponse struct {
 
-	// is versioned
-	IsVersioned bool `json:"is_versioned,omitempty"`
+	// exclude folders
+	ExcludeFolders bool `json:"ExcludeFolders,omitempty"`
+
+	// excluded prefixes
+	ExcludedPrefixes []*BucketVersioningResponseExcludedPrefixesItems0 `json:"ExcludedPrefixes"`
+
+	// m f a delete
+	MFADelete string `json:"MFADelete,omitempty"`
+
+	// status
+	Status string `json:"Status,omitempty"`
 }
 
 // Validate validates this bucket versioning response
 func (m *BucketVersioningResponse) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateExcludedPrefixes(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
 	return nil
 }
 
-// ContextValidate validates this bucket versioning response based on context it is used
+func (m *BucketVersioningResponse) validateExcludedPrefixes(formats strfmt.Registry) error {
+	if swag.IsZero(m.ExcludedPrefixes) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.ExcludedPrefixes); i++ {
+		if swag.IsZero(m.ExcludedPrefixes[i]) { // not required
+			continue
+		}
+
+		if m.ExcludedPrefixes[i] != nil {
+			if err := m.ExcludedPrefixes[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("ExcludedPrefixes" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("ExcludedPrefixes" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// ContextValidate validate this bucket versioning response based on the context it is used
 func (m *BucketVersioningResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateExcludedPrefixes(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *BucketVersioningResponse) contextValidateExcludedPrefixes(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.ExcludedPrefixes); i++ {
+
+		if m.ExcludedPrefixes[i] != nil {
+			if err := m.ExcludedPrefixes[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("ExcludedPrefixes" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("ExcludedPrefixes" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
 	return nil
 }
 
@@ -65,3 +140,40 @@ func (m *BucketVersioningResponse) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
+
+// BucketVersioningResponseExcludedPrefixesItems0 bucket versioning response excluded prefixes items0
+//
+// swagger:model BucketVersioningResponseExcludedPrefixesItems0
+type BucketVersioningResponseExcludedPrefixesItems0 struct {
+
+	// prefix
+	Prefix string `json:"Prefix,omitempty"`
+}
+
+// Validate validates this bucket versioning response excluded prefixes items0
+func (m *BucketVersioningResponseExcludedPrefixesItems0) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this bucket versioning response excluded prefixes items0 based on context it is used
+func (m *BucketVersioningResponseExcludedPrefixesItems0) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *BucketVersioningResponseExcludedPrefixesItems0) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *BucketVersioningResponseExcludedPrefixesItems0) UnmarshalBinary(b []byte) error {
+	var res BucketVersioningResponseExcludedPrefixesItems0
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}