Merge pull request #748 from opencloud-eu/mockery-polish

fix mockery warnings
2026-01-21 20:10:30 -06:00 · 2025-04-29 11:41:25 +02:00
parent 99d69b4707 3c38a3e3ed
commit bf6d07352f
35 changed files with 61 additions and 34 deletions
--- a/pkg/.mockery.yaml
+++ b/pkg/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 dir: "{{.PackageName}}/mocks"
 mockname: "{{.InterfaceName}}"
--- a/pkg/oidc/mocks/oidc_client.go
+++ b/pkg/oidc/mocks/oidc_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/protogen/.mockery.yaml
+++ b/protogen/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 dir: "{{.InterfaceDir}}/mocks"
 mockname: "{{.InterfaceName}}"
--- a/services/antivirus/.mockery.yaml
+++ b/services/antivirus/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 dir: "pkg/{{.PackageName}}/mocks"
 mockname: "{{.InterfaceName}}"
--- a/services/antivirus/pkg/scanners/mocks/scanner.go
+++ b/services/antivirus/pkg/scanners/mocks/scanner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/collaboration/.mockery.yaml
+++ b/services/collaboration/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
--- a/services/collaboration/mocks/connector_service.go
+++ b/services/collaboration/mocks/connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/collaboration/mocks/content_connector_service.go
+++ b/services/collaboration/mocks/content_connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/collaboration/mocks/file_connector_service.go
+++ b/services/collaboration/mocks/file_connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/collaboration/mocks/gateway_selector.go
+++ b/services/collaboration/mocks/gateway_selector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

@@ -8,11 +8,11 @@ import (
 )

 // Selectable is an autogenerated mock type for the Selectable type
-type Selectable[T interface{}] struct {
+type Selectable[T any] struct {
 	mock.Mock
 }

-type Selectable_Expecter[T interface{}] struct {
+type Selectable_Expecter[T any] struct {
 	mock *mock.Mock
 }

@@ -57,7 +57,7 @@ func (_m *Selectable[T]) Next(opts ...pool.Option) (T, error) {
 }

 // Selectable_Next_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Next'
-type Selectable_Next_Call[T interface{}] struct {
+type Selectable_Next_Call[T any] struct {
 	*mock.Call
 }

@@ -93,7 +93,7 @@ func (_c *Selectable_Next_Call[T]) RunAndReturn(run func(...pool.Option) (T, err

 // NewSelectable creates a new instance of Selectable. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewSelectable[T interface{}](t interface {
+func NewSelectable[T any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *Selectable[T] {
--- a/services/collaboration/mocks/lock_parser.go
+++ b/services/collaboration/mocks/lock_parser.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/.mockery.yaml
+++ b/services/graph/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
--- a/services/graph/mocks/base_graph_provider.go
+++ b/services/graph/mocks/base_graph_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/drive_item_permissions_provider.go
+++ b/services/graph/mocks/drive_item_permissions_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/drives_drive_item_provider.go
+++ b/services/graph/mocks/drives_drive_item_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/gateway_selector.go
+++ b/services/graph/mocks/gateway_selector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

@@ -8,11 +8,11 @@ import (
 )

 // Selectable is an autogenerated mock type for the Selectable type
-type Selectable[T interface{}] struct {
+type Selectable[T any] struct {
 	mock.Mock
 }

-type Selectable_Expecter[T interface{}] struct {
+type Selectable_Expecter[T any] struct {
 	mock *mock.Mock
 }

@@ -57,7 +57,7 @@ func (_m *Selectable[T]) Next(opts ...pool.Option) (T, error) {
 }

 // Selectable_Next_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Next'
-type Selectable_Next_Call[T interface{}] struct {
+type Selectable_Next_Call[T any] struct {
 	*mock.Call
 }

@@ -93,7 +93,7 @@ func (_c *Selectable_Next_Call[T]) RunAndReturn(run func(...pool.Option) (T, err

 // NewSelectable creates a new instance of Selectable. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewSelectable[T interface{}](t interface {
+func NewSelectable[T any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *Selectable[T] {
--- a/services/graph/mocks/http_client.go
+++ b/services/graph/mocks/http_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/permissions.go
+++ b/services/graph/mocks/permissions.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/publisher.go
+++ b/services/graph/mocks/publisher.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/mocks/role_service.go
+++ b/services/graph/mocks/role_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/pkg/identity/mocks/backend.go
+++ b/services/graph/pkg/identity/mocks/backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/pkg/identity/mocks/education_backend.go
+++ b/services/graph/pkg/identity/mocks/education_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/graph/pkg/identity/mocks/ldapclient.go
+++ b/services/graph/pkg/identity/mocks/ldapclient.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/invitations/.mockery.yaml
+++ b/services/invitations/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
--- a/services/invitations/pkg/backends/keycloak/mocks/client.go
+++ b/services/invitations/pkg/backends/keycloak/mocks/client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/proxy/.mockery.yaml
+++ b/services/proxy/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
--- a/services/proxy/pkg/user/backend/mocks/user_backend.go
+++ b/services/proxy/pkg/user/backend/mocks/user_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/proxy/pkg/userroles/mocks/user_role_assigner.go
+++ b/services/proxy/pkg/userroles/mocks/user_role_assigner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/search/.mockery.yaml
+++ b/services/search/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 dir: "pkg/{{.PackageName}}/mocks"
 mockname: "{{.InterfaceName}}"
--- a/services/search/pkg/content/mocks/extractor.go
+++ b/services/search/pkg/content/mocks/extractor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/search/pkg/content/mocks/retriever.go
+++ b/services/search/pkg/content/mocks/retriever.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/search/pkg/engine/mocks/engine.go
+++ b/services/search/pkg/engine/mocks/engine.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/search/pkg/search/mocks/searcher.go
+++ b/services/search/pkg/search/mocks/searcher.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/services/settings/.mockery.yaml
+++ b/services/settings/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
--- a/services/settings/pkg/settings/mocks/manager.go
+++ b/services/settings/pkg/settings/mocks/manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks