Fix Float32OrString validation methods

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

Makefile

@@ -6,9 +6,15 @@ fmt:
 	@go vet ./...
 	@go fmt ./...
 
+goimports:
+	@command -v goimports > /dev/null || go install golang.org/x/tools/cmd/goimports@latest
+	@goimports -w .
+
+
 lint:
 	@command -v golangci-lint > /dev/null || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "${GOPATH}/bin"
 	make addheaders
+	make goimports
 	make fmt
 	./hack/go-lint.sh ${params}
 

go.mod

@@ -1,31 +1,32 @@
 module github.com/serverlessworkflow/sdk-go/v2
 
-go 1.22.0
+go 1.22.8
 
 toolchain go1.23.1
 
 require (
-	github.com/go-playground/validator/v10 v10.11.1
+	github.com/go-playground/validator/v10 v10.16.0
 	github.com/pkg/errors v0.9.1
 	github.com/relvacode/iso8601 v1.4.0
 	github.com/sosodev/duration v1.3.1
 	github.com/stretchr/testify v1.9.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/apimachinery v0.31.0
+	k8s.io/apimachinery v0.31.1
 	sigs.k8s.io/controller-runtime v0.19.0
 	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

go.sum

@@ -16,6 +16,8 @@ package model
 
 import (
 	"testing"
+
+	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
 func buildActionByOperationState(state *State, name string) *Action {
@@ -64,7 +66,8 @@ func buildFunctionRef(workflow *Workflow, action *Action, name string) (*Functio
 
 func buildRetryRef(workflow *Workflow, action *Action, name string) {
 	retry := Retry{
-		Name: name,
+		Name:        name,
+		MaxAttempts: intstr.FromInt32(1),
 	}
 
 	workflow.Retries = append(workflow.Retries, retry)

model/action_validator_test.go

@@ -53,5 +53,5 @@ func (r *Retry) UnmarshalJSON(data []byte) error {
 }
 
 func (r *Retry) ApplyDefault() {
-	r.MaxAttempts = intstr.FromInt(1)
+	r.MaxAttempts = intstr.FromInt32(1)
 }

model/retry.go

@@ -37,7 +37,7 @@ func TestRetryStructLevelValidation(t *testing.T) {
 				model.Retries[0].Delay = "PT5S"
 				model.Retries[0].MaxDelay = "PT5S"
 				model.Retries[0].Increment = "PT5S"
-				model.Retries[0].Jitter = floatstr.FromString("PT5S")
+				model.Retries[0].Jitter = floatstr.FromString("0.5")
 				return *model
 			},
 		},
@@ -82,8 +82,18 @@ func TestRetryStructLevelValidation(t *testing.T) {
 			},
 			Err: `workflow.retries[0].delay invalid iso8601 duration "P5S"
 workflow.retries[0].maxDelay invalid iso8601 duration "P5S"
-workflow.retries[0].increment invalid iso8601 duration "P5S"
-workflow.retries[0].jitter invalid iso8601 duration "P5S"`,
+workflow.retries[0].increment invalid iso8601 duration "P5S"`,
+		},
+		{
+			Desp: "multiplier less than zero",
+			Model: func() Workflow {
+				multiplierZero := floatstr.FromString("0")
+				model := baseWorkflow.DeepCopy()
+				model.Retries[0].Multiplier = &multiplierZero
+
+				return *model
+			},
+			Err: `workflow.retries[0].multiplier must have the minimum `,
 		},
 	}
 

model/retry_validator_test.go

@@ -17,6 +17,8 @@ package model
 import (
 	"context"
 
+	"github.com/serverlessworkflow/sdk-go/v2/util/floatstr"
+
 	validator "github.com/go-playground/validator/v10"
 
 	val "github.com/serverlessworkflow/sdk-go/v2/validator"
@@ -156,6 +158,8 @@ func init() {
 	val.GetValidator().RegisterStructValidationCtx(ValidationWrap(onErrorStructLevelValidationCtx), OnError{})
 	val.GetValidator().RegisterStructValidationCtx(ValidationWrap(transitionStructLevelValidationCtx), Transition{})
 	val.GetValidator().RegisterStructValidationCtx(ValidationWrap(startStructLevelValidationCtx), Start{})
+
+	val.GetValidator().RegisterStructValidation(floatstr.ValidateFloat32OrString, Retry{})
 }
 
 func startStructLevelValidationCtx(ctx ValidatorContext, structLevel validator.StructLevel) {

model/workflow_validator.go

@@ -16,8 +16,14 @@ package floatstr
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
+	"reflect"
 	"strconv"
+	"strings"
+
+	"github.com/go-playground/validator/v10"
+	val "github.com/serverlessworkflow/sdk-go/v2/validator"
 )
 
 // Float32OrString is a type that can hold a float32 or a string.
@@ -71,7 +77,7 @@ func (floatstr *Float32OrString) UnmarshalJSON(value []byte) error {
 }
 
 // MarshalJSON implements the json.Marshaller interface.
-func (floatstr Float32OrString) MarshalJSON() ([]byte, error) {
+func (floatstr *Float32OrString) MarshalJSON() ([]byte, error) {
 	switch floatstr.Type {
 	case Float:
 		return json.Marshal(floatstr.FloatVal)
@@ -103,3 +109,71 @@ func (floatstr *Float32OrString) FloatValue() float32 {
 	}
 	return floatstr.FloatVal
 }
+
+func init() {
+	val.GetValidator().RegisterCustomTypeFunc(func(fl reflect.Value) interface{} {
+		if fl.Kind() != reflect.Struct {
+			return errors.New("invalid type: expected Float32OrString")
+		}
+
+		// Get the Float32OrString value
+		_, ok := fl.Interface().(Float32OrString)
+		if !ok {
+			return fmt.Errorf("invalid type: expected Float32OrString")
+		}
+
+		return nil
+	}, Float32OrString{})
+}
+
+func ValidateFloat32OrString(sl validator.StructLevel) {
+	// Get the current struct being validated.
+	current := sl.Current()
+
+	for i := 0; i < current.NumField(); i++ {
+		field := current.Type().Field(i)
+		value := current.Field(i)
+
+		// Check if the field is a pointer and handle nil pointers.
+		if value.Kind() == reflect.Ptr {
+			if value.IsNil() {
+				continue // Skip nil pointers.
+			}
+			value = value.Elem() // Dereference the pointer.
+		}
+
+		// Check if the field is of type Float32OrString.
+		if value.Type() == reflect.TypeOf(Float32OrString{}) {
+			// Extract validation tags from the field.
+			tags := field.Tag.Get("validate")
+
+			// Split tags and look for min/max.
+			tagList := strings.Split(tags, ",")
+			for _, tag := range tagList {
+				if strings.HasPrefix(tag, "min=") {
+					minVal, err := strconv.ParseFloat(strings.TrimPrefix(tag, "min="), 32)
+					if err != nil {
+						sl.ReportError(value.Interface(), field.Name, field.Name, "min", "")
+						continue
+					}
+
+					if value.FieldByName("FloatVal").Float() < minVal {
+						sl.ReportError(value.Interface(), field.Name, field.Name, "min", "")
+					}
+				}
+
+				if strings.HasPrefix(tag, "max=") {
+					maxVal, err := strconv.ParseFloat(strings.TrimPrefix(tag, "max="), 32)
+					if err != nil {
+						sl.ReportError(value.Interface(), field.Name, field.Name, "max", "")
+						continue
+					}
+
+					if value.FieldByName("FloatVal").Float() > maxVal {
+						sl.ReportError(value.Interface(), field.Name, field.Name, "max", "")
+					}
+				}
+			}
+		}
+	}
+}