Sync monorepo state at 8b25649141c08c17e61e8239f284775b2c927bf5

Author: uc-build-user

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.4.0 - 18-07-2024
+
+- Deprecate v1.0.0 and v1.1.0
+
 ## 1.3.0 - 28-06-2024
 
 - Retry getting access token on EOF type network errors which occur when connection is lost.

go.mod

@@ -20,6 +20,8 @@ require (
 )
 
 retract (
+	v1.1.0
+	v1.0.0
 	v0.8.5
 	v0.8.4
 	v0.8.3

idp/durationunit_constant_generated.go

@@ -20,7 +20,7 @@ func (t DurationUnit) MarshalText() ([]byte, error) {
 	case DurationUnitYear:
 		return []byte("year"), nil
 	default:
-		return nil, ucerr.Errorf("unknown DurationUnit value '%s'", t)
+		return nil, ucerr.Friendlyf(nil, "unknown DurationUnit value '%s'", t)
 	}
 }
 
@@ -41,7 +41,7 @@ func (t *DurationUnit) UnmarshalText(b []byte) error {
 	case "year":
 		*t = DurationUnitYear
 	default:
-		return ucerr.Errorf("unknown DurationUnit value '%s'", s)
+		return ucerr.Friendlyf(nil, "unknown DurationUnit value '%s'", s)
 	}
 	return nil
 }
@@ -62,7 +62,7 @@ func (t *DurationUnit) Validate() error {
 	case DurationUnitYear:
 		return nil
 	default:
-		return ucerr.Errorf("unknown DurationUnit value '%s'", *t)
+		return ucerr.Friendlyf(nil, "unknown DurationUnit value '%s'", *t)
 	}
 }
 

idp/policy/accesspolicy_validate_generated.go

