diff --git a/client/models/a_w_s_cloud_watch_logs.go b/client/models/a_w_s_cloud_watch_logs.go
index 66bc89c39..36aec23dc 100644
--- a/client/models/a_w_s_cloud_watch_logs.go
+++ b/client/models/a_w_s_cloud_watch_logs.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -105,7 +105,7 @@ func (m AWSCloudWatchLogs) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this a w s cloud watch logs
@@ -146,13 +146,13 @@ func (m *AWSCloudWatchLogs) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AWSCloudWatchLogs) UnmarshalBinary(b []byte) error {
 	var res AWSCloudWatchLogs
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/a_w_s_infrastructure_resources_aggregation.go b/client/models/a_w_s_infrastructure_resources_aggregation.go
index c481b6288..75aa67d9c 100644
--- a/client/models/a_w_s_infrastructure_resources_aggregation.go
+++ b/client/models/a_w_s_infrastructure_resources_aggregation.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // AWSInfrastructureResourcesAggregation AWS Infrastructure Resources Aggregation
@@ -229,7 +230,7 @@ func (m AWSInfrastructureResourcesAggregation) MarshalJSON() ([]byte, error) {
 	}
 
 	// concatenate the 2 objects
-	return swag.ConcatJSON(props, additional), nil
+	return jsonutils.ConcatJSON(props, additional), nil
 }
 
 // Validate validates this a w s infrastructure resources aggregation
@@ -242,12 +243,12 @@ func (m *AWSInfrastructureResourcesAggregation) Validate(formats strfmt.Registry
 	}
 
 	props := make(map[string]json.RawMessage, 12+10)
-	j, err := swag.WriteJSON(m)
+	j, err := jsonutils.WriteJSON(m)
 	if err != nil {
 		return err
 	}
 
