chore(deps): update module gopkg.in/go-playground/validator.v9 to v10 (…

…#25) * chore(deps): update module gopkg.in/go-playground/validator.v9 to v10 * chore(deps): update mocks and versions * chore(deps): fix comment on mockery.yaml * chore(deps): clean up go.mod --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ivan Maidurov <ivan.maidurov@omnevo.net>
i-love-flamingo · Feb 9, 2024 · 0f858a0 · 0f858a0
1 parent e1398d0
commit 0f858a0
Show file tree

Hide file tree

Showing 37 changed files with 1,193 additions and 102 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -1,4 +1,34 @@
-inpackage: False
-testonly: False
-with-expecter: True
-keeptree: True
+# mock might needed in all places
+testonly: false
+# for better usability of the mocks
+with-expecter: true
+# less changes in update pull requests
+disable-version-string: true
+# generate mocks in separate package
+inpackage: false
+# use original interface name as name, we use a dedicated `mocks` package to make the context clear
+mockname: "{{.InterfaceName}}"
+# snake case file names
+filename: "{{.InterfaceNameSnake}}.go"
+# place all mocks in the mocks package
+outpkg: "mocks"
+# all mocks should live near their interfaces
+dir: "{{.InterfaceDirRelative}}/mocks"
+
+# mocks to generate
+packages:
+  "flamingo.me/form/domain":
+    config:
+      all: true
+      recursive: true
+  "flamingo.me/form/application":
+    config:
+      all: true
+      recursive: true
+  "github.com/go-playground/validator/v10":
+    config:
+      dir: "domain/mocks"
+    interfaces:
+      FieldLevel:
+      StructLevel:
+      FieldError:
diff --git a/application/doc.go b/application/doc.go
diff --git a/application/fake/form_handler_builder.go b/application/fake/form_handler_builder.go
@@ -3,13 +3,12 @@ package fake
 import (
 	"flamingo.me/form/application"
 	"flamingo.me/form/domain"
-	"flamingo.me/form/domain/mocks"
 )
 
 type (
 	// formHandlerBuilderImpl defines faked implementation of FormHandlerBuilder interface used for unit testing
 	formHandlerBuilderImpl struct {
-		formHandler *mocks.FormHandler
+		formHandler domain.FormHandler
 	}
 )
 

diff --git a/application/fake/form_handler_factory.go b/application/fake/form_handler_factory.go
@@ -3,18 +3,17 @@ package fake
 import (
 	"flamingo.me/form/application"
 	"flamingo.me/form/domain"
-	"flamingo.me/form/domain/mocks"
 )
 
 type (
 	// FormHandlerFactoryImpl defines faked implementation of FormHandlerFactory interface used for unit testing
 	FormHandlerFactoryImpl struct {
-		formHandler *mocks.FormHandler
+		formHandler domain.FormHandler
 	}
 )
 
 // New returns faked implementation of FormHandlerFactory interface which should deliver mocked domain.FormHandler instance
-func New(formHandler *mocks.FormHandler) application.FormHandlerFactory {
+func New(formHandler domain.FormHandler) application.FormHandlerFactory {
 	return &FormHandlerFactoryImpl{
 		formHandler: formHandler,
 	}

diff --git a/application/fake/validator.go b/application/fake/validator.go
@@ -1,9 +1,8 @@
 package fake
 
 import (
-	"reflect"
-
 	"flamingo.me/form/domain/mocks"
+	"reflect"
 )
 
 // NewFieldLevel is helper method to provide mocked instance of validator.FieldLevel interface

diff --git a/application/mocks/form_data_encoder_factory.go b/application/mocks/form_data_encoder_factory.go
diff --git a/application/mocks/form_handler_builder.go b/application/mocks/form_handler_builder.go
diff --git a/application/mocks/form_handler_factory.go b/application/mocks/form_handler_factory.go
diff --git a/application/validator_provider.go b/application/validator_provider.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	validator "gopkg.in/go-playground/validator.v9"
+	"github.com/go-playground/validator/v10"
 
 	"flamingo.me/flamingo/v3/framework/web"
 	"flamingo.me/form/domain"

diff --git a/application/validator_provider_test.go b/application/validator_provider_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
+	validator "github.com/go-playground/validator/v10"
 	"github.com/stretchr/testify/suite"
-	validator "gopkg.in/go-playground/validator.v9"
 
 	"flamingo.me/flamingo/v3/framework/web"
 	"flamingo.me/form/domain"

diff --git a/domain/doc.go b/domain/doc.go
diff --git a/domain/mocks/complete_form_service.go b/domain/mocks/complete_form_service.go
diff --git a/domain/mocks/default_form_data_decoder.go b/domain/mocks/default_form_data_decoder.go
diff --git a/domain/mocks/default_form_data_encoder.go b/domain/mocks/default_form_data_encoder.go
diff --git a/domain/mocks/default_form_data_provider.go b/domain/mocks/default_form_data_provider.go
diff --git a/domain/mocks/default_form_data_validator.go b/domain/mocks/default_form_data_validator.go