@@ -8,9 +8,8 @@ import (
 
 // Validate implements Validateable
 func (o AccessPolicy) Validate() error {
-	fieldLen := len(o.Name)
-	if fieldLen < 1 || fieldLen > 128 {
-		return ucerr.Friendlyf(nil, "AccessPolicy.Name length has to be between 1 and 128 (length: %v)", fieldLen)
+	if len(o.Name) < 1 || len(o.Name) > 128 {
+		return ucerr.Friendlyf(nil, "AccessPolicy.Name length has to be between 1 and 128 (length: %v)", len(o.Name))
 	}
 	if err := o.PolicyType.Validate(); err != nil {
 		return ucerr.Wrap(err)

idp/policy/models.go

@@ -39,12 +39,12 @@ type Transformer struct {
 	ID                 uuid.UUID                   `json:"id"`
 	Name               string                      `json:"name" validate:"length:1,128" required:"true"`
 	Description        string                      `json:"description"`
-	InputDataType      userstore.ResourceID        `json:"input_data_type" validate:"skip"`
-	InputType          userstore.DataType          `json:"input_type" required:"true"`
-	InputConstraints   userstore.ColumnConstraints `json:"input_type_constraints"`
-	OutputDataType     userstore.ResourceID        `json:"output_data_type" validate:"skip"`
+	InputDataType      userstore.ResourceID        `json:"input_data_type" required:"true"`
+	InputType          userstore.DataType          `json:"input_type" validate:"skip"`
+	InputConstraints   userstore.ColumnConstraints `json:"input_type_constraints" validate:"skip"`
+	OutputDataType     userstore.ResourceID        `json:"output_data_type" required:"true"`
 	OutputType         userstore.DataType          `json:"output_type" validate:"skip"`
-	OutputConstraints  userstore.ColumnConstraints `json:"output_type_constraints"`
+	OutputConstraints  userstore.ColumnConstraints `json:"output_type_constraints" validate:"skip"`
 	ReuseExistingToken bool                        `json:"reuse_existing_token" validate:"skip" description:"Specifies if the tokenizing transformer should return existing token instead of creating a new one."`
 	TransformType      TransformType               `json:"transform_type" required:"true"`
 	TagIDs             uuidarray.UUIDArray         `json:"tag_ids" validate:"skip"`
@@ -74,36 +74,13 @@ func (g Transformer) extraValidate() error {
 		}
 	}
 
-	if g.OutputType != userstore.DataTypeInvalid {
-		if err := g.OutputType.Validate(); err != nil {
-			return ucerr.Wrap(err)
-		}
-	}
-
 	if g.ReuseExistingToken && g.TransformType != TransformTypeTokenizeByValue && g.TransformType != TransformTypeTokenizeByReference {
 		return ucerr.Friendlyf(nil, "ReuseExistingToken can only be true for tokenization transformers")
 	}
 
 	return nil
 }
 
-// EqualsIgnoringNilID returns true if the two policies are equal, ignoring the description and ID if one is nil
-func (g *Transformer) EqualsIgnoringNilID(other *Transformer) bool {
-	return (g.ID == other.ID || g.ID.IsNil() || other.ID.IsNil()) &&
-		strings.EqualFold(g.Name, other.Name) &&
-		g.InputDataType.EquivalentTo(other.InputDataType) &&
-		g.InputType == other.InputType &&
-		g.InputConstraints.Equals(other.InputConstraints) &&
-		g.OutputDataType.EquivalentTo(other.OutputDataType) &&
-		g.OutputType == other.OutputType &&
-		g.OutputConstraints.Equals(other.OutputConstraints) &&
-		g.TransformType == other.TransformType &&
-		g.ReuseExistingToken == other.ReuseExistingToken &&
-		g.Function == other.Function &&
-		g.Parameters == other.Parameters &&
-		g.IsSystem == other.IsSystem
-}
-
 // UserstoreDataProvenance is used by TransformTypeTokenizeByReference to describe the provenance of the data
 type UserstoreDataProvenance struct {
 	UserID   uuid.UUID `json:"user_id" validate:"notnil"`

idp/policy/policytype_constant_generated.go

@@ -14,7 +14,7 @@ func (t PolicyType) MarshalText() ([]byte, error) {
 	case PolicyTypeInvalid:
 		return []byte("invalid"), nil
 	default:
-		return nil, ucerr.Errorf("unknown PolicyType value '%s'", t)
+		return nil, ucerr.Friendlyf(nil, "unknown PolicyType value '%s'", t)
 	}
 }
 
@@ -29,7 +29,7 @@ func (t *PolicyType) UnmarshalText(b []byte) error {
 	case "invalid":
 		*t = PolicyTypeInvalid
 	default:
-		return ucerr.Errorf("unknown PolicyType value '%s'", s)
+		return ucerr.Friendlyf(nil, "unknown PolicyType value '%s'", s)
 	}
 	return nil
 }
@@ -42,7 +42,7 @@ func (t *PolicyType) Validate() error {
 	case PolicyTypeCompositeOr:
 		return nil
 	default:
-		return ucerr.Errorf("unknown PolicyType value '%s'", *t)
+		return ucerr.Friendlyf(nil, "unknown PolicyType value '%s'", *t)
 	}
 }
 

idp/policy/transformer_validate_generated.go

@@ -8,17 +8,13 @@ import (
 
 // Validate implements Validateable
 func (o Transformer) Validate() error {
-	fieldLen := len(o.Name)
-	if fieldLen < 1 || fieldLen > 128 {
-		return ucerr.Friendlyf(nil, "Transformer.Name length has to be between 1 and 128 (length: %v)", fieldLen)
+	if len(o.Name) < 1 || len(o.Name) > 128 {
+		return ucerr.Friendlyf(nil, "Transformer.Name length has to be between 1 and 128 (length: %v)", len(o.Name))
 	}
-	if err := o.InputType.Validate(); err != nil {
+	if err := o.InputDataType.Validate(); err != nil {
 		return ucerr.Wrap(err)
 	}
-	if err := o.InputConstraints.Validate(); err != nil {
-		return ucerr.Wrap(err)
-	}
-	if err := o.OutputConstraints.Validate(); err != nil {
+	if err := o.OutputDataType.Validate(); err != nil {
 		return ucerr.Wrap(err)
 	}
 	if err := o.TransformType.Validate(); err != nil {

idp/policy/transformtype_constant_generated.go

@@ -16,7 +16,7 @@ func (t TransformType) MarshalText() ([]byte, error) {
 	case TransformTypeTransform:
 		return []byte("transform"), nil
 	default:
-		return nil, ucerr.Errorf("unknown TransformType value '%s'", t)
+		return nil, ucerr.Friendlyf(nil, "unknown TransformType value '%s'", t)
 	}
 }
 
@@ -33,7 +33,7 @@ func (t *TransformType) UnmarshalText(b []byte) error {
 	case "transform":
 		*t = TransformTypeTransform
 	default:
-		return ucerr.Errorf("unknown TransformType value '%s'", s)
+		return ucerr.Friendlyf(nil, "unknown TransformType value '%s'", s)
 	}
 	return nil
 }
@@ -50,7 +50,7 @@ func (t *TransformType) Validate() error {
 	case TransformTypeTransform:
 		return nil
 	default:
-		return ucerr.Errorf("unknown TransformType value '%s'", *t)
+		return ucerr.Friendlyf(nil, "unknown TransformType value '%s'", *t)
 	}
 }
 

idp/userstore/columnfield_validate_generated.go

@@ -11,9 +11,8 @@ func (o ColumnField) Validate() error {
 	if err := o.Type.Validate(); err != nil {
 		return ucerr.Wrap(err)
 	}
-	fieldLen := len(o.Name)
-	if fieldLen < 1 || fieldLen > 128 {
-		return ucerr.Friendlyf(nil, "ColumnField.Name length has to be between 1 and 128 (length: %v)", fieldLen)
+	if len(o.Name) < 1 || len(o.Name) > 128 {
+		return ucerr.Friendlyf(nil, "ColumnField.Name length has to be between 1 and 128 (length: %v)", len(o.Name))
 	}
 	return nil
 }

idp/userstore/datalifecyclestate_constant_generated.go

@@ -18,7 +18,7 @@ func (t DataLifeCycleState) MarshalText() ([]byte, error) {
 	case DataLifeCycleStateSoftDeleted:
 		return []byte("softdeleted"), nil
 	default:
-		return nil, ucerr.Errorf("unknown DataLifeCycleState value '%s'", t)
+		return nil, ucerr.Friendlyf(nil, "unknown DataLifeCycleState value '%s'", t)
 	}
 }
 
@@ -37,7 +37,7 @@ func (t *DataLifeCycleState) UnmarshalText(b []byte) error {
 	case "softdeleted":
 		*t = DataLifeCycleStateSoftDeleted
 	default:
-		return ucerr.Errorf("unknown DataLifeCycleState value '%s'", s)
+		return ucerr.Friendlyf(nil, "unknown DataLifeCycleState value '%s'", s)
 	}
 	return nil
 }
@@ -56,7 +56,7 @@ func (t *DataLifeCycleState) Validate() error {
 	case DataLifeCycleStateSoftDeleted:
 		return nil
 	default:
-		return ucerr.Errorf("unknown DataLifeCycleState value '%s'", *t)
+		return ucerr.Friendlyf(nil, "unknown DataLifeCycleState value '%s'", *t)
 	}
 }