-	if err = swag.ReadJSON(j, &props); err != nil {
+	if err = jsonutils.ReadJSON(j, &props); err != nil {
 		return err
 	}
 
@@ -318,7 +319,7 @@ func (m *AWSInfrastructureResourcesAggregation) Validate(formats strfmt.Registry
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateBuckets(formats strfmt.Registry) error {
-	if swag.IsZero(m.Buckets) { // not required
+	if typeutils.IsZero(m.Buckets) { // not required
 		return nil
 	}
 
@@ -341,7 +342,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateBuckets(formats strfmt.R
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateCacheClusters(formats strfmt.Registry) error {
-	if swag.IsZero(m.CacheClusters) { // not required
+	if typeutils.IsZero(m.CacheClusters) { // not required
 		return nil
 	}
 
@@ -364,7 +365,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateCacheClusters(formats st
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateDbInstances(formats strfmt.Registry) error {
-	if swag.IsZero(m.DbInstances) { // not required
+	if typeutils.IsZero(m.DbInstances) { // not required
 		return nil
 	}
 
@@ -387,7 +388,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateDbInstances(formats strf
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateImages(formats strfmt.Registry) error {
-	if swag.IsZero(m.Images) { // not required
+	if typeutils.IsZero(m.Images) { // not required
 		return nil
 	}
 
@@ -410,7 +411,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateImages(formats strfmt.Re
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateInstances(formats strfmt.Registry) error {
-	if swag.IsZero(m.Instances) { // not required
+	if typeutils.IsZero(m.Instances) { // not required
 		return nil
 	}
 
@@ -433,7 +434,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateInstances(formats strfmt
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateLoadBalancersV1(formats strfmt.Registry) error {
-	if swag.IsZero(m.LoadBalancersV1) { // not required
+	if typeutils.IsZero(m.LoadBalancersV1) { // not required
 		return nil
 	}
 
@@ -456,7 +457,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateLoadBalancersV1(formats
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateLoadBalancersV2(formats strfmt.Registry) error {
-	if swag.IsZero(m.LoadBalancersV2) { // not required
+	if typeutils.IsZero(m.LoadBalancersV2) { // not required
 		return nil
 	}
 
@@ -479,7 +480,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateLoadBalancersV2(formats
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateSecurityGroups(formats strfmt.Registry) error {
-	if swag.IsZero(m.SecurityGroups) { // not required
+	if typeutils.IsZero(m.SecurityGroups) { // not required
 		return nil
 	}
 
@@ -502,7 +503,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateSecurityGroups(formats s
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateSnapshots(formats strfmt.Registry) error {
-	if swag.IsZero(m.Snapshots) { // not required
+	if typeutils.IsZero(m.Snapshots) { // not required
 		return nil
 	}
 
@@ -525,7 +526,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateSnapshots(formats strfmt
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateSubnets(formats strfmt.Registry) error {
-	if swag.IsZero(m.Subnets) { // not required
+	if typeutils.IsZero(m.Subnets) { // not required
 		return nil
 	}
 
@@ -548,7 +549,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateSubnets(formats strfmt.R
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateVolumes(formats strfmt.Registry) error {
-	if swag.IsZero(m.Volumes) { // not required
+	if typeutils.IsZero(m.Volumes) { // not required
 		return nil
 	}
 
@@ -571,7 +572,7 @@ func (m *AWSInfrastructureResourcesAggregation) validateVolumes(formats strfmt.R
 }
 
 func (m *AWSInfrastructureResourcesAggregation) validateVpcs(formats strfmt.Registry) error {
-	if swag.IsZero(m.Vpcs) { // not required
+	if typeutils.IsZero(m.Vpcs) { // not required
 		return nil
 	}
 
@@ -655,7 +656,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateBuckets(ctx conte
 
 	if m.Buckets != nil {
 
-		if swag.IsZero(m.Buckets) { // not required
+		if typeutils.IsZero(m.Buckets) { // not required
 			return nil
 		}
 
@@ -680,7 +681,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateCacheClusters(ctx
 
 	if m.CacheClusters != nil {
 
-		if swag.IsZero(m.CacheClusters) { // not required
+		if typeutils.IsZero(m.CacheClusters) { // not required
 			return nil
 		}
 
@@ -705,7 +706,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateDbInstances(ctx c
 
 	if m.DbInstances != nil {
 
-		if swag.IsZero(m.DbInstances) { // not required
+		if typeutils.IsZero(m.DbInstances) { // not required
 			return nil
 		}
 
@@ -730,7 +731,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateImages(ctx contex
 
 	if m.Images != nil {
 
-		if swag.IsZero(m.Images) { // not required
+		if typeutils.IsZero(m.Images) { // not required
 			return nil
 		}
 
@@ -755,7 +756,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateInstances(ctx con
 
 	if m.Instances != nil {
 
-		if swag.IsZero(m.Instances) { // not required
+		if typeutils.IsZero(m.Instances) { // not required
 			return nil
 		}
 
@@ -780,7 +781,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateLoadBalancersV1(c
 
 	if m.LoadBalancersV1 != nil {
 
-		if swag.IsZero(m.LoadBalancersV1) { // not required
+		if typeutils.IsZero(m.LoadBalancersV1) { // not required
 			return nil
 		}
 
@@ -805,7 +806,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateLoadBalancersV2(c
 
 	if m.LoadBalancersV2 != nil {
 
-		if swag.IsZero(m.LoadBalancersV2) { // not required
+		if typeutils.IsZero(m.LoadBalancersV2) { // not required
 			return nil
 		}
 
@@ -830,7 +831,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateSecurityGroups(ct
 
 	if m.SecurityGroups != nil {
 
-		if swag.IsZero(m.SecurityGroups) { // not required
+		if typeutils.IsZero(m.SecurityGroups) { // not required
 			return nil
 		}
 
@@ -855,7 +856,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateSnapshots(ctx con
 
 	if m.Snapshots != nil {
 
-		if swag.IsZero(m.Snapshots) { // not required
+		if typeutils.IsZero(m.Snapshots) { // not required
 			return nil
 		}
 
@@ -880,7 +881,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateSubnets(ctx conte
 
 	if m.Subnets != nil {
 
-		if swag.IsZero(m.Subnets) { // not required
+		if typeutils.IsZero(m.Subnets) { // not required
 			return nil
 		}
 
@@ -905,7 +906,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateVolumes(ctx conte
 
 	if m.Volumes != nil {
 
-		if swag.IsZero(m.Volumes) { // not required
+		if typeutils.IsZero(m.Volumes) { // not required
 			return nil
 		}
 
@@ -930,7 +931,7 @@ func (m *AWSInfrastructureResourcesAggregation) contextValidateVpcs(ctx context.
 
 	if m.Vpcs != nil {
 
-		if swag.IsZero(m.Vpcs) { // not required
+		if typeutils.IsZero(m.Vpcs) { // not required
 			return nil
 		}
 
@@ -956,13 +957,13 @@ func (m *AWSInfrastructureResourcesAggregation) MarshalBinary() ([]byte, error)
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AWSInfrastructureResourcesAggregation) UnmarshalBinary(b []byte) error {
 	var res AWSInfrastructureResourcesAggregation
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/a_w_s_remote_t_f_state.go b/client/models/a_w_s_remote_t_f_state.go
index 0ae920c24..45cd4034b 100644
--- a/client/models/a_w_s_remote_t_f_state.go
+++ b/client/models/a_w_s_remote_t_f_state.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -187,7 +187,7 @@ func (m AWSRemoteTFState) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this a w s remote t f state
@@ -241,13 +241,13 @@ func (m *AWSRemoteTFState) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AWSRemoteTFState) UnmarshalBinary(b []byte) error {
 	var res AWSRemoteTFState
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/a_w_s_storage.go b/client/models/a_w_s_storage.go
index dfb979567..eec8c9010 100644
--- a/client/models/a_w_s_storage.go
+++ b/client/models/a_w_s_storage.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -183,7 +183,7 @@ func (m AWSStorage) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this a w s storage
@@ -237,13 +237,13 @@ func (m *AWSStorage) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AWSStorage) UnmarshalBinary(b []byte) error {
 	var res AWSStorage
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/api_key.go b/client/models/api_key.go
index cdfcca44a..fb0c25bb0 100644
--- a/client/models/api_key.go
+++ b/client/models/api_key.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -152,7 +153,7 @@ func (m *APIKey) validateName(formats strfmt.Registry) error {
 }
 
 func (m *APIKey) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -181,7 +182,7 @@ func (m *APIKey) validateRules(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Rules); i++ {
-		if swag.IsZero(m.Rules[i]) { // not required
+		if typeutils.IsZero(m.Rules[i]) { // not required
 			continue
 		}
 
@@ -227,7 +228,7 @@ func (m *APIKey) contextValidateOwner(ctx context.Context, formats strfmt.Regist
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -254,7 +255,7 @@ func (m *APIKey) contextValidateRules(ctx context.Context, formats strfmt.Regist
 
 		if m.Rules[i] != nil {
 
-			if swag.IsZero(m.Rules[i]) { // not required
+			if typeutils.IsZero(m.Rules[i]) { // not required
 				return nil
 			}
 
@@ -282,13 +283,13 @@ func (m *APIKey) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *APIKey) UnmarshalBinary(b []byte) error {
 	var res APIKey
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/app_configuration.go b/client/models/app_configuration.go
index 016ddfa8e..9741d4abb 100644
--- a/client/models/app_configuration.go
+++ b/client/models/app_configuration.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -65,13 +65,13 @@ func (m *AppConfiguration) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AppConfiguration) UnmarshalBinary(b []byte) error {
 	var res AppConfiguration
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/app_version.go b/client/models/app_version.go
index 8e636c1f5..917a2a7e1 100644
--- a/client/models/app_version.go
+++ b/client/models/app_version.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -108,13 +108,13 @@ func (m *AppVersion) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AppVersion) UnmarshalBinary(b []byte) error {
 	var res AppVersion
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/appearance.go b/client/models/appearance.go
index 5554b1645..340853f7e 100644
--- a/client/models/appearance.go
+++ b/client/models/appearance.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -172,7 +173,7 @@ func (m *Appearance) validateColor(formats strfmt.Registry) error {
 }
 
 func (m *Appearance) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -278,7 +279,7 @@ func (m *Appearance) validateTabTitle(formats strfmt.Registry) error {
 }
 
 func (m *Appearance) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -329,13 +330,13 @@ func (m *Appearance) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Appearance) UnmarshalBinary(b []byte) error {
 	var res Appearance
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
@@ -449,13 +450,13 @@ func (m *AppearanceColor) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AppearanceColor) UnmarshalBinary(b []byte) error {
 	var res AppearanceColor
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/authentication.go b/client/models/authentication.go
index ca0fb5671..80991bfd6 100644
--- a/client/models/authentication.go
+++ b/client/models/authentication.go
@@ -12,7 +12,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // Authentication AuthenticationWrapper
@@ -83,7 +84,7 @@ func (m Authentication) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this authentication
@@ -101,7 +102,7 @@ func (m *Authentication) Validate(formats strfmt.Registry) error {
 }
 
 func (m *Authentication) validateConfig(formats strfmt.Registry) error {
-	if swag.IsZero(m.Config()) { // not required
+	if typeutils.IsZero(m.Config()) { // not required
 		return nil
 	}
 
@@ -137,7 +138,7 @@ func (m *Authentication) ContextValidate(ctx context.Context, formats strfmt.Reg
 
 func (m *Authentication) contextValidateConfig(ctx context.Context, formats strfmt.Registry) error {
 
-	if swag.IsZero(m.Config()) { // not required
+	if typeutils.IsZero(m.Config()) { // not required
 		return nil
 	}
 
@@ -162,13 +163,13 @@ func (m *Authentication) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Authentication) UnmarshalBinary(b []byte) error {
 	var res Authentication
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/authentication_azure_a_d.go b/client/models/authentication_azure_a_d.go
index f65385463..442a251b3 100644
--- a/client/models/authentication_azure_a_d.go
+++ b/client/models/authentication_azure_a_d.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -131,7 +131,7 @@ func (m AuthenticationAzureAD) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this authentication azure a d
@@ -172,13 +172,13 @@ func (m *AuthenticationAzureAD) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AuthenticationAzureAD) UnmarshalBinary(b []byte) error {
 	var res AuthenticationAzureAD
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/authentication_git_hub.go b/client/models/authentication_git_hub.go
index 805ceeb79..9d752fe68 100644
--- a/client/models/authentication_git_hub.go
+++ b/client/models/authentication_git_hub.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -167,7 +167,7 @@ func (m AuthenticationGitHub) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this authentication git hub
@@ -221,13 +221,13 @@ func (m *AuthenticationGitHub) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AuthenticationGitHub) UnmarshalBinary(b []byte) error {
 	var res AuthenticationGitHub
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/authentication_google.go b/client/models/authentication_google.go
index f34e8daef..4f6d42f0f 100644
--- a/client/models/authentication_google.go
+++ b/client/models/authentication_google.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -119,7 +119,7 @@ func (m AuthenticationGoogle) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this authentication google
@@ -160,13 +160,13 @@ func (m *AuthenticationGoogle) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AuthenticationGoogle) UnmarshalBinary(b []byte) error {
 	var res AuthenticationGoogle
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/authentication_local.go b/client/models/authentication_local.go
index 9b401bec3..55cfbbc10 100644
--- a/client/models/authentication_local.go
+++ b/client/models/authentication_local.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -105,7 +105,7 @@ func (m AuthenticationLocal) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this authentication local
@@ -146,13 +146,13 @@ func (m *AuthenticationLocal) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AuthenticationLocal) UnmarshalBinary(b []byte) error {
 	var res AuthenticationLocal
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/authentication_o_id_c.go b/client/models/authentication_o_id_c.go
index 75f2d7be6..b8d70e7a3 100644
--- a/client/models/authentication_o_id_c.go
+++ b/client/models/authentication_o_id_c.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -245,7 +245,7 @@ func (m AuthenticationOIDC) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this authentication o ID c
@@ -312,13 +312,13 @@ func (m *AuthenticationOIDC) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AuthenticationOIDC) UnmarshalBinary(b []byte) error {
 	var res AuthenticationOIDC
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/authentication_s_a_m_l.go b/client/models/authentication_s_a_m_l.go
index fe3e75636..548acd86e 100644
--- a/client/models/authentication_s_a_m_l.go
+++ b/client/models/authentication_s_a_m_l.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -134,7 +135,7 @@ func (m AuthenticationSAML) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this authentication s a m l
@@ -166,7 +167,7 @@ func (m *AuthenticationSAML) validateEnabled(formats strfmt.Registry) error {
 
 func (m *AuthenticationSAML) validateSsoURL(formats strfmt.Registry) error {
 
-	if swag.IsZero(m.SsoURL) { // not required
+	if typeutils.IsZero(m.SsoURL) { // not required
 		return nil
 	}
 
@@ -192,13 +193,13 @@ func (m *AuthenticationSAML) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AuthenticationSAML) UnmarshalBinary(b []byte) error {
 	var res AuthenticationSAML
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/azure_cost_export.go b/client/models/azure_cost_export.go
index d5246a743..a0aff665b 100644
--- a/client/models/azure_cost_export.go
+++ b/client/models/azure_cost_export.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // AzureCostExport Representation of AzureCostExport external backend.
@@ -122,7 +122,7 @@ func (m AzureCostExport) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this azure cost export
@@ -150,13 +150,13 @@ func (m *AzureCostExport) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AzureCostExport) UnmarshalBinary(b []byte) error {
 	var res AzureCostExport
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/azure_remote_t_f_state.go b/client/models/azure_remote_t_f_state.go
index 6e68fbe5c..854371229 100644
--- a/client/models/azure_remote_t_f_state.go
+++ b/client/models/azure_remote_t_f_state.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -145,7 +145,7 @@ func (m AzureRemoteTFState) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this azure remote t f state
@@ -186,13 +186,13 @@ func (m *AzureRemoteTFState) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AzureRemoteTFState) UnmarshalBinary(b []byte) error {
 	var res AzureRemoteTFState
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/azure_storage.go b/client/models/azure_storage.go
index 17a68fd4e..af46adee3 100644
--- a/client/models/azure_storage.go
+++ b/client/models/azure_storage.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -144,7 +144,7 @@ func (m AzureStorage) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this azure storage
@@ -185,13 +185,13 @@ func (m *AzureStorage) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *AzureStorage) UnmarshalBinary(b []byte) error {
 	var res AzureStorage
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/bare_credential.go b/client/models/bare_credential.go
index 6e7f77163..0fb92b8b5 100644
--- a/client/models/bare_credential.go
+++ b/client/models/bare_credential.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,7 +74,7 @@ func (m *BareCredential) Validate(formats strfmt.Registry) error {
 }
 
 func (m *BareCredential) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -93,7 +94,7 @@ func (m *BareCredential) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *BareCredential) validatePath(formats strfmt.Registry) error {
-	if swag.IsZero(m.Path) { // not required
+	if typeutils.IsZero(m.Path) { // not required
 		return nil
 	}
 
@@ -235,13 +236,13 @@ func (m *BareCredential) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *BareCredential) UnmarshalBinary(b []byte) error {
 	var res BareCredential
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/build.go b/client/models/build.go
index adcdc1eba..8c2e931d7 100644
--- a/client/models/build.go
+++ b/client/models/build.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -142,13 +142,13 @@ func (m *Build) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Build) UnmarshalBinary(b []byte) error {
 	var res Build
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/build_inputs_outputs.go b/client/models/build_inputs_outputs.go
index 9db475f16..2a3564f1f 100644
--- a/client/models/build_inputs_outputs.go
+++ b/client/models/build_inputs_outputs.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -54,7 +55,7 @@ func (m *BuildInputsOutputs) validateInputs(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Inputs); i++ {
-		if swag.IsZero(m.Inputs[i]) { // not required
+		if typeutils.IsZero(m.Inputs[i]) { // not required
 			continue
 		}
 
@@ -85,7 +86,7 @@ func (m *BuildInputsOutputs) validateOutputs(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Outputs); i++ {
-		if swag.IsZero(m.Outputs[i]) { // not required
+		if typeutils.IsZero(m.Outputs[i]) { // not required
 			continue
 		}
 
@@ -133,7 +134,7 @@ func (m *BuildInputsOutputs) contextValidateInputs(ctx context.Context, formats
 
 		if m.Inputs[i] != nil {
 
-			if swag.IsZero(m.Inputs[i]) { // not required
+			if typeutils.IsZero(m.Inputs[i]) { // not required
 				return nil
 			}
 
@@ -162,7 +163,7 @@ func (m *BuildInputsOutputs) contextValidateOutputs(ctx context.Context, formats
 
 		if m.Outputs[i] != nil {
 
-			if swag.IsZero(m.Outputs[i]) { // not required
+			if typeutils.IsZero(m.Outputs[i]) { // not required
 				return nil
 			}
 
@@ -190,13 +191,13 @@ func (m *BuildInputsOutputs) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *BuildInputsOutputs) UnmarshalBinary(b []byte) error {
 	var res BuildInputsOutputs
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/build_summary.go b/client/models/build_summary.go
index 80afc36e2..23e258109 100644
--- a/client/models/build_summary.go
+++ b/client/models/build_summary.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -125,13 +125,13 @@ func (m *BuildSummary) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *BuildSummary) UnmarshalBinary(b []byte) error {
 	var res BuildSummary
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/can_do_input.go b/client/models/can_do_input.go
index 33542aa87..bf5eb3002 100644
--- a/client/models/can_do_input.go
+++ b/client/models/can_do_input.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *CanDoInput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CanDoInput) UnmarshalBinary(b []byte) error {
 	var res CanDoInput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/can_do_output.go b/client/models/can_do_output.go
index 42ddfbda2..d64bec6f9 100644
--- a/client/models/can_do_output.go
+++ b/client/models/can_do_output.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -59,13 +59,13 @@ func (m *CanDoOutput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CanDoOutput) UnmarshalBinary(b []byte) error {
 	var res CanDoOutput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/check_report.go b/client/models/check_report.go
index 310fa170c..fa17b4c6c 100644
--- a/client/models/check_report.go
+++ b/client/models/check_report.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -159,13 +159,13 @@ func (m *CheckReport) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CheckReport) UnmarshalBinary(b []byte) error {
 	var res CheckReport
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/clear_task_cache.go b/client/models/clear_task_cache.go
index 17f03e83e..6b115c26c 100644
--- a/client/models/clear_task_cache.go
+++ b/client/models/clear_task_cache.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *ClearTaskCache) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ClearTaskCache) UnmarshalBinary(b []byte) error {
 	var res ClearTaskCache
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_account.go b/client/models/cloud_account.go
index 318366785..fcd5a2cc4 100644
--- a/client/models/cloud_account.go
+++ b/client/models/cloud_account.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -204,7 +205,7 @@ func (m *CloudAccount) validateName(formats strfmt.Registry) error {
 }
 
 func (m *CloudAccount) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -282,7 +283,7 @@ func (m *CloudAccount) contextValidateOwner(ctx context.Context, formats strfmt.
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -308,13 +309,13 @@ func (m *CloudAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudAccount) UnmarshalBinary(b []byte) error {
 	var res CloudAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_account_detail.go b/client/models/cloud_account_detail.go
index b4710de8b..7c262bde8 100644
--- a/client/models/cloud_account_detail.go
+++ b/client/models/cloud_account_detail.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // CloudAccountDetail Cloud Account Detail
@@ -34,7 +35,7 @@ type CloudAccountDetail struct {
 func (m *CloudAccountDetail) UnmarshalJSON(raw []byte) error {
 	// AO0
 	var aO0 CloudAccount
-	if err := swag.ReadJSON(raw, &aO0); err != nil {
+	if err := jsonutils.ReadJSON(raw, &aO0); err != nil {
 		return err
 	}
 	m.CloudAccount = aO0
@@ -47,7 +48,7 @@ func (m *CloudAccountDetail) UnmarshalJSON(raw []byte) error {
 
 		FinopsEnabled bool `json:"finops_enabled,omitempty"`
 	}
-	if err := swag.ReadJSON(raw, &dataAO1); err != nil {
+	if err := jsonutils.ReadJSON(raw, &dataAO1); err != nil {
 		return err
 	}
 
@@ -64,7 +65,7 @@ func (m *CloudAccountDetail) UnmarshalJSON(raw []byte) error {
 func (m CloudAccountDetail) MarshalJSON() ([]byte, error) {
 	_parts := make([][]byte, 0, 2)
 
-	aO0, err := swag.WriteJSON(m.CloudAccount)
+	aO0, err := jsonutils.WriteJSON(m.CloudAccount)
 	if err != nil {
 		return nil, err
 	}
@@ -83,12 +84,12 @@ func (m CloudAccountDetail) MarshalJSON() ([]byte, error) {
 
 	dataAO1.FinopsEnabled = m.FinopsEnabled
 
-	jsonDataAO1, errAO1 := swag.WriteJSON(dataAO1)
+	jsonDataAO1, errAO1 := jsonutils.WriteJSON(dataAO1)
 	if errAO1 != nil {
 		return nil, errAO1
 	}
 	_parts = append(_parts, jsonDataAO1)
-	return swag.ConcatJSON(_parts...), nil
+	return jsonutils.ConcatJSON(_parts...), nil
 }
 
 // Validate validates this cloud account detail
@@ -116,12 +117,12 @@ func (m *CloudAccountDetail) Validate(formats strfmt.Registry) error {
 
 func (m *CloudAccountDetail) validateEnvironments(formats strfmt.Registry) error {
 
-	if swag.IsZero(m.Environments) { // not required
+	if typeutils.IsZero(m.Environments) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Environments); i++ {
-		if swag.IsZero(m.Environments[i]) { // not required
+		if typeutils.IsZero(m.Environments[i]) { // not required
 			continue
 		}
 
@@ -147,7 +148,7 @@ func (m *CloudAccountDetail) validateEnvironments(formats strfmt.Registry) error
 
 func (m *CloudAccountDetail) validateFinopsAccount(formats strfmt.Registry) error {
 
-	if swag.IsZero(m.FinopsAccount) { // not required
+	if typeutils.IsZero(m.FinopsAccount) { // not required
 		return nil
 	}
 
@@ -198,7 +199,7 @@ func (m *CloudAccountDetail) contextValidateEnvironments(ctx context.Context, fo
 
 		if m.Environments[i] != nil {
 
-			if swag.IsZero(m.Environments[i]) { // not required
+			if typeutils.IsZero(m.Environments[i]) { // not required
 				return nil
 			}
 
@@ -225,7 +226,7 @@ func (m *CloudAccountDetail) contextValidateFinopsAccount(ctx context.Context, f
 
 	if m.FinopsAccount != nil {
 
-		if swag.IsZero(m.FinopsAccount) { // not required
+		if typeutils.IsZero(m.FinopsAccount) { // not required
 			return nil
 		}
 
@@ -251,13 +252,13 @@ func (m *CloudAccountDetail) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudAccountDetail) UnmarshalBinary(b []byte) error {
 	var res CloudAccountDetail
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_account_simple.go b/client/models/cloud_account_simple.go
index 067717534..133f27ccc 100644
--- a/client/models/cloud_account_simple.go
+++ b/client/models/cloud_account_simple.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -137,13 +137,13 @@ func (m *CloudAccountSimple) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudAccountSimple) UnmarshalBinary(b []byte) error {
 	var res CloudAccountSimple
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_account.go b/client/models/cloud_cost_management_account.go
index 389ca3541..32fd8621d 100644
--- a/client/models/cloud_cost_management_account.go
+++ b/client/models/cloud_cost_management_account.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -224,7 +225,7 @@ func (m *CloudCostManagementAccount) validateEnabled(formats strfmt.Registry) er
 }
 
 func (m *CloudCostManagementAccount) validateExternalBackend(formats strfmt.Registry) error {
-	if swag.IsZero(m.ExternalBackend) { // not required
+	if typeutils.IsZero(m.ExternalBackend) { // not required
 		return nil
 	}
 
@@ -260,7 +261,7 @@ func (m *CloudCostManagementAccount) validateID(formats strfmt.Registry) error {
 }
 
 func (m *CloudCostManagementAccount) validateLastIngestionEndedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.LastIngestionEndedAt) { // not required
+	if typeutils.IsZero(m.LastIngestionEndedAt) { // not required
 		return nil
 	}
 
@@ -272,7 +273,7 @@ func (m *CloudCostManagementAccount) validateLastIngestionEndedAt(formats strfmt
 }
 
 func (m *CloudCostManagementAccount) validateLastIngestionStartedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.LastIngestionStartedAt) { // not required
+	if typeutils.IsZero(m.LastIngestionStartedAt) { // not required
 		return nil
 	}
 
@@ -322,7 +323,7 @@ func (m *CloudCostManagementAccount) validatePhaseEnum(path, location string, va
 }
 
 func (m *CloudCostManagementAccount) validatePhase(formats strfmt.Registry) error {
-	if swag.IsZero(m.Phase) { // not required
+	if typeutils.IsZero(m.Phase) { // not required
 		return nil
 	}
 
@@ -436,7 +437,7 @@ func (m *CloudCostManagementAccount) contextValidateExternalBackend(ctx context.
 
 	if m.ExternalBackend != nil {
 
-		if swag.IsZero(m.ExternalBackend) { // not required
+		if typeutils.IsZero(m.ExternalBackend) { // not required
 			return nil
 		}
 
@@ -462,13 +463,13 @@ func (m *CloudCostManagementAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementAccount) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_bucket.go b/client/models/cloud_cost_management_bucket.go
index 374f02015..b54a3e54a 100644
--- a/client/models/cloud_cost_management_bucket.go
+++ b/client/models/cloud_cost_management_bucket.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -79,12 +80,12 @@ func (m *CloudCostManagementBucket) Validate(formats strfmt.Registry) error {
 }
 
 func (m *CloudCostManagementBucket) validateBuckets(formats strfmt.Registry) error {
-	if swag.IsZero(m.Buckets) { // not required
+	if typeutils.IsZero(m.Buckets) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Buckets); i++ {
-		if swag.IsZero(m.Buckets[i]) { // not required
+		if typeutils.IsZero(m.Buckets[i]) { // not required
 			continue
 		}
 
@@ -164,7 +165,7 @@ func (m *CloudCostManagementBucket) contextValidateBuckets(ctx context.Context,
 
 		if m.Buckets[i] != nil {
 
-			if swag.IsZero(m.Buckets[i]) { // not required
+			if typeutils.IsZero(m.Buckets[i]) { // not required
 				return nil
 			}
 
@@ -192,13 +193,13 @@ func (m *CloudCostManagementBucket) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementBucket) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementBucket
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_dashboard.go b/client/models/cloud_cost_management_dashboard.go
index 6285e4132..4e752dc83 100644
--- a/client/models/cloud_cost_management_dashboard.go
+++ b/client/models/cloud_cost_management_dashboard.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -110,7 +111,7 @@ func (m *CloudCostManagementDashboard) validateProjectResources(formats strfmt.R
 	}
 
 	for i := 0; i < len(m.ProjectResources); i++ {
-		if swag.IsZero(m.ProjectResources[i]) { // not required
+		if typeutils.IsZero(m.ProjectResources[i]) { // not required
 			continue
 		}
 
@@ -235,7 +236,7 @@ func (m *CloudCostManagementDashboard) contextValidateProjectResources(ctx conte
 
 		if m.ProjectResources[i] != nil {
 
-			if swag.IsZero(m.ProjectResources[i]) { // not required
+			if typeutils.IsZero(m.ProjectResources[i]) { // not required
 				return nil
 			}
 
@@ -305,13 +306,13 @@ func (m *CloudCostManagementDashboard) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementDashboard) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementDashboard
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_filter_values.go b/client/models/cloud_cost_management_filter_values.go
index ed719b3cd..79f924ec8 100644
--- a/client/models/cloud_cost_management_filter_values.go
+++ b/client/models/cloud_cost_management_filter_values.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // CloudCostManagementFilterValues CloudCostManagementFilterValues
@@ -78,13 +78,13 @@ func (m *CloudCostManagementFilterValues) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementFilterValues) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementFilterValues
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_histogram.go b/client/models/cloud_cost_management_histogram.go
index 1099cb106..0b1269079 100644
--- a/client/models/cloud_cost_management_histogram.go
+++ b/client/models/cloud_cost_management_histogram.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -70,7 +71,7 @@ func (m *CloudCostManagementHistogram) validateBuckets(formats strfmt.Registry)
 	}
 
 	for i := 0; i < len(m.Buckets); i++ {
-		if swag.IsZero(m.Buckets[i]) { // not required
+		if typeutils.IsZero(m.Buckets[i]) { // not required
 			continue
 		}
 
@@ -141,7 +142,7 @@ func (m *CloudCostManagementHistogram) contextValidateBuckets(ctx context.Contex
 
 		if m.Buckets[i] != nil {
 
-			if swag.IsZero(m.Buckets[i]) { // not required
+			if typeutils.IsZero(m.Buckets[i]) { // not required
 				return nil
 			}
 
@@ -169,13 +170,13 @@ func (m *CloudCostManagementHistogram) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementHistogram) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementHistogram
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_linked_account.go b/client/models/cloud_cost_management_linked_account.go
index c17ab2c5a..f9c962ca2 100644
--- a/client/models/cloud_cost_management_linked_account.go
+++ b/client/models/cloud_cost_management_linked_account.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -115,13 +115,13 @@ func (m *CloudCostManagementLinkedAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementLinkedAccount) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementLinkedAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_project_provider_resources.go b/client/models/cloud_cost_management_project_provider_resources.go
index 7ad402518..a919f5d57 100644
--- a/client/models/cloud_cost_management_project_provider_resources.go
+++ b/client/models/cloud_cost_management_project_provider_resources.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -141,13 +141,13 @@ func (m *CloudCostManagementProjectProviderResources) MarshalBinary() ([]byte, e
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementProjectProviderResources) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementProjectProviderResources
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_project_resources.go b/client/models/cloud_cost_management_project_resources.go
index f902444b8..06509453e 100644
--- a/client/models/cloud_cost_management_project_resources.go
+++ b/client/models/cloud_cost_management_project_resources.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -80,7 +81,7 @@ func (m *CloudCostManagementProjectResources) validateProviders(formats strfmt.R
 	}
 
 	for i := 0; i < len(m.Providers); i++ {
-		if swag.IsZero(m.Providers[i]) { // not required
+		if typeutils.IsZero(m.Providers[i]) { // not required
 			continue
 		}
 
@@ -124,7 +125,7 @@ func (m *CloudCostManagementProjectResources) contextValidateProviders(ctx conte
 
 		if m.Providers[i] != nil {
 
-			if swag.IsZero(m.Providers[i]) { // not required
+			if typeutils.IsZero(m.Providers[i]) { // not required
 				return nil
 			}
 
@@ -152,13 +153,13 @@ func (m *CloudCostManagementProjectResources) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementProjectResources) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementProjectResources
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_projects_dashboard.go b/client/models/cloud_cost_management_projects_dashboard.go
index 32c56657b..092c00010 100644
--- a/client/models/cloud_cost_management_projects_dashboard.go
+++ b/client/models/cloud_cost_management_projects_dashboard.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -161,13 +161,13 @@ func (m *CloudCostManagementProjectsDashboard) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementProjectsDashboard) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementProjectsDashboard
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_provider_details.go b/client/models/cloud_cost_management_provider_details.go
index b41b788da..3588b8c11 100644
--- a/client/models/cloud_cost_management_provider_details.go
+++ b/client/models/cloud_cost_management_provider_details.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -70,7 +71,7 @@ func (m *CloudCostManagementProviderDetails) validateCostHistogram(formats strfm
 }
 
 func (m *CloudCostManagementProviderDetails) validateFilterValues(formats strfmt.Registry) error {
-	if swag.IsZero(m.FilterValues) { // not required
+	if typeutils.IsZero(m.FilterValues) { // not required
 		return nil
 	}
 
@@ -135,7 +136,7 @@ func (m *CloudCostManagementProviderDetails) contextValidateFilterValues(ctx con
 
 	if m.FilterValues != nil {
 
-		if swag.IsZero(m.FilterValues) { // not required
+		if typeutils.IsZero(m.FilterValues) { // not required
 			return nil
 		}
 
@@ -161,13 +162,13 @@ func (m *CloudCostManagementProviderDetails) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementProviderDetails) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementProviderDetails
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_providers.go b/client/models/cloud_cost_management_providers.go
index 8d6345f2c..3a0f5be99 100644
--- a/client/models/cloud_cost_management_providers.go
+++ b/client/models/cloud_cost_management_providers.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -102,13 +102,13 @@ func (m *CloudCostManagementProviders) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementProviders) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementProviders
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_cost_management_tag_mapping.go b/client/models/cloud_cost_management_tag_mapping.go
index e581021ce..bc59e7b35 100644
--- a/client/models/cloud_cost_management_tag_mapping.go
+++ b/client/models/cloud_cost_management_tag_mapping.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -129,13 +129,13 @@ func (m *CloudCostManagementTagMapping) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudCostManagementTagMapping) UnmarshalBinary(b []byte) error {
 	var res CloudCostManagementTagMapping
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_provider.go b/client/models/cloud_provider.go
index 983e811fa..300b5d04d 100644
--- a/client/models/cloud_provider.go
+++ b/client/models/cloud_provider.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -89,7 +90,7 @@ func (m *CloudProvider) Validate(formats strfmt.Registry) error {
 }
 
 func (m *CloudProvider) validateAbbreviation(formats strfmt.Registry) error {
-	if swag.IsZero(m.Abbreviation) { // not required
+	if typeutils.IsZero(m.Abbreviation) { // not required
 		return nil
 	}
 
@@ -190,7 +191,7 @@ func (m *CloudProvider) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *CloudProvider) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -202,7 +203,7 @@ func (m *CloudProvider) validateCreatedAt(formats strfmt.Registry) error {
 }
 
 func (m *CloudProvider) validateID(formats strfmt.Registry) error {
-	if swag.IsZero(m.ID) { // not required
+	if typeutils.IsZero(m.ID) { // not required
 		return nil
 	}
 
@@ -231,7 +232,7 @@ func (m *CloudProvider) validateName(formats strfmt.Registry) error {
 }
 
 func (m *CloudProvider) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -252,13 +253,13 @@ func (m *CloudProvider) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudProvider) UnmarshalBinary(b []byte) error {
 	var res CloudProvider
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_provider_a_w_s_configuration.go b/client/models/cloud_provider_a_w_s_configuration.go
index 9af0828f9..483823319 100644
--- a/client/models/cloud_provider_a_w_s_configuration.go
+++ b/client/models/cloud_provider_a_w_s_configuration.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -104,7 +104,7 @@ func (m CloudProviderAWSConfiguration) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this cloud provider a w s configuration
@@ -145,13 +145,13 @@ func (m *CloudProviderAWSConfiguration) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudProviderAWSConfiguration) UnmarshalBinary(b []byte) error {
 	var res CloudProviderAWSConfiguration
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_provider_azure_configuration.go b/client/models/cloud_provider_azure_configuration.go
index f6a6403a5..6b8479d26 100644
--- a/client/models/cloud_provider_azure_configuration.go
+++ b/client/models/cloud_provider_azure_configuration.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -125,7 +125,7 @@ func (m CloudProviderAzureConfiguration) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this cloud provider azure configuration
@@ -185,13 +185,13 @@ func (m *CloudProviderAzureConfiguration) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudProviderAzureConfiguration) UnmarshalBinary(b []byte) error {
 	var res CloudProviderAzureConfiguration
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_provider_g_c_p_configuration.go b/client/models/cloud_provider_g_c_p_configuration.go
index 90c48f4d6..ecc5e6114 100644
--- a/client/models/cloud_provider_g_c_p_configuration.go
+++ b/client/models/cloud_provider_g_c_p_configuration.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -122,7 +122,7 @@ func (m CloudProviderGCPConfiguration) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this cloud provider g c p configuration
@@ -176,13 +176,13 @@ func (m *CloudProviderGCPConfiguration) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudProviderGCPConfiguration) UnmarshalBinary(b []byte) error {
 	var res CloudProviderGCPConfiguration
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cloud_provider_vm_ware_v_sphere_configuration.go b/client/models/cloud_provider_vm_ware_v_sphere_configuration.go
index 1300c8e8c..b6d2c67f3 100644
--- a/client/models/cloud_provider_vm_ware_v_sphere_configuration.go
+++ b/client/models/cloud_provider_vm_ware_v_sphere_configuration.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -122,7 +122,7 @@ func (m CloudProviderVMWareVSphereConfiguration) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this cloud provider VM ware v sphere configuration
@@ -176,13 +176,13 @@ func (m *CloudProviderVMWareVSphereConfiguration) MarshalBinary() ([]byte, error
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CloudProviderVMWareVSphereConfiguration) UnmarshalBinary(b []byte) error {
 	var res CloudProviderVMWareVSphereConfiguration
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/component.go b/client/models/component.go
index a327de4ce..c69d69078 100644
--- a/client/models/component.go
+++ b/client/models/component.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -174,7 +175,7 @@ func (m *Component) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *Component) validateCloudProvider(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudProvider) { // not required
+	if typeutils.IsZero(m.CloudProvider) { // not required
 		return nil
 	}
 
@@ -279,7 +280,7 @@ func (m *Component) validateImportStatusEnum(path, location string, value string
 }
 
 func (m *Component) validateImportStatus(formats strfmt.Registry) error {
-	if swag.IsZero(m.ImportStatus) { // not required
+	if typeutils.IsZero(m.ImportStatus) { // not required
 		return nil
 	}
 
@@ -353,7 +354,7 @@ func (m *Component) validateServiceCatalog(formats strfmt.Registry) error {
 }
 
 func (m *Component) validateStackformUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.StackformUpdatedAt) { // not required
+	if typeutils.IsZero(m.StackformUpdatedAt) { // not required
 		return nil
 	}
 
@@ -378,7 +379,7 @@ func (m *Component) validateUpdatedAt(formats strfmt.Registry) error {
 }
 
 func (m *Component) validateUseCase(formats strfmt.Registry) error {
-	if swag.IsZero(m.UseCase) { // not required
+	if typeutils.IsZero(m.UseCase) { // not required
 		return nil
 	}
 
@@ -455,7 +456,7 @@ func (m *Component) contextValidateCloudProvider(ctx context.Context, formats st
 
 	if m.CloudProvider != nil {
 
-		if swag.IsZero(m.CloudProvider) { // not required
+		if typeutils.IsZero(m.CloudProvider) { // not required
 			return nil
 		}
 
@@ -565,13 +566,13 @@ func (m *Component) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Component) UnmarshalBinary(b []byte) error {
 	var res Component
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/component_simple.go b/client/models/component_simple.go
index 7c6f0ff37..e5203db82 100644
--- a/client/models/component_simple.go
+++ b/client/models/component_simple.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -138,7 +139,7 @@ func (m *ComponentSimple) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *ComponentSimple) validateCloudProvider(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudProvider) { // not required
+	if typeutils.IsZero(m.CloudProvider) { // not required
 		return nil
 	}
 
@@ -237,7 +238,7 @@ func (m *ComponentSimple) validateUpdatedAt(formats strfmt.Registry) error {
 }
 
 func (m *ComponentSimple) validateUseCase(formats strfmt.Registry) error {
-	if swag.IsZero(m.UseCase) { // not required
+	if typeutils.IsZero(m.UseCase) { // not required
 		return nil
 	}
 
@@ -306,7 +307,7 @@ func (m *ComponentSimple) contextValidateCloudProvider(ctx context.Context, form
 
 	if m.CloudProvider != nil {
 
-		if swag.IsZero(m.CloudProvider) { // not required
+		if typeutils.IsZero(m.CloudProvider) { // not required
 			return nil
 		}
 
@@ -374,13 +375,13 @@ func (m *ComponentSimple) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ComponentSimple) UnmarshalBinary(b []byte) error {
 	var res ComponentSimple
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/config_file.go b/client/models/config_file.go
index 80af2fdde..8f09f261b 100644
--- a/client/models/config_file.go
+++ b/client/models/config_file.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -74,13 +74,13 @@ func (m *ConfigFile) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ConfigFile) UnmarshalBinary(b []byte) error {
 	var res ConfigFile
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/config_repository.go b/client/models/config_repository.go
index feb76ea81..ddf35db93 100644
--- a/client/models/config_repository.go
+++ b/client/models/config_repository.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -123,7 +124,7 @@ func (m *ConfigRepository) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *ConfigRepository) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -135,7 +136,7 @@ func (m *ConfigRepository) validateCreatedAt(formats strfmt.Registry) error {
 }
 
 func (m *ConfigRepository) validateCredentialCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CredentialCanonical) { // not required
+	if typeutils.IsZero(m.CredentialCanonical) { // not required
 		return nil
 	}
 
@@ -186,7 +187,7 @@ func (m *ConfigRepository) validateName(formats strfmt.Registry) error {
 }
 
 func (m *ConfigRepository) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -220,13 +221,13 @@ func (m *ConfigRepository) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ConfigRepository) UnmarshalBinary(b []byte) error {
 	var res ConfigRepository
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/configure_component.go b/client/models/configure_component.go
index 06a830084..ab07f14b5 100644
--- a/client/models/configure_component.go
+++ b/client/models/configure_component.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -57,7 +58,7 @@ func (m *ConfigureComponent) Validate(formats strfmt.Registry) error {
 }
 
 func (m *ConfigureComponent) validateServiceCatalogSourceVersionID(formats strfmt.Registry) error {
-	if swag.IsZero(m.ServiceCatalogSourceVersionID) { // not required
+	if typeutils.IsZero(m.ServiceCatalogSourceVersionID) { // not required
 		return nil
 	}
 
@@ -90,7 +91,7 @@ func (m *ConfigureComponent) validateUseCase(formats strfmt.Registry) error {
 }
 
 func (m *ConfigureComponent) validateVars(formats strfmt.Registry) error {
-	if swag.IsZero(m.Vars) { // not required
+	if typeutils.IsZero(m.Vars) { // not required
 		return nil
 	}
 
@@ -128,7 +129,7 @@ func (m *ConfigureComponent) ContextValidate(ctx context.Context, formats strfmt
 
 func (m *ConfigureComponent) contextValidateVars(ctx context.Context, formats strfmt.Registry) error {
 
-	if swag.IsZero(m.Vars) { // not required
+	if typeutils.IsZero(m.Vars) { // not required
 		return nil
 	}
 
@@ -153,13 +154,13 @@ func (m *ConfigureComponent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ConfigureComponent) UnmarshalBinary(b []byte) error {
 	var res ConfigureComponent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cost_estimation_component.go b/client/models/cost_estimation_component.go
index 300aea1ba..13f251cc0 100644
--- a/client/models/cost_estimation_component.go
+++ b/client/models/cost_estimation_component.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -76,7 +77,7 @@ func (m *CostEstimationComponent) validateLabel(formats strfmt.Registry) error {
 }
 
 func (m *CostEstimationComponent) validatePlanned(formats strfmt.Registry) error {
-	if swag.IsZero(m.Planned) { // not required
+	if typeutils.IsZero(m.Planned) { // not required
 		return nil
 	}
 
@@ -99,7 +100,7 @@ func (m *CostEstimationComponent) validatePlanned(formats strfmt.Registry) error
 }
 
 func (m *CostEstimationComponent) validatePrior(formats strfmt.Registry) error {
-	if swag.IsZero(m.Prior) { // not required
+	if typeutils.IsZero(m.Prior) { // not required
 		return nil
 	}
 
@@ -152,7 +153,7 @@ func (m *CostEstimationComponent) contextValidatePlanned(ctx context.Context, fo
 
 	if m.Planned != nil {
 
-		if swag.IsZero(m.Planned) { // not required
+		if typeutils.IsZero(m.Planned) { // not required
 			return nil
 		}
 
@@ -177,7 +178,7 @@ func (m *CostEstimationComponent) contextValidatePrior(ctx context.Context, form
 
 	if m.Prior != nil {
 
-		if swag.IsZero(m.Prior) { // not required
+		if typeutils.IsZero(m.Prior) { // not required
 			return nil
 		}
 
@@ -203,13 +204,13 @@ func (m *CostEstimationComponent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CostEstimationComponent) UnmarshalBinary(b []byte) error {
 	var res CostEstimationComponent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cost_estimation_component_state.go b/client/models/cost_estimation_component_state.go
index 482b56e0d..328cda386 100644
--- a/client/models/cost_estimation_component_state.go
+++ b/client/models/cost_estimation_component_state.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -107,13 +107,13 @@ func (m *CostEstimationComponentState) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CostEstimationComponentState) UnmarshalBinary(b []byte) error {
 	var res CostEstimationComponentState
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cost_estimation_resource_estimate.go b/client/models/cost_estimation_resource_estimate.go
index 9b9efc0a7..8484ff50c 100644
--- a/client/models/cost_estimation_resource_estimate.go
+++ b/client/models/cost_estimation_resource_estimate.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -99,7 +100,7 @@ func (m *CostEstimationResourceEstimate) validateComponents(formats strfmt.Regis
 	}
 
 	for i := 0; i < len(m.Components); i++ {
-		if swag.IsZero(m.Components[i]) { // not required
+		if typeutils.IsZero(m.Components[i]) { // not required
 			continue
 		}
 
@@ -124,7 +125,7 @@ func (m *CostEstimationResourceEstimate) validateComponents(formats strfmt.Regis
 }
 
 func (m *CostEstimationResourceEstimate) validateImage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Image) { // not required
+	if typeutils.IsZero(m.Image) { // not required
 		return nil
 	}
 
@@ -173,7 +174,7 @@ func (m *CostEstimationResourceEstimate) contextValidateComponents(ctx context.C
 
 		if m.Components[i] != nil {
 
-			if swag.IsZero(m.Components[i]) { // not required
+			if typeutils.IsZero(m.Components[i]) { // not required
 				return nil
 			}
 
@@ -201,13 +202,13 @@ func (m *CostEstimationResourceEstimate) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CostEstimationResourceEstimate) UnmarshalBinary(b []byte) error {
 	var res CostEstimationResourceEstimate
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/cost_estimation_result.go b/client/models/cost_estimation_result.go
index 93336fa35..b1192fe29 100644
--- a/client/models/cost_estimation_result.go
+++ b/client/models/cost_estimation_result.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -69,7 +70,7 @@ func (m *CostEstimationResult) validateResourceEstimates(formats strfmt.Registry
 	}
 
 	for i := 0; i < len(m.ResourceEstimates); i++ {
-		if swag.IsZero(m.ResourceEstimates[i]) { // not required
+		if typeutils.IsZero(m.ResourceEstimates[i]) { // not required
 			continue
 		}
 
@@ -113,7 +114,7 @@ func (m *CostEstimationResult) contextValidateResourceEstimates(ctx context.Cont
 
 		if m.ResourceEstimates[i] != nil {
 
-			if swag.IsZero(m.ResourceEstimates[i]) { // not required
+			if typeutils.IsZero(m.ResourceEstimates[i]) { // not required
 				return nil
 			}
 
@@ -141,13 +142,13 @@ func (m *CostEstimationResult) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CostEstimationResult) UnmarshalBinary(b []byte) error {
 	var res CostEstimationResult
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/country.go b/client/models/country.go
index 2615f2ee8..8493a7ac6 100644
--- a/client/models/country.go
+++ b/client/models/country.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,13 +78,13 @@ func (m *Country) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Country) UnmarshalBinary(b []byte) error {
 	var res Country
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/create_or_update_subscription.go b/client/models/create_or_update_subscription.go
index 6b0fc2552..8d0ba203c 100644
--- a/client/models/create_or_update_subscription.go
+++ b/client/models/create_or_update_subscription.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -58,7 +59,7 @@ func (m *CreateOrUpdateSubscription) Validate(formats strfmt.Registry) error {
 }
 
 func (m *CreateOrUpdateSubscription) validateExpiresAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.ExpiresAt) { // not required
+	if typeutils.IsZero(m.ExpiresAt) { // not required
 		return nil
 	}
 
@@ -70,7 +71,7 @@ func (m *CreateOrUpdateSubscription) validateExpiresAt(formats strfmt.Registry)
 }
 
 func (m *CreateOrUpdateSubscription) validateMembersCount(formats strfmt.Registry) error {
-	if swag.IsZero(m.MembersCount) { // not required
+	if typeutils.IsZero(m.MembersCount) { // not required
 		return nil
 	}
 
@@ -111,7 +112,7 @@ func (m *CreateOrUpdateSubscription) validatePlanCanonicalEnum(path, location st
 }
 
 func (m *CreateOrUpdateSubscription) validatePlanCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.PlanCanonical) { // not required
+	if typeutils.IsZero(m.PlanCanonical) { // not required
 		return nil
 	}
 
@@ -133,13 +134,13 @@ func (m *CreateOrUpdateSubscription) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CreateOrUpdateSubscription) UnmarshalBinary(b []byte) error {
 	var res CreateOrUpdateSubscription
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/credential.go b/client/models/credential.go
index 21183507a..d3c30c71b 100644
--- a/client/models/credential.go
+++ b/client/models/credential.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -150,7 +151,7 @@ func (m *Credential) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *Credential) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -175,7 +176,7 @@ func (m *Credential) validateID(formats strfmt.Registry) error {
 }
 
 func (m *Credential) validateInUse(formats strfmt.Registry) error {
-	if swag.IsZero(m.InUse) { // not required
+	if typeutils.IsZero(m.InUse) { // not required
 		return nil
 	}
 
@@ -216,7 +217,7 @@ func (m *Credential) validateName(formats strfmt.Registry) error {
 }
 
 func (m *Credential) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -339,7 +340,7 @@ func (m *Credential) validateType(formats strfmt.Registry) error {
 }
 
 func (m *Credential) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -376,7 +377,7 @@ func (m *Credential) contextValidateInUse(ctx context.Context, formats strfmt.Re
 
 	if m.InUse != nil {
 
-		if swag.IsZero(m.InUse) { // not required
+		if typeutils.IsZero(m.InUse) { // not required
 			return nil
 		}
 
@@ -401,7 +402,7 @@ func (m *Credential) contextValidateOwner(ctx context.Context, formats strfmt.Re
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -448,13 +449,13 @@ func (m *Credential) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Credential) UnmarshalBinary(b []byte) error {
 	var res Credential
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/credential_in_use.go b/client/models/credential_in_use.go
index 77e21e305..9cbbbff6b 100644
--- a/client/models/credential_in_use.go
+++ b/client/models/credential_in_use.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // CredentialInUse Credential in use
@@ -52,12 +53,12 @@ func (m *CredentialInUse) Validate(formats strfmt.Registry) error {
 }
 
 func (m *CredentialInUse) validateConfigRepositories(formats strfmt.Registry) error {
-	if swag.IsZero(m.ConfigRepositories) { // not required
+	if typeutils.IsZero(m.ConfigRepositories) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.ConfigRepositories); i++ {
-		if swag.IsZero(m.ConfigRepositories[i]) { // not required
+		if typeutils.IsZero(m.ConfigRepositories[i]) { // not required
 			continue
 		}
 
@@ -82,12 +83,12 @@ func (m *CredentialInUse) validateConfigRepositories(formats strfmt.Registry) er
 }
 
 func (m *CredentialInUse) validateExternalBackends(formats strfmt.Registry) error {
-	if swag.IsZero(m.ExternalBackends) { // not required
+	if typeutils.IsZero(m.ExternalBackends) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.ExternalBackends); i++ {
-		if swag.IsZero(m.ExternalBackends[i]) { // not required
+		if typeutils.IsZero(m.ExternalBackends[i]) { // not required
 			continue
 		}
 
@@ -112,12 +113,12 @@ func (m *CredentialInUse) validateExternalBackends(formats strfmt.Registry) erro
 }
 
 func (m *CredentialInUse) validateServiceCatalogSources(formats strfmt.Registry) error {
-	if swag.IsZero(m.ServiceCatalogSources) { // not required
+	if typeutils.IsZero(m.ServiceCatalogSources) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.ServiceCatalogSources); i++ {
-		if swag.IsZero(m.ServiceCatalogSources[i]) { // not required
+		if typeutils.IsZero(m.ServiceCatalogSources[i]) { // not required
 			continue
 		}
 
@@ -169,7 +170,7 @@ func (m *CredentialInUse) contextValidateConfigRepositories(ctx context.Context,
 
 		if m.ConfigRepositories[i] != nil {
 
-			if swag.IsZero(m.ConfigRepositories[i]) { // not required
+			if typeutils.IsZero(m.ConfigRepositories[i]) { // not required
 				return nil
 			}
 
@@ -198,7 +199,7 @@ func (m *CredentialInUse) contextValidateExternalBackends(ctx context.Context, f
 
 		if m.ExternalBackends[i] != nil {
 
-			if swag.IsZero(m.ExternalBackends[i]) { // not required
+			if typeutils.IsZero(m.ExternalBackends[i]) { // not required
 				return nil
 			}
 
@@ -227,7 +228,7 @@ func (m *CredentialInUse) contextValidateServiceCatalogSources(ctx context.Conte
 
 		if m.ServiceCatalogSources[i] != nil {
 
-			if swag.IsZero(m.ServiceCatalogSources[i]) { // not required
+			if typeutils.IsZero(m.ServiceCatalogSources[i]) { // not required
 				return nil
 			}
 
@@ -255,13 +256,13 @@ func (m *CredentialInUse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CredentialInUse) UnmarshalBinary(b []byte) error {
 	var res CredentialInUse
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/credential_raw.go b/client/models/credential_raw.go
index d9c954e8c..1ed63ae90 100644
--- a/client/models/credential_raw.go
+++ b/client/models/credential_raw.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -119,7 +120,7 @@ func (m *CredentialRaw) validateEnvironmentEnum(path, location string, value str
 }
 
 func (m *CredentialRaw) validateEnvironment(formats strfmt.Registry) error {
-	if swag.IsZero(m.Environment) { // not required
+	if typeutils.IsZero(m.Environment) { // not required
 		return nil
 	}
 
@@ -141,13 +142,13 @@ func (m *CredentialRaw) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CredentialRaw) UnmarshalBinary(b []byte) error {
 	var res CredentialRaw
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/credential_simple.go b/client/models/credential_simple.go
index efb9d6839..a16ae86b0 100644
--- a/client/models/credential_simple.go
+++ b/client/models/credential_simple.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -142,7 +143,7 @@ func (m *CredentialSimple) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *CredentialSimple) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -167,7 +168,7 @@ func (m *CredentialSimple) validateID(formats strfmt.Registry) error {
 }
 
 func (m *CredentialSimple) validateInUse(formats strfmt.Registry) error {
-	if swag.IsZero(m.InUse) { // not required
+	if typeutils.IsZero(m.InUse) { // not required
 		return nil
 	}
 
@@ -208,7 +209,7 @@ func (m *CredentialSimple) validateName(formats strfmt.Registry) error {
 }
 
 func (m *CredentialSimple) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -307,7 +308,7 @@ func (m *CredentialSimple) validateType(formats strfmt.Registry) error {
 }
 
 func (m *CredentialSimple) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -340,7 +341,7 @@ func (m *CredentialSimple) contextValidateInUse(ctx context.Context, formats str
 
 	if m.InUse != nil {
 
-		if swag.IsZero(m.InUse) { // not required
+		if typeutils.IsZero(m.InUse) { // not required
 			return nil
 		}
 
@@ -365,7 +366,7 @@ func (m *CredentialSimple) contextValidateOwner(ctx context.Context, formats str
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -391,13 +392,13 @@ func (m *CredentialSimple) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *CredentialSimple) UnmarshalBinary(b []byte) error {
 	var res CredentialSimple
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/elasticsearch_logs.go b/client/models/elasticsearch_logs.go
index 4699bbdcb..cde89cf2e 100644
--- a/client/models/elasticsearch_logs.go
+++ b/client/models/elasticsearch_logs.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -145,7 +146,7 @@ func (m ElasticsearchLogs) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this elasticsearch logs
@@ -277,13 +278,13 @@ func (m *ElasticsearchLogs) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ElasticsearchLogs) UnmarshalBinary(b []byte) error {
 	var res ElasticsearchLogs
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
@@ -327,7 +328,7 @@ func (m *ElasticsearchLogsSourcesAnon) Validate(formats strfmt.Registry) error {
 }
 
 func (m *ElasticsearchLogsSourcesAnon) validateMapping(formats strfmt.Registry) error {
-	if swag.IsZero(m.Mapping) { // not required
+	if typeutils.IsZero(m.Mapping) { // not required
 		return nil
 	}
 
@@ -367,7 +368,7 @@ func (m *ElasticsearchLogsSourcesAnon) contextValidateMapping(ctx context.Contex
 
 	if m.Mapping != nil {
 
-		if swag.IsZero(m.Mapping) { // not required
+		if typeutils.IsZero(m.Mapping) { // not required
 			return nil
 		}
 
@@ -393,13 +394,13 @@ func (m *ElasticsearchLogsSourcesAnon) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ElasticsearchLogsSourcesAnon) UnmarshalBinary(b []byte) error {
 	var res ElasticsearchLogsSourcesAnon
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
@@ -487,13 +488,13 @@ func (m *ElasticsearchLogsSourcesAnonMapping) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ElasticsearchLogsSourcesAnonMapping) UnmarshalBinary(b []byte) error {
 	var res ElasticsearchLogsSourcesAnonMapping
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/ensure_plan.go b/client/models/ensure_plan.go
index 1274e5454..697c0b667 100644
--- a/client/models/ensure_plan.go
+++ b/client/models/ensure_plan.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -159,13 +159,13 @@ func (m *EnsurePlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *EnsurePlan) UnmarshalBinary(b []byte) error {
 	var res EnsurePlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/environment.go b/client/models/environment.go
index 3bb54c1e5..ef112e8c7 100644
--- a/client/models/environment.go
+++ b/client/models/environment.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -163,12 +164,12 @@ func (m *Environment) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *Environment) validateCloudAccounts(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudAccounts) { // not required
+	if typeutils.IsZero(m.CloudAccounts) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.CloudAccounts); i++ {
-		if swag.IsZero(m.CloudAccounts[i]) { // not required
+		if typeutils.IsZero(m.CloudAccounts[i]) { // not required
 			continue
 		}
 
@@ -193,12 +194,12 @@ func (m *Environment) validateCloudAccounts(formats strfmt.Registry) error {
 }
 
 func (m *Environment) validateComponents(formats strfmt.Registry) error {
-	if swag.IsZero(m.Components) { // not required
+	if typeutils.IsZero(m.Components) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Components); i++ {
-		if swag.IsZero(m.Components[i]) { // not required
+		if typeutils.IsZero(m.Components[i]) { // not required
 			continue
 		}
 
@@ -236,7 +237,7 @@ func (m *Environment) validateCreatedAt(formats strfmt.Registry) error {
 }
 
 func (m *Environment) validateDescription(formats strfmt.Registry) error {
-	if swag.IsZero(m.Description) { // not required
+	if typeutils.IsZero(m.Description) { // not required
 		return nil
 	}
 
@@ -248,7 +249,7 @@ func (m *Environment) validateDescription(formats strfmt.Registry) error {
 }
 
 func (m *Environment) validateEnvironmentType(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentType) { // not required
+	if typeutils.IsZero(m.EnvironmentType) { // not required
 		return nil
 	}
 
@@ -284,7 +285,7 @@ func (m *Environment) validateID(formats strfmt.Registry) error {
 }
 
 func (m *Environment) validateName(formats strfmt.Registry) error {
-	if swag.IsZero(m.Name) { // not required
+	if typeutils.IsZero(m.Name) { // not required
 		return nil
 	}
 
@@ -300,7 +301,7 @@ func (m *Environment) validateName(formats strfmt.Registry) error {
 }
 
 func (m *Environment) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -349,12 +350,12 @@ func (m *Environment) validateUpdatedAt(formats strfmt.Registry) error {
 }
 
 func (m *Environment) validateVariables(formats strfmt.Registry) error {
-	if swag.IsZero(m.Variables) { // not required
+	if typeutils.IsZero(m.Variables) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Variables); i++ {
-		if swag.IsZero(m.Variables[i]) { // not required
+		if typeutils.IsZero(m.Variables[i]) { // not required
 			continue
 		}
 
@@ -398,7 +399,7 @@ func (m *Environment) validateVersionStatusItemsEnum(path, location string, valu
 }
 
 func (m *Environment) validateVersionStatus(formats strfmt.Registry) error {
-	if swag.IsZero(m.VersionStatus) { // not required
+	if typeutils.IsZero(m.VersionStatus) { // not required
 		return nil
 	}
 
@@ -450,7 +451,7 @@ func (m *Environment) contextValidateCloudAccounts(ctx context.Context, formats
 
 		if m.CloudAccounts[i] != nil {
 
-			if swag.IsZero(m.CloudAccounts[i]) { // not required
+			if typeutils.IsZero(m.CloudAccounts[i]) { // not required
 				return nil
 			}
 
@@ -479,7 +480,7 @@ func (m *Environment) contextValidateComponents(ctx context.Context, formats str
 
 		if m.Components[i] != nil {
 
-			if swag.IsZero(m.Components[i]) { // not required
+			if typeutils.IsZero(m.Components[i]) { // not required
 				return nil
 			}
 
@@ -506,7 +507,7 @@ func (m *Environment) contextValidateEnvironmentType(ctx context.Context, format
 
 	if m.EnvironmentType != nil {
 
-		if swag.IsZero(m.EnvironmentType) { // not required
+		if typeutils.IsZero(m.EnvironmentType) { // not required
 			return nil
 		}
 
@@ -531,7 +532,7 @@ func (m *Environment) contextValidateOwner(ctx context.Context, formats strfmt.R
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -558,7 +559,7 @@ func (m *Environment) contextValidateVariables(ctx context.Context, formats strf
 
 		if m.Variables[i] != nil {
 
-			if swag.IsZero(m.Variables[i]) { // not required
+			if typeutils.IsZero(m.Variables[i]) { // not required
 				return nil
 			}
 
@@ -586,13 +587,13 @@ func (m *Environment) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Environment) UnmarshalBinary(b []byte) error {
 	var res Environment
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/environment_simple.go b/client/models/environment_simple.go
index 1b7eea17f..50f81f64a 100644
--- a/client/models/environment_simple.go
+++ b/client/models/environment_simple.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -120,13 +120,13 @@ func (m *EnvironmentSimple) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *EnvironmentSimple) UnmarshalBinary(b []byte) error {
 	var res EnvironmentSimple
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/environment_type.go b/client/models/environment_type.go
index 18b77bf88..a4ade9737 100644
--- a/client/models/environment_type.go
+++ b/client/models/environment_type.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -220,13 +220,13 @@ func (m *EnvironmentType) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *EnvironmentType) UnmarshalBinary(b []byte) error {
 	var res EnvironmentType
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/environment_variable_item.go b/client/models/environment_variable_item.go
index d2309ef15..6b8a4d317 100644
--- a/client/models/environment_variable_item.go
+++ b/client/models/environment_variable_item.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,7 +79,7 @@ func (m *EnvironmentVariableItem) Validate(formats strfmt.Registry) error {
 }
 
 func (m *EnvironmentVariableItem) validateDescription(formats strfmt.Registry) error {
-	if swag.IsZero(m.Description) { // not required
+	if typeutils.IsZero(m.Description) { // not required
 		return nil
 	}
 
@@ -215,13 +216,13 @@ func (m *EnvironmentVariableItem) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *EnvironmentVariableItem) UnmarshalBinary(b []byte) error {
 	var res EnvironmentVariableItem
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/error_details_item.go b/client/models/error_details_item.go
index 982d3629d..b56db262b 100644
--- a/client/models/error_details_item.go
+++ b/client/models/error_details_item.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -76,13 +76,13 @@ func (m *ErrorDetailsItem) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ErrorDetailsItem) UnmarshalBinary(b []byte) error {
 	var res ErrorDetailsItem
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/error_payload.go b/client/models/error_payload.go
index 6413e6dfd..8cf81ffaa 100644
--- a/client/models/error_payload.go
+++ b/client/models/error_payload.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -49,7 +50,7 @@ func (m *ErrorPayload) validateErrors(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Errors); i++ {
-		if swag.IsZero(m.Errors[i]) { // not required
+		if typeutils.IsZero(m.Errors[i]) { // not required
 			continue
 		}
 
@@ -93,7 +94,7 @@ func (m *ErrorPayload) contextValidateErrors(ctx context.Context, formats strfmt
 
 		if m.Errors[i] != nil {
 
-			if swag.IsZero(m.Errors[i]) { // not required
+			if typeutils.IsZero(m.Errors[i]) { // not required
 				return nil
 			}
 
@@ -121,13 +122,13 @@ func (m *ErrorPayload) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ErrorPayload) UnmarshalBinary(b []byte) error {
 	var res ErrorPayload
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/event.go b/client/models/event.go
index 45724b045..556f57e5a 100644
--- a/client/models/event.go
+++ b/client/models/event.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -111,7 +112,7 @@ func (m *Event) Validate(formats strfmt.Registry) error {
 }
 
 func (m *Event) validateColor(formats strfmt.Registry) error {
-	if swag.IsZero(m.Color) { // not required
+	if typeutils.IsZero(m.Color) { // not required
 		return nil
 	}
 
@@ -131,7 +132,7 @@ func (m *Event) validateColor(formats strfmt.Registry) error {
 }
 
 func (m *Event) validateIcon(formats strfmt.Registry) error {
-	if swag.IsZero(m.Icon) { // not required
+	if typeutils.IsZero(m.Icon) { // not required
 		return nil
 	}
 
@@ -220,7 +221,7 @@ func (m *Event) validateTags(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Tags); i++ {
-		if swag.IsZero(m.Tags[i]) { // not required
+		if typeutils.IsZero(m.Tags[i]) { // not required
 			continue
 		}
 
@@ -335,7 +336,7 @@ func (m *Event) contextValidateTags(ctx context.Context, formats strfmt.Registry
 
 		if m.Tags[i] != nil {
 
-			if swag.IsZero(m.Tags[i]) { // not required
+			if typeutils.IsZero(m.Tags[i]) { // not required
 				return nil
 			}
 
@@ -363,13 +364,13 @@ func (m *Event) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Event) UnmarshalBinary(b []byte) error {
 	var res Event
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/events_actions_and_entities.go b/client/models/events_actions_and_entities.go
index 5eb3796eb..912cc944f 100644
--- a/client/models/events_actions_and_entities.go
+++ b/client/models/events_actions_and_entities.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *EventsActionsAndEntities) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *EventsActionsAndEntities) UnmarshalBinary(b []byte) error {
 	var res EventsActionsAndEntities
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/events_count.go b/client/models/events_count.go
index 3f47e528b..e8afbe436 100644
--- a/client/models/events_count.go
+++ b/client/models/events_count.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -95,13 +95,13 @@ func (m *EventsCount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *EventsCount) UnmarshalBinary(b []byte) error {
 	var res EventsCount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/external_backend.go b/client/models/external_backend.go
index 87dc40b20..042b8acb7 100644
--- a/client/models/external_backend.go
+++ b/client/models/external_backend.go
@@ -12,7 +12,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -220,7 +221,7 @@ func (m ExternalBackend) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this external backend
@@ -274,7 +275,7 @@ func (m *ExternalBackend) Validate(formats strfmt.Registry) error {
 }
 
 func (m *ExternalBackend) validateComponentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ComponentCanonical) { // not required
+	if typeutils.IsZero(m.ComponentCanonical) { // not required
 		return nil
 	}
 
@@ -316,7 +317,7 @@ func (m *ExternalBackend) validateConfiguration(formats strfmt.Registry) error {
 }
 
 func (m *ExternalBackend) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -328,7 +329,7 @@ func (m *ExternalBackend) validateCreatedAt(formats strfmt.Registry) error {
 }
 
 func (m *ExternalBackend) validateCredentialCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CredentialCanonical) { // not required
+	if typeutils.IsZero(m.CredentialCanonical) { // not required
 		return nil
 	}
 
@@ -357,7 +358,7 @@ func (m *ExternalBackend) validateDefault(formats strfmt.Registry) error {
 }
 
 func (m *ExternalBackend) validateEnvironmentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentCanonical) { // not required
+	if typeutils.IsZero(m.EnvironmentCanonical) { // not required
 		return nil
 	}
 
@@ -377,7 +378,7 @@ func (m *ExternalBackend) validateEnvironmentCanonical(formats strfmt.Registry)
 }
 
 func (m *ExternalBackend) validateID(formats strfmt.Registry) error {
-	if swag.IsZero(m.ID) { // not required
+	if typeutils.IsZero(m.ID) { // not required
 		return nil
 	}
 
@@ -389,7 +390,7 @@ func (m *ExternalBackend) validateID(formats strfmt.Registry) error {
 }
 
 func (m *ExternalBackend) validateProjectCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectCanonical) { // not required
+	if typeutils.IsZero(m.ProjectCanonical) { // not required
 		return nil
 	}
 
@@ -418,7 +419,7 @@ func (m *ExternalBackend) validatePurpose(formats strfmt.Registry) error {
 }
 
 func (m *ExternalBackend) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -466,13 +467,13 @@ func (m *ExternalBackend) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ExternalBackend) UnmarshalBinary(b []byte) error {
 	var res ExternalBackend
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/form_entity.go b/client/models/form_entity.go
index 040012e20..f49e0c5f1 100644
--- a/client/models/form_entity.go
+++ b/client/models/form_entity.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -19,6 +19,9 @@ import (
 // swagger:model FormEntity
 type FormEntity struct {
 
+	// Optional condition expression that gates whether this widget is displayed. Same V2 syntax as Group.condition (e.g. "$other_field == 'aws'"). Variables prefixed with "ctx_" are runtime-injected and bypass the entity-existence validation.
+	Condition string `json:"condition,omitempty"`
+
 	// The current value that was previously configured for this variable upon creation or update. In case of shared variables having different values, it will be empty, and 'mismatch_values' will be filled instead.
 	Current any `json:"current,omitempty"`
 
@@ -332,13 +335,13 @@ func (m *FormEntity) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *FormEntity) UnmarshalBinary(b []byte) error {
 	var res FormEntity
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/form_group.go b/client/models/form_group.go
index cc19980af..e62594883 100644
--- a/client/models/form_group.go
+++ b/client/models/form_group.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -90,7 +91,7 @@ func (m *FormGroup) validateVars(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Vars); i++ {
-		if swag.IsZero(m.Vars[i]) { // not required
+		if typeutils.IsZero(m.Vars[i]) { // not required
 			continue
 		}
 
@@ -134,7 +135,7 @@ func (m *FormGroup) contextValidateVars(ctx context.Context, formats strfmt.Regi
 
 		if m.Vars[i] != nil {
 
-			if swag.IsZero(m.Vars[i]) { // not required
+			if typeutils.IsZero(m.Vars[i]) { // not required
 				return nil
 			}
 
@@ -162,13 +163,13 @@ func (m *FormGroup) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *FormGroup) UnmarshalBinary(b []byte) error {
 	var res FormGroup
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/form_section.go b/client/models/form_section.go
index c1f9ba96d..bb90c09b6 100644
--- a/client/models/form_section.go
+++ b/client/models/form_section.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -55,7 +56,7 @@ func (m *FormSection) validateGroups(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Groups); i++ {
-		if swag.IsZero(m.Groups[i]) { // not required
+		if typeutils.IsZero(m.Groups[i]) { // not required
 			continue
 		}
 
@@ -108,7 +109,7 @@ func (m *FormSection) contextValidateGroups(ctx context.Context, formats strfmt.
 
 		if m.Groups[i] != nil {
 
-			if swag.IsZero(m.Groups[i]) { // not required
+			if typeutils.IsZero(m.Groups[i]) { // not required
 				return nil
 			}
 
@@ -136,13 +137,13 @@ func (m *FormSection) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *FormSection) UnmarshalBinary(b []byte) error {
 	var res FormSection
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/form_use_case.go b/client/models/form_use_case.go
index 0143a3383..7da12ae1d 100644
--- a/client/models/form_use_case.go
+++ b/client/models/form_use_case.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -61,7 +62,7 @@ func (m *FormUseCase) validateSections(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Sections); i++ {
-		if swag.IsZero(m.Sections[i]) { // not required
+		if typeutils.IsZero(m.Sections[i]) { // not required
 			continue
 		}
 
@@ -105,7 +106,7 @@ func (m *FormUseCase) contextValidateSections(ctx context.Context, formats strfm
 
 		if m.Sections[i] != nil {
 
-			if swag.IsZero(m.Sections[i]) { // not required
+			if typeutils.IsZero(m.Sections[i]) { // not required
 				return nil
 			}
 
@@ -133,13 +134,13 @@ func (m *FormUseCase) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *FormUseCase) UnmarshalBinary(b []byte) error {
 	var res FormUseCase
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/forms_file_v3.go b/client/models/forms_file_v3.go
index 18dc9b54a..ad042a7bb 100644
--- a/client/models/forms_file_v3.go
+++ b/client/models/forms_file_v3.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -52,7 +53,7 @@ func (m *FormsFileV3) validateUseCases(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.UseCases); i++ {
-		if swag.IsZero(m.UseCases[i]) { // not required
+		if typeutils.IsZero(m.UseCases[i]) { // not required
 			continue
 		}
 
@@ -105,7 +106,7 @@ func (m *FormsFileV3) contextValidateUseCases(ctx context.Context, formats strfm
 
 		if m.UseCases[i] != nil {
 
-			if swag.IsZero(m.UseCases[i]) { // not required
+			if typeutils.IsZero(m.UseCases[i]) { // not required
 				return nil
 			}
 
@@ -133,13 +134,13 @@ func (m *FormsFileV3) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *FormsFileV3) UnmarshalBinary(b []byte) error {
 	var res FormsFileV3
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/forms_validation.go b/client/models/forms_validation.go
index 08da53764..847f9c6cb 100644
--- a/client/models/forms_validation.go
+++ b/client/models/forms_validation.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // FormsValidation Forms validation
@@ -55,13 +55,13 @@ func (m *FormsValidation) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *FormsValidation) UnmarshalBinary(b []byte) error {
 	var res FormsValidation
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/forms_validation_result.go b/client/models/forms_validation_result.go
index 904a5d3f1..ecede8d9e 100644
--- a/client/models/forms_validation_result.go
+++ b/client/models/forms_validation_result.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -119,13 +119,13 @@ func (m *FormsValidationResult) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *FormsValidationResult) UnmarshalBinary(b []byte) error {
 	var res FormsValidationResult
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/forms_values_ref.go b/client/models/forms_values_ref.go
index d44563817..8e530037b 100644
--- a/client/models/forms_values_ref.go
+++ b/client/models/forms_values_ref.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *FormsValuesRef) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *FormsValuesRef) UnmarshalBinary(b []byte) error {
 	var res FormsValuesRef
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/g_c_p_cost_storage.go b/client/models/g_c_p_cost_storage.go
index b35e06028..6ea011313 100644
--- a/client/models/g_c_p_cost_storage.go
+++ b/client/models/g_c_p_cost_storage.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // GCPCostStorage Representation of BigQuery external backend.
@@ -131,7 +131,7 @@ func (m GCPCostStorage) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this g c p cost storage
@@ -159,13 +159,13 @@ func (m *GCPCostStorage) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *GCPCostStorage) UnmarshalBinary(b []byte) error {
 	var res GCPCostStorage
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/g_c_p_remote_t_f_state.go b/client/models/g_c_p_remote_t_f_state.go
index c52e4f9ac..6772b9eb0 100644
--- a/client/models/g_c_p_remote_t_f_state.go
+++ b/client/models/g_c_p_remote_t_f_state.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -121,7 +121,7 @@ func (m GCPRemoteTFState) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this g c p remote t f state
@@ -162,13 +162,13 @@ func (m *GCPRemoteTFState) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *GCPRemoteTFState) UnmarshalBinary(b []byte) error {
 	var res GCPRemoteTFState
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/g_c_p_storage.go b/client/models/g_c_p_storage.go
index 6668238a9..9c4e387ae 100644
--- a/client/models/g_c_p_storage.go
+++ b/client/models/g_c_p_storage.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -123,7 +123,7 @@ func (m GCPStorage) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this g c p storage
@@ -164,13 +164,13 @@ func (m *GCPStorage) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *GCPStorage) UnmarshalBinary(b []byte) error {
 	var res GCPStorage
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/general_status.go b/client/models/general_status.go
index 68d2f0679..1ecdfbed7 100644
--- a/client/models/general_status.go
+++ b/client/models/general_status.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -63,7 +64,7 @@ func (m *GeneralStatus) validateChecks(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Checks); i++ {
-		if swag.IsZero(m.Checks[i]) { // not required
+		if typeutils.IsZero(m.Checks[i]) { // not required
 			continue
 		}
 
@@ -166,7 +167,7 @@ func (m *GeneralStatus) contextValidateChecks(ctx context.Context, formats strfm
 
 		if m.Checks[i] != nil {
 
-			if swag.IsZero(m.Checks[i]) { // not required
+			if typeutils.IsZero(m.Checks[i]) { // not required
 				return nil
 			}
 
@@ -194,13 +195,13 @@ func (m *GeneralStatus) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *GeneralStatus) UnmarshalBinary(b []byte) error {
 	var res GeneralStatus
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/get_plan.go b/client/models/get_plan.go
index 407c823aa..150e736bb 100644
--- a/client/models/get_plan.go
+++ b/client/models/get_plan.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -113,12 +114,12 @@ func (m *GetPlan) validateType(formats strfmt.Registry) error {
 }
 
 func (m *GetPlan) validateVersionedResourceTypes(formats strfmt.Registry) error {
-	if swag.IsZero(m.VersionedResourceTypes) { // not required
+	if typeutils.IsZero(m.VersionedResourceTypes) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.VersionedResourceTypes); i++ {
-		if swag.IsZero(m.VersionedResourceTypes[i]) { // not required
+		if typeutils.IsZero(m.VersionedResourceTypes[i]) { // not required
 			continue
 		}
 
@@ -162,7 +163,7 @@ func (m *GetPlan) contextValidateVersionedResourceTypes(ctx context.Context, for
 
 		if m.VersionedResourceTypes[i] != nil {
 
-			if swag.IsZero(m.VersionedResourceTypes[i]) { // not required
+			if typeutils.IsZero(m.VersionedResourceTypes[i]) { // not required
 				return nil
 			}
 
@@ -190,13 +191,13 @@ func (m *GetPlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *GetPlan) UnmarshalBinary(b []byte) error {
 	var res GetPlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/git_lab_http_storage.go b/client/models/git_lab_http_storage.go
index dae8a6942..b4684bda3 100644
--- a/client/models/git_lab_http_storage.go
+++ b/client/models/git_lab_http_storage.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -105,7 +105,7 @@ func (m GitLabHTTPStorage) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this git lab HTTP storage
@@ -146,13 +146,13 @@ func (m *GitLabHTTPStorage) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *GitLabHTTPStorage) UnmarshalBinary(b []byte) error {
 	var res GitLabHTTPStorage
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/group_config.go b/client/models/group_config.go
index 938d08c41..bf3b2c217 100644
--- a/client/models/group_config.go
+++ b/client/models/group_config.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -62,13 +62,13 @@ func (m *GroupConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *GroupConfig) UnmarshalBinary(b []byte) error {
 	var res GroupConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/http_storage.go b/client/models/http_storage.go
index 8ce09f902..46476d46e 100644
--- a/client/models/http_storage.go
+++ b/client/models/http_storage.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -105,7 +105,7 @@ func (m HTTPStorage) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this HTTP storage
@@ -146,13 +146,13 @@ func (m *HTTPStorage) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *HTTPStorage) UnmarshalBinary(b []byte) error {
 	var res HTTPStorage
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/in_use_component.go b/client/models/in_use_component.go
index a11f9bc2c..22a9f1aa8 100644
--- a/client/models/in_use_component.go
+++ b/client/models/in_use_component.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -71,13 +71,13 @@ func (m *InUseComponent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InUseComponent) UnmarshalBinary(b []byte) error {
 	var res InUseComponent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/in_use_config_repository.go b/client/models/in_use_config_repository.go
index 5dbef6e7f..f5fd3a089 100644
--- a/client/models/in_use_config_repository.go
+++ b/client/models/in_use_config_repository.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -88,13 +88,13 @@ func (m *InUseConfigRepository) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InUseConfigRepository) UnmarshalBinary(b []byte) error {
 	var res InUseConfigRepository
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/in_use_environment.go b/client/models/in_use_environment.go
index e34972f52..a50af1b81 100644
--- a/client/models/in_use_environment.go
+++ b/client/models/in_use_environment.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -71,13 +71,13 @@ func (m *InUseEnvironment) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InUseEnvironment) UnmarshalBinary(b []byte) error {
 	var res InUseEnvironment
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/in_use_external_backend.go b/client/models/in_use_external_backend.go
index b764b1b39..364aa54ae 100644
--- a/client/models/in_use_external_backend.go
+++ b/client/models/in_use_external_backend.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -68,7 +69,7 @@ func (m *InUseExternalBackend) Validate(formats strfmt.Registry) error {
 }
 
 func (m *InUseExternalBackend) validateComponent(formats strfmt.Registry) error {
-	if swag.IsZero(m.Component) { // not required
+	if typeutils.IsZero(m.Component) { // not required
 		return nil
 	}
 
@@ -100,7 +101,7 @@ func (m *InUseExternalBackend) validateEngine(formats strfmt.Registry) error {
 }
 
 func (m *InUseExternalBackend) validateEnvironment(formats strfmt.Registry) error {
-	if swag.IsZero(m.Environment) { // not required
+	if typeutils.IsZero(m.Environment) { // not required
 		return nil
 	}
 
@@ -123,7 +124,7 @@ func (m *InUseExternalBackend) validateEnvironment(formats strfmt.Registry) erro
 }
 
 func (m *InUseExternalBackend) validateProject(formats strfmt.Registry) error {
-	if swag.IsZero(m.Project) { // not required
+	if typeutils.IsZero(m.Project) { // not required
 		return nil
 	}
 
@@ -180,7 +181,7 @@ func (m *InUseExternalBackend) contextValidateComponent(ctx context.Context, for
 
 	if m.Component != nil {
 
-		if swag.IsZero(m.Component) { // not required
+		if typeutils.IsZero(m.Component) { // not required
 			return nil
 		}
 
@@ -205,7 +206,7 @@ func (m *InUseExternalBackend) contextValidateEnvironment(ctx context.Context, f
 
 	if m.Environment != nil {
 
-		if swag.IsZero(m.Environment) { // not required
+		if typeutils.IsZero(m.Environment) { // not required
 			return nil
 		}
 
@@ -230,7 +231,7 @@ func (m *InUseExternalBackend) contextValidateProject(ctx context.Context, forma
 
 	if m.Project != nil {
 
-		if swag.IsZero(m.Project) { // not required
+		if typeutils.IsZero(m.Project) { // not required
 			return nil
 		}
 
@@ -256,13 +257,13 @@ func (m *InUseExternalBackend) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InUseExternalBackend) UnmarshalBinary(b []byte) error {
 	var res InUseExternalBackend
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/in_use_project.go b/client/models/in_use_project.go
index 12f42348d..18d598664 100644
--- a/client/models/in_use_project.go
+++ b/client/models/in_use_project.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -88,13 +88,13 @@ func (m *InUseProject) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InUseProject) UnmarshalBinary(b []byte) error {
 	var res InUseProject
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/in_use_service_catalog_source.go b/client/models/in_use_service_catalog_source.go
index 9da231aae..78d9cad4e 100644
--- a/client/models/in_use_service_catalog_source.go
+++ b/client/models/in_use_service_catalog_source.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -88,13 +88,13 @@ func (m *InUseServiceCatalogSource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InUseServiceCatalogSource) UnmarshalBinary(b []byte) error {
 	var res InUseServiceCatalogSource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infra_import.go b/client/models/infra_import.go
index 9e16d521d..8ae99b06a 100644
--- a/client/models/infra_import.go
+++ b/client/models/infra_import.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -94,7 +95,7 @@ func (m *InfraImport) Validate(formats strfmt.Registry) error {
 }
 
 func (m *InfraImport) validateComponentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ComponentCanonical) { // not required
+	if typeutils.IsZero(m.ComponentCanonical) { // not required
 		return nil
 	}
 
@@ -114,7 +115,7 @@ func (m *InfraImport) validateComponentCanonical(formats strfmt.Registry) error
 }
 
 func (m *InfraImport) validateEnvironmentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentCanonical) { // not required
+	if typeutils.IsZero(m.EnvironmentCanonical) { // not required
 		return nil
 	}
 
@@ -152,7 +153,7 @@ func (m *InfraImport) validateLogs(formats strfmt.Registry) error {
 }
 
 func (m *InfraImport) validateProjectCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectCanonical) { // not required
+	if typeutils.IsZero(m.ProjectCanonical) { // not required
 		return nil
 	}
 
@@ -236,13 +237,13 @@ func (m *InfraImport) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfraImport) UnmarshalBinary(b []byte) error {
 	var res InfraImport
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infra_import_preset.go b/client/models/infra_import_preset.go
index 552e53e7f..9ddb17e6b 100644
--- a/client/models/infra_import_preset.go
+++ b/client/models/infra_import_preset.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *InfraImportPreset) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfraImportPreset) UnmarshalBinary(b []byte) error {
 	var res InfraImportPreset
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infra_import_resource.go b/client/models/infra_import_resource.go
index 8a13a9fe5..1c72063c6 100644
--- a/client/models/infra_import_resource.go
+++ b/client/models/infra_import_resource.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *InfraImportResource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfraImportResource) UnmarshalBinary(b []byte) error {
 	var res InfraImportResource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infra_import_resource_body.go b/client/models/infra_import_resource_body.go
index 27ae47fe4..f15f22d57 100644
--- a/client/models/infra_import_resource_body.go
+++ b/client/models/infra_import_resource_body.go
@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -110,7 +110,7 @@ func (m InfraImportResourceBody) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this infra import resource body
@@ -211,13 +211,13 @@ func (m *InfraImportResourceBody) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfraImportResourceBody) UnmarshalBinary(b []byte) error {
 	var res InfraImportResourceBody
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infra_import_resources_body.go b/client/models/infra_import_resources_body.go
index 77b73aa64..af95e92b2 100644
--- a/client/models/infra_import_resources_body.go
+++ b/client/models/infra_import_resources_body.go
@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -98,7 +98,7 @@ func (m InfraImportResourcesBody) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this infra import resources body
@@ -199,13 +199,13 @@ func (m *InfraImportResourcesBody) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfraImportResourcesBody) UnmarshalBinary(b []byte) error {
 	var res InfraImportResourcesBody
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infra_policies_validation_result.go b/client/models/infra_policies_validation_result.go
index 810671038..f000185ee 100644
--- a/client/models/infra_policies_validation_result.go
+++ b/client/models/infra_policies_validation_result.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // InfraPoliciesValidationResult Infra policies validation results.
@@ -52,12 +53,12 @@ func (m *InfraPoliciesValidationResult) Validate(formats strfmt.Registry) error
 }
 
 func (m *InfraPoliciesValidationResult) validateAdvisories(formats strfmt.Registry) error {
-	if swag.IsZero(m.Advisories) { // not required
+	if typeutils.IsZero(m.Advisories) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Advisories); i++ {
-		if swag.IsZero(m.Advisories[i]) { // not required
+		if typeutils.IsZero(m.Advisories[i]) { // not required
 			continue
 		}
 
@@ -82,12 +83,12 @@ func (m *InfraPoliciesValidationResult) validateAdvisories(formats strfmt.Regist
 }
 
 func (m *InfraPoliciesValidationResult) validateCriticals(formats strfmt.Registry) error {
-	if swag.IsZero(m.Criticals) { // not required
+	if typeutils.IsZero(m.Criticals) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Criticals); i++ {
-		if swag.IsZero(m.Criticals[i]) { // not required
+		if typeutils.IsZero(m.Criticals[i]) { // not required
 			continue
 		}
 
@@ -112,12 +113,12 @@ func (m *InfraPoliciesValidationResult) validateCriticals(formats strfmt.Registr
 }
 
 func (m *InfraPoliciesValidationResult) validateWarnings(formats strfmt.Registry) error {
-	if swag.IsZero(m.Warnings) { // not required
+	if typeutils.IsZero(m.Warnings) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Warnings); i++ {
-		if swag.IsZero(m.Warnings[i]) { // not required
+		if typeutils.IsZero(m.Warnings[i]) { // not required
 			continue
 		}
 
@@ -169,7 +170,7 @@ func (m *InfraPoliciesValidationResult) contextValidateAdvisories(ctx context.Co
 
 		if m.Advisories[i] != nil {
 
-			if swag.IsZero(m.Advisories[i]) { // not required
+			if typeutils.IsZero(m.Advisories[i]) { // not required
 				return nil
 			}
 
@@ -198,7 +199,7 @@ func (m *InfraPoliciesValidationResult) contextValidateCriticals(ctx context.Con
 
 		if m.Criticals[i] != nil {
 
-			if swag.IsZero(m.Criticals[i]) { // not required
+			if typeutils.IsZero(m.Criticals[i]) { // not required
 				return nil
 			}
 
@@ -227,7 +228,7 @@ func (m *InfraPoliciesValidationResult) contextValidateWarnings(ctx context.Cont
 
 		if m.Warnings[i] != nil {
 
-			if swag.IsZero(m.Warnings[i]) { // not required
+			if typeutils.IsZero(m.Warnings[i]) { // not required
 				return nil
 			}
 
@@ -255,13 +256,13 @@ func (m *InfraPoliciesValidationResult) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfraPoliciesValidationResult) UnmarshalBinary(b []byte) error {
 	var res InfraPoliciesValidationResult
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infra_policies_validation_result_item.go b/client/models/infra_policies_validation_result_item.go
index 6d131203f..979337a0a 100644
--- a/client/models/infra_policies_validation_result_item.go
+++ b/client/models/infra_policies_validation_result_item.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -106,13 +106,13 @@ func (m *InfraPoliciesValidationResultItem) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfraPoliciesValidationResultItem) UnmarshalBinary(b []byte) error {
 	var res InfraPoliciesValidationResultItem
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infra_policy.go b/client/models/infra_policy.go
index 31c70ad23..91c3e1d3e 100644
--- a/client/models/infra_policy.go
+++ b/client/models/infra_policy.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -208,7 +209,7 @@ func (m *InfraPolicy) validateName(formats strfmt.Registry) error {
 }
 
 func (m *InfraPolicy) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -303,7 +304,7 @@ func (m *InfraPolicy) contextValidateOwner(ctx context.Context, formats strfmt.R
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -329,13 +330,13 @@ func (m *InfraPolicy) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfraPolicy) UnmarshalBinary(b []byte) error {
 	var res InfraPolicy
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infrastructure.go b/client/models/infrastructure.go
index cfb3ec995..b409c819a 100644
--- a/client/models/infrastructure.go
+++ b/client/models/infrastructure.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -119,13 +119,13 @@ func (m *Infrastructure) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Infrastructure) UnmarshalBinary(b []byte) error {
 	var res Infrastructure
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infrastructure_graph.go b/client/models/infrastructure_graph.go
index 64f99578d..826f1e3b9 100644
--- a/client/models/infrastructure_graph.go
+++ b/client/models/infrastructure_graph.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -54,7 +55,7 @@ func (m *InfrastructureGraph) validateEdges(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Edges); i++ {
-		if swag.IsZero(m.Edges[i]) { // not required
+		if typeutils.IsZero(m.Edges[i]) { // not required
 			continue
 		}
 
@@ -85,7 +86,7 @@ func (m *InfrastructureGraph) validateNodes(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Nodes); i++ {
-		if swag.IsZero(m.Nodes[i]) { // not required
+		if typeutils.IsZero(m.Nodes[i]) { // not required
 			continue
 		}
 
@@ -133,7 +134,7 @@ func (m *InfrastructureGraph) contextValidateEdges(ctx context.Context, formats
 
 		if m.Edges[i] != nil {
 
-			if swag.IsZero(m.Edges[i]) { // not required
+			if typeutils.IsZero(m.Edges[i]) { // not required
 				return nil
 			}
 
@@ -162,7 +163,7 @@ func (m *InfrastructureGraph) contextValidateNodes(ctx context.Context, formats
 
 		if m.Nodes[i] != nil {
 
-			if swag.IsZero(m.Nodes[i]) { // not required
+			if typeutils.IsZero(m.Nodes[i]) { // not required
 				return nil
 			}
 
@@ -190,13 +191,13 @@ func (m *InfrastructureGraph) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfrastructureGraph) UnmarshalBinary(b []byte) error {
 	var res InfrastructureGraph
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infrastructure_graph_edge.go b/client/models/infrastructure_graph_edge.go
index 0d2685ef3..eb83b91d8 100644
--- a/client/models/infrastructure_graph_edge.go
+++ b/client/models/infrastructure_graph_edge.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -107,13 +107,13 @@ func (m *InfrastructureGraphEdge) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfrastructureGraphEdge) UnmarshalBinary(b []byte) error {
 	var res InfrastructureGraphEdge
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infrastructure_graph_node.go b/client/models/infrastructure_graph_node.go
index 9752a03f4..f1594cb04 100644
--- a/client/models/infrastructure_graph_node.go
+++ b/client/models/infrastructure_graph_node.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -156,13 +156,13 @@ func (m *InfrastructureGraphNode) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfrastructureGraphNode) UnmarshalBinary(b []byte) error {
 	var res InfrastructureGraphNode
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/infrastructure_resources_aggregation_item.go b/client/models/infrastructure_resources_aggregation_item.go
index c12610272..b567fdddc 100644
--- a/client/models/infrastructure_resources_aggregation_item.go
+++ b/client/models/infrastructure_resources_aggregation_item.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *InfrastructureResourcesAggregationItem) MarshalBinary() ([]byte, error)
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InfrastructureResourcesAggregationItem) UnmarshalBinary(b []byte) error {
 	var res InfrastructureResourcesAggregationItem
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/inventory_output.go b/client/models/inventory_output.go
index f67311f27..aa6ed6c7d 100644
--- a/client/models/inventory_output.go
+++ b/client/models/inventory_output.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -93,13 +93,13 @@ func (m *InventoryOutput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InventoryOutput) UnmarshalBinary(b []byte) error {
 	var res InventoryOutput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/inventory_resource.go b/client/models/inventory_resource.go
index 919b94d84..c470a7411 100644
--- a/client/models/inventory_resource.go
+++ b/client/models/inventory_resource.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -143,7 +144,7 @@ func (m *InventoryResource) Validate(formats strfmt.Registry) error {
 }
 
 func (m *InventoryResource) validateComponent(formats strfmt.Registry) error {
-	if swag.IsZero(m.Component) { // not required
+	if typeutils.IsZero(m.Component) { // not required
 		return nil
 	}
 
@@ -166,7 +167,7 @@ func (m *InventoryResource) validateComponent(formats strfmt.Registry) error {
 }
 
 func (m *InventoryResource) validateCPU(formats strfmt.Registry) error {
-	if swag.IsZero(m.CPU) { // not required
+	if typeutils.IsZero(m.CPU) { // not required
 		return nil
 	}
 
@@ -178,7 +179,7 @@ func (m *InventoryResource) validateCPU(formats strfmt.Registry) error {
 }
 
 func (m *InventoryResource) validateEnvironment(formats strfmt.Registry) error {
-	if swag.IsZero(m.Environment) { // not required
+	if typeutils.IsZero(m.Environment) { // not required
 		return nil
 	}
 
@@ -201,7 +202,7 @@ func (m *InventoryResource) validateEnvironment(formats strfmt.Registry) error {
 }
 
 func (m *InventoryResource) validateID(formats strfmt.Registry) error {
-	if swag.IsZero(m.ID) { // not required
+	if typeutils.IsZero(m.ID) { // not required
 		return nil
 	}
 
@@ -213,7 +214,7 @@ func (m *InventoryResource) validateID(formats strfmt.Registry) error {
 }
 
 func (m *InventoryResource) validateImage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Image) { // not required
+	if typeutils.IsZero(m.Image) { // not required
 		return nil
 	}
 
@@ -225,7 +226,7 @@ func (m *InventoryResource) validateImage(formats strfmt.Registry) error {
 }
 
 func (m *InventoryResource) validateMemory(formats strfmt.Registry) error {
-	if swag.IsZero(m.Memory) { // not required
+	if typeutils.IsZero(m.Memory) { // not required
 		return nil
 	}
 
@@ -246,7 +247,7 @@ func (m *InventoryResource) validateName(formats strfmt.Registry) error {
 }
 
 func (m *InventoryResource) validateProject(formats strfmt.Registry) error {
-	if swag.IsZero(m.Project) { // not required
+	if typeutils.IsZero(m.Project) { // not required
 		return nil
 	}
 
@@ -278,7 +279,7 @@ func (m *InventoryResource) validateProvider(formats strfmt.Registry) error {
 }
 
 func (m *InventoryResource) validateStorage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Storage) { // not required
+	if typeutils.IsZero(m.Storage) { // not required
 		return nil
 	}
 
@@ -324,7 +325,7 @@ func (m *InventoryResource) contextValidateComponent(ctx context.Context, format
 
 	if m.Component != nil {
 
-		if swag.IsZero(m.Component) { // not required
+		if typeutils.IsZero(m.Component) { // not required
 			return nil
 		}
 
@@ -349,7 +350,7 @@ func (m *InventoryResource) contextValidateEnvironment(ctx context.Context, form
 
 	if m.Environment != nil {
 
-		if swag.IsZero(m.Environment) { // not required
+		if typeutils.IsZero(m.Environment) { // not required
 			return nil
 		}
 
@@ -374,7 +375,7 @@ func (m *InventoryResource) contextValidateProject(ctx context.Context, formats
 
 	if m.Project != nil {
 
-		if swag.IsZero(m.Project) { // not required
+		if typeutils.IsZero(m.Project) { // not required
 			return nil
 		}
 
@@ -400,13 +401,13 @@ func (m *InventoryResource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InventoryResource) UnmarshalBinary(b []byte) error {
 	var res InventoryResource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/inventory_resource_label.go b/client/models/inventory_resource_label.go
index dc14b6407..60dd80f22 100644
--- a/client/models/inventory_resource_label.go
+++ b/client/models/inventory_resource_label.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -122,13 +122,13 @@ func (m *InventoryResourceLabel) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *InventoryResourceLabel) UnmarshalBinary(b []byte) error {
 	var res InventoryResourceLabel
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/job.go b/client/models/job.go
index 75af63d33..da53e2f47 100644
--- a/client/models/job.go
+++ b/client/models/job.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -107,7 +108,7 @@ func (m *Job) Validate(formats strfmt.Registry) error {
 }
 
 func (m *Job) validateFinishedBuild(formats strfmt.Registry) error {
-	if swag.IsZero(m.FinishedBuild) { // not required
+	if typeutils.IsZero(m.FinishedBuild) { // not required
 		return nil
 	}
 
@@ -139,12 +140,12 @@ func (m *Job) validateID(formats strfmt.Registry) error {
 }
 
 func (m *Job) validateInputs(formats strfmt.Registry) error {
-	if swag.IsZero(m.Inputs) { // not required
+	if typeutils.IsZero(m.Inputs) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Inputs); i++ {
-		if swag.IsZero(m.Inputs[i]) { // not required
+		if typeutils.IsZero(m.Inputs[i]) { // not required
 			continue
 		}
 
@@ -178,7 +179,7 @@ func (m *Job) validateName(formats strfmt.Registry) error {
 }
 
 func (m *Job) validateNextBuild(formats strfmt.Registry) error {
-	if swag.IsZero(m.NextBuild) { // not required
+	if typeutils.IsZero(m.NextBuild) { // not required
 		return nil
 	}
 
@@ -201,12 +202,12 @@ func (m *Job) validateNextBuild(formats strfmt.Registry) error {
 }
 
 func (m *Job) validateOutputs(formats strfmt.Registry) error {
-	if swag.IsZero(m.Outputs) { // not required
+	if typeutils.IsZero(m.Outputs) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Outputs); i++ {
-		if swag.IsZero(m.Outputs[i]) { // not required
+		if typeutils.IsZero(m.Outputs[i]) { // not required
 			continue
 		}
 
@@ -231,7 +232,7 @@ func (m *Job) validateOutputs(formats strfmt.Registry) error {
 }
 
 func (m *Job) validateTransitionBuild(formats strfmt.Registry) error {
-	if swag.IsZero(m.TransitionBuild) { // not required
+	if typeutils.IsZero(m.TransitionBuild) { // not required
 		return nil
 	}
 
@@ -287,7 +288,7 @@ func (m *Job) contextValidateFinishedBuild(ctx context.Context, formats strfmt.R
 
 	if m.FinishedBuild != nil {
 
-		if swag.IsZero(m.FinishedBuild) { // not required
+		if typeutils.IsZero(m.FinishedBuild) { // not required
 			return nil
 		}
 
@@ -314,7 +315,7 @@ func (m *Job) contextValidateInputs(ctx context.Context, formats strfmt.Registry
 
 		if m.Inputs[i] != nil {
 
-			if swag.IsZero(m.Inputs[i]) { // not required
+			if typeutils.IsZero(m.Inputs[i]) { // not required
 				return nil
 			}
 
@@ -341,7 +342,7 @@ func (m *Job) contextValidateNextBuild(ctx context.Context, formats strfmt.Regis
 
 	if m.NextBuild != nil {
 
-		if swag.IsZero(m.NextBuild) { // not required
+		if typeutils.IsZero(m.NextBuild) { // not required
 			return nil
 		}
 
@@ -368,7 +369,7 @@ func (m *Job) contextValidateOutputs(ctx context.Context, formats strfmt.Registr
 
 		if m.Outputs[i] != nil {
 
-			if swag.IsZero(m.Outputs[i]) { // not required
+			if typeutils.IsZero(m.Outputs[i]) { // not required
 				return nil
 			}
 
@@ -395,7 +396,7 @@ func (m *Job) contextValidateTransitionBuild(ctx context.Context, formats strfmt
 
 	if m.TransitionBuild != nil {
 
-		if swag.IsZero(m.TransitionBuild) { // not required
+		if typeutils.IsZero(m.TransitionBuild) { // not required
 			return nil
 		}
 
@@ -421,13 +422,13 @@ func (m *Job) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Job) UnmarshalBinary(b []byte) error {
 	var res Job
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/job_input.go b/client/models/job_input.go
index 110503b90..52f129eed 100644
--- a/client/models/job_input.go
+++ b/client/models/job_input.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -92,7 +93,7 @@ func (m *JobInput) validateTrigger(formats strfmt.Registry) error {
 }
 
 func (m *JobInput) validateVersion(formats strfmt.Registry) error {
-	if swag.IsZero(m.Version) { // not required
+	if typeutils.IsZero(m.Version) { // not required
 		return nil
 	}
 
@@ -132,7 +133,7 @@ func (m *JobInput) contextValidateVersion(ctx context.Context, formats strfmt.Re
 
 	if m.Version != nil {
 
-		if swag.IsZero(m.Version) { // not required
+		if typeutils.IsZero(m.Version) { // not required
 			return nil
 		}
 
@@ -158,13 +159,13 @@ func (m *JobInput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *JobInput) UnmarshalBinary(b []byte) error {
 	var res JobInput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/job_output.go b/client/models/job_output.go
index ed9254f67..3152883bd 100644
--- a/client/models/job_output.go
+++ b/client/models/job_output.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *JobOutput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *JobOutput) UnmarshalBinary(b []byte) error {
 	var res JobOutput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/k_p_i.go b/client/models/k_p_i.go
index 0a13ddf39..d7ec6c382 100644
--- a/client/models/k_p_i.go
+++ b/client/models/k_p_i.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -421,13 +421,13 @@ func (m *KPI) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *KPI) UnmarshalBinary(b []byte) error {
 	var res KPI
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/licence.go b/client/models/licence.go
index 3491e2138..f26c996cc 100644
--- a/client/models/licence.go
+++ b/client/models/licence.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -234,13 +234,13 @@ func (m *Licence) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Licence) UnmarshalBinary(b []byte) error {
 	var res Licence
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/log_source.go b/client/models/log_source.go
index 38d86be17..603757de7 100644
--- a/client/models/log_source.go
+++ b/client/models/log_source.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -61,13 +61,13 @@ func (m *LogSource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *LogSource) UnmarshalBinary(b []byte) error {
 	var res LogSource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/log_source_entry.go b/client/models/log_source_entry.go
index daae9c64b..7446080b1 100644
--- a/client/models/log_source_entry.go
+++ b/client/models/log_source_entry.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -100,13 +100,13 @@ func (m *LogSourceEntry) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *LogSourceEntry) UnmarshalBinary(b []byte) error {
 	var res LogSourceEntry
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/member_assignation.go b/client/models/member_assignation.go
index 9761cbee7..ff6bf830d 100644
--- a/client/models/member_assignation.go
+++ b/client/models/member_assignation.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -71,13 +71,13 @@ func (m *MemberAssignation) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *MemberAssignation) UnmarshalBinary(b []byte) error {
 	var res MemberAssignation
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/member_org.go b/client/models/member_org.go
index b3e7f4126..3ed0d5330 100644
--- a/client/models/member_org.go
+++ b/client/models/member_org.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -174,7 +175,7 @@ func (m *MemberOrg) validateCreatedAt(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateEmail(formats strfmt.Registry) error {
-	if swag.IsZero(m.Email) { // not required
+	if typeutils.IsZero(m.Email) { // not required
 		return nil
 	}
 
@@ -199,7 +200,7 @@ func (m *MemberOrg) validateID(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateInvitationEmail(formats strfmt.Registry) error {
-	if swag.IsZero(m.InvitationEmail) { // not required
+	if typeutils.IsZero(m.InvitationEmail) { // not required
 		return nil
 	}
 
@@ -211,7 +212,7 @@ func (m *MemberOrg) validateInvitationEmail(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateInvitationResentAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.InvitationResentAt) { // not required
+	if typeutils.IsZero(m.InvitationResentAt) { // not required
 		return nil
 	}
 
@@ -255,7 +256,7 @@ func (m *MemberOrg) validateInvitationStateEnum(path, location string, value str
 }
 
 func (m *MemberOrg) validateInvitationState(formats strfmt.Registry) error {
-	if swag.IsZero(m.InvitationState) { // not required
+	if typeutils.IsZero(m.InvitationState) { // not required
 		return nil
 	}
 
@@ -268,7 +269,7 @@ func (m *MemberOrg) validateInvitationState(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateInvitedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.InvitedAt) { // not required
+	if typeutils.IsZero(m.InvitedAt) { // not required
 		return nil
 	}
 
@@ -280,7 +281,7 @@ func (m *MemberOrg) validateInvitedAt(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateInvitedBy(formats strfmt.Registry) error {
-	if swag.IsZero(m.InvitedBy) { // not required
+	if typeutils.IsZero(m.InvitedBy) { // not required
 		return nil
 	}
 
@@ -303,7 +304,7 @@ func (m *MemberOrg) validateInvitedBy(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateLastLoginAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.LastLoginAt) { // not required
+	if typeutils.IsZero(m.LastLoginAt) { // not required
 		return nil
 	}
 
@@ -347,7 +348,7 @@ func (m *MemberOrg) validateLocaleEnum(path, location string, value string) erro
 }
 
 func (m *MemberOrg) validateLocale(formats strfmt.Registry) error {
-	if swag.IsZero(m.Locale) { // not required
+	if typeutils.IsZero(m.Locale) { // not required
 		return nil
 	}
 
@@ -360,7 +361,7 @@ func (m *MemberOrg) validateLocale(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validatePictureURL(formats strfmt.Registry) error {
-	if swag.IsZero(m.PictureURL) { // not required
+	if typeutils.IsZero(m.PictureURL) { // not required
 		return nil
 	}
 
@@ -396,12 +397,12 @@ func (m *MemberOrg) validateRole(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateTeams(formats strfmt.Registry) error {
-	if swag.IsZero(m.Teams) { // not required
+	if typeutils.IsZero(m.Teams) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Teams); i++ {
-		if swag.IsZero(m.Teams[i]) { // not required
+		if typeutils.IsZero(m.Teams[i]) { // not required
 			continue
 		}
 
@@ -426,7 +427,7 @@ func (m *MemberOrg) validateTeams(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -438,7 +439,7 @@ func (m *MemberOrg) validateUpdatedAt(formats strfmt.Registry) error {
 }
 
 func (m *MemberOrg) validateUsername(formats strfmt.Registry) error {
-	if swag.IsZero(m.Username) { // not required
+	if typeutils.IsZero(m.Username) { // not required
 		return nil
 	}
 
@@ -483,7 +484,7 @@ func (m *MemberOrg) contextValidateInvitedBy(ctx context.Context, formats strfmt
 
 	if m.InvitedBy != nil {
 
-		if swag.IsZero(m.InvitedBy) { // not required
+		if typeutils.IsZero(m.InvitedBy) { // not required
 			return nil
 		}
 
@@ -531,7 +532,7 @@ func (m *MemberOrg) contextValidateTeams(ctx context.Context, formats strfmt.Reg
 
 		if m.Teams[i] != nil {
 
-			if swag.IsZero(m.Teams[i]) { // not required
+			if typeutils.IsZero(m.Teams[i]) { // not required
 				return nil
 			}
 
@@ -559,13 +560,13 @@ func (m *MemberOrg) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *MemberOrg) UnmarshalBinary(b []byte) error {
 	var res MemberOrg
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/member_team.go b/client/models/member_team.go
index 9c9936aae..71274b6c3 100644
--- a/client/models/member_team.go
+++ b/client/models/member_team.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -142,7 +143,7 @@ func (m *MemberTeam) validateEmail(formats strfmt.Registry) error {
 }
 
 func (m *MemberTeam) validateFullName(formats strfmt.Registry) error {
-	if swag.IsZero(m.FullName) { // not required
+	if typeutils.IsZero(m.FullName) { // not required
 		return nil
 	}
 
@@ -171,7 +172,7 @@ func (m *MemberTeam) validateID(formats strfmt.Registry) error {
 }
 
 func (m *MemberTeam) validateInvitedBy(formats strfmt.Registry) error {
-	if swag.IsZero(m.InvitedBy) { // not required
+	if typeutils.IsZero(m.InvitedBy) { // not required
 		return nil
 	}
 
@@ -194,7 +195,7 @@ func (m *MemberTeam) validateInvitedBy(formats strfmt.Registry) error {
 }
 
 func (m *MemberTeam) validateLastLoginAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.LastLoginAt) { // not required
+	if typeutils.IsZero(m.LastLoginAt) { // not required
 		return nil
 	}
 
@@ -215,7 +216,7 @@ func (m *MemberTeam) validateMfaEnabled(formats strfmt.Registry) error {
 }
 
 func (m *MemberTeam) validatePictureURL(formats strfmt.Registry) error {
-	if swag.IsZero(m.PictureURL) { // not required
+	if typeutils.IsZero(m.PictureURL) { // not required
 		return nil
 	}
 
@@ -227,7 +228,7 @@ func (m *MemberTeam) validatePictureURL(formats strfmt.Registry) error {
 }
 
 func (m *MemberTeam) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -239,7 +240,7 @@ func (m *MemberTeam) validateUpdatedAt(formats strfmt.Registry) error {
 }
 
 func (m *MemberTeam) validateUsername(formats strfmt.Registry) error {
-	if swag.IsZero(m.Username) { // not required
+	if typeutils.IsZero(m.Username) { // not required
 		return nil
 	}
 
@@ -276,7 +277,7 @@ func (m *MemberTeam) contextValidateInvitedBy(ctx context.Context, formats strfm
 
 	if m.InvitedBy != nil {
 
-		if swag.IsZero(m.InvitedBy) { // not required
+		if typeutils.IsZero(m.InvitedBy) { // not required
 			return nil
 		}
 
@@ -302,13 +303,13 @@ func (m *MemberTeam) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *MemberTeam) UnmarshalBinary(b []byte) error {
 	var res MemberTeam
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/metadata_field.go b/client/models/metadata_field.go
index 2997dab68..b12ea1eb5 100644
--- a/client/models/metadata_field.go
+++ b/client/models/metadata_field.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *MetadataField) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *MetadataField) UnmarshalBinary(b []byte) error {
 	var res MetadataField
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/migrate_component.go b/client/models/migrate_component.go
index a033e6ed9..072c5ecb7 100644
--- a/client/models/migrate_component.go
+++ b/client/models/migrate_component.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -63,7 +64,7 @@ func (m *MigrateComponent) Validate(formats strfmt.Registry) error {
 }
 
 func (m *MigrateComponent) validateDestinationComponentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.DestinationComponentCanonical) { // not required
+	if typeutils.IsZero(m.DestinationComponentCanonical) { // not required
 		return nil
 	}
 
@@ -83,7 +84,7 @@ func (m *MigrateComponent) validateDestinationComponentCanonical(formats strfmt.
 }
 
 func (m *MigrateComponent) validateDestinationEnvironmentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.DestinationEnvironmentCanonical) { // not required
+	if typeutils.IsZero(m.DestinationEnvironmentCanonical) { // not required
 		return nil
 	}
 
@@ -103,7 +104,7 @@ func (m *MigrateComponent) validateDestinationEnvironmentCanonical(formats strfm
 }
 
 func (m *MigrateComponent) validateDestinationProjectCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.DestinationProjectCanonical) { // not required
+	if typeutils.IsZero(m.DestinationProjectCanonical) { // not required
 		return nil
 	}
 
@@ -132,13 +133,13 @@ func (m *MigrateComponent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *MigrateComponent) UnmarshalBinary(b []byte) error {
 	var res MigrateComponent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_a_w_s_marketplace_user_account.go b/client/models/new_a_w_s_marketplace_user_account.go
index d5d688f60..512f82b2b 100644
--- a/client/models/new_a_w_s_marketplace_user_account.go
+++ b/client/models/new_a_w_s_marketplace_user_account.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -108,7 +109,7 @@ func (m *NewAWSMarketplaceUserAccount) validateAwsMarketplaceToken(formats strfm
 }
 
 func (m *NewAWSMarketplaceUserAccount) validateCountryCode(formats strfmt.Registry) error {
-	if swag.IsZero(m.CountryCode) { // not required
+	if typeutils.IsZero(m.CountryCode) { // not required
 		return nil
 	}
 
@@ -182,7 +183,7 @@ func (m *NewAWSMarketplaceUserAccount) validateLocaleEnum(path, location string,
 }
 
 func (m *NewAWSMarketplaceUserAccount) validateLocale(formats strfmt.Registry) error {
-	if swag.IsZero(m.Locale) { // not required
+	if typeutils.IsZero(m.Locale) { // not required
 		return nil
 	}
 
@@ -212,7 +213,7 @@ func (m *NewAWSMarketplaceUserAccount) validatePassword(formats strfmt.Registry)
 }
 
 func (m *NewAWSMarketplaceUserAccount) validateUsername(formats strfmt.Registry) error {
-	if swag.IsZero(m.Username) { // not required
+	if typeutils.IsZero(m.Username) { // not required
 		return nil
 	}
 
@@ -241,13 +242,13 @@ func (m *NewAWSMarketplaceUserAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewAWSMarketplaceUserAccount) UnmarshalBinary(b []byte) error {
 	var res NewAWSMarketplaceUserAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_and_configured_component.go b/client/models/new_and_configured_component.go
index f4501844f..f203b1d3a 100644
--- a/client/models/new_and_configured_component.go
+++ b/client/models/new_and_configured_component.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -91,7 +92,7 @@ func (m *NewAndConfiguredComponent) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewAndConfiguredComponent) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -111,7 +112,7 @@ func (m *NewAndConfiguredComponent) validateCanonical(formats strfmt.Registry) e
 }
 
 func (m *NewAndConfiguredComponent) validateCloudProviderCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudProviderCanonical) { // not required
+	if typeutils.IsZero(m.CloudProviderCanonical) { // not required
 		return nil
 	}
 
@@ -144,7 +145,7 @@ func (m *NewAndConfiguredComponent) validateName(formats strfmt.Registry) error
 }
 
 func (m *NewAndConfiguredComponent) validateServiceCatalogSourceVersionID(formats strfmt.Registry) error {
-	if swag.IsZero(m.ServiceCatalogSourceVersionID) { // not required
+	if typeutils.IsZero(m.ServiceCatalogSourceVersionID) { // not required
 		return nil
 	}
 
@@ -156,7 +157,7 @@ func (m *NewAndConfiguredComponent) validateServiceCatalogSourceVersionID(format
 }
 
 func (m *NewAndConfiguredComponent) validateUseCase(formats strfmt.Registry) error {
-	if swag.IsZero(m.UseCase) { // not required
+	if typeutils.IsZero(m.UseCase) { // not required
 		return nil
 	}
 
@@ -176,7 +177,7 @@ func (m *NewAndConfiguredComponent) validateUseCase(formats strfmt.Registry) err
 }
 
 func (m *NewAndConfiguredComponent) validateVars(formats strfmt.Registry) error {
-	if swag.IsZero(m.Vars) { // not required
+	if typeutils.IsZero(m.Vars) { // not required
 		return nil
 	}
 
@@ -214,7 +215,7 @@ func (m *NewAndConfiguredComponent) ContextValidate(ctx context.Context, formats
 
 func (m *NewAndConfiguredComponent) contextValidateVars(ctx context.Context, formats strfmt.Registry) error {
 
-	if swag.IsZero(m.Vars) { // not required
+	if typeutils.IsZero(m.Vars) { // not required
 		return nil
 	}
 
@@ -239,13 +240,13 @@ func (m *NewAndConfiguredComponent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewAndConfiguredComponent) UnmarshalBinary(b []byte) error {
 	var res NewAndConfiguredComponent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_api_key.go b/client/models/new_api_key.go
index 88eb2d6d6..7d118c0e0 100644
--- a/client/models/new_api_key.go
+++ b/client/models/new_api_key.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -68,7 +69,7 @@ func (m *NewAPIKey) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewAPIKey) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -107,7 +108,7 @@ func (m *NewAPIKey) validateRules(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Rules); i++ {
-		if swag.IsZero(m.Rules[i]) { // not required
+		if typeutils.IsZero(m.Rules[i]) { // not required
 			continue
 		}
 
@@ -151,7 +152,7 @@ func (m *NewAPIKey) contextValidateRules(ctx context.Context, formats strfmt.Reg
 
 		if m.Rules[i] != nil {
 
-			if swag.IsZero(m.Rules[i]) { // not required
+			if typeutils.IsZero(m.Rules[i]) { // not required
 				return nil
 			}
 
@@ -179,13 +180,13 @@ func (m *NewAPIKey) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewAPIKey) UnmarshalBinary(b []byte) error {
 	var res NewAPIKey
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_appearance.go b/client/models/new_appearance.go
index f1da8bece..979e4bdcb 100644
--- a/client/models/new_appearance.go
+++ b/client/models/new_appearance.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -254,13 +254,13 @@ func (m *NewAppearance) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewAppearance) UnmarshalBinary(b []byte) error {
 	var res NewAppearance
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
@@ -374,13 +374,13 @@ func (m *NewAppearanceColor) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewAppearanceColor) UnmarshalBinary(b []byte) error {
 	var res NewAppearanceColor
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_cloud_account.go b/client/models/new_cloud_account.go
index 496079525..28621194b 100644
--- a/client/models/new_cloud_account.go
+++ b/client/models/new_cloud_account.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -79,7 +80,7 @@ func (m *NewCloudAccount) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewCloudAccount) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -163,13 +164,13 @@ func (m *NewCloudAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewCloudAccount) UnmarshalBinary(b []byte) error {
 	var res NewCloudAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_cloud_account_credential.go b/client/models/new_cloud_account_credential.go
index 262b57e70..e168d662f 100644
--- a/client/models/new_cloud_account_credential.go
+++ b/client/models/new_cloud_account_credential.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,7 +79,7 @@ func (m *NewCloudAccountCredential) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewCloudAccountCredential) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -107,7 +108,7 @@ func (m *NewCloudAccountCredential) validateName(formats strfmt.Registry) error
 }
 
 func (m *NewCloudAccountCredential) validatePath(formats strfmt.Registry) error {
-	if swag.IsZero(m.Path) { // not required
+	if typeutils.IsZero(m.Path) { // not required
 		return nil
 	}
 
@@ -249,13 +250,13 @@ func (m *NewCloudAccountCredential) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewCloudAccountCredential) UnmarshalBinary(b []byte) error {
 	var res NewCloudAccountCredential
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_cloud_account_with_credentials.go b/client/models/new_cloud_account_with_credentials.go
index fb89a0013..a2bc047db 100644
--- a/client/models/new_cloud_account_with_credentials.go
+++ b/client/models/new_cloud_account_with_credentials.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -119,7 +120,7 @@ func (m *NewCloudAccountWithCredentials) validateAccessCredential(formats strfmt
 }
 
 func (m *NewCloudAccountWithCredentials) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -160,7 +161,7 @@ func (m *NewCloudAccountWithCredentials) validateCloudProvider(formats strfmt.Re
 }
 
 func (m *NewCloudAccountWithCredentials) validateFinopsConfig(formats strfmt.Registry) error {
-	if swag.IsZero(m.FinopsConfig) { // not required
+	if typeutils.IsZero(m.FinopsConfig) { // not required
 		return nil
 	}
 
@@ -183,7 +184,7 @@ func (m *NewCloudAccountWithCredentials) validateFinopsConfig(formats strfmt.Reg
 }
 
 func (m *NewCloudAccountWithCredentials) validateFinopsCredential(formats strfmt.Registry) error {
-	if swag.IsZero(m.FinopsCredential) { // not required
+	if typeutils.IsZero(m.FinopsCredential) { // not required
 		return nil
 	}
 
@@ -269,7 +270,7 @@ func (m *NewCloudAccountWithCredentials) contextValidateFinopsConfig(ctx context
 
 	if m.FinopsConfig != nil {
 
-		if swag.IsZero(m.FinopsConfig) { // not required
+		if typeutils.IsZero(m.FinopsConfig) { // not required
 			return nil
 		}
 
@@ -294,7 +295,7 @@ func (m *NewCloudAccountWithCredentials) contextValidateFinopsCredential(ctx con
 
 	if m.FinopsCredential != nil {
 
-		if swag.IsZero(m.FinopsCredential) { // not required
+		if typeutils.IsZero(m.FinopsCredential) { // not required
 			return nil
 		}
 
@@ -320,13 +321,13 @@ func (m *NewCloudAccountWithCredentials) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewCloudAccountWithCredentials) UnmarshalBinary(b []byte) error {
 	var res NewCloudAccountWithCredentials
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_cloud_cost_management_account.go b/client/models/new_cloud_cost_management_account.go
index 51c48b9cd..102f4eefc 100644
--- a/client/models/new_cloud_cost_management_account.go
+++ b/client/models/new_cloud_cost_management_account.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -53,7 +54,7 @@ func (m *NewCloudCostManagementAccount) Validate(formats strfmt.Registry) error
 }
 
 func (m *NewCloudCostManagementAccount) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -136,13 +137,13 @@ func (m *NewCloudCostManagementAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewCloudCostManagementAccount) UnmarshalBinary(b []byte) error {
 	var res NewCloudCostManagementAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_component.go b/client/models/new_component.go
index dbc8bbde0..61689dbf1 100644
--- a/client/models/new_component.go
+++ b/client/models/new_component.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,7 +79,7 @@ func (m *NewComponent) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewComponent) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -98,7 +99,7 @@ func (m *NewComponent) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *NewComponent) validateCloudProviderCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudProviderCanonical) { // not required
+	if typeutils.IsZero(m.CloudProviderCanonical) { // not required
 		return nil
 	}
 
@@ -140,7 +141,7 @@ func (m *NewComponent) validateServiceCatalogRef(formats strfmt.Registry) error
 }
 
 func (m *NewComponent) validateServiceCatalogSourceVersionID(formats strfmt.Registry) error {
-	if swag.IsZero(m.ServiceCatalogSourceVersionID) { // not required
+	if typeutils.IsZero(m.ServiceCatalogSourceVersionID) { // not required
 		return nil
 	}
 
@@ -161,13 +162,13 @@ func (m *NewComponent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewComponent) UnmarshalBinary(b []byte) error {
 	var res NewComponent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_config_repository.go b/client/models/new_config_repository.go
index d1fc319c8..8f0cf3533 100644
--- a/client/models/new_config_repository.go
+++ b/client/models/new_config_repository.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -91,7 +92,7 @@ func (m *NewConfigRepository) validateBranch(formats strfmt.Registry) error {
 }
 
 func (m *NewConfigRepository) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -172,13 +173,13 @@ func (m *NewConfigRepository) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewConfigRepository) UnmarshalBinary(b []byte) error {
 	var res NewConfigRepository
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_credential.go b/client/models/new_credential.go
index 3b050763b..ada80c5df 100644
--- a/client/models/new_credential.go
+++ b/client/models/new_credential.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -85,7 +86,7 @@ func (m *NewCredential) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewCredential) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -257,13 +258,13 @@ func (m *NewCredential) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewCredential) UnmarshalBinary(b []byte) error {
 	var res NewCredential
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_environment.go b/client/models/new_environment.go
index 0064b2b18..693421110 100644
--- a/client/models/new_environment.go
+++ b/client/models/new_environment.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -45,10 +46,14 @@ type NewEnvironment struct {
 	//
 	Owner string `json:"owner,omitempty"`
 
-	// type
+	// Canonical of the environment type. When omitted, it is auto-detected
+	// from the environment canonical by matching the keywords
+	// `production`/`prod`/`prd`/`live`, `pre-prod`/`preprod`/`staging`/`stage`/`stg`/`uat`,
+	// `development`/`dev`/`test`/`qa`/`sandbox`, or `preview`/`prev`.
+	// When no keyword is recognised, it defaults to `production`.
+	//
 	// Example: production
-	// Required: true
-	Type *string `json:"type"`
+	Type string `json:"type,omitempty"`
 
 	// Environment variables to attach to the new environment. Keys must not contain dots and must include at least one alphanumeric character. Omit or pass an empty array to create the environment without variables.
 	Variables []*EnvironmentVariableItem `json:"variables"`
@@ -74,10 +79,6 @@ func (m *NewEnvironment) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
-	if err := m.validateType(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateVariables(formats); err != nil {
 		res = append(res, err)
 	}
@@ -89,7 +90,7 @@ func (m *NewEnvironment) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewEnvironment) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -109,7 +110,7 @@ func (m *NewEnvironment) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *NewEnvironment) validateCloudAccountCanonicals(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudAccountCanonicals) { // not required
+	if typeutils.IsZero(m.CloudAccountCanonicals) { // not required
 		return nil
 	}
 
@@ -129,7 +130,7 @@ func (m *NewEnvironment) validateCloudAccountCanonicals(formats strfmt.Registry)
 }
 
 func (m *NewEnvironment) validateDescription(formats strfmt.Registry) error {
-	if swag.IsZero(m.Description) { // not required
+	if typeutils.IsZero(m.Description) { // not required
 		return nil
 	}
 
@@ -157,22 +158,13 @@ func (m *NewEnvironment) validateName(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *NewEnvironment) validateType(formats strfmt.Registry) error {
-
-	if err := validate.Required("type", "body", m.Type); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (m *NewEnvironment) validateVariables(formats strfmt.Registry) error {
-	if swag.IsZero(m.Variables) { // not required
+	if typeutils.IsZero(m.Variables) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Variables); i++ {
-		if swag.IsZero(m.Variables[i]) { // not required
+		if typeutils.IsZero(m.Variables[i]) { // not required
 			continue
 		}
 
@@ -216,7 +208,7 @@ func (m *NewEnvironment) contextValidateVariables(ctx context.Context, formats s
 
 		if m.Variables[i] != nil {
 
-			if swag.IsZero(m.Variables[i]) { // not required
+			if typeutils.IsZero(m.Variables[i]) { // not required
 				return nil
 			}
 
@@ -244,13 +236,13 @@ func (m *NewEnvironment) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewEnvironment) UnmarshalBinary(b []byte) error {
 	var res NewEnvironment
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_environment_type.go b/client/models/new_environment_type.go
index 3d042b3f7..6188cbc5b 100644
--- a/client/models/new_environment_type.go
+++ b/client/models/new_environment_type.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -59,7 +60,7 @@ func (m *NewEnvironmentType) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewEnvironmentType) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -118,13 +119,13 @@ func (m *NewEnvironmentType) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewEnvironmentType) UnmarshalBinary(b []byte) error {
 	var res NewEnvironmentType
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_event.go b/client/models/new_event.go
index 287a38ec2..56e5acba0 100644
--- a/client/models/new_event.go
+++ b/client/models/new_event.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -95,7 +96,7 @@ func (m *NewEvent) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewEvent) validateColor(formats strfmt.Registry) error {
-	if swag.IsZero(m.Color) { // not required
+	if typeutils.IsZero(m.Color) { // not required
 		return nil
 	}
 
@@ -115,7 +116,7 @@ func (m *NewEvent) validateColor(formats strfmt.Registry) error {
 }
 
 func (m *NewEvent) validateIcon(formats strfmt.Registry) error {
-	if swag.IsZero(m.Icon) { // not required
+	if typeutils.IsZero(m.Icon) { // not required
 		return nil
 	}
 
@@ -195,7 +196,7 @@ func (m *NewEvent) validateTags(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Tags); i++ {
-		if swag.IsZero(m.Tags[i]) { // not required
+		if typeutils.IsZero(m.Tags[i]) { // not required
 			continue
 		}
 
@@ -301,7 +302,7 @@ func (m *NewEvent) contextValidateTags(ctx context.Context, formats strfmt.Regis
 
 		if m.Tags[i] != nil {
 
-			if swag.IsZero(m.Tags[i]) { // not required
+			if typeutils.IsZero(m.Tags[i]) { // not required
 				return nil
 			}
 
@@ -329,13 +330,13 @@ func (m *NewEvent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewEvent) UnmarshalBinary(b []byte) error {
 	var res NewEvent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_external_backend.go b/client/models/new_external_backend.go
index 893516c23..fea7ec1b2 100644
--- a/client/models/new_external_backend.go
+++ b/client/models/new_external_backend.go
@@ -12,7 +12,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -170,7 +171,7 @@ func (m NewExternalBackend) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this new external backend
@@ -208,7 +209,7 @@ func (m *NewExternalBackend) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewExternalBackend) validateComponentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ComponentCanonical) { // not required
+	if typeutils.IsZero(m.ComponentCanonical) { // not required
 		return nil
 	}
 
@@ -250,7 +251,7 @@ func (m *NewExternalBackend) validateConfiguration(formats strfmt.Registry) erro
 }
 
 func (m *NewExternalBackend) validateCredentialCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CredentialCanonical) { // not required
+	if typeutils.IsZero(m.CredentialCanonical) { // not required
 		return nil
 	}
 
@@ -270,7 +271,7 @@ func (m *NewExternalBackend) validateCredentialCanonical(formats strfmt.Registry
 }
 
 func (m *NewExternalBackend) validateEnvironmentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentCanonical) { // not required
+	if typeutils.IsZero(m.EnvironmentCanonical) { // not required
 		return nil
 	}
 
@@ -290,7 +291,7 @@ func (m *NewExternalBackend) validateEnvironmentCanonical(formats strfmt.Registr
 }
 
 func (m *NewExternalBackend) validateProjectCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectCanonical) { // not required
+	if typeutils.IsZero(m.ProjectCanonical) { // not required
 		return nil
 	}
 
@@ -395,13 +396,13 @@ func (m *NewExternalBackend) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewExternalBackend) UnmarshalBinary(b []byte) error {
 	var res NewExternalBackend
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_infra_import.go b/client/models/new_infra_import.go
index bb545150d..eac4778cf 100644
--- a/client/models/new_infra_import.go
+++ b/client/models/new_infra_import.go
@@ -12,7 +12,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -208,7 +209,7 @@ func (m NewInfraImport) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this new infra import
@@ -250,7 +251,7 @@ func (m *NewInfraImport) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewInfraImport) validateComponent(formats strfmt.Registry) error {
-	if swag.IsZero(m.Component) { // not required
+	if typeutils.IsZero(m.Component) { // not required
 		return nil
 	}
 
@@ -316,7 +317,7 @@ func (m *NewInfraImport) validateCredentialCanonical(formats strfmt.Registry) er
 }
 
 func (m *NewInfraImport) validateEnvironment(formats strfmt.Registry) error {
-	if swag.IsZero(m.Environment) { // not required
+	if typeutils.IsZero(m.Environment) { // not required
 		return nil
 	}
 
@@ -339,7 +340,7 @@ func (m *NewInfraImport) validateEnvironment(formats strfmt.Registry) error {
 }
 
 func (m *NewInfraImport) validateExternalBackend(formats strfmt.Registry) error {
-	if swag.IsZero(m.ExternalBackend) { // not required
+	if typeutils.IsZero(m.ExternalBackend) { // not required
 		return nil
 	}
 
@@ -362,7 +363,7 @@ func (m *NewInfraImport) validateExternalBackend(formats strfmt.Registry) error
 }
 
 func (m *NewInfraImport) validateProject(formats strfmt.Registry) error {
-	if swag.IsZero(m.Project) { // not required
+	if typeutils.IsZero(m.Project) { // not required
 		return nil
 	}
 
@@ -446,7 +447,7 @@ func (m *NewInfraImport) contextValidateComponent(ctx context.Context, formats s
 
 	if m.Component != nil {
 
-		if swag.IsZero(m.Component) { // not required
+		if typeutils.IsZero(m.Component) { // not required
 			return nil
 		}
 
@@ -489,7 +490,7 @@ func (m *NewInfraImport) contextValidateEnvironment(ctx context.Context, formats
 
 	if m.Environment != nil {
 
-		if swag.IsZero(m.Environment) { // not required
+		if typeutils.IsZero(m.Environment) { // not required
 			return nil
 		}
 
@@ -514,7 +515,7 @@ func (m *NewInfraImport) contextValidateExternalBackend(ctx context.Context, for
 
 	if m.ExternalBackend != nil {
 
-		if swag.IsZero(m.ExternalBackend) { // not required
+		if typeutils.IsZero(m.ExternalBackend) { // not required
 			return nil
 		}
 
@@ -539,7 +540,7 @@ func (m *NewInfraImport) contextValidateProject(ctx context.Context, formats str
 
 	if m.Project != nil {
 
-		if swag.IsZero(m.Project) { // not required
+		if typeutils.IsZero(m.Project) { // not required
 			return nil
 		}
 
@@ -586,13 +587,13 @@ func (m *NewInfraImport) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewInfraImport) UnmarshalBinary(b []byte) error {
 	var res NewInfraImport
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_infra_import_component.go b/client/models/new_infra_import_component.go
index 645095c34..321737e1c 100644
--- a/client/models/new_infra_import_component.go
+++ b/client/models/new_infra_import_component.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -60,7 +61,7 @@ func (m *NewInfraImportComponent) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewInfraImportComponent) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -123,13 +124,13 @@ func (m *NewInfraImportComponent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewInfraImportComponent) UnmarshalBinary(b []byte) error {
 	var res NewInfraImportComponent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_infra_import_external_backend.go b/client/models/new_infra_import_external_backend.go
index 6dc4aa3d1..e7d0a853b 100644
--- a/client/models/new_infra_import_external_backend.go
+++ b/client/models/new_infra_import_external_backend.go
@@ -12,7 +12,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -97,7 +98,7 @@ func (m NewInfraImportExternalBackend) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this new infra import external backend
@@ -141,7 +142,7 @@ func (m *NewInfraImportExternalBackend) validateConfiguration(formats strfmt.Reg
 }
 
 func (m *NewInfraImportExternalBackend) validateCredentialCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CredentialCanonical) { // not required
+	if typeutils.IsZero(m.CredentialCanonical) { // not required
 		return nil
 	}
 
@@ -197,13 +198,13 @@ func (m *NewInfraImportExternalBackend) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewInfraImportExternalBackend) UnmarshalBinary(b []byte) error {
 	var res NewInfraImportExternalBackend
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_infra_import_project.go b/client/models/new_infra_import_project.go
index 6b56ad7cc..ea40a900c 100644
--- a/client/models/new_infra_import_project.go
+++ b/client/models/new_infra_import_project.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -65,7 +66,7 @@ func (m *NewInfraImportProject) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewInfraImportProject) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -128,13 +129,13 @@ func (m *NewInfraImportProject) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewInfraImportProject) UnmarshalBinary(b []byte) error {
 	var res NewInfraImportProject
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_infra_policy.go b/client/models/new_infra_policy.go
index e6d425ff1..2e7e7dd41 100644
--- a/client/models/new_infra_policy.go
+++ b/client/models/new_infra_policy.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -95,7 +96,7 @@ func (m *NewInfraPolicy) validateBody(formats strfmt.Registry) error {
 }
 
 func (m *NewInfraPolicy) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -204,13 +205,13 @@ func (m *NewInfraPolicy) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewInfraPolicy) UnmarshalBinary(b []byte) error {
 	var res NewInfraPolicy
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_inventory_resource.go b/client/models/new_inventory_resource.go
index 18376147f..9f5851dad 100644
--- a/client/models/new_inventory_resource.go
+++ b/client/models/new_inventory_resource.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -91,7 +92,7 @@ func (m *NewInventoryResource) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewInventoryResource) validateCPU(formats strfmt.Registry) error {
-	if swag.IsZero(m.CPU) { // not required
+	if typeutils.IsZero(m.CPU) { // not required
 		return nil
 	}
 
@@ -112,7 +113,7 @@ func (m *NewInventoryResource) validateLabel(formats strfmt.Registry) error {
 }
 
 func (m *NewInventoryResource) validateMemory(formats strfmt.Registry) error {
-	if swag.IsZero(m.Memory) { // not required
+	if typeutils.IsZero(m.Memory) { // not required
 		return nil
 	}
 
@@ -142,7 +143,7 @@ func (m *NewInventoryResource) validateProvider(formats strfmt.Registry) error {
 }
 
 func (m *NewInventoryResource) validateStorage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Storage) { // not required
+	if typeutils.IsZero(m.Storage) { // not required
 		return nil
 	}
 
@@ -172,13 +173,13 @@ func (m *NewInventoryResource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewInventoryResource) UnmarshalBinary(b []byte) error {
 	var res NewInventoryResource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_k_p_i.go b/client/models/new_k_p_i.go
index b46410f31..da8205208 100644
--- a/client/models/new_k_p_i.go
+++ b/client/models/new_k_p_i.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -81,7 +82,7 @@ func (m *NewKPI) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewKPI) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -233,13 +234,13 @@ func (m *NewKPI) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewKPI) UnmarshalBinary(b []byte) error {
 	var res NewKPI
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_licence.go b/client/models/new_licence.go
index 73c2e231f..981dd42fd 100644
--- a/client/models/new_licence.go
+++ b/client/models/new_licence.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *NewLicence) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewLicence) UnmarshalBinary(b []byte) error {
 	var res NewLicence
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_member_invitation.go b/client/models/new_member_invitation.go
index b302dd630..c1d46d670 100644
--- a/client/models/new_member_invitation.go
+++ b/client/models/new_member_invitation.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -93,13 +93,13 @@ func (m *NewMemberInvitation) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewMemberInvitation) UnmarshalBinary(b []byte) error {
 	var res NewMemberInvitation
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_o_auth_user.go b/client/models/new_o_auth_user.go
index 20a114892..1ee20d258 100644
--- a/client/models/new_o_auth_user.go
+++ b/client/models/new_o_auth_user.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -106,7 +107,7 @@ func (m *NewOAuthUser) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewOAuthUser) validateCountryCode(formats strfmt.Registry) error {
-	if swag.IsZero(m.CountryCode) { // not required
+	if typeutils.IsZero(m.CountryCode) { // not required
 		return nil
 	}
 
@@ -148,7 +149,7 @@ func (m *NewOAuthUser) validateFullName(formats strfmt.Registry) error {
 }
 
 func (m *NewOAuthUser) validateInvitationToken(formats strfmt.Registry) error {
-	if swag.IsZero(m.InvitationToken) { // not required
+	if typeutils.IsZero(m.InvitationToken) { // not required
 		return nil
 	}
 
@@ -192,7 +193,7 @@ func (m *NewOAuthUser) validateLocaleEnum(path, location string, value string) e
 }
 
 func (m *NewOAuthUser) validateLocale(formats strfmt.Registry) error {
-	if swag.IsZero(m.Locale) { // not required
+	if typeutils.IsZero(m.Locale) { // not required
 		return nil
 	}
 
@@ -205,7 +206,7 @@ func (m *NewOAuthUser) validateLocale(formats strfmt.Registry) error {
 }
 
 func (m *NewOAuthUser) validatePictureURL(formats strfmt.Registry) error {
-	if swag.IsZero(m.PictureURL) { // not required
+	if typeutils.IsZero(m.PictureURL) { // not required
 		return nil
 	}
 
@@ -226,7 +227,7 @@ func (m *NewOAuthUser) validateSocialID(formats strfmt.Registry) error {
 }
 
 func (m *NewOAuthUser) validateUsername(formats strfmt.Registry) error {
-	if swag.IsZero(m.Username) { // not required
+	if typeutils.IsZero(m.Username) { // not required
 		return nil
 	}
 
@@ -255,13 +256,13 @@ func (m *NewOAuthUser) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewOAuthUser) UnmarshalBinary(b []byte) error {
 	var res NewOAuthUser
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_organization.go b/client/models/new_organization.go
index 6e8411ffe..b9bb10b0a 100644
--- a/client/models/new_organization.go
+++ b/client/models/new_organization.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -49,7 +50,7 @@ func (m *NewOrganization) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewOrganization) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -91,13 +92,13 @@ func (m *NewOrganization) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewOrganization) UnmarshalBinary(b []byte) error {
 	var res NewOrganization
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_pipeline.go b/client/models/new_pipeline.go
index 81e9699eb..353cea4bc 100644
--- a/client/models/new_pipeline.go
+++ b/client/models/new_pipeline.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -80,13 +80,13 @@ func (m *NewPipeline) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewPipeline) UnmarshalBinary(b []byte) error {
 	var res NewPipeline
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_plugin.go b/client/models/new_plugin.go
index b4250f149..e3db3a7d0 100644
--- a/client/models/new_plugin.go
+++ b/client/models/new_plugin.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *NewPlugin) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewPlugin) UnmarshalBinary(b []byte) error {
 	var res NewPlugin
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_plugin_install.go b/client/models/new_plugin_install.go
index 0b54dbf21..02dcdfa68 100644
--- a/client/models/new_plugin_install.go
+++ b/client/models/new_plugin_install.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *NewPluginInstall) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewPluginInstall) UnmarshalBinary(b []byte) error {
 	var res NewPluginInstall
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_plugin_manager.go b/client/models/new_plugin_manager.go
index bc63e46ae..bb401672e 100644
--- a/client/models/new_plugin_manager.go
+++ b/client/models/new_plugin_manager.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -81,13 +81,13 @@ func (m *NewPluginManager) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewPluginManager) UnmarshalBinary(b []byte) error {
 	var res NewPluginManager
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_plugin_registry.go b/client/models/new_plugin_registry.go
index 04e6a5ad2..feb6d2e80 100644
--- a/client/models/new_plugin_registry.go
+++ b/client/models/new_plugin_registry.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,13 +78,13 @@ func (m *NewPluginRegistry) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewPluginRegistry) UnmarshalBinary(b []byte) error {
 	var res NewPluginRegistry
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_plugin_version.go b/client/models/new_plugin_version.go
index 1c546114f..cf60bfe0d 100644
--- a/client/models/new_plugin_version.go
+++ b/client/models/new_plugin_version.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *NewPluginVersion) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewPluginVersion) UnmarshalBinary(b []byte) error {
 	var res NewPluginVersion
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_project.go b/client/models/new_project.go
index e5a561f6a..9a45d4d52 100644
--- a/client/models/new_project.go
+++ b/client/models/new_project.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -87,7 +88,7 @@ func (m *NewProject) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewProject) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -107,7 +108,7 @@ func (m *NewProject) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *NewProject) validateColor(formats strfmt.Registry) error {
-	if swag.IsZero(m.Color) { // not required
+	if typeutils.IsZero(m.Color) { // not required
 		return nil
 	}
 
@@ -140,7 +141,7 @@ func (m *NewProject) validateConfigRepositoryCanonical(formats strfmt.Registry)
 }
 
 func (m *NewProject) validateIcon(formats strfmt.Registry) error {
-	if swag.IsZero(m.Icon) { // not required
+	if typeutils.IsZero(m.Icon) { // not required
 		return nil
 	}
 
@@ -174,13 +175,13 @@ func (m *NewProject) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewProject) UnmarshalBinary(b []byte) error {
 	var res NewProject
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_role.go b/client/models/new_role.go
index 1dcc01722..00b76093d 100644
--- a/client/models/new_role.go
+++ b/client/models/new_role.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -63,7 +64,7 @@ func (m *NewRole) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewRole) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -106,7 +107,7 @@ func (m *NewRole) validateRules(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Rules); i++ {
-		if swag.IsZero(m.Rules[i]) { // not required
+		if typeutils.IsZero(m.Rules[i]) { // not required
 			continue
 		}
 
@@ -150,7 +151,7 @@ func (m *NewRole) contextValidateRules(ctx context.Context, formats strfmt.Regis
 
 		if m.Rules[i] != nil {
 
-			if swag.IsZero(m.Rules[i]) { // not required
+			if typeutils.IsZero(m.Rules[i]) { // not required
 				return nil
 			}
 
@@ -178,13 +179,13 @@ func (m *NewRole) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewRole) UnmarshalBinary(b []byte) error {
 	var res NewRole
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_rule.go b/client/models/new_rule.go
index 2e7e92b8b..79dc921a3 100644
--- a/client/models/new_rule.go
+++ b/client/models/new_rule.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -109,13 +109,13 @@ func (m *NewRule) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewRule) UnmarshalBinary(b []byte) error {
 	var res NewRule
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_service_catalog.go b/client/models/new_service_catalog.go
index 363ba0cc4..a77201759 100644
--- a/client/models/new_service_catalog.go
+++ b/client/models/new_service_catalog.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -125,7 +126,7 @@ func (m *NewServiceCatalog) validateAuthor(formats strfmt.Registry) error {
 }
 
 func (m *NewServiceCatalog) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -145,12 +146,12 @@ func (m *NewServiceCatalog) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *NewServiceCatalog) validateDependencies(formats strfmt.Registry) error {
-	if swag.IsZero(m.Dependencies) { // not required
+	if typeutils.IsZero(m.Dependencies) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Dependencies); i++ {
-		if swag.IsZero(m.Dependencies[i]) { // not required
+		if typeutils.IsZero(m.Dependencies[i]) { // not required
 			continue
 		}
 
@@ -175,7 +176,7 @@ func (m *NewServiceCatalog) validateDependencies(formats strfmt.Registry) error
 }
 
 func (m *NewServiceCatalog) validateImage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Image) { // not required
+	if typeutils.IsZero(m.Image) { // not required
 		return nil
 	}
 
@@ -226,7 +227,7 @@ func (m *NewServiceCatalog) validateServiceCatalogSourceCanonical(formats strfmt
 }
 
 func (m *NewServiceCatalog) validateTeamCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.TeamCanonical) { // not required
+	if typeutils.IsZero(m.TeamCanonical) { // not required
 		return nil
 	}
 
@@ -246,12 +247,12 @@ func (m *NewServiceCatalog) validateTeamCanonical(formats strfmt.Registry) error
 }
 
 func (m *NewServiceCatalog) validateTechnologies(formats strfmt.Registry) error {
-	if swag.IsZero(m.Technologies) { // not required
+	if typeutils.IsZero(m.Technologies) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Technologies); i++ {
-		if swag.IsZero(m.Technologies[i]) { // not required
+		if typeutils.IsZero(m.Technologies[i]) { // not required
 			continue
 		}
 
@@ -299,7 +300,7 @@ func (m *NewServiceCatalog) contextValidateDependencies(ctx context.Context, for
 
 		if m.Dependencies[i] != nil {
 
-			if swag.IsZero(m.Dependencies[i]) { // not required
+			if typeutils.IsZero(m.Dependencies[i]) { // not required
 				return nil
 			}
 
@@ -328,7 +329,7 @@ func (m *NewServiceCatalog) contextValidateTechnologies(ctx context.Context, for
 
 		if m.Technologies[i] != nil {
 
-			if swag.IsZero(m.Technologies[i]) { // not required
+			if typeutils.IsZero(m.Technologies[i]) { // not required
 				return nil
 			}
 
@@ -356,13 +357,13 @@ func (m *NewServiceCatalog) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewServiceCatalog) UnmarshalBinary(b []byte) error {
 	var res NewServiceCatalog
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_service_catalog_from_template.go b/client/models/new_service_catalog_from_template.go
index 98ccaf2d8..0c820e36d 100644
--- a/client/models/new_service_catalog_from_template.go
+++ b/client/models/new_service_catalog_from_template.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -139,7 +140,7 @@ func (m *NewServiceCatalogFromTemplate) validateServiceCatalogSourceCanonical(fo
 }
 
 func (m *NewServiceCatalogFromTemplate) validateTeamCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.TeamCanonical) { // not required
+	if typeutils.IsZero(m.TeamCanonical) { // not required
 		return nil
 	}
 
@@ -189,13 +190,13 @@ func (m *NewServiceCatalogFromTemplate) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewServiceCatalogFromTemplate) UnmarshalBinary(b []byte) error {
 	var res NewServiceCatalogFromTemplate
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_service_catalog_source.go b/client/models/new_service_catalog_source.go
index 1be51e324..46cdcfca8 100644
--- a/client/models/new_service_catalog_source.go
+++ b/client/models/new_service_catalog_source.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -104,7 +105,7 @@ func (m *NewServiceCatalogSource) validateBranch(formats strfmt.Registry) error
 }
 
 func (m *NewServiceCatalogSource) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -124,7 +125,7 @@ func (m *NewServiceCatalogSource) validateCanonical(formats strfmt.Registry) err
 }
 
 func (m *NewServiceCatalogSource) validateCredentialCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CredentialCanonical) { // not required
+	if typeutils.IsZero(m.CredentialCanonical) { // not required
 		return nil
 	}
 
@@ -153,7 +154,7 @@ func (m *NewServiceCatalogSource) validateName(formats strfmt.Registry) error {
 }
 
 func (m *NewServiceCatalogSource) validateTeamCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.TeamCanonical) { // not required
+	if typeutils.IsZero(m.TeamCanonical) { // not required
 		return nil
 	}
 
@@ -195,13 +196,13 @@ func (m *NewServiceCatalogSource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewServiceCatalogSource) UnmarshalBinary(b []byte) error {
 	var res NewServiceCatalogSource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_subscription.go b/client/models/new_subscription.go
index fadd3b769..f3cbcf901 100644
--- a/client/models/new_subscription.go
+++ b/client/models/new_subscription.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -71,13 +71,13 @@ func (m *NewSubscription) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewSubscription) UnmarshalBinary(b []byte) error {
 	var res NewSubscription
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_team.go b/client/models/new_team.go
index 24c3e4407..0ed0ad6da 100644
--- a/client/models/new_team.go
+++ b/client/models/new_team.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -64,7 +65,7 @@ func (m *NewTeam) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewTeam) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -131,13 +132,13 @@ func (m *NewTeam) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewTeam) UnmarshalBinary(b []byte) error {
 	var res NewTeam
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_team_member_assignation.go b/client/models/new_team_member_assignation.go
index 3d684f6b6..0f983d10b 100644
--- a/client/models/new_team_member_assignation.go
+++ b/client/models/new_team_member_assignation.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -43,7 +44,7 @@ func (m *NewTeamMemberAssignation) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewTeamMemberAssignation) validateEmail(formats strfmt.Registry) error {
-	if swag.IsZero(m.Email) { // not required
+	if typeutils.IsZero(m.Email) { // not required
 		return nil
 	}
 
@@ -64,13 +65,13 @@ func (m *NewTeamMemberAssignation) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewTeamMemberAssignation) UnmarshalBinary(b []byte) error {
 	var res NewTeamMemberAssignation
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_user_account.go b/client/models/new_user_account.go
index 1646647f4..8889e9cf9 100644
--- a/client/models/new_user_account.go
+++ b/client/models/new_user_account.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -94,7 +95,7 @@ func (m *NewUserAccount) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewUserAccount) validateCountryCode(formats strfmt.Registry) error {
-	if swag.IsZero(m.CountryCode) { // not required
+	if typeutils.IsZero(m.CountryCode) { // not required
 		return nil
 	}
 
@@ -136,7 +137,7 @@ func (m *NewUserAccount) validateFullName(formats strfmt.Registry) error {
 }
 
 func (m *NewUserAccount) validateInvitationToken(formats strfmt.Registry) error {
-	if swag.IsZero(m.InvitationToken) { // not required
+	if typeutils.IsZero(m.InvitationToken) { // not required
 		return nil
 	}
 
@@ -180,7 +181,7 @@ func (m *NewUserAccount) validateLocaleEnum(path, location string, value string)
 }
 
 func (m *NewUserAccount) validateLocale(formats strfmt.Registry) error {
-	if swag.IsZero(m.Locale) { // not required
+	if typeutils.IsZero(m.Locale) { // not required
 		return nil
 	}
 
@@ -210,7 +211,7 @@ func (m *NewUserAccount) validatePassword(formats strfmt.Registry) error {
 }
 
 func (m *NewUserAccount) validateUsername(formats strfmt.Registry) error {
-	if swag.IsZero(m.Username) { // not required
+	if typeutils.IsZero(m.Username) { // not required
 		return nil
 	}
 
@@ -239,13 +240,13 @@ func (m *NewUserAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewUserAccount) UnmarshalBinary(b []byte) error {
 	var res NewUserAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_watch_rule.go b/client/models/new_watch_rule.go
index 288b23844..a56c22676 100644
--- a/client/models/new_watch_rule.go
+++ b/client/models/new_watch_rule.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -81,7 +82,7 @@ func (m *NewWatchRule) Validate(formats strfmt.Registry) error {
 }
 
 func (m *NewWatchRule) validateCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.Canonical) { // not required
+	if typeutils.IsZero(m.Canonical) { // not required
 		return nil
 	}
 
@@ -113,7 +114,7 @@ func (m *NewWatchRule) validateFilters(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Filters); i++ {
-		if swag.IsZero(m.Filters[i]) { // not required
+		if typeutils.IsZero(m.Filters[i]) { // not required
 			continue
 		}
 
@@ -172,7 +173,7 @@ func (m *NewWatchRule) validateOrganizationCanonical(formats strfmt.Registry) er
 }
 
 func (m *NewWatchRule) validateProjectCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectCanonical) { // not required
+	if typeutils.IsZero(m.ProjectCanonical) { // not required
 		return nil
 	}
 
@@ -211,7 +212,7 @@ func (m *NewWatchRule) contextValidateFilters(ctx context.Context, formats strfm
 
 		if m.Filters[i] != nil {
 
-			if swag.IsZero(m.Filters[i]) { // not required
+			if typeutils.IsZero(m.Filters[i]) { // not required
 				return nil
 			}
 
@@ -239,13 +240,13 @@ func (m *NewWatchRule) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewWatchRule) UnmarshalBinary(b []byte) error {
 	var res NewWatchRule
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/new_watch_rule_filter.go b/client/models/new_watch_rule_filter.go
index 4312b4c05..fcf9fc588 100644
--- a/client/models/new_watch_rule_filter.go
+++ b/client/models/new_watch_rule_filter.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *NewWatchRuleFilter) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NewWatchRuleFilter) UnmarshalBinary(b []byte) error {
 	var res NewWatchRuleFilter
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/notification.go b/client/models/notification.go
index 5c7872130..a0eea99fe 100644
--- a/client/models/notification.go
+++ b/client/models/notification.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -132,7 +133,7 @@ func (m *Notification) validateUpdatedAt(formats strfmt.Registry) error {
 }
 
 func (m *Notification) validateWatchRuleCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.WatchRuleCanonical) { // not required
+	if typeutils.IsZero(m.WatchRuleCanonical) { // not required
 		return nil
 	}
 
@@ -191,13 +192,13 @@ func (m *Notification) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Notification) UnmarshalBinary(b []byte) error {
 	var res Notification
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/notification_settings.go b/client/models/notification_settings.go
index b15d71269..405db4fba 100644
--- a/client/models/notification_settings.go
+++ b/client/models/notification_settings.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -110,13 +110,13 @@ func (m *NotificationSettings) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *NotificationSettings) UnmarshalBinary(b []byte) error {
 	var res NotificationSettings
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/on_failure_plan.go b/client/models/on_failure_plan.go
index 6a36449f2..8df160e47 100644
--- a/client/models/on_failure_plan.go
+++ b/client/models/on_failure_plan.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -159,13 +159,13 @@ func (m *OnFailurePlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *OnFailurePlan) UnmarshalBinary(b []byte) error {
 	var res OnFailurePlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/on_success_plan.go b/client/models/on_success_plan.go
index 2795ca7eb..4b5075486 100644
--- a/client/models/on_success_plan.go
+++ b/client/models/on_success_plan.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -159,13 +159,13 @@ func (m *OnSuccessPlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *OnSuccessPlan) UnmarshalBinary(b []byte) error {
 	var res OnSuccessPlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/organization.go b/client/models/organization.go
index b012ce560..94eb3ffd0 100644
--- a/client/models/organization.go
+++ b/client/models/organization.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -209,12 +210,12 @@ func (m *Organization) Validate(formats strfmt.Registry) error {
 }
 
 func (m *Organization) validateAdmins(formats strfmt.Registry) error {
-	if swag.IsZero(m.Admins) { // not required
+	if typeutils.IsZero(m.Admins) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Admins); i++ {
-		if swag.IsZero(m.Admins[i]) { // not required
+		if typeutils.IsZero(m.Admins[i]) { // not required
 			continue
 		}
 
@@ -239,7 +240,7 @@ func (m *Organization) validateAdmins(formats strfmt.Registry) error {
 }
 
 func (m *Organization) validateAppearance(formats strfmt.Registry) error {
-	if swag.IsZero(m.Appearance) { // not required
+	if typeutils.IsZero(m.Appearance) { // not required
 		return nil
 	}
 
@@ -430,7 +431,7 @@ func (m *Organization) validateName(formats strfmt.Registry) error {
 }
 
 func (m *Organization) validateParentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ParentCanonical) { // not required
+	if typeutils.IsZero(m.ParentCanonical) { // not required
 		return nil
 	}
 
@@ -450,7 +451,7 @@ func (m *Organization) validateParentCanonical(formats strfmt.Registry) error {
 }
 
 func (m *Organization) validateSubscription(formats strfmt.Registry) error {
-	if swag.IsZero(m.Subscription) { // not required
+	if typeutils.IsZero(m.Subscription) { // not required
 		return nil
 	}
 
@@ -513,7 +514,7 @@ func (m *Organization) contextValidateAdmins(ctx context.Context, formats strfmt
 
 		if m.Admins[i] != nil {
 
-			if swag.IsZero(m.Admins[i]) { // not required
+			if typeutils.IsZero(m.Admins[i]) { // not required
 				return nil
 			}
 
@@ -540,7 +541,7 @@ func (m *Organization) contextValidateAppearance(ctx context.Context, formats st
 
 	if m.Appearance != nil {
 
-		if swag.IsZero(m.Appearance) { // not required
+		if typeutils.IsZero(m.Appearance) { // not required
 			return nil
 		}
 
@@ -565,7 +566,7 @@ func (m *Organization) contextValidateSubscription(ctx context.Context, formats
 
 	if m.Subscription != nil {
 
-		if swag.IsZero(m.Subscription) { // not required
+		if typeutils.IsZero(m.Subscription) { // not required
 			return nil
 		}
 
@@ -591,13 +592,13 @@ func (m *Organization) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Organization) UnmarshalBinary(b []byte) error {
 	var res Organization
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/organization_messages.go b/client/models/organization_messages.go
index 6daaf769a..4fce0337e 100644
--- a/client/models/organization_messages.go
+++ b/client/models/organization_messages.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // OrganizationMessages organization messages
@@ -33,13 +33,13 @@ func (m *OrganizationMessages) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *OrganizationMessages) UnmarshalBinary(b []byte) error {
 	var res OrganizationMessages
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/organization_naming_rules.go b/client/models/organization_naming_rules.go
index 00c883678..4f2cc3106 100644
--- a/client/models/organization_naming_rules.go
+++ b/client/models/organization_naming_rules.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,7 +79,7 @@ func (m *OrganizationNamingRules) Validate(formats strfmt.Registry) error {
 }
 
 func (m *OrganizationNamingRules) validateComponentMessage(formats strfmt.Registry) error {
-	if swag.IsZero(m.ComponentMessage) { // not required
+	if typeutils.IsZero(m.ComponentMessage) { // not required
 		return nil
 	}
 
@@ -90,7 +91,7 @@ func (m *OrganizationNamingRules) validateComponentMessage(formats strfmt.Regist
 }
 
 func (m *OrganizationNamingRules) validateComponentRegex(formats strfmt.Registry) error {
-	if swag.IsZero(m.ComponentRegex) { // not required
+	if typeutils.IsZero(m.ComponentRegex) { // not required
 		return nil
 	}
 
@@ -102,7 +103,7 @@ func (m *OrganizationNamingRules) validateComponentRegex(formats strfmt.Registry
 }
 
 func (m *OrganizationNamingRules) validateEnvMessage(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvMessage) { // not required
+	if typeutils.IsZero(m.EnvMessage) { // not required
 		return nil
 	}
 
@@ -114,7 +115,7 @@ func (m *OrganizationNamingRules) validateEnvMessage(formats strfmt.Registry) er
 }
 
 func (m *OrganizationNamingRules) validateEnvRegex(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvRegex) { // not required
+	if typeutils.IsZero(m.EnvRegex) { // not required
 		return nil
 	}
 
@@ -126,7 +127,7 @@ func (m *OrganizationNamingRules) validateEnvRegex(formats strfmt.Registry) erro
 }
 
 func (m *OrganizationNamingRules) validateProjectMessage(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectMessage) { // not required
+	if typeutils.IsZero(m.ProjectMessage) { // not required
 		return nil
 	}
 
@@ -138,7 +139,7 @@ func (m *OrganizationNamingRules) validateProjectMessage(formats strfmt.Registry
 }
 
 func (m *OrganizationNamingRules) validateProjectRegex(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectRegex) { // not required
+	if typeutils.IsZero(m.ProjectRegex) { // not required
 		return nil
 	}
 
@@ -159,13 +160,13 @@ func (m *OrganizationNamingRules) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *OrganizationNamingRules) UnmarshalBinary(b []byte) error {
 	var res OrganizationNamingRules
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/page_concourse.go b/client/models/page_concourse.go
index fecddfb67..1a9d5b2fa 100644
--- a/client/models/page_concourse.go
+++ b/client/models/page_concourse.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -88,13 +88,13 @@ func (m *PageConcourse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PageConcourse) UnmarshalBinary(b []byte) error {
 	var res PageConcourse
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pagination.go b/client/models/pagination.go
index ebe791b24..5ae220c6e 100644
--- a/client/models/pagination.go
+++ b/client/models/pagination.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -103,13 +103,13 @@ func (m *Pagination) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Pagination) UnmarshalBinary(b []byte) error {
 	var res Pagination
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pagination_a_w_s.go b/client/models/pagination_a_w_s.go
index efa9f94b5..f9225ab99 100644
--- a/client/models/pagination_a_w_s.go
+++ b/client/models/pagination_a_w_s.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -54,13 +54,13 @@ func (m *PaginationAWS) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PaginationAWS) UnmarshalBinary(b []byte) error {
 	var res PaginationAWS
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pagination_concourse.go b/client/models/pagination_concourse.go
index 57d861654..96fcf436e 100644
--- a/client/models/pagination_concourse.go
+++ b/client/models/pagination_concourse.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -157,13 +157,13 @@ func (m *PaginationConcourse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PaginationConcourse) UnmarshalBinary(b []byte) error {
 	var res PaginationConcourse
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pending_member_invitation.go b/client/models/pending_member_invitation.go
index 52f9e4916..4f4d5d7bf 100644
--- a/client/models/pending_member_invitation.go
+++ b/client/models/pending_member_invitation.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -61,13 +61,13 @@ func (m *PendingMemberInvitation) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PendingMemberInvitation) UnmarshalBinary(b []byte) error {
 	var res PendingMemberInvitation
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pin_comment.go b/client/models/pin_comment.go
index d3dfe06cc..db286043a 100644
--- a/client/models/pin_comment.go
+++ b/client/models/pin_comment.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *PinComment) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PinComment) UnmarshalBinary(b []byte) error {
 	var res PinComment
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pipeline.go b/client/models/pipeline.go
index ee9a92619..de6bdeef8 100644
--- a/client/models/pipeline.go
+++ b/client/models/pipeline.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -199,12 +200,12 @@ func (m *Pipeline) validateEnvironment(formats strfmt.Registry) error {
 }
 
 func (m *Pipeline) validateGroups(formats strfmt.Registry) error {
-	if swag.IsZero(m.Groups) { // not required
+	if typeutils.IsZero(m.Groups) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Groups); i++ {
-		if swag.IsZero(m.Groups[i]) { // not required
+		if typeutils.IsZero(m.Groups[i]) { // not required
 			continue
 		}
 
@@ -244,7 +245,7 @@ func (m *Pipeline) validateJobs(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Jobs); i++ {
-		if swag.IsZero(m.Jobs[i]) { // not required
+		if typeutils.IsZero(m.Jobs[i]) { // not required
 			continue
 		}
 
@@ -419,7 +420,7 @@ func (m *Pipeline) contextValidateGroups(ctx context.Context, formats strfmt.Reg
 
 		if m.Groups[i] != nil {
 
-			if swag.IsZero(m.Groups[i]) { // not required
+			if typeutils.IsZero(m.Groups[i]) { // not required
 				return nil
 			}
 
@@ -448,7 +449,7 @@ func (m *Pipeline) contextValidateJobs(ctx context.Context, formats strfmt.Regis
 
 		if m.Jobs[i] != nil {
 
-			if swag.IsZero(m.Jobs[i]) { // not required
+			if typeutils.IsZero(m.Jobs[i]) { // not required
 				return nil
 			}
 
@@ -497,13 +498,13 @@ func (m *Pipeline) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Pipeline) UnmarshalBinary(b []byte) error {
 	var res Pipeline
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pipeline_diff.go b/client/models/pipeline_diff.go
index 7e94be464..594b2ffc9 100644
--- a/client/models/pipeline_diff.go
+++ b/client/models/pipeline_diff.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -64,7 +65,7 @@ func (m *PipelineDiff) validateDiff(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Diff); i++ {
-		if swag.IsZero(m.Diff[i]) { // not required
+		if typeutils.IsZero(m.Diff[i]) { // not required
 			continue
 		}
 
@@ -163,7 +164,7 @@ func (m *PipelineDiff) contextValidateDiff(ctx context.Context, formats strfmt.R
 
 		if m.Diff[i] != nil {
 
-			if swag.IsZero(m.Diff[i]) { // not required
+			if typeutils.IsZero(m.Diff[i]) { // not required
 				return nil
 			}
 
@@ -191,13 +192,13 @@ func (m *PipelineDiff) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PipelineDiff) UnmarshalBinary(b []byte) error {
 	var res PipelineDiff
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pipeline_diff_record.go b/client/models/pipeline_diff_record.go
index 63f292efb..64ec7bd87 100644
--- a/client/models/pipeline_diff_record.go
+++ b/client/models/pipeline_diff_record.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *PipelineDiffRecord) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PipelineDiffRecord) UnmarshalBinary(b []byte) error {
 	var res PipelineDiffRecord
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pipeline_diffs.go b/client/models/pipeline_diffs.go
index a0115e55c..2dbf584e1 100644
--- a/client/models/pipeline_diffs.go
+++ b/client/models/pipeline_diffs.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // PipelineDiffs PipelineDiffs
@@ -59,12 +60,12 @@ func (m *PipelineDiffs) Validate(formats strfmt.Registry) error {
 }
 
 func (m *PipelineDiffs) validateGroups(formats strfmt.Registry) error {
-	if swag.IsZero(m.Groups) { // not required
+	if typeutils.IsZero(m.Groups) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Groups); i++ {
-		if swag.IsZero(m.Groups[i]) { // not required
+		if typeutils.IsZero(m.Groups[i]) { // not required
 			continue
 		}
 
@@ -89,12 +90,12 @@ func (m *PipelineDiffs) validateGroups(formats strfmt.Registry) error {
 }
 
 func (m *PipelineDiffs) validateJobs(formats strfmt.Registry) error {
-	if swag.IsZero(m.Jobs) { // not required
+	if typeutils.IsZero(m.Jobs) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Jobs); i++ {
-		if swag.IsZero(m.Jobs[i]) { // not required
+		if typeutils.IsZero(m.Jobs[i]) { // not required
 			continue
 		}
 
@@ -119,12 +120,12 @@ func (m *PipelineDiffs) validateJobs(formats strfmt.Registry) error {
 }
 
 func (m *PipelineDiffs) validateResourceTypes(formats strfmt.Registry) error {
-	if swag.IsZero(m.ResourceTypes) { // not required
+	if typeutils.IsZero(m.ResourceTypes) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.ResourceTypes); i++ {
-		if swag.IsZero(m.ResourceTypes[i]) { // not required
+		if typeutils.IsZero(m.ResourceTypes[i]) { // not required
 			continue
 		}
 
@@ -149,12 +150,12 @@ func (m *PipelineDiffs) validateResourceTypes(formats strfmt.Registry) error {
 }
 
 func (m *PipelineDiffs) validateResources(formats strfmt.Registry) error {
-	if swag.IsZero(m.Resources) { // not required
+	if typeutils.IsZero(m.Resources) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Resources); i++ {
-		if swag.IsZero(m.Resources[i]) { // not required
+		if typeutils.IsZero(m.Resources[i]) { // not required
 			continue
 		}
 
@@ -210,7 +211,7 @@ func (m *PipelineDiffs) contextValidateGroups(ctx context.Context, formats strfm
 
 		if m.Groups[i] != nil {
 
-			if swag.IsZero(m.Groups[i]) { // not required
+			if typeutils.IsZero(m.Groups[i]) { // not required
 				return nil
 			}
 
@@ -239,7 +240,7 @@ func (m *PipelineDiffs) contextValidateJobs(ctx context.Context, formats strfmt.
 
 		if m.Jobs[i] != nil {
 
-			if swag.IsZero(m.Jobs[i]) { // not required
+			if typeutils.IsZero(m.Jobs[i]) { // not required
 				return nil
 			}
 
@@ -268,7 +269,7 @@ func (m *PipelineDiffs) contextValidateResourceTypes(ctx context.Context, format
 
 		if m.ResourceTypes[i] != nil {
 
-			if swag.IsZero(m.ResourceTypes[i]) { // not required
+			if typeutils.IsZero(m.ResourceTypes[i]) { // not required
 				return nil
 			}
 
@@ -297,7 +298,7 @@ func (m *PipelineDiffs) contextValidateResources(ctx context.Context, formats st
 
 		if m.Resources[i] != nil {
 
-			if swag.IsZero(m.Resources[i]) { // not required
+			if typeutils.IsZero(m.Resources[i]) { // not required
 				return nil
 			}
 
@@ -325,13 +326,13 @@ func (m *PipelineDiffs) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PipelineDiffs) UnmarshalBinary(b []byte) error {
 	var res PipelineDiffs
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pipeline_status.go b/client/models/pipeline_status.go
index 2d57e1194..5090786b8 100644
--- a/client/models/pipeline_status.go
+++ b/client/models/pipeline_status.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -55,7 +56,7 @@ func (m *PipelineStatus) Validate(formats strfmt.Registry) error {
 }
 
 func (m *PipelineStatus) validateDiffs(formats strfmt.Registry) error {
-	if swag.IsZero(m.Diffs) { // not required
+	if typeutils.IsZero(m.Diffs) { // not required
 		return nil
 	}
 
@@ -144,7 +145,7 @@ func (m *PipelineStatus) contextValidateDiffs(ctx context.Context, formats strfm
 
 	if m.Diffs != nil {
 
-		if swag.IsZero(m.Diffs) { // not required
+		if typeutils.IsZero(m.Diffs) { // not required
 			return nil
 		}
 
@@ -170,13 +171,13 @@ func (m *PipelineStatus) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PipelineStatus) UnmarshalBinary(b []byte) error {
 	var res PipelineStatus
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/pipeline_variables.go b/client/models/pipeline_variables.go
index e4a1733e6..0e52d669a 100644
--- a/client/models/pipeline_variables.go
+++ b/client/models/pipeline_variables.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -76,13 +76,13 @@ func (m *PipelineVariables) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PipelineVariables) UnmarshalBinary(b []byte) error {
 	var res PipelineVariables
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plan.go b/client/models/plan.go
index c5c5b7097..e6f120adc 100644
--- a/client/models/plan.go
+++ b/client/models/plan.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -116,12 +117,12 @@ func (m *Plan) Validate(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateDo(formats strfmt.Registry) error {
-	if swag.IsZero(m.Do) { // not required
+	if typeutils.IsZero(m.Do) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Do); i++ {
-		if swag.IsZero(m.Do[i]) { // not required
+		if typeutils.IsZero(m.Do[i]) { // not required
 			continue
 		}
 
@@ -146,7 +147,7 @@ func (m *Plan) validateDo(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateEnsure(formats strfmt.Registry) error {
-	if swag.IsZero(m.Ensure) { // not required
+	if typeutils.IsZero(m.Ensure) { // not required
 		return nil
 	}
 
@@ -169,7 +170,7 @@ func (m *Plan) validateEnsure(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateGet(formats strfmt.Registry) error {
-	if swag.IsZero(m.Get) { // not required
+	if typeutils.IsZero(m.Get) { // not required
 		return nil
 	}
 
@@ -201,7 +202,7 @@ func (m *Plan) validateID(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateOnFailure(formats strfmt.Registry) error {
-	if swag.IsZero(m.OnFailure) { // not required
+	if typeutils.IsZero(m.OnFailure) { // not required
 		return nil
 	}
 
@@ -224,7 +225,7 @@ func (m *Plan) validateOnFailure(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateOnSuccess(formats strfmt.Registry) error {
-	if swag.IsZero(m.OnSuccess) { // not required
+	if typeutils.IsZero(m.OnSuccess) { // not required
 		return nil
 	}
 
@@ -247,7 +248,7 @@ func (m *Plan) validateOnSuccess(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validatePut(formats strfmt.Registry) error {
-	if swag.IsZero(m.Put) { // not required
+	if typeutils.IsZero(m.Put) { // not required
 		return nil
 	}
 
@@ -270,12 +271,12 @@ func (m *Plan) validatePut(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateRetry(formats strfmt.Registry) error {
-	if swag.IsZero(m.Retry) { // not required
+	if typeutils.IsZero(m.Retry) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Retry); i++ {
-		if swag.IsZero(m.Retry[i]) { // not required
+		if typeutils.IsZero(m.Retry[i]) { // not required
 			continue
 		}
 
@@ -300,7 +301,7 @@ func (m *Plan) validateRetry(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateTask(formats strfmt.Registry) error {
-	if swag.IsZero(m.Task) { // not required
+	if typeutils.IsZero(m.Task) { // not required
 		return nil
 	}
 
@@ -323,7 +324,7 @@ func (m *Plan) validateTask(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateTimeout(formats strfmt.Registry) error {
-	if swag.IsZero(m.Timeout) { // not required
+	if typeutils.IsZero(m.Timeout) { // not required
 		return nil
 	}
 
@@ -346,7 +347,7 @@ func (m *Plan) validateTimeout(formats strfmt.Registry) error {
 }
 
 func (m *Plan) validateTry(formats strfmt.Registry) error {
-	if swag.IsZero(m.Try) { // not required
+	if typeutils.IsZero(m.Try) { // not required
 		return nil
 	}
 
@@ -424,7 +425,7 @@ func (m *Plan) contextValidateDo(ctx context.Context, formats strfmt.Registry) e
 
 		if m.Do[i] != nil {
 
-			if swag.IsZero(m.Do[i]) { // not required
+			if typeutils.IsZero(m.Do[i]) { // not required
 				return nil
 			}
 
@@ -451,7 +452,7 @@ func (m *Plan) contextValidateEnsure(ctx context.Context, formats strfmt.Registr
 
 	if m.Ensure != nil {
 
-		if swag.IsZero(m.Ensure) { // not required
+		if typeutils.IsZero(m.Ensure) { // not required
 			return nil
 		}
 
@@ -476,7 +477,7 @@ func (m *Plan) contextValidateGet(ctx context.Context, formats strfmt.Registry)
 
 	if m.Get != nil {
 
-		if swag.IsZero(m.Get) { // not required
+		if typeutils.IsZero(m.Get) { // not required
 			return nil
 		}
 
@@ -501,7 +502,7 @@ func (m *Plan) contextValidateOnFailure(ctx context.Context, formats strfmt.Regi
 
 	if m.OnFailure != nil {
 
-		if swag.IsZero(m.OnFailure) { // not required
+		if typeutils.IsZero(m.OnFailure) { // not required
 			return nil
 		}
 
@@ -526,7 +527,7 @@ func (m *Plan) contextValidateOnSuccess(ctx context.Context, formats strfmt.Regi
 
 	if m.OnSuccess != nil {
 
-		if swag.IsZero(m.OnSuccess) { // not required
+		if typeutils.IsZero(m.OnSuccess) { // not required
 			return nil
 		}
 
@@ -551,7 +552,7 @@ func (m *Plan) contextValidatePut(ctx context.Context, formats strfmt.Registry)
 
 	if m.Put != nil {
 
-		if swag.IsZero(m.Put) { // not required
+		if typeutils.IsZero(m.Put) { // not required
 			return nil
 		}
 
@@ -578,7 +579,7 @@ func (m *Plan) contextValidateRetry(ctx context.Context, formats strfmt.Registry
 
 		if m.Retry[i] != nil {
 
-			if swag.IsZero(m.Retry[i]) { // not required
+			if typeutils.IsZero(m.Retry[i]) { // not required
 				return nil
 			}
 
@@ -605,7 +606,7 @@ func (m *Plan) contextValidateTask(ctx context.Context, formats strfmt.Registry)
 
 	if m.Task != nil {
 
-		if swag.IsZero(m.Task) { // not required
+		if typeutils.IsZero(m.Task) { // not required
 			return nil
 		}
 
@@ -630,7 +631,7 @@ func (m *Plan) contextValidateTimeout(ctx context.Context, formats strfmt.Regist
 
 	if m.Timeout != nil {
 
-		if swag.IsZero(m.Timeout) { // not required
+		if typeutils.IsZero(m.Timeout) { // not required
 			return nil
 		}
 
@@ -655,7 +656,7 @@ func (m *Plan) contextValidateTry(ctx context.Context, formats strfmt.Registry)
 
 	if m.Try != nil {
 
-		if swag.IsZero(m.Try) { // not required
+		if typeutils.IsZero(m.Try) { // not required
 			return nil
 		}
 
@@ -681,13 +682,13 @@ func (m *Plan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Plan) UnmarshalBinary(b []byte) error {
 	var res Plan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plan_config.go b/client/models/plan_config.go
index 0b3444400..e879eb40a 100644
--- a/client/models/plan_config.go
+++ b/client/models/plan_config.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // PlanConfig PlanConfig
@@ -85,12 +86,12 @@ func (m *PlanConfig) Validate(formats strfmt.Registry) error {
 }
 
 func (m *PlanConfig) validateAggregate(formats strfmt.Registry) error {
-	if swag.IsZero(m.Aggregate) { // not required
+	if typeutils.IsZero(m.Aggregate) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Aggregate); i++ {
-		if swag.IsZero(m.Aggregate[i]) { // not required
+		if typeutils.IsZero(m.Aggregate[i]) { // not required
 			continue
 		}
 
@@ -115,12 +116,12 @@ func (m *PlanConfig) validateAggregate(formats strfmt.Registry) error {
 }
 
 func (m *PlanConfig) validateDo(formats strfmt.Registry) error {
-	if swag.IsZero(m.Do) { // not required
+	if typeutils.IsZero(m.Do) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Do); i++ {
-		if swag.IsZero(m.Do[i]) { // not required
+		if typeutils.IsZero(m.Do[i]) { // not required
 			continue
 		}
 
@@ -145,7 +146,7 @@ func (m *PlanConfig) validateDo(formats strfmt.Registry) error {
 }
 
 func (m *PlanConfig) validateTaskConfig(formats strfmt.Registry) error {
-	if swag.IsZero(m.TaskConfig) { // not required
+	if typeutils.IsZero(m.TaskConfig) { // not required
 		return nil
 	}
 
@@ -195,7 +196,7 @@ func (m *PlanConfig) contextValidateAggregate(ctx context.Context, formats strfm
 
 		if m.Aggregate[i] != nil {
 
-			if swag.IsZero(m.Aggregate[i]) { // not required
+			if typeutils.IsZero(m.Aggregate[i]) { // not required
 				return nil
 			}
 
@@ -224,7 +225,7 @@ func (m *PlanConfig) contextValidateDo(ctx context.Context, formats strfmt.Regis
 
 		if m.Do[i] != nil {
 
-			if swag.IsZero(m.Do[i]) { // not required
+			if typeutils.IsZero(m.Do[i]) { // not required
 				return nil
 			}
 
@@ -251,7 +252,7 @@ func (m *PlanConfig) contextValidateTaskConfig(ctx context.Context, formats strf
 
 	if m.TaskConfig != nil {
 
-		if swag.IsZero(m.TaskConfig) { // not required
+		if typeutils.IsZero(m.TaskConfig) { // not required
 			return nil
 		}
 
@@ -277,13 +278,13 @@ func (m *PlanConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PlanConfig) UnmarshalBinary(b []byte) error {
 	var res PlanConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin.go b/client/models/plugin.go
index eb13692f7..7cd379c8f 100644
--- a/client/models/plugin.go
+++ b/client/models/plugin.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -105,7 +106,7 @@ func (m *Plugin) validateID(formats strfmt.Registry) error {
 }
 
 func (m *Plugin) validateInstall(formats strfmt.Registry) error {
-	if swag.IsZero(m.Install) { // not required
+	if typeutils.IsZero(m.Install) { // not required
 		return nil
 	}
 
@@ -128,7 +129,7 @@ func (m *Plugin) validateInstall(formats strfmt.Registry) error {
 }
 
 func (m *Plugin) validateLatest(formats strfmt.Registry) error {
-	if swag.IsZero(m.Latest) { // not required
+	if typeutils.IsZero(m.Latest) { // not required
 		return nil
 	}
 
@@ -193,7 +194,7 @@ func (m *Plugin) validateRegistry(formats strfmt.Registry) error {
 }
 
 func (m *Plugin) validateRelation(formats strfmt.Registry) error {
-	if swag.IsZero(m.Relation) { // not required
+	if typeutils.IsZero(m.Relation) { // not required
 		return nil
 	}
 
@@ -245,7 +246,7 @@ func (m *Plugin) contextValidateInstall(ctx context.Context, formats strfmt.Regi
 
 	if m.Install != nil {
 
-		if swag.IsZero(m.Install) { // not required
+		if typeutils.IsZero(m.Install) { // not required
 			return nil
 		}
 
@@ -270,7 +271,7 @@ func (m *Plugin) contextValidateLatest(ctx context.Context, formats strfmt.Regis
 
 	if m.Latest != nil {
 
-		if swag.IsZero(m.Latest) { // not required
+		if typeutils.IsZero(m.Latest) { // not required
 			return nil
 		}
 
@@ -316,7 +317,7 @@ func (m *Plugin) contextValidateRelation(ctx context.Context, formats strfmt.Reg
 
 	if m.Relation != nil {
 
-		if swag.IsZero(m.Relation) { // not required
+		if typeutils.IsZero(m.Relation) { // not required
 			return nil
 		}
 
@@ -342,13 +343,13 @@ func (m *Plugin) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Plugin) UnmarshalBinary(b []byte) error {
 	var res Plugin
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_install.go b/client/models/plugin_install.go
index 89d7f7aff..d4a6dfc0f 100644
--- a/client/models/plugin_install.go
+++ b/client/models/plugin_install.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -216,7 +217,7 @@ func (m *PluginInstall) validateUUID(formats strfmt.Registry) error {
 }
 
 func (m *PluginInstall) validateVersion(formats strfmt.Registry) error {
-	if swag.IsZero(m.Version) { // not required
+	if typeutils.IsZero(m.Version) { // not required
 		return nil
 	}
 
@@ -256,7 +257,7 @@ func (m *PluginInstall) contextValidateVersion(ctx context.Context, formats strf
 
 	if m.Version != nil {
 
-		if swag.IsZero(m.Version) { // not required
+		if typeutils.IsZero(m.Version) { // not required
 			return nil
 		}
 
@@ -282,13 +283,13 @@ func (m *PluginInstall) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginInstall) UnmarshalBinary(b []byte) error {
 	var res PluginInstall
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_install_deployment_log.go b/client/models/plugin_install_deployment_log.go
index 4f394036e..03fc177ea 100644
--- a/client/models/plugin_install_deployment_log.go
+++ b/client/models/plugin_install_deployment_log.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,13 +78,13 @@ func (m *PluginInstallDeploymentLog) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginInstallDeploymentLog) UnmarshalBinary(b []byte) error {
 	var res PluginInstallDeploymentLog
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_install_runtime_log.go b/client/models/plugin_install_runtime_log.go
index f6766273e..63f4a0657 100644
--- a/client/models/plugin_install_runtime_log.go
+++ b/client/models/plugin_install_runtime_log.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -100,13 +100,13 @@ func (m *PluginInstallRuntimeLog) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginInstallRuntimeLog) UnmarshalBinary(b []byte) error {
 	var res PluginInstallRuntimeLog
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_logs.go b/client/models/plugin_logs.go
index 037dfd016..355e0788f 100644
--- a/client/models/plugin_logs.go
+++ b/client/models/plugin_logs.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // PluginLogs Plugin Logs
@@ -45,12 +46,12 @@ func (m *PluginLogs) Validate(formats strfmt.Registry) error {
 }
 
 func (m *PluginLogs) validateInstallLogs(formats strfmt.Registry) error {
-	if swag.IsZero(m.InstallLogs) { // not required
+	if typeutils.IsZero(m.InstallLogs) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.InstallLogs); i++ {
-		if swag.IsZero(m.InstallLogs[i]) { // not required
+		if typeutils.IsZero(m.InstallLogs[i]) { // not required
 			continue
 		}
 
@@ -75,12 +76,12 @@ func (m *PluginLogs) validateInstallLogs(formats strfmt.Registry) error {
 }
 
 func (m *PluginLogs) validateRuntimeLogs(formats strfmt.Registry) error {
-	if swag.IsZero(m.RuntimeLogs) { // not required
+	if typeutils.IsZero(m.RuntimeLogs) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.RuntimeLogs); i++ {
-		if swag.IsZero(m.RuntimeLogs[i]) { // not required
+		if typeutils.IsZero(m.RuntimeLogs[i]) { // not required
 			continue
 		}
 
@@ -128,7 +129,7 @@ func (m *PluginLogs) contextValidateInstallLogs(ctx context.Context, formats str
 
 		if m.InstallLogs[i] != nil {
 
-			if swag.IsZero(m.InstallLogs[i]) { // not required
+			if typeutils.IsZero(m.InstallLogs[i]) { // not required
 				return nil
 			}
 
@@ -157,7 +158,7 @@ func (m *PluginLogs) contextValidateRuntimeLogs(ctx context.Context, formats str
 
 		if m.RuntimeLogs[i] != nil {
 
-			if swag.IsZero(m.RuntimeLogs[i]) { // not required
+			if typeutils.IsZero(m.RuntimeLogs[i]) { // not required
 				return nil
 			}
 
@@ -185,13 +186,13 @@ func (m *PluginLogs) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginLogs) UnmarshalBinary(b []byte) error {
 	var res PluginLogs
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_manager.go b/client/models/plugin_manager.go
index e90624541..04882c27f 100644
--- a/client/models/plugin_manager.go
+++ b/client/models/plugin_manager.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -244,49 +244,18 @@ func (m *PluginManager) ContextValidate(ctx context.Context, formats strfmt.Regi
 	return nil
 }
 
-// UnmarshalJSON implements json.Unmarshaler with a workaround for backends that
-// serialize the status field as an integer (iota) instead of a string. This is
-// a known API bug in v6.10.8-rc (fix is entities/plugin.go:83 in meta-gov-env).
-// TODO: remove after meta-gov-env merges to develop and swagger client is regenerated.
-func (m *PluginManager) UnmarshalJSON(b []byte) error {
-	var raw map[string]json.RawMessage
-	if err := json.Unmarshal(b, &raw); err != nil {
-		return err
-	}
-	if statusRaw, ok := raw["status"]; ok && len(statusRaw) > 0 && statusRaw[0] != '"' {
-		var idx int
-		if err := json.Unmarshal(statusRaw, &idx); err == nil {
-			names := []string{"offline", "connected"}
-			if idx >= 0 && idx < len(names) {
-				raw["status"] = json.RawMessage(`"` + names[idx] + `"`)
-			}
-		}
-	}
-	normalized, err := json.Marshal(raw)
-	if err != nil {
-		return err
-	}
-	type alias PluginManager
-	var a alias
-	if err := json.Unmarshal(normalized, &a); err != nil {
-		return err
-	}
-	*m = PluginManager(a)
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *PluginManager) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginManager) UnmarshalBinary(b []byte) error {
 	var res PluginManager
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_registry.go b/client/models/plugin_registry.go
index 4a6a3354b..4198d603c 100644
--- a/client/models/plugin_registry.go
+++ b/client/models/plugin_registry.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -214,13 +214,13 @@ func (m *PluginRegistry) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginRegistry) UnmarshalBinary(b []byte) error {
 	var res PluginRegistry
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_relation.go b/client/models/plugin_relation.go
index 551ad60c7..a26be1a32 100644
--- a/client/models/plugin_relation.go
+++ b/client/models/plugin_relation.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *PluginRelation) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginRelation) UnmarshalBinary(b []byte) error {
 	var res PluginRelation
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_version.go b/client/models/plugin_version.go
index b4b5dedad..211903f2e 100644
--- a/client/models/plugin_version.go
+++ b/client/models/plugin_version.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -100,7 +101,7 @@ func (m *PluginVersion) Validate(formats strfmt.Registry) error {
 }
 
 func (m *PluginVersion) validateIcon(formats strfmt.Registry) error {
-	if swag.IsZero(m.Icon) { // not required
+	if typeutils.IsZero(m.Icon) { // not required
 		return nil
 	}
 
@@ -125,7 +126,7 @@ func (m *PluginVersion) validateID(formats strfmt.Registry) error {
 }
 
 func (m *PluginVersion) validateImages(formats strfmt.Registry) error {
-	if swag.IsZero(m.Images) { // not required
+	if typeutils.IsZero(m.Images) { // not required
 		return nil
 	}
 
@@ -221,13 +222,13 @@ func (m *PluginVersion) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginVersion) UnmarshalBinary(b []byte) error {
 	var res PluginVersion
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_version_log.go b/client/models/plugin_version_log.go
index 8c4b0791c..94dd22b8f 100644
--- a/client/models/plugin_version_log.go
+++ b/client/models/plugin_version_log.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,13 +78,13 @@ func (m *PluginVersionLog) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginVersionLog) UnmarshalBinary(b []byte) error {
 	var res PluginVersionLog
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_widget.go b/client/models/plugin_widget.go
index 74a2d9252..8fe71168a 100644
--- a/client/models/plugin_widget.go
+++ b/client/models/plugin_widget.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -70,7 +71,7 @@ func (m *PluginWidget) Validate(formats strfmt.Registry) error {
 }
 
 func (m *PluginWidget) validateID(formats strfmt.Registry) error {
-	if swag.IsZero(m.ID) { // not required
+	if typeutils.IsZero(m.ID) { // not required
 		return nil
 	}
 
@@ -127,13 +128,13 @@ func (m *PluginWidget) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginWidget) UnmarshalBinary(b []byte) error {
 	var res PluginWidget
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/plugin_widget_data.go b/client/models/plugin_widget_data.go
index 3da79e885..c2dbf399d 100644
--- a/client/models/plugin_widget_data.go
+++ b/client/models/plugin_widget_data.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *PluginWidgetData) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PluginWidgetData) UnmarshalBinary(b []byte) error {
 	var res PluginWidgetData
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/policy.go b/client/models/policy.go
index 1cc80979d..473db1a17 100644
--- a/client/models/policy.go
+++ b/client/models/policy.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -98,7 +99,7 @@ func (m *Policy) validateCode(formats strfmt.Registry) error {
 }
 
 func (m *Policy) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -132,7 +133,7 @@ func (m *Policy) validateID(formats strfmt.Registry) error {
 }
 
 func (m *Policy) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -153,13 +154,13 @@ func (m *Policy) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Policy) UnmarshalBinary(b []byte) error {
 	var res Policy
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/preparation.go b/client/models/preparation.go
index b8409c8a3..dd1f46fe2 100644
--- a/client/models/preparation.go
+++ b/client/models/preparation.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -156,13 +156,13 @@ func (m *Preparation) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Preparation) UnmarshalBinary(b []byte) error {
 	var res Preparation
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/project.go b/client/models/project.go
index a66aa040c..c6485e339 100644
--- a/client/models/project.go
+++ b/client/models/project.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -173,7 +174,7 @@ func (m *Project) validateColor(formats strfmt.Registry) error {
 }
 
 func (m *Project) validateConfigRepositoryCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ConfigRepositoryCanonical) { // not required
+	if typeutils.IsZero(m.ConfigRepositoryCanonical) { // not required
 		return nil
 	}
 
@@ -212,7 +213,7 @@ func (m *Project) validateEnvironments(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Environments); i++ {
-		if swag.IsZero(m.Environments[i]) { // not required
+		if typeutils.IsZero(m.Environments[i]) { // not required
 			continue
 		}
 
@@ -276,7 +277,7 @@ func (m *Project) validateName(formats strfmt.Registry) error {
 }
 
 func (m *Project) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -331,7 +332,7 @@ func (m *Project) validateVersionStatusItemsEnum(path, location string, value st
 }
 
 func (m *Project) validateVersionStatus(formats strfmt.Registry) error {
-	if swag.IsZero(m.VersionStatus) { // not required
+	if typeutils.IsZero(m.VersionStatus) { // not required
 		return nil
 	}
 
@@ -371,7 +372,7 @@ func (m *Project) contextValidateEnvironments(ctx context.Context, formats strfm
 
 		if m.Environments[i] != nil {
 
-			if swag.IsZero(m.Environments[i]) { // not required
+			if typeutils.IsZero(m.Environments[i]) { // not required
 				return nil
 			}
 
@@ -398,7 +399,7 @@ func (m *Project) contextValidateOwner(ctx context.Context, formats strfmt.Regis
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -424,13 +425,13 @@ func (m *Project) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Project) UnmarshalBinary(b []byte) error {
 	var res Project
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/project_environment.go b/client/models/project_environment.go
index 5f7e00e92..a4818ce2a 100644
--- a/client/models/project_environment.go
+++ b/client/models/project_environment.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -147,12 +148,12 @@ func (m *ProjectEnvironment) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *ProjectEnvironment) validateCloudAccounts(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudAccounts) { // not required
+	if typeutils.IsZero(m.CloudAccounts) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.CloudAccounts); i++ {
-		if swag.IsZero(m.CloudAccounts[i]) { // not required
+		if typeutils.IsZero(m.CloudAccounts[i]) { // not required
 			continue
 		}
 
@@ -177,12 +178,12 @@ func (m *ProjectEnvironment) validateCloudAccounts(formats strfmt.Registry) erro
 }
 
 func (m *ProjectEnvironment) validateComponents(formats strfmt.Registry) error {
-	if swag.IsZero(m.Components) { // not required
+	if typeutils.IsZero(m.Components) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Components); i++ {
-		if swag.IsZero(m.Components[i]) { // not required
+		if typeutils.IsZero(m.Components[i]) { // not required
 			continue
 		}
 
@@ -220,7 +221,7 @@ func (m *ProjectEnvironment) validateCreatedAt(formats strfmt.Registry) error {
 }
 
 func (m *ProjectEnvironment) validateDescription(formats strfmt.Registry) error {
-	if swag.IsZero(m.Description) { // not required
+	if typeutils.IsZero(m.Description) { // not required
 		return nil
 	}
 
@@ -232,7 +233,7 @@ func (m *ProjectEnvironment) validateDescription(formats strfmt.Registry) error
 }
 
 func (m *ProjectEnvironment) validateEnvironmentType(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentType) { // not required
+	if typeutils.IsZero(m.EnvironmentType) { // not required
 		return nil
 	}
 
@@ -268,7 +269,7 @@ func (m *ProjectEnvironment) validateID(formats strfmt.Registry) error {
 }
 
 func (m *ProjectEnvironment) validateName(formats strfmt.Registry) error {
-	if swag.IsZero(m.Name) { // not required
+	if typeutils.IsZero(m.Name) { // not required
 		return nil
 	}
 
@@ -284,7 +285,7 @@ func (m *ProjectEnvironment) validateName(formats strfmt.Registry) error {
 }
 
 func (m *ProjectEnvironment) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -339,7 +340,7 @@ func (m *ProjectEnvironment) validateVersionStatusItemsEnum(path, location strin
 }
 
 func (m *ProjectEnvironment) validateVersionStatus(formats strfmt.Registry) error {
-	if swag.IsZero(m.VersionStatus) { // not required
+	if typeutils.IsZero(m.VersionStatus) { // not required
 		return nil
 	}
 
@@ -387,7 +388,7 @@ func (m *ProjectEnvironment) contextValidateCloudAccounts(ctx context.Context, f
 
 		if m.CloudAccounts[i] != nil {
 
-			if swag.IsZero(m.CloudAccounts[i]) { // not required
+			if typeutils.IsZero(m.CloudAccounts[i]) { // not required
 				return nil
 			}
 
@@ -416,7 +417,7 @@ func (m *ProjectEnvironment) contextValidateComponents(ctx context.Context, form
 
 		if m.Components[i] != nil {
 
-			if swag.IsZero(m.Components[i]) { // not required
+			if typeutils.IsZero(m.Components[i]) { // not required
 				return nil
 			}
 
@@ -443,7 +444,7 @@ func (m *ProjectEnvironment) contextValidateEnvironmentType(ctx context.Context,
 
 	if m.EnvironmentType != nil {
 
-		if swag.IsZero(m.EnvironmentType) { // not required
+		if typeutils.IsZero(m.EnvironmentType) { // not required
 			return nil
 		}
 
@@ -468,7 +469,7 @@ func (m *ProjectEnvironment) contextValidateOwner(ctx context.Context, formats s
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -494,13 +495,13 @@ func (m *ProjectEnvironment) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ProjectEnvironment) UnmarshalBinary(b []byte) error {
 	var res ProjectEnvironment
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/project_simple.go b/client/models/project_simple.go
index 4ee4334e4..d97a19047 100644
--- a/client/models/project_simple.go
+++ b/client/models/project_simple.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -198,7 +199,7 @@ func (m *ProjectSimple) validateName(formats strfmt.Registry) error {
 }
 
 func (m *ProjectSimple) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -251,7 +252,7 @@ func (m *ProjectSimple) contextValidateOwner(ctx context.Context, formats strfmt
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -277,13 +278,13 @@ func (m *ProjectSimple) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ProjectSimple) UnmarshalBinary(b []byte) error {
 	var res ProjectSimple
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/public_build_input.go b/client/models/public_build_input.go
index d768f9b79..8d8b01f90 100644
--- a/client/models/public_build_input.go
+++ b/client/models/public_build_input.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -107,13 +107,13 @@ func (m *PublicBuildInput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PublicBuildInput) UnmarshalBinary(b []byte) error {
 	var res PublicBuildInput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/public_build_output.go b/client/models/public_build_output.go
index a2aadf924..8cccad865 100644
--- a/client/models/public_build_output.go
+++ b/client/models/public_build_output.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *PublicBuildOutput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PublicBuildOutput) UnmarshalBinary(b []byte) error {
 	var res PublicBuildOutput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/public_plan.go b/client/models/public_plan.go
index 55bdbf483..685334102 100644
--- a/client/models/public_plan.go
+++ b/client/models/public_plan.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *PublicPlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PublicPlan) UnmarshalBinary(b []byte) error {
 	var res PublicPlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/put_plan.go b/client/models/put_plan.go
index cf9cc0779..b4ad60d34 100644
--- a/client/models/put_plan.go
+++ b/client/models/put_plan.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -107,12 +108,12 @@ func (m *PutPlan) validateType(formats strfmt.Registry) error {
 }
 
 func (m *PutPlan) validateVersionedResourceTypes(formats strfmt.Registry) error {
-	if swag.IsZero(m.VersionedResourceTypes) { // not required
+	if typeutils.IsZero(m.VersionedResourceTypes) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.VersionedResourceTypes); i++ {
-		if swag.IsZero(m.VersionedResourceTypes[i]) { // not required
+		if typeutils.IsZero(m.VersionedResourceTypes[i]) { // not required
 			continue
 		}
 
@@ -156,7 +157,7 @@ func (m *PutPlan) contextValidateVersionedResourceTypes(ctx context.Context, for
 
 		if m.VersionedResourceTypes[i] != nil {
 
-			if swag.IsZero(m.VersionedResourceTypes[i]) { // not required
+			if typeutils.IsZero(m.VersionedResourceTypes[i]) { // not required
 				return nil
 			}
 
@@ -184,13 +185,13 @@ func (m *PutPlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *PutPlan) UnmarshalBinary(b []byte) error {
 	var res PutPlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/resource.go b/client/models/resource.go
index 11efdee70..f07293983 100644
--- a/client/models/resource.go
+++ b/client/models/resource.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,7 +79,7 @@ func (m *Resource) Validate(formats strfmt.Registry) error {
 }
 
 func (m *Resource) validateBuild(formats strfmt.Registry) error {
-	if swag.IsZero(m.Build) { // not required
+	if typeutils.IsZero(m.Build) { // not required
 		return nil
 	}
 
@@ -136,7 +137,7 @@ func (m *Resource) contextValidateBuild(ctx context.Context, formats strfmt.Regi
 
 	if m.Build != nil {
 
-		if swag.IsZero(m.Build) { // not required
+		if typeutils.IsZero(m.Build) { // not required
 			return nil
 		}
 
@@ -162,13 +163,13 @@ func (m *Resource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Resource) UnmarshalBinary(b []byte) error {
 	var res Resource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/resource_version.go b/client/models/resource_version.go
index 2a89fb73d..318f0f5b8 100644
--- a/client/models/resource_version.go
+++ b/client/models/resource_version.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -81,12 +82,12 @@ func (m *ResourceVersion) validateID(formats strfmt.Registry) error {
 }
 
 func (m *ResourceVersion) validateMetadata(formats strfmt.Registry) error {
-	if swag.IsZero(m.Metadata) { // not required
+	if typeutils.IsZero(m.Metadata) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Metadata); i++ {
-		if swag.IsZero(m.Metadata[i]) { // not required
+		if typeutils.IsZero(m.Metadata[i]) { // not required
 			continue
 		}
 
@@ -139,7 +140,7 @@ func (m *ResourceVersion) contextValidateMetadata(ctx context.Context, formats s
 
 		if m.Metadata[i] != nil {
 
-			if swag.IsZero(m.Metadata[i]) { // not required
+			if typeutils.IsZero(m.Metadata[i]) { // not required
 				return nil
 			}
 
@@ -167,13 +168,13 @@ func (m *ResourceVersion) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ResourceVersion) UnmarshalBinary(b []byte) error {
 	var res ResourceVersion
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/role.go b/client/models/role.go
index c1123904e..329abefe9 100644
--- a/client/models/role.go
+++ b/client/models/role.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -123,7 +124,7 @@ func (m *Role) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *Role) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -189,7 +190,7 @@ func (m *Role) validateRules(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Rules); i++ {
-		if swag.IsZero(m.Rules[i]) { // not required
+		if typeutils.IsZero(m.Rules[i]) { // not required
 			continue
 		}
 
@@ -214,7 +215,7 @@ func (m *Role) validateRules(formats strfmt.Registry) error {
 }
 
 func (m *Role) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -245,7 +246,7 @@ func (m *Role) contextValidateRules(ctx context.Context, formats strfmt.Registry
 
 		if m.Rules[i] != nil {
 
-			if swag.IsZero(m.Rules[i]) { // not required
+			if typeutils.IsZero(m.Rules[i]) { // not required
 				return nil
 			}
 
@@ -273,13 +274,13 @@ func (m *Role) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Role) UnmarshalBinary(b []byte) error {
 	var res Role
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/rule.go b/client/models/rule.go
index 8779d9313..cb1836130 100644
--- a/client/models/rule.go
+++ b/client/models/rule.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -131,13 +131,13 @@ func (m *Rule) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Rule) UnmarshalBinary(b []byte) error {
 	var res Rule
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/s_c_config.go b/client/models/s_c_config.go
index 2999c1380..7875884f2 100644
--- a/client/models/s_c_config.go
+++ b/client/models/s_c_config.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -46,7 +47,7 @@ func (m *SCConfig) validateConfigs(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Configs); i++ {
-		if swag.IsZero(m.Configs[i]) { // not required
+		if typeutils.IsZero(m.Configs[i]) { // not required
 			continue
 		}
 
@@ -90,7 +91,7 @@ func (m *SCConfig) contextValidateConfigs(ctx context.Context, formats strfmt.Re
 
 		if m.Configs[i] != nil {
 
-			if swag.IsZero(m.Configs[i]) { // not required
+			if typeutils.IsZero(m.Configs[i]) { // not required
 				return nil
 			}
 
@@ -118,13 +119,13 @@ func (m *SCConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SCConfig) UnmarshalBinary(b []byte) error {
 	var res SCConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/s_c_config_custom_config.go b/client/models/s_c_config_custom_config.go
index 8503f8ef0..906bbf212 100644
--- a/client/models/s_c_config_custom_config.go
+++ b/client/models/s_c_config_custom_config.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -54,7 +55,7 @@ func (m *SCConfigCustomConfig) validateTemplates(formats strfmt.Registry) error
 	}
 
 	for i := 0; i < len(m.Templates); i++ {
-		if swag.IsZero(m.Templates[i]) { // not required
+		if typeutils.IsZero(m.Templates[i]) { // not required
 			continue
 		}
 
@@ -107,7 +108,7 @@ func (m *SCConfigCustomConfig) contextValidateTemplates(ctx context.Context, for
 
 		if m.Templates[i] != nil {
 
-			if swag.IsZero(m.Templates[i]) { // not required
+			if typeutils.IsZero(m.Templates[i]) { // not required
 				return nil
 			}
 
@@ -135,13 +136,13 @@ func (m *SCConfigCustomConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SCConfigCustomConfig) UnmarshalBinary(b []byte) error {
 	var res SCConfigCustomConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/s_c_config_form_data.go b/client/models/s_c_config_form_data.go
index bfe2f0837..1a2944dd2 100644
--- a/client/models/s_c_config_form_data.go
+++ b/client/models/s_c_config_form_data.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -69,7 +69,7 @@ func (m SCConfigFormData) ContextValidate(ctx context.Context, formats strfmt.Re
 
 			for i := 0; i < len(m[k][kk]); i++ {
 
-				if swag.IsZero(m[k][kk][i]) { // not required
+				if typeutils.IsZero(m[k][kk][i]) { // not required
 					return nil
 				}
 
diff --git a/client/models/s_c_config_path_config.go b/client/models/s_c_config_path_config.go
index b5ab2ba03..49d243bf1 100644
--- a/client/models/s_c_config_path_config.go
+++ b/client/models/s_c_config_path_config.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *SCConfigPathConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SCConfigPathConfig) UnmarshalBinary(b []byte) error {
 	var res SCConfigPathConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/s_c_config_path_dest_config.go b/client/models/s_c_config_path_dest_config.go
index 49bdee975..d747b048c 100644
--- a/client/models/s_c_config_path_dest_config.go
+++ b/client/models/s_c_config_path_dest_config.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -90,13 +90,13 @@ func (m *SCConfigPathDestConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SCConfigPathDestConfig) UnmarshalBinary(b []byte) error {
 	var res SCConfigPathDestConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/s_c_config_pipeline_config.go b/client/models/s_c_config_pipeline_config.go
index f15c2e7db..7121c9a5f 100644
--- a/client/models/s_c_config_pipeline_config.go
+++ b/client/models/s_c_config_pipeline_config.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -159,13 +159,13 @@ func (m *SCConfigPipelineConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SCConfigPipelineConfig) UnmarshalBinary(b []byte) error {
 	var res SCConfigPipelineConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/s_c_optional_template_config.go b/client/models/s_c_optional_template_config.go
index 6b0c146fc..a1a743c11 100644
--- a/client/models/s_c_optional_template_config.go
+++ b/client/models/s_c_optional_template_config.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // SCOptionalTemplateConfig An optional configuration of a single template
@@ -36,13 +36,13 @@ func (m *SCOptionalTemplateConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SCOptionalTemplateConfig) UnmarshalBinary(b []byte) error {
 	var res SCOptionalTemplateConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/s_c_template_config.go b/client/models/s_c_template_config.go
index b220b4f81..e8fa69289 100644
--- a/client/models/s_c_template_config.go
+++ b/client/models/s_c_template_config.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -68,7 +69,7 @@ func (m *SCTemplateConfig) Validate(formats strfmt.Registry) error {
 }
 
 func (m *SCTemplateConfig) validateConfig(formats strfmt.Registry) error {
-	if swag.IsZero(m.Config) { // not required
+	if typeutils.IsZero(m.Config) { // not required
 		return nil
 	}
 
@@ -126,7 +127,7 @@ func (m *SCTemplateConfig) contextValidateConfig(ctx context.Context, formats st
 
 	if m.Config != nil {
 
-		if swag.IsZero(m.Config) { // not required
+		if typeutils.IsZero(m.Config) { // not required
 			return nil
 		}
 
@@ -152,13 +153,13 @@ func (m *SCTemplateConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SCTemplateConfig) UnmarshalBinary(b []byte) error {
 	var res SCTemplateConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/service_catalog.go b/client/models/service_catalog.go
index 0f657a684..748dc64f8 100644
--- a/client/models/service_catalog.go
+++ b/client/models/service_catalog.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -256,12 +257,12 @@ func (m *ServiceCatalog) validateCanonical(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalog) validateCloudProviders(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudProviders) { // not required
+	if typeutils.IsZero(m.CloudProviders) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.CloudProviders); i++ {
-		if swag.IsZero(m.CloudProviders[i]) { // not required
+		if typeutils.IsZero(m.CloudProviders[i]) { // not required
 			continue
 		}
 
@@ -286,7 +287,7 @@ func (m *ServiceCatalog) validateCloudProviders(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalog) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -298,12 +299,12 @@ func (m *ServiceCatalog) validateCreatedAt(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalog) validateDependencies(formats strfmt.Registry) error {
-	if swag.IsZero(m.Dependencies) { // not required
+	if typeutils.IsZero(m.Dependencies) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Dependencies); i++ {
-		if swag.IsZero(m.Dependencies[i]) { // not required
+		if typeutils.IsZero(m.Dependencies[i]) { // not required
 			continue
 		}
 
@@ -359,7 +360,7 @@ func (m *ServiceCatalog) validateID(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalog) validateImage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Image) { // not required
+	if typeutils.IsZero(m.Image) { // not required
 		return nil
 	}
 
@@ -403,7 +404,7 @@ func (m *ServiceCatalog) validateImportStatusEnum(path, location string, value s
 }
 
 func (m *ServiceCatalog) validateImportStatus(formats strfmt.Registry) error {
-	if swag.IsZero(m.ImportStatus) { // not required
+	if typeutils.IsZero(m.ImportStatus) { // not required
 		return nil
 	}
 
@@ -473,7 +474,7 @@ func (m *ServiceCatalog) validateRef(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalog) validateServiceCatalogSourceCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ServiceCatalogSourceCanonical) { // not required
+	if typeutils.IsZero(m.ServiceCatalogSourceCanonical) { // not required
 		return nil
 	}
 
@@ -493,7 +494,7 @@ func (m *ServiceCatalog) validateServiceCatalogSourceCanonical(formats strfmt.Re
 }
 
 func (m *ServiceCatalog) validateTeam(formats strfmt.Registry) error {
-	if swag.IsZero(m.Team) { // not required
+	if typeutils.IsZero(m.Team) { // not required
 		return nil
 	}
 
@@ -516,12 +517,12 @@ func (m *ServiceCatalog) validateTeam(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalog) validateTechnologies(formats strfmt.Registry) error {
-	if swag.IsZero(m.Technologies) { // not required
+	if typeutils.IsZero(m.Technologies) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Technologies); i++ {
-		if swag.IsZero(m.Technologies[i]) { // not required
+		if typeutils.IsZero(m.Technologies[i]) { // not required
 			continue
 		}
 
@@ -555,7 +556,7 @@ func (m *ServiceCatalog) validateTrusted(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalog) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -616,7 +617,7 @@ func (m *ServiceCatalog) contextValidateCloudProviders(ctx context.Context, form
 
 		if m.CloudProviders[i] != nil {
 
-			if swag.IsZero(m.CloudProviders[i]) { // not required
+			if typeutils.IsZero(m.CloudProviders[i]) { // not required
 				return nil
 			}
 
@@ -645,7 +646,7 @@ func (m *ServiceCatalog) contextValidateDependencies(ctx context.Context, format
 
 		if m.Dependencies[i] != nil {
 
-			if swag.IsZero(m.Dependencies[i]) { // not required
+			if typeutils.IsZero(m.Dependencies[i]) { // not required
 				return nil
 			}
 
@@ -672,7 +673,7 @@ func (m *ServiceCatalog) contextValidateTeam(ctx context.Context, formats strfmt
 
 	if m.Team != nil {
 
-		if swag.IsZero(m.Team) { // not required
+		if typeutils.IsZero(m.Team) { // not required
 			return nil
 		}
 
@@ -699,7 +700,7 @@ func (m *ServiceCatalog) contextValidateTechnologies(ctx context.Context, format
 
 		if m.Technologies[i] != nil {
 
-			if swag.IsZero(m.Technologies[i]) { // not required
+			if typeutils.IsZero(m.Technologies[i]) { // not required
 				return nil
 			}
 
@@ -727,13 +728,13 @@ func (m *ServiceCatalog) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ServiceCatalog) UnmarshalBinary(b []byte) error {
 	var res ServiceCatalog
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/service_catalog_changes.go b/client/models/service_catalog_changes.go
index 859309e78..82a984ce3 100644
--- a/client/models/service_catalog_changes.go
+++ b/client/models/service_catalog_changes.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -76,7 +77,7 @@ func (m *ServiceCatalogChanges) validateCreated(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Created); i++ {
-		if swag.IsZero(m.Created[i]) { // not required
+		if typeutils.IsZero(m.Created[i]) { // not required
 			continue
 		}
 
@@ -107,7 +108,7 @@ func (m *ServiceCatalogChanges) validateDeleted(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Deleted); i++ {
-		if swag.IsZero(m.Deleted[i]) { // not required
+		if typeutils.IsZero(m.Deleted[i]) { // not required
 			continue
 		}
 
@@ -132,12 +133,12 @@ func (m *ServiceCatalogChanges) validateDeleted(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalogChanges) validateErrored(formats strfmt.Registry) error {
-	if swag.IsZero(m.Errored) { // not required
+	if typeutils.IsZero(m.Errored) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Errored); i++ {
-		if swag.IsZero(m.Errored[i]) { // not required
+		if typeutils.IsZero(m.Errored[i]) { // not required
 			continue
 		}
 
@@ -168,7 +169,7 @@ func (m *ServiceCatalogChanges) validateUpdated(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Updated); i++ {
-		if swag.IsZero(m.Updated[i]) { // not required
+		if typeutils.IsZero(m.Updated[i]) { // not required
 			continue
 		}
 
@@ -193,12 +194,12 @@ func (m *ServiceCatalogChanges) validateUpdated(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalogChanges) validateVersions(formats strfmt.Registry) error {
-	if swag.IsZero(m.Versions) { // not required
+	if typeutils.IsZero(m.Versions) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Versions); i++ {
-		if swag.IsZero(m.Versions[i]) { // not required
+		if typeutils.IsZero(m.Versions[i]) { // not required
 			continue
 		}
 
@@ -258,7 +259,7 @@ func (m *ServiceCatalogChanges) contextValidateCreated(ctx context.Context, form
 
 		if m.Created[i] != nil {
 
-			if swag.IsZero(m.Created[i]) { // not required
+			if typeutils.IsZero(m.Created[i]) { // not required
 				return nil
 			}
 
@@ -287,7 +288,7 @@ func (m *ServiceCatalogChanges) contextValidateDeleted(ctx context.Context, form
 
 		if m.Deleted[i] != nil {
 
-			if swag.IsZero(m.Deleted[i]) { // not required
+			if typeutils.IsZero(m.Deleted[i]) { // not required
 				return nil
 			}
 
@@ -316,7 +317,7 @@ func (m *ServiceCatalogChanges) contextValidateErrored(ctx context.Context, form
 
 		if m.Errored[i] != nil {
 
-			if swag.IsZero(m.Errored[i]) { // not required
+			if typeutils.IsZero(m.Errored[i]) { // not required
 				return nil
 			}
 
@@ -345,7 +346,7 @@ func (m *ServiceCatalogChanges) contextValidateUpdated(ctx context.Context, form
 
 		if m.Updated[i] != nil {
 
-			if swag.IsZero(m.Updated[i]) { // not required
+			if typeutils.IsZero(m.Updated[i]) { // not required
 				return nil
 			}
 
@@ -374,7 +375,7 @@ func (m *ServiceCatalogChanges) contextValidateVersions(ctx context.Context, for
 
 		if m.Versions[i] != nil {
 
-			if swag.IsZero(m.Versions[i]) { // not required
+			if typeutils.IsZero(m.Versions[i]) { // not required
 				return nil
 			}
 
@@ -402,13 +403,13 @@ func (m *ServiceCatalogChanges) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ServiceCatalogChanges) UnmarshalBinary(b []byte) error {
 	var res ServiceCatalogChanges
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/service_catalog_config.go b/client/models/service_catalog_config.go
index 59e5fd300..916b92449 100644
--- a/client/models/service_catalog_config.go
+++ b/client/models/service_catalog_config.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -91,7 +92,7 @@ func (m *ServiceCatalogConfig) Validate(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalogConfig) validateAnsible(formats strfmt.Registry) error {
-	if swag.IsZero(m.Ansible) { // not required
+	if typeutils.IsZero(m.Ansible) { // not required
 		return nil
 	}
 
@@ -123,7 +124,7 @@ func (m *ServiceCatalogConfig) validateCloudProvider(formats strfmt.Registry) er
 }
 
 func (m *ServiceCatalogConfig) validateCustom(formats strfmt.Registry) error {
-	if swag.IsZero(m.Custom) { // not required
+	if typeutils.IsZero(m.Custom) { // not required
 		return nil
 	}
 
@@ -155,7 +156,7 @@ func (m *ServiceCatalogConfig) validateDescription(formats strfmt.Registry) erro
 }
 
 func (m *ServiceCatalogConfig) validateForms(formats strfmt.Registry) error {
-	if swag.IsZero(m.Forms) { // not required
+	if typeutils.IsZero(m.Forms) { // not required
 		return nil
 	}
 
@@ -211,7 +212,7 @@ func (m *ServiceCatalogConfig) validatePipeline(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalogConfig) validateTerraform(formats strfmt.Registry) error {
-	if swag.IsZero(m.Terraform) { // not required
+	if typeutils.IsZero(m.Terraform) { // not required
 		return nil
 	}
 
@@ -265,7 +266,7 @@ func (m *ServiceCatalogConfig) ContextValidate(ctx context.Context, formats strf
 
 func (m *ServiceCatalogConfig) contextValidateAnsible(ctx context.Context, formats strfmt.Registry) error {
 
-	if swag.IsZero(m.Ansible) { // not required
+	if typeutils.IsZero(m.Ansible) { // not required
 		return nil
 	}
 
@@ -289,7 +290,7 @@ func (m *ServiceCatalogConfig) contextValidateCustom(ctx context.Context, format
 
 	if m.Custom != nil {
 
-		if swag.IsZero(m.Custom) { // not required
+		if typeutils.IsZero(m.Custom) { // not required
 			return nil
 		}
 
@@ -314,7 +315,7 @@ func (m *ServiceCatalogConfig) contextValidateForms(ctx context.Context, formats
 
 	if m.Forms != nil {
 
-		if swag.IsZero(m.Forms) { // not required
+		if typeutils.IsZero(m.Forms) { // not required
 			return nil
 		}
 
@@ -358,7 +359,7 @@ func (m *ServiceCatalogConfig) contextValidatePipeline(ctx context.Context, form
 
 func (m *ServiceCatalogConfig) contextValidateTerraform(ctx context.Context, formats strfmt.Registry) error {
 
-	if swag.IsZero(m.Terraform) { // not required
+	if typeutils.IsZero(m.Terraform) { // not required
 		return nil
 	}
 
@@ -383,13 +384,13 @@ func (m *ServiceCatalogConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ServiceCatalogConfig) UnmarshalBinary(b []byte) error {
 	var res ServiceCatalogConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/service_catalog_dependencies_validation_result.go b/client/models/service_catalog_dependencies_validation_result.go
index f9a9dc0da..13fb377f1 100644
--- a/client/models/service_catalog_dependencies_validation_result.go
+++ b/client/models/service_catalog_dependencies_validation_result.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -73,13 +73,13 @@ func (m *ServiceCatalogDependenciesValidationResult) MarshalBinary() ([]byte, er
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ServiceCatalogDependenciesValidationResult) UnmarshalBinary(b []byte) error {
 	var res ServiceCatalogDependenciesValidationResult
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/service_catalog_dependency.go b/client/models/service_catalog_dependency.go
index ac47d70bf..d5b1d6c11 100644
--- a/client/models/service_catalog_dependency.go
+++ b/client/models/service_catalog_dependency.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // ServiceCatalogDependency ServiceCatalogDependency
@@ -38,13 +38,13 @@ func (m *ServiceCatalogDependency) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ServiceCatalogDependency) UnmarshalBinary(b []byte) error {
 	var res ServiceCatalogDependency
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/service_catalog_source.go b/client/models/service_catalog_source.go
index ec5b59cdf..94c24c5ab 100644
--- a/client/models/service_catalog_source.go
+++ b/client/models/service_catalog_source.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -159,7 +160,7 @@ func (m *ServiceCatalogSource) validateCanonical(formats strfmt.Registry) error
 }
 
 func (m *ServiceCatalogSource) validateChanges(formats strfmt.Registry) error {
-	if swag.IsZero(m.Changes) { // not required
+	if typeutils.IsZero(m.Changes) { // not required
 		return nil
 	}
 
@@ -182,7 +183,7 @@ func (m *ServiceCatalogSource) validateChanges(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalogSource) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -194,7 +195,7 @@ func (m *ServiceCatalogSource) validateCreatedAt(formats strfmt.Registry) error
 }
 
 func (m *ServiceCatalogSource) validateCredentialCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CredentialCanonical) { // not required
+	if typeutils.IsZero(m.CredentialCanonical) { // not required
 		return nil
 	}
 
@@ -260,7 +261,7 @@ func (m *ServiceCatalogSource) validateOwner(formats strfmt.Registry) error {
 }
 
 func (m *ServiceCatalogSource) validateRefreshedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.RefreshedAt) { // not required
+	if typeutils.IsZero(m.RefreshedAt) { // not required
 		return nil
 	}
 
@@ -272,12 +273,12 @@ func (m *ServiceCatalogSource) validateRefreshedAt(formats strfmt.Registry) erro
 }
 
 func (m *ServiceCatalogSource) validateServiceCatalogs(formats strfmt.Registry) error {
-	if swag.IsZero(m.ServiceCatalogs) { // not required
+	if typeutils.IsZero(m.ServiceCatalogs) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.ServiceCatalogs); i++ {
-		if swag.IsZero(m.ServiceCatalogs[i]) { // not required
+		if typeutils.IsZero(m.ServiceCatalogs[i]) { // not required
 			continue
 		}
 
@@ -315,7 +316,7 @@ func (m *ServiceCatalogSource) validateStackCount(formats strfmt.Registry) error
 }
 
 func (m *ServiceCatalogSource) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -365,7 +366,7 @@ func (m *ServiceCatalogSource) contextValidateChanges(ctx context.Context, forma
 
 	if m.Changes != nil {
 
-		if swag.IsZero(m.Changes) { // not required
+		if typeutils.IsZero(m.Changes) { // not required
 			return nil
 		}
 
@@ -413,7 +414,7 @@ func (m *ServiceCatalogSource) contextValidateServiceCatalogs(ctx context.Contex
 
 		if m.ServiceCatalogs[i] != nil {
 
-			if swag.IsZero(m.ServiceCatalogs[i]) { // not required
+			if typeutils.IsZero(m.ServiceCatalogs[i]) { // not required
 				return nil
 			}
 
@@ -441,13 +442,13 @@ func (m *ServiceCatalogSource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ServiceCatalogSource) UnmarshalBinary(b []byte) error {
 	var res ServiceCatalogSource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/service_catalog_source_version.go b/client/models/service_catalog_source_version.go
index 5b653fcb4..f94a28838 100644
--- a/client/models/service_catalog_source_version.go
+++ b/client/models/service_catalog_source_version.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -245,13 +245,13 @@ func (m *ServiceCatalogSourceVersion) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ServiceCatalogSourceVersion) UnmarshalBinary(b []byte) error {
 	var res ServiceCatalogSourceVersion
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/service_catalog_technology.go b/client/models/service_catalog_technology.go
index 7baf8d85b..d6fe82ccf 100644
--- a/client/models/service_catalog_technology.go
+++ b/client/models/service_catalog_technology.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // ServiceCatalogTechnology ServiceCatalogTechnology
@@ -38,13 +38,13 @@ func (m *ServiceCatalogTechnology) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *ServiceCatalogTechnology) UnmarshalBinary(b []byte) error {
 	var res ServiceCatalogTechnology
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/simple_member_org.go b/client/models/simple_member_org.go
index b42d24a39..32ffaf016 100644
--- a/client/models/simple_member_org.go
+++ b/client/models/simple_member_org.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -133,7 +134,7 @@ func (m *SimpleMemberOrg) validateID(formats strfmt.Registry) error {
 }
 
 func (m *SimpleMemberOrg) validateLastLoginAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.LastLoginAt) { // not required
+	if typeutils.IsZero(m.LastLoginAt) { // not required
 		return nil
 	}
 
@@ -145,7 +146,7 @@ func (m *SimpleMemberOrg) validateLastLoginAt(formats strfmt.Registry) error {
 }
 
 func (m *SimpleMemberOrg) validatePictureURL(formats strfmt.Registry) error {
-	if swag.IsZero(m.PictureURL) { // not required
+	if typeutils.IsZero(m.PictureURL) { // not required
 		return nil
 	}
 
@@ -157,7 +158,7 @@ func (m *SimpleMemberOrg) validatePictureURL(formats strfmt.Registry) error {
 }
 
 func (m *SimpleMemberOrg) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -169,7 +170,7 @@ func (m *SimpleMemberOrg) validateUpdatedAt(formats strfmt.Registry) error {
 }
 
 func (m *SimpleMemberOrg) validateUsername(formats strfmt.Registry) error {
-	if swag.IsZero(m.Username) { // not required
+	if typeutils.IsZero(m.Username) { // not required
 		return nil
 	}
 
@@ -198,13 +199,13 @@ func (m *SimpleMemberOrg) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SimpleMemberOrg) UnmarshalBinary(b []byte) error {
 	var res SimpleMemberOrg
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/simple_team.go b/client/models/simple_team.go
index 3bd4be599..e0412d977 100644
--- a/client/models/simple_team.go
+++ b/client/models/simple_team.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -148,7 +149,7 @@ func (m *SimpleTeam) validateName(formats strfmt.Registry) error {
 }
 
 func (m *SimpleTeam) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -201,7 +202,7 @@ func (m *SimpleTeam) contextValidateOwner(ctx context.Context, formats strfmt.Re
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -227,13 +228,13 @@ func (m *SimpleTeam) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SimpleTeam) UnmarshalBinary(b []byte) error {
 	var res SimpleTeam
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/stack_use_case.go b/client/models/stack_use_case.go
index 8fdcb13ce..995984afd 100644
--- a/client/models/stack_use_case.go
+++ b/client/models/stack_use_case.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -61,7 +62,7 @@ func (m *StackUseCase) Validate(formats strfmt.Registry) error {
 }
 
 func (m *StackUseCase) validateCloudProvider(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudProvider) { // not required
+	if typeutils.IsZero(m.CloudProvider) { // not required
 		return nil
 	}
 
@@ -116,13 +117,13 @@ func (m *StackUseCase) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *StackUseCase) UnmarshalBinary(b []byte) error {
 	var res StackUseCase
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/state.go b/client/models/state.go
index 753c4d038..d13d3820b 100644
--- a/client/models/state.go
+++ b/client/models/state.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // State State
@@ -53,12 +54,12 @@ func (m *State) Validate(formats strfmt.Registry) error {
 }
 
 func (m *State) validateResources(formats strfmt.Registry) error {
-	if swag.IsZero(m.Resources) { // not required
+	if typeutils.IsZero(m.Resources) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Resources); i++ {
-		if swag.IsZero(m.Resources[i]) { // not required
+		if typeutils.IsZero(m.Resources[i]) { // not required
 			continue
 		}
 
@@ -102,7 +103,7 @@ func (m *State) contextValidateResources(ctx context.Context, formats strfmt.Reg
 
 		if m.Resources[i] != nil {
 
-			if swag.IsZero(m.Resources[i]) { // not required
+			if typeutils.IsZero(m.Resources[i]) { // not required
 				return nil
 			}
 
@@ -130,13 +131,13 @@ func (m *State) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *State) UnmarshalBinary(b []byte) error {
 	var res State
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/state_lock.go b/client/models/state_lock.go
index 6ef835867..f19e1cddb 100644
--- a/client/models/state_lock.go
+++ b/client/models/state_lock.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // StateLock State Lock
@@ -50,13 +50,13 @@ func (m *StateLock) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *StateLock) UnmarshalBinary(b []byte) error {
 	var res StateLock
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/state_resource.go b/client/models/state_resource.go
index b4cdc3e32..710fdc2f6 100644
--- a/client/models/state_resource.go
+++ b/client/models/state_resource.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -77,7 +78,7 @@ func (m *StateResource) Validate(formats strfmt.Registry) error {
 }
 
 func (m *StateResource) validateImage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Image) { // not required
+	if typeutils.IsZero(m.Image) { // not required
 		return nil
 	}
 
@@ -89,12 +90,12 @@ func (m *StateResource) validateImage(formats strfmt.Registry) error {
 }
 
 func (m *StateResource) validateInstances(formats strfmt.Registry) error {
-	if swag.IsZero(m.Instances) { // not required
+	if typeutils.IsZero(m.Instances) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Instances); i++ {
-		if swag.IsZero(m.Instances[i]) { // not required
+		if typeutils.IsZero(m.Instances[i]) { // not required
 			continue
 		}
 
@@ -138,7 +139,7 @@ func (m *StateResource) contextValidateInstances(ctx context.Context, formats st
 
 		if m.Instances[i] != nil {
 
-			if swag.IsZero(m.Instances[i]) { // not required
+			if typeutils.IsZero(m.Instances[i]) { // not required
 				return nil
 			}
 
@@ -166,13 +167,13 @@ func (m *StateResource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *StateResource) UnmarshalBinary(b []byte) error {
 	var res StateResource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/state_resource_instances.go b/client/models/state_resource_instances.go
index b5d092b72..4b223ea7b 100644
--- a/client/models/state_resource_instances.go
+++ b/client/models/state_resource_instances.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // StateResourceInstances State Resource Instances
@@ -38,13 +38,13 @@ func (m *StateResourceInstances) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *StateResourceInstances) UnmarshalBinary(b []byte) error {
 	var res StateResourceInstances
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/subscription.go b/client/models/subscription.go
index 0cece71b3..68978f568 100644
--- a/client/models/subscription.go
+++ b/client/models/subscription.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -65,7 +66,7 @@ func (m *Subscription) Validate(formats strfmt.Registry) error {
 }
 
 func (m *Subscription) validateCurrentMembers(formats strfmt.Registry) error {
-	if swag.IsZero(m.CurrentMembers) { // not required
+	if typeutils.IsZero(m.CurrentMembers) { // not required
 		return nil
 	}
 
@@ -90,7 +91,7 @@ func (m *Subscription) validateExpiresAt(formats strfmt.Registry) error {
 }
 
 func (m *Subscription) validateMembersCount(formats strfmt.Registry) error {
-	if swag.IsZero(m.MembersCount) { // not required
+	if typeutils.IsZero(m.MembersCount) { // not required
 		return nil
 	}
 
@@ -165,13 +166,13 @@ func (m *Subscription) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Subscription) UnmarshalBinary(b []byte) error {
 	var res Subscription
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/subscription_plan.go b/client/models/subscription_plan.go
index 3c7f1ae52..d4ef4be20 100644
--- a/client/models/subscription_plan.go
+++ b/client/models/subscription_plan.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -93,13 +93,13 @@ func (m *SubscriptionPlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SubscriptionPlan) UnmarshalBinary(b []byte) error {
 	var res SubscriptionPlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/summary.go b/client/models/summary.go
index a4e3802a7..58c51342d 100644
--- a/client/models/summary.go
+++ b/client/models/summary.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -190,13 +190,13 @@ func (m *Summary) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Summary) UnmarshalBinary(b []byte) error {
 	var res Summary
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/swift_remote_t_f_state.go b/client/models/swift_remote_t_f_state.go
index 6ca801985..40c8e3f0b 100644
--- a/client/models/swift_remote_t_f_state.go
+++ b/client/models/swift_remote_t_f_state.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -154,7 +154,7 @@ func (m SwiftRemoteTFState) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this swift remote t f state
@@ -208,13 +208,13 @@ func (m *SwiftRemoteTFState) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SwiftRemoteTFState) UnmarshalBinary(b []byte) error {
 	var res SwiftRemoteTFState
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/swift_storage.go b/client/models/swift_storage.go
index 1f4122fd4..a39165f03 100644
--- a/client/models/swift_storage.go
+++ b/client/models/swift_storage.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -156,7 +156,7 @@ func (m SwiftStorage) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this swift storage
@@ -210,13 +210,13 @@ func (m *SwiftStorage) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *SwiftStorage) UnmarshalBinary(b []byte) error {
 	var res SwiftStorage
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/tag.go b/client/models/tag.go
index 00a9f2096..9bd4067bb 100644
--- a/client/models/tag.go
+++ b/client/models/tag.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -93,13 +93,13 @@ func (m *Tag) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Tag) UnmarshalBinary(b []byte) error {
 	var res Tag
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/task_config.go b/client/models/task_config.go
index e8ea85894..164668305 100644
--- a/client/models/task_config.go
+++ b/client/models/task_config.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // TaskConfig TaskConfig
@@ -57,12 +58,12 @@ func (m *TaskConfig) Validate(formats strfmt.Registry) error {
 }
 
 func (m *TaskConfig) validateInputs(formats strfmt.Registry) error {
-	if swag.IsZero(m.Inputs) { // not required
+	if typeutils.IsZero(m.Inputs) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Inputs); i++ {
-		if swag.IsZero(m.Inputs[i]) { // not required
+		if typeutils.IsZero(m.Inputs[i]) { // not required
 			continue
 		}
 
@@ -87,7 +88,7 @@ func (m *TaskConfig) validateInputs(formats strfmt.Registry) error {
 }
 
 func (m *TaskConfig) validateRun(formats strfmt.Registry) error {
-	if swag.IsZero(m.Run) { // not required
+	if typeutils.IsZero(m.Run) { // not required
 		return nil
 	}
 
@@ -133,7 +134,7 @@ func (m *TaskConfig) contextValidateInputs(ctx context.Context, formats strfmt.R
 
 		if m.Inputs[i] != nil {
 
-			if swag.IsZero(m.Inputs[i]) { // not required
+			if typeutils.IsZero(m.Inputs[i]) { // not required
 				return nil
 			}
 
@@ -160,7 +161,7 @@ func (m *TaskConfig) contextValidateRun(ctx context.Context, formats strfmt.Regi
 
 	if m.Run != nil {
 
-		if swag.IsZero(m.Run) { // not required
+		if typeutils.IsZero(m.Run) { // not required
 			return nil
 		}
 
@@ -186,13 +187,13 @@ func (m *TaskConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TaskConfig) UnmarshalBinary(b []byte) error {
 	var res TaskConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/task_input_config.go b/client/models/task_input_config.go
index 2786ff5fd..12375ac3c 100644
--- a/client/models/task_input_config.go
+++ b/client/models/task_input_config.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -59,13 +59,13 @@ func (m *TaskInputConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TaskInputConfig) UnmarshalBinary(b []byte) error {
 	var res TaskInputConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/task_plan.go b/client/models/task_plan.go
index cbf664b8e..c96fb7d5e 100644
--- a/client/models/task_plan.go
+++ b/client/models/task_plan.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -75,7 +76,7 @@ func (m *TaskPlan) Validate(formats strfmt.Registry) error {
 }
 
 func (m *TaskPlan) validateConfig(formats strfmt.Registry) error {
-	if swag.IsZero(m.Config) { // not required
+	if typeutils.IsZero(m.Config) { // not required
 		return nil
 	}
 
@@ -107,12 +108,12 @@ func (m *TaskPlan) validatePrivileged(formats strfmt.Registry) error {
 }
 
 func (m *TaskPlan) validateVersionedResourceTypes(formats strfmt.Registry) error {
-	if swag.IsZero(m.VersionedResourceTypes) { // not required
+	if typeutils.IsZero(m.VersionedResourceTypes) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.VersionedResourceTypes); i++ {
-		if swag.IsZero(m.VersionedResourceTypes[i]) { // not required
+		if typeutils.IsZero(m.VersionedResourceTypes[i]) { // not required
 			continue
 		}
 
@@ -158,7 +159,7 @@ func (m *TaskPlan) contextValidateConfig(ctx context.Context, formats strfmt.Reg
 
 	if m.Config != nil {
 
-		if swag.IsZero(m.Config) { // not required
+		if typeutils.IsZero(m.Config) { // not required
 			return nil
 		}
 
@@ -185,7 +186,7 @@ func (m *TaskPlan) contextValidateVersionedResourceTypes(ctx context.Context, fo
 
 		if m.VersionedResourceTypes[i] != nil {
 
-			if swag.IsZero(m.VersionedResourceTypes[i]) { // not required
+			if typeutils.IsZero(m.VersionedResourceTypes[i]) { // not required
 				return nil
 			}
 
@@ -213,13 +214,13 @@ func (m *TaskPlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TaskPlan) UnmarshalBinary(b []byte) error {
 	var res TaskPlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/task_run_config.go b/client/models/task_run_config.go
index 25da74fb7..c8ace9efe 100644
--- a/client/models/task_run_config.go
+++ b/client/models/task_run_config.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -41,7 +42,7 @@ func (m *TaskRunConfig) Validate(formats strfmt.Registry) error {
 }
 
 func (m *TaskRunConfig) validatePath(formats strfmt.Registry) error {
-	if swag.IsZero(m.Path) { // not required
+	if typeutils.IsZero(m.Path) { // not required
 		return nil
 	}
 
@@ -62,13 +63,13 @@ func (m *TaskRunConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TaskRunConfig) UnmarshalBinary(b []byte) error {
 	var res TaskRunConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/team.go b/client/models/team.go
index 1b2144521..117b7515c 100644
--- a/client/models/team.go
+++ b/client/models/team.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -183,7 +184,7 @@ func (m *Team) validateMembersPreview(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.MembersPreview); i++ {
-		if swag.IsZero(m.MembersPreview[i]) { // not required
+		if typeutils.IsZero(m.MembersPreview[i]) { // not required
 			continue
 		}
 
@@ -221,7 +222,7 @@ func (m *Team) validateName(formats strfmt.Registry) error {
 }
 
 func (m *Team) validateOwner(formats strfmt.Registry) error {
-	if swag.IsZero(m.Owner) { // not required
+	if typeutils.IsZero(m.Owner) { // not required
 		return nil
 	}
 
@@ -256,7 +257,7 @@ func (m *Team) validateRoles(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Roles); i++ {
-		if swag.IsZero(m.Roles[i]) { // not required
+		if typeutils.IsZero(m.Roles[i]) { // not required
 			continue
 		}
 
@@ -321,7 +322,7 @@ func (m *Team) contextValidateMembersPreview(ctx context.Context, formats strfmt
 
 		if m.MembersPreview[i] != nil {
 
-			if swag.IsZero(m.MembersPreview[i]) { // not required
+			if typeutils.IsZero(m.MembersPreview[i]) { // not required
 				return nil
 			}
 
@@ -348,7 +349,7 @@ func (m *Team) contextValidateOwner(ctx context.Context, formats strfmt.Registry
 
 	if m.Owner != nil {
 
-		if swag.IsZero(m.Owner) { // not required
+		if typeutils.IsZero(m.Owner) { // not required
 			return nil
 		}
 
@@ -375,7 +376,7 @@ func (m *Team) contextValidateRoles(ctx context.Context, formats strfmt.Registry
 
 		if m.Roles[i] != nil {
 
-			if swag.IsZero(m.Roles[i]) { // not required
+			if typeutils.IsZero(m.Roles[i]) { // not required
 				return nil
 			}
 
@@ -403,13 +404,13 @@ func (m *Team) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Team) UnmarshalBinary(b []byte) error {
 	var res Team
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_h_c_l_config.go b/client/models/terraform_h_c_l_config.go
index 1fd9c0062..4123b5021 100644
--- a/client/models/terraform_h_c_l_config.go
+++ b/client/models/terraform_h_c_l_config.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *TerraformHCLConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformHCLConfig) UnmarshalBinary(b []byte) error {
 	var res TerraformHCLConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_image.go b/client/models/terraform_image.go
index 8bea3cc14..8788a360d 100644
--- a/client/models/terraform_image.go
+++ b/client/models/terraform_image.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -57,13 +57,13 @@ func (m *TerraformImage) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformImage) UnmarshalBinary(b []byte) error {
 	var res TerraformImage
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_json_config.go b/client/models/terraform_json_config.go
index c581f6ef4..0b363ed79 100644
--- a/client/models/terraform_json_config.go
+++ b/client/models/terraform_json_config.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // TerraformJSONConfig TerraformJSONConfig
@@ -55,13 +55,13 @@ func (m *TerraformJSONConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformJSONConfig) UnmarshalBinary(b []byte) error {
 	var res TerraformJSONConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_plan_input.go b/client/models/terraform_plan_input.go
index 6f7139ea0..3b98b85e7 100644
--- a/client/models/terraform_plan_input.go
+++ b/client/models/terraform_plan_input.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *TerraformPlanInput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformPlanInput) UnmarshalBinary(b []byte) error {
 	var res TerraformPlanInput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_provider.go b/client/models/terraform_provider.go
index f0905035d..b92208bde 100644
--- a/client/models/terraform_provider.go
+++ b/client/models/terraform_provider.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -134,13 +134,13 @@ func (m *TerraformProvider) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformProvider) UnmarshalBinary(b []byte) error {
 	var res TerraformProvider
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_provider_resource.go b/client/models/terraform_provider_resource.go
index a40f3e765..df15dcd0b 100644
--- a/client/models/terraform_provider_resource.go
+++ b/client/models/terraform_provider_resource.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -172,7 +173,7 @@ func (m *TerraformProviderResource) validateDescription(formats strfmt.Registry)
 }
 
 func (m *TerraformProviderResource) validateImage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Image) { // not required
+	if typeutils.IsZero(m.Image) { // not required
 		return nil
 	}
 
@@ -268,13 +269,13 @@ func (m *TerraformProviderResource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformProviderResource) UnmarshalBinary(b []byte) error {
 	var res TerraformProviderResource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_provider_resource_attributes.go b/client/models/terraform_provider_resource_attributes.go
index c9c3a84db..7188303c8 100644
--- a/client/models/terraform_provider_resource_attributes.go
+++ b/client/models/terraform_provider_resource_attributes.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // TerraformProviderResourceAttributes ResourceAttributes
@@ -41,13 +41,13 @@ func (m *TerraformProviderResourceAttributes) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformProviderResourceAttributes) UnmarshalBinary(b []byte) error {
 	var res TerraformProviderResourceAttributes
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_provider_resource_simple.go b/client/models/terraform_provider_resource_simple.go
index b97a67b4d..decd959d9 100644
--- a/client/models/terraform_provider_resource_simple.go
+++ b/client/models/terraform_provider_resource_simple.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -164,7 +165,7 @@ func (m *TerraformProviderResourceSimple) validateDescription(formats strfmt.Reg
 }
 
 func (m *TerraformProviderResourceSimple) validateImage(formats strfmt.Registry) error {
-	if swag.IsZero(m.Image) { // not required
+	if typeutils.IsZero(m.Image) { // not required
 		return nil
 	}
 
@@ -251,13 +252,13 @@ func (m *TerraformProviderResourceSimple) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformProviderResourceSimple) UnmarshalBinary(b []byte) error {
 	var res TerraformProviderResourceSimple
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_provider_simple.go b/client/models/terraform_provider_simple.go
index 992a74b15..557438d2a 100644
--- a/client/models/terraform_provider_simple.go
+++ b/client/models/terraform_provider_simple.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -117,13 +117,13 @@ func (m *TerraformProviderSimple) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformProviderSimple) UnmarshalBinary(b []byte) error {
 	var res TerraformProviderSimple
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/terraform_validation_result.go b/client/models/terraform_validation_result.go
index cb895aa4d..7a66bfe71 100644
--- a/client/models/terraform_validation_result.go
+++ b/client/models/terraform_validation_result.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *TerraformValidationResult) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TerraformValidationResult) UnmarshalBinary(b []byte) error {
 	var res TerraformValidationResult
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/test_connection_credential.go b/client/models/test_connection_credential.go
index 47222eccf..2972195c2 100644
--- a/client/models/test_connection_credential.go
+++ b/client/models/test_connection_credential.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -173,13 +173,13 @@ func (m *TestConnectionCredential) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TestConnectionCredential) UnmarshalBinary(b []byte) error {
 	var res TestConnectionCredential
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/test_external_backend_connection_input.go b/client/models/test_external_backend_connection_input.go
index 196ebe48b..17829b1c5 100644
--- a/client/models/test_external_backend_connection_input.go
+++ b/client/models/test_external_backend_connection_input.go
@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -109,7 +109,7 @@ func (m TestExternalBackendConnectionInput) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this test external backend connection input
@@ -288,13 +288,13 @@ func (m *TestExternalBackendConnectionInput) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TestExternalBackendConnectionInput) UnmarshalBinary(b []byte) error {
 	var res TestExternalBackendConnectionInput
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/timeout_plan.go b/client/models/timeout_plan.go
index 81098776c..c94868fe8 100644
--- a/client/models/timeout_plan.go
+++ b/client/models/timeout_plan.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -159,13 +159,13 @@ func (m *TimeoutPlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TimeoutPlan) UnmarshalBinary(b []byte) error {
 	var res TimeoutPlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/try_plan.go b/client/models/try_plan.go
index 15e75e1c6..0ae2d57f2 100644
--- a/client/models/try_plan.go
+++ b/client/models/try_plan.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -159,13 +159,13 @@ func (m *TryPlan) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *TryPlan) UnmarshalBinary(b []byte) error {
 	var res TryPlan
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_api_key.go b/client/models/update_api_key.go
index 8ef6bdc5a..6b322e7fd 100644
--- a/client/models/update_api_key.go
+++ b/client/models/update_api_key.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -71,13 +71,13 @@ func (m *UpdateAPIKey) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateAPIKey) UnmarshalBinary(b []byte) error {
 	var res UpdateAPIKey
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_cloud_account.go b/client/models/update_cloud_account.go
index 74760da7c..9f44eff7e 100644
--- a/client/models/update_cloud_account.go
+++ b/client/models/update_cloud_account.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -101,13 +101,13 @@ func (m *UpdateCloudAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateCloudAccount) UnmarshalBinary(b []byte) error {
 	var res UpdateCloudAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_cloud_account_finops.go b/client/models/update_cloud_account_finops.go
index 1e9b82ecb..3abf6bb8a 100644
--- a/client/models/update_cloud_account_finops.go
+++ b/client/models/update_cloud_account_finops.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -53,7 +54,7 @@ func (m *UpdateCloudAccountFinops) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UpdateCloudAccountFinops) validateFinopsConfig(formats strfmt.Registry) error {
-	if swag.IsZero(m.FinopsConfig) { // not required
+	if typeutils.IsZero(m.FinopsConfig) { // not required
 		return nil
 	}
 
@@ -76,7 +77,7 @@ func (m *UpdateCloudAccountFinops) validateFinopsConfig(formats strfmt.Registry)
 }
 
 func (m *UpdateCloudAccountFinops) validateFinopsCredential(formats strfmt.Registry) error {
-	if swag.IsZero(m.FinopsCredential) { // not required
+	if typeutils.IsZero(m.FinopsCredential) { // not required
 		return nil
 	}
 
@@ -129,7 +130,7 @@ func (m *UpdateCloudAccountFinops) contextValidateFinopsConfig(ctx context.Conte
 
 	if m.FinopsConfig != nil {
 
-		if swag.IsZero(m.FinopsConfig) { // not required
+		if typeutils.IsZero(m.FinopsConfig) { // not required
 			return nil
 		}
 
@@ -154,7 +155,7 @@ func (m *UpdateCloudAccountFinops) contextValidateFinopsCredential(ctx context.C
 
 	if m.FinopsCredential != nil {
 
-		if swag.IsZero(m.FinopsCredential) { // not required
+		if typeutils.IsZero(m.FinopsCredential) { // not required
 			return nil
 		}
 
@@ -180,13 +181,13 @@ func (m *UpdateCloudAccountFinops) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateCloudAccountFinops) UnmarshalBinary(b []byte) error {
 	var res UpdateCloudAccountFinops
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_cloud_cost_management_account.go b/client/models/update_cloud_cost_management_account.go
index 8a814d093..112b9dfd5 100644
--- a/client/models/update_cloud_cost_management_account.go
+++ b/client/models/update_cloud_cost_management_account.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -105,13 +105,13 @@ func (m *UpdateCloudCostManagementAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateCloudCostManagementAccount) UnmarshalBinary(b []byte) error {
 	var res UpdateCloudCostManagementAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_cloud_cost_management_linked_account.go b/client/models/update_cloud_cost_management_linked_account.go
index 2f61935b0..280d5988f 100644
--- a/client/models/update_cloud_cost_management_linked_account.go
+++ b/client/models/update_cloud_cost_management_linked_account.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *UpdateCloudCostManagementLinkedAccount) MarshalBinary() ([]byte, error)
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateCloudCostManagementLinkedAccount) UnmarshalBinary(b []byte) error {
 	var res UpdateCloudCostManagementLinkedAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_cloud_cost_management_tag_mapping.go b/client/models/update_cloud_cost_management_tag_mapping.go
index 1f8e47796..ab1ca665b 100644
--- a/client/models/update_cloud_cost_management_tag_mapping.go
+++ b/client/models/update_cloud_cost_management_tag_mapping.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // UpdateCloudCostManagementTagMapping Create or Update CloudCostManagementTagMapping
@@ -50,13 +50,13 @@ func (m *UpdateCloudCostManagementTagMapping) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateCloudCostManagementTagMapping) UnmarshalBinary(b []byte) error {
 	var res UpdateCloudCostManagementTagMapping
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_component.go b/client/models/update_component.go
index 7ac68b3e9..3913bd596 100644
--- a/client/models/update_component.go
+++ b/client/models/update_component.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -64,13 +64,13 @@ func (m *UpdateComponent) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateComponent) UnmarshalBinary(b []byte) error {
 	var res UpdateComponent
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_config_repository.go b/client/models/update_config_repository.go
index 5ccacc25c..5b622ab65 100644
--- a/client/models/update_config_repository.go
+++ b/client/models/update_config_repository.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -142,13 +142,13 @@ func (m *UpdateConfigRepository) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateConfigRepository) UnmarshalBinary(b []byte) error {
 	var res UpdateConfigRepository
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_credential.go b/client/models/update_credential.go
index 800baa55c..33d600d62 100644
--- a/client/models/update_credential.go
+++ b/client/models/update_credential.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -255,13 +255,13 @@ func (m *UpdateCredential) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateCredential) UnmarshalBinary(b []byte) error {
 	var res UpdateCredential
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_environment.go b/client/models/update_environment.go
index 8f580a774..82013e773 100644
--- a/client/models/update_environment.go
+++ b/client/models/update_environment.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -79,7 +80,7 @@ func (m *UpdateEnvironment) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UpdateEnvironment) validateCloudAccountCanonicals(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudAccountCanonicals) { // not required
+	if typeutils.IsZero(m.CloudAccountCanonicals) { // not required
 		return nil
 	}
 
@@ -99,7 +100,7 @@ func (m *UpdateEnvironment) validateCloudAccountCanonicals(formats strfmt.Regist
 }
 
 func (m *UpdateEnvironment) validateDescription(formats strfmt.Registry) error {
-	if swag.IsZero(m.Description) { // not required
+	if typeutils.IsZero(m.Description) { // not required
 		return nil
 	}
 
@@ -137,12 +138,12 @@ func (m *UpdateEnvironment) validateType(formats strfmt.Registry) error {
 }
 
 func (m *UpdateEnvironment) validateVariables(formats strfmt.Registry) error {
-	if swag.IsZero(m.Variables) { // not required
+	if typeutils.IsZero(m.Variables) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Variables); i++ {
-		if swag.IsZero(m.Variables[i]) { // not required
+		if typeutils.IsZero(m.Variables[i]) { // not required
 			continue
 		}
 
@@ -186,7 +187,7 @@ func (m *UpdateEnvironment) contextValidateVariables(ctx context.Context, format
 
 		if m.Variables[i] != nil {
 
-			if swag.IsZero(m.Variables[i]) { // not required
+			if typeutils.IsZero(m.Variables[i]) { // not required
 				return nil
 			}
 
@@ -214,13 +215,13 @@ func (m *UpdateEnvironment) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateEnvironment) UnmarshalBinary(b []byte) error {
 	var res UpdateEnvironment
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_environment_type.go b/client/models/update_environment_type.go
index f2d08c7c6..8a4488575 100644
--- a/client/models/update_environment_type.go
+++ b/client/models/update_environment_type.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -88,13 +88,13 @@ func (m *UpdateEnvironmentType) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateEnvironmentType) UnmarshalBinary(b []byte) error {
 	var res UpdateEnvironmentType
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_external_backend.go b/client/models/update_external_backend.go
index 5972305c3..bc6af344e 100644
--- a/client/models/update_external_backend.go
+++ b/client/models/update_external_backend.go
@@ -12,7 +12,8 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -183,7 +184,7 @@ func (m UpdateExternalBackend) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this update external backend
@@ -225,7 +226,7 @@ func (m *UpdateExternalBackend) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UpdateExternalBackend) validateComponentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ComponentCanonical) { // not required
+	if typeutils.IsZero(m.ComponentCanonical) { // not required
 		return nil
 	}
 
@@ -267,7 +268,7 @@ func (m *UpdateExternalBackend) validateConfiguration(formats strfmt.Registry) e
 }
 
 func (m *UpdateExternalBackend) validateCredentialCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CredentialCanonical) { // not required
+	if typeutils.IsZero(m.CredentialCanonical) { // not required
 		return nil
 	}
 
@@ -287,7 +288,7 @@ func (m *UpdateExternalBackend) validateCredentialCanonical(formats strfmt.Regis
 }
 
 func (m *UpdateExternalBackend) validateEnvironmentCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentCanonical) { // not required
+	if typeutils.IsZero(m.EnvironmentCanonical) { // not required
 		return nil
 	}
 
@@ -307,7 +308,7 @@ func (m *UpdateExternalBackend) validateEnvironmentCanonical(formats strfmt.Regi
 }
 
 func (m *UpdateExternalBackend) validateID(formats strfmt.Registry) error {
-	if swag.IsZero(m.ID) { // not required
+	if typeutils.IsZero(m.ID) { // not required
 		return nil
 	}
 
@@ -319,7 +320,7 @@ func (m *UpdateExternalBackend) validateID(formats strfmt.Registry) error {
 }
 
 func (m *UpdateExternalBackend) validateProjectCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectCanonical) { // not required
+	if typeutils.IsZero(m.ProjectCanonical) { // not required
 		return nil
 	}
 
@@ -424,13 +425,13 @@ func (m *UpdateExternalBackend) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateExternalBackend) UnmarshalBinary(b []byte) error {
 	var res UpdateExternalBackend
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_infra_policy.go b/client/models/update_infra_policy.go
index 65cc96c6d..be7d48f39 100644
--- a/client/models/update_infra_policy.go
+++ b/client/models/update_infra_policy.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -194,13 +194,13 @@ func (m *UpdateInfraPolicy) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateInfraPolicy) UnmarshalBinary(b []byte) error {
 	var res UpdateInfraPolicy
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_organization.go b/client/models/update_organization.go
index ce13f534e..8c88bbf0c 100644
--- a/client/models/update_organization.go
+++ b/client/models/update_organization.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -79,13 +79,13 @@ func (m *UpdateOrganization) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateOrganization) UnmarshalBinary(b []byte) error {
 	var res UpdateOrganization
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_organization_messages.go b/client/models/update_organization_messages.go
index f9ec374f0..5d5bafa53 100644
--- a/client/models/update_organization_messages.go
+++ b/client/models/update_organization_messages.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // UpdateOrganizationMessages update organization messages
@@ -33,13 +33,13 @@ func (m *UpdateOrganizationMessages) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateOrganizationMessages) UnmarshalBinary(b []byte) error {
 	var res UpdateOrganizationMessages
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_organization_naming_rules.go b/client/models/update_organization_naming_rules.go
index 72a2537c5..f2c7e0f5c 100644
--- a/client/models/update_organization_naming_rules.go
+++ b/client/models/update_organization_naming_rules.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,7 +79,7 @@ func (m *UpdateOrganizationNamingRules) Validate(formats strfmt.Registry) error
 }
 
 func (m *UpdateOrganizationNamingRules) validateComponentMessage(formats strfmt.Registry) error {
-	if swag.IsZero(m.ComponentMessage) { // not required
+	if typeutils.IsZero(m.ComponentMessage) { // not required
 		return nil
 	}
 
@@ -90,7 +91,7 @@ func (m *UpdateOrganizationNamingRules) validateComponentMessage(formats strfmt.
 }
 
 func (m *UpdateOrganizationNamingRules) validateComponentRegex(formats strfmt.Registry) error {
-	if swag.IsZero(m.ComponentRegex) { // not required
+	if typeutils.IsZero(m.ComponentRegex) { // not required
 		return nil
 	}
 
@@ -102,7 +103,7 @@ func (m *UpdateOrganizationNamingRules) validateComponentRegex(formats strfmt.Re
 }
 
 func (m *UpdateOrganizationNamingRules) validateEnvMessage(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvMessage) { // not required
+	if typeutils.IsZero(m.EnvMessage) { // not required
 		return nil
 	}
 
@@ -114,7 +115,7 @@ func (m *UpdateOrganizationNamingRules) validateEnvMessage(formats strfmt.Regist
 }
 
 func (m *UpdateOrganizationNamingRules) validateEnvRegex(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvRegex) { // not required
+	if typeutils.IsZero(m.EnvRegex) { // not required
 		return nil
 	}
 
@@ -126,7 +127,7 @@ func (m *UpdateOrganizationNamingRules) validateEnvRegex(formats strfmt.Registry
 }
 
 func (m *UpdateOrganizationNamingRules) validateProjectMessage(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectMessage) { // not required
+	if typeutils.IsZero(m.ProjectMessage) { // not required
 		return nil
 	}
 
@@ -138,7 +139,7 @@ func (m *UpdateOrganizationNamingRules) validateProjectMessage(formats strfmt.Re
 }
 
 func (m *UpdateOrganizationNamingRules) validateProjectRegex(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectRegex) { // not required
+	if typeutils.IsZero(m.ProjectRegex) { // not required
 		return nil
 	}
 
@@ -159,13 +160,13 @@ func (m *UpdateOrganizationNamingRules) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateOrganizationNamingRules) UnmarshalBinary(b []byte) error {
 	var res UpdateOrganizationNamingRules
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_pipeline.go b/client/models/update_pipeline.go
index 8b840b812..7764c0f34 100644
--- a/client/models/update_pipeline.go
+++ b/client/models/update_pipeline.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // UpdatePipeline Update Pipeline
@@ -50,13 +50,13 @@ func (m *UpdatePipeline) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdatePipeline) UnmarshalBinary(b []byte) error {
 	var res UpdatePipeline
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_plugin.go b/client/models/update_plugin.go
index 0fc046d63..d5c24c98a 100644
--- a/client/models/update_plugin.go
+++ b/client/models/update_plugin.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *UpdatePlugin) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdatePlugin) UnmarshalBinary(b []byte) error {
 	var res UpdatePlugin
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_plugin_install.go b/client/models/update_plugin_install.go
index 6cd12c943..96f0d72a6 100644
--- a/client/models/update_plugin_install.go
+++ b/client/models/update_plugin_install.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,13 +78,13 @@ func (m *UpdatePluginInstall) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdatePluginInstall) UnmarshalBinary(b []byte) error {
 	var res UpdatePluginInstall
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_plugin_manager.go b/client/models/update_plugin_manager.go
index c3a90fe70..a949ee612 100644
--- a/client/models/update_plugin_manager.go
+++ b/client/models/update_plugin_manager.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -92,13 +92,13 @@ func (m *UpdatePluginManager) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdatePluginManager) UnmarshalBinary(b []byte) error {
 	var res UpdatePluginManager
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_plugin_registry.go b/client/models/update_plugin_registry.go
index 371469e9e..8f0e931cf 100644
--- a/client/models/update_plugin_registry.go
+++ b/client/models/update_plugin_registry.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,13 +56,13 @@ func (m *UpdatePluginRegistry) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdatePluginRegistry) UnmarshalBinary(b []byte) error {
 	var res UpdatePluginRegistry
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_project.go b/client/models/update_project.go
index cdd121fb1..4bfa4588d 100644
--- a/client/models/update_project.go
+++ b/client/models/update_project.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -136,7 +137,7 @@ func (m *UpdateProject) validateCloudProviderEnum(path, location string, value s
 }
 
 func (m *UpdateProject) validateCloudProvider(formats strfmt.Registry) error {
-	if swag.IsZero(m.CloudProvider) { // not required
+	if typeutils.IsZero(m.CloudProvider) { // not required
 		return nil
 	}
 
@@ -149,7 +150,7 @@ func (m *UpdateProject) validateCloudProvider(formats strfmt.Registry) error {
 }
 
 func (m *UpdateProject) validateColor(formats strfmt.Registry) error {
-	if swag.IsZero(m.Color) { // not required
+	if typeutils.IsZero(m.Color) { // not required
 		return nil
 	}
 
@@ -161,7 +162,7 @@ func (m *UpdateProject) validateColor(formats strfmt.Registry) error {
 }
 
 func (m *UpdateProject) validateConfigRepositoryCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ConfigRepositoryCanonical) { // not required
+	if typeutils.IsZero(m.ConfigRepositoryCanonical) { // not required
 		return nil
 	}
 
@@ -181,7 +182,7 @@ func (m *UpdateProject) validateConfigRepositoryCanonical(formats strfmt.Registr
 }
 
 func (m *UpdateProject) validateIcon(formats strfmt.Registry) error {
-	if swag.IsZero(m.Icon) { // not required
+	if typeutils.IsZero(m.Icon) { // not required
 		return nil
 	}
 
@@ -215,13 +216,13 @@ func (m *UpdateProject) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateProject) UnmarshalBinary(b []byte) error {
 	var res UpdateProject
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_service_catalog.go b/client/models/update_service_catalog.go
index 4df9fa9ab..9acc57d30 100644
--- a/client/models/update_service_catalog.go
+++ b/client/models/update_service_catalog.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -49,7 +50,7 @@ func (m *UpdateServiceCatalog) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UpdateServiceCatalog) validateTeamCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.TeamCanonical) { // not required
+	if typeutils.IsZero(m.TeamCanonical) { // not required
 		return nil
 	}
 
@@ -87,13 +88,13 @@ func (m *UpdateServiceCatalog) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateServiceCatalog) UnmarshalBinary(b []byte) error {
 	var res UpdateServiceCatalog
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_service_catalog_source.go b/client/models/update_service_catalog_source.go
index 336d71fd5..141c589dc 100644
--- a/client/models/update_service_catalog_source.go
+++ b/client/models/update_service_catalog_source.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -64,7 +65,7 @@ func (m *UpdateServiceCatalogSource) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UpdateServiceCatalogSource) validateCredentialCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.CredentialCanonical) { // not required
+	if typeutils.IsZero(m.CredentialCanonical) { // not required
 		return nil
 	}
 
@@ -115,13 +116,13 @@ func (m *UpdateServiceCatalogSource) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateServiceCatalogSource) UnmarshalBinary(b []byte) error {
 	var res UpdateServiceCatalogSource
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_team.go b/client/models/update_team.go
index e639077b2..88340ee72 100644
--- a/client/models/update_team.go
+++ b/client/models/update_team.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -133,13 +133,13 @@ func (m *UpdateTeam) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateTeam) UnmarshalBinary(b []byte) error {
 	var res UpdateTeam
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_user_account.go b/client/models/update_user_account.go
index d03e4ab0c..7e2e277fc 100644
--- a/client/models/update_user_account.go
+++ b/client/models/update_user_account.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -102,7 +103,7 @@ func (m *UpdateUserAccount) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UpdateUserAccount) validateCountryCode(formats strfmt.Registry) error {
-	if swag.IsZero(m.CountryCode) { // not required
+	if typeutils.IsZero(m.CountryCode) { // not required
 		return nil
 	}
 
@@ -114,7 +115,7 @@ func (m *UpdateUserAccount) validateCountryCode(formats strfmt.Registry) error {
 }
 
 func (m *UpdateUserAccount) validateEmails(formats strfmt.Registry) error {
-	if swag.IsZero(m.Emails) { // not required
+	if typeutils.IsZero(m.Emails) { // not required
 		return nil
 	}
 
@@ -125,7 +126,7 @@ func (m *UpdateUserAccount) validateEmails(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Emails); i++ {
-		if swag.IsZero(m.Emails[i]) { // not required
+		if typeutils.IsZero(m.Emails[i]) { // not required
 			continue
 		}
 
@@ -222,7 +223,7 @@ func (m *UpdateUserAccount) validateMfaEnabled(formats strfmt.Registry) error {
 }
 
 func (m *UpdateUserAccount) validatePasswordUpdate(formats strfmt.Registry) error {
-	if swag.IsZero(m.PasswordUpdate) { // not required
+	if typeutils.IsZero(m.PasswordUpdate) { // not required
 		return nil
 	}
 
@@ -245,7 +246,7 @@ func (m *UpdateUserAccount) validatePasswordUpdate(formats strfmt.Registry) erro
 }
 
 func (m *UpdateUserAccount) validatePictureURL(formats strfmt.Registry) error {
-	if swag.IsZero(m.PictureURL) { // not required
+	if typeutils.IsZero(m.PictureURL) { // not required
 		return nil
 	}
 
@@ -301,7 +302,7 @@ func (m *UpdateUserAccount) contextValidateEmails(ctx context.Context, formats s
 
 		if m.Emails[i] != nil {
 
-			if swag.IsZero(m.Emails[i]) { // not required
+			if typeutils.IsZero(m.Emails[i]) { // not required
 				return nil
 			}
 
@@ -328,7 +329,7 @@ func (m *UpdateUserAccount) contextValidatePasswordUpdate(ctx context.Context, f
 
 	if m.PasswordUpdate != nil {
 
-		if swag.IsZero(m.PasswordUpdate) { // not required
+		if typeutils.IsZero(m.PasswordUpdate) { // not required
 			return nil
 		}
 
@@ -354,13 +355,13 @@ func (m *UpdateUserAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateUserAccount) UnmarshalBinary(b []byte) error {
 	var res UpdateUserAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
@@ -447,13 +448,13 @@ func (m *UpdateUserAccountPasswordUpdate) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateUserAccountPasswordUpdate) UnmarshalBinary(b []byte) error {
 	var res UpdateUserAccountPasswordUpdate
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_user_account_email.go b/client/models/update_user_account_email.go
index 37f9c3f31..6c479723f 100644
--- a/client/models/update_user_account_email.go
+++ b/client/models/update_user_account_email.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -78,13 +78,13 @@ func (m *UpdateUserAccountEmail) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateUserAccountEmail) UnmarshalBinary(b []byte) error {
 	var res UpdateUserAccountEmail
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/update_watch_rule.go b/client/models/update_watch_rule.go
index f104688b9..6132921da 100644
--- a/client/models/update_watch_rule.go
+++ b/client/models/update_watch_rule.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -56,12 +57,12 @@ func (m *UpdateWatchRule) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UpdateWatchRule) validateFilters(formats strfmt.Registry) error {
-	if swag.IsZero(m.Filters) { // not required
+	if typeutils.IsZero(m.Filters) { // not required
 		return nil
 	}
 
 	for i := 0; i < len(m.Filters); i++ {
-		if swag.IsZero(m.Filters[i]) { // not required
+		if typeutils.IsZero(m.Filters[i]) { // not required
 			continue
 		}
 
@@ -127,7 +128,7 @@ func (m *UpdateWatchRule) contextValidateFilters(ctx context.Context, formats st
 
 		if m.Filters[i] != nil {
 
-			if swag.IsZero(m.Filters[i]) { // not required
+			if typeutils.IsZero(m.Filters[i]) { // not required
 				return nil
 			}
 
@@ -155,13 +156,13 @@ func (m *UpdateWatchRule) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UpdateWatchRule) UnmarshalBinary(b []byte) error {
 	var res UpdateWatchRule
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user.go b/client/models/user.go
index f62c90917..80533873b 100644
--- a/client/models/user.go
+++ b/client/models/user.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -125,7 +126,7 @@ func (m *User) Validate(formats strfmt.Registry) error {
 }
 
 func (m *User) validateCountryCode(formats strfmt.Registry) error {
-	if swag.IsZero(m.CountryCode) { // not required
+	if typeutils.IsZero(m.CountryCode) { // not required
 		return nil
 	}
 
@@ -185,7 +186,7 @@ func (m *User) validateID(formats strfmt.Registry) error {
 }
 
 func (m *User) validateLastLoginAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.LastLoginAt) { // not required
+	if typeutils.IsZero(m.LastLoginAt) { // not required
 		return nil
 	}
 
@@ -219,7 +220,7 @@ func (m *User) validateMfaEnabled(formats strfmt.Registry) error {
 }
 
 func (m *User) validatePictureURL(formats strfmt.Registry) error {
-	if swag.IsZero(m.PictureURL) { // not required
+	if typeutils.IsZero(m.PictureURL) { // not required
 		return nil
 	}
 
@@ -231,7 +232,7 @@ func (m *User) validatePictureURL(formats strfmt.Registry) error {
 }
 
 func (m *User) validateUpdatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.UpdatedAt) { // not required
+	if typeutils.IsZero(m.UpdatedAt) { // not required
 		return nil
 	}
 
@@ -273,13 +274,13 @@ func (m *User) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *User) UnmarshalBinary(b []byte) error {
 	var res User
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user_account.go b/client/models/user_account.go
index 286ab0490..57fec22d0 100644
--- a/client/models/user_account.go
+++ b/client/models/user_account.go
@@ -10,7 +10,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -125,7 +126,7 @@ func (m *UserAccount) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UserAccount) validateCountry(formats strfmt.Registry) error {
-	if swag.IsZero(m.Country) { // not required
+	if typeutils.IsZero(m.Country) { // not required
 		return nil
 	}
 
@@ -173,7 +174,7 @@ func (m *UserAccount) validateEmails(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Emails); i++ {
-		if swag.IsZero(m.Emails[i]) { // not required
+		if typeutils.IsZero(m.Emails[i]) { // not required
 			continue
 		}
 
@@ -283,7 +284,7 @@ func (m *UserAccount) validateMfaEnabled(formats strfmt.Registry) error {
 }
 
 func (m *UserAccount) validatePictureURL(formats strfmt.Registry) error {
-	if swag.IsZero(m.PictureURL) { // not required
+	if typeutils.IsZero(m.PictureURL) { // not required
 		return nil
 	}
 
@@ -350,7 +351,7 @@ func (m *UserAccount) contextValidateCountry(ctx context.Context, formats strfmt
 
 	if m.Country != nil {
 
-		if swag.IsZero(m.Country) { // not required
+		if typeutils.IsZero(m.Country) { // not required
 			return nil
 		}
 
@@ -377,7 +378,7 @@ func (m *UserAccount) contextValidateEmails(ctx context.Context, formats strfmt.
 
 		if m.Emails[i] != nil {
 
-			if swag.IsZero(m.Emails[i]) { // not required
+			if typeutils.IsZero(m.Emails[i]) { // not required
 				return nil
 			}
 
@@ -405,13 +406,13 @@ func (m *UserAccount) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UserAccount) UnmarshalBinary(b []byte) error {
 	var res UserAccount
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user_account_email.go b/client/models/user_account_email.go
index 49edcc6a4..fdca38349 100644
--- a/client/models/user_account_email.go
+++ b/client/models/user_account_email.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -63,7 +64,7 @@ func (m *UserAccountEmail) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UserAccountEmail) validateCreatedAt(formats strfmt.Registry) error {
-	if swag.IsZero(m.CreatedAt) { // not required
+	if typeutils.IsZero(m.CreatedAt) { // not required
 		return nil
 	}
 
@@ -115,13 +116,13 @@ func (m *UserAccountEmail) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UserAccountEmail) UnmarshalBinary(b []byte) error {
 	var res UserAccountEmail
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user_email.go b/client/models/user_email.go
index 92cfc6be5..15a928076 100644
--- a/client/models/user_email.go
+++ b/client/models/user_email.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -61,13 +61,13 @@ func (m *UserEmail) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UserEmail) UnmarshalBinary(b []byte) error {
 	var res UserEmail
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user_login.go b/client/models/user_login.go
index 5827ea9e9..935af276a 100644
--- a/client/models/user_login.go
+++ b/client/models/user_login.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -72,7 +73,7 @@ func (m *UserLogin) validateEmail(formats strfmt.Registry) error {
 }
 
 func (m *UserLogin) validateOrganizationCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.OrganizationCanonical) { // not required
+	if typeutils.IsZero(m.OrganizationCanonical) { // not required
 		return nil
 	}
 
@@ -118,13 +119,13 @@ func (m *UserLogin) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UserLogin) UnmarshalBinary(b []byte) error {
 	var res UserLogin
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user_o_auth.go b/client/models/user_o_auth.go
index 233c9a44c..8aa7b747a 100644
--- a/client/models/user_o_auth.go
+++ b/client/models/user_o_auth.go
@@ -8,7 +8,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 )
 
 // UserOAuth User's OAuth information
@@ -40,7 +41,7 @@ func (m *UserOAuth) Validate(formats strfmt.Registry) error {
 }
 
 func (m *UserOAuth) validateUser(formats strfmt.Registry) error {
-	if swag.IsZero(m.User) { // not required
+	if typeutils.IsZero(m.User) { // not required
 		return nil
 	}
 
@@ -80,7 +81,7 @@ func (m *UserOAuth) contextValidateUser(ctx context.Context, formats strfmt.Regi
 
 	if m.User != nil {
 
-		if swag.IsZero(m.User) { // not required
+		if typeutils.IsZero(m.User) { // not required
 			return nil
 		}
 
@@ -106,13 +107,13 @@ func (m *UserOAuth) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UserOAuth) UnmarshalBinary(b []byte) error {
 	var res UserOAuth
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user_password_reset_req.go b/client/models/user_password_reset_req.go
index 83de50ee7..f91535389 100644
--- a/client/models/user_password_reset_req.go
+++ b/client/models/user_password_reset_req.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -61,13 +61,13 @@ func (m *UserPasswordResetReq) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UserPasswordResetReq) UnmarshalBinary(b []byte) error {
 	var res UserPasswordResetReq
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user_password_reset_update.go b/client/models/user_password_reset_update.go
index 508683ed2..fe820ceda 100644
--- a/client/models/user_password_reset_update.go
+++ b/client/models/user_password_reset_update.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -88,13 +88,13 @@ func (m *UserPasswordResetUpdate) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UserPasswordResetUpdate) UnmarshalBinary(b []byte) error {
 	var res UserPasswordResetUpdate
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/user_session.go b/client/models/user_session.go
index fa6037e5a..4f2003591 100644
--- a/client/models/user_session.go
+++ b/client/models/user_session.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -141,13 +141,13 @@ func (m *UserSession) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *UserSession) UnmarshalBinary(b []byte) error {
 	var res UserSession
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/v_mware_vsphere.go b/client/models/v_mware_vsphere.go
index 52c76f3e0..a7493c56d 100644
--- a/client/models/v_mware_vsphere.go
+++ b/client/models/v_mware_vsphere.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // VMwareVsphere Representation of VMwareVsphere external backend.
@@ -116,7 +116,7 @@ func (m VMwareVsphere) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	return swag.ConcatJSON(b1, b2, b3), nil
+	return jsonutils.ConcatJSON(b1, b2, b3), nil
 }
 
 // Validate validates this v mware vsphere
@@ -144,13 +144,13 @@ func (m *VMwareVsphere) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *VMwareVsphere) UnmarshalBinary(b []byte) error {
 	var res VMwareVsphere
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/version_config.go b/client/models/version_config.go
index ccff8e95a..68e56c844 100644
--- a/client/models/version_config.go
+++ b/client/models/version_config.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 )
 
 // VersionConfig VersionConfig
@@ -41,13 +41,13 @@ func (m *VersionConfig) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *VersionConfig) UnmarshalBinary(b []byte) error {
 	var res VersionConfig
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/versioned_resource_type.go b/client/models/versioned_resource_type.go
index c66e43fc7..fda60083b 100644
--- a/client/models/versioned_resource_type.go
+++ b/client/models/versioned_resource_type.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -166,13 +166,13 @@ func (m *VersionedResourceType) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *VersionedResourceType) UnmarshalBinary(b []byte) error {
 	var res VersionedResourceType
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/watch_rule.go b/client/models/watch_rule.go
index b9293c906..755e4e4fb 100644
--- a/client/models/watch_rule.go
+++ b/client/models/watch_rule.go
@@ -9,7 +9,8 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
+	"github.com/go-openapi/swag/typeutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -150,7 +151,7 @@ func (m *WatchRule) validateFilters(formats strfmt.Registry) error {
 	}
 
 	for i := 0; i < len(m.Filters); i++ {
-		if swag.IsZero(m.Filters[i]) { // not required
+		if typeutils.IsZero(m.Filters[i]) { // not required
 			continue
 		}
 
@@ -231,7 +232,7 @@ func (m *WatchRule) validateOrganizationCanonical(formats strfmt.Registry) error
 }
 
 func (m *WatchRule) validateProjectCanonical(formats strfmt.Registry) error {
-	if swag.IsZero(m.ProjectCanonical) { // not required
+	if typeutils.IsZero(m.ProjectCanonical) { // not required
 		return nil
 	}
 
@@ -279,7 +280,7 @@ func (m *WatchRule) contextValidateFilters(ctx context.Context, formats strfmt.R
 
 		if m.Filters[i] != nil {
 
-			if swag.IsZero(m.Filters[i]) { // not required
+			if typeutils.IsZero(m.Filters[i]) { // not required
 				return nil
 			}
 
@@ -307,13 +308,13 @@ func (m *WatchRule) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *WatchRule) UnmarshalBinary(b []byte) error {
 	var res WatchRule
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/watch_rule_filter.go b/client/models/watch_rule_filter.go
index f3b9b41fd..c74850488 100644
--- a/client/models/watch_rule_filter.go
+++ b/client/models/watch_rule_filter.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -129,13 +129,13 @@ func (m *WatchRuleFilter) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *WatchRuleFilter) UnmarshalBinary(b []byte) error {
 	var res WatchRuleFilter
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/models/worker.go b/client/models/worker.go
index dbf082c23..8e6c4f001 100644
--- a/client/models/worker.go
+++ b/client/models/worker.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/jsonutils"
 	"github.com/go-openapi/validate"
 )
 
@@ -181,13 +181,13 @@ func (m *Worker) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
-	return swag.WriteJSON(m)
+	return jsonutils.WriteJSON(m)
 }
 
 // UnmarshalBinary interface implementation
 func (m *Worker) UnmarshalBinary(b []byte) error {
 	var res Worker
-	if err := swag.ReadJSON(b, &res); err != nil {
+	if err := jsonutils.ReadJSON(b, &res); err != nil {
 		return err
 	}
 	*m = res
diff --git a/client/version b/client/version
index eb49b111b..9cc1de1e4 100644
--- a/client/version
+++ b/client/version
@@ -1 +1 @@
-v6.10.24
+v6.10.46