Update mockery to v3 (#327)

* Update mockery to v3

Signed-off-by: lapentafd <francesco.lapenta@est.tech>

* fix lower came struct-causing private methods

Signed-off-by: lapentafd <francesco.lapenta@est.tech>

---------

Signed-off-by: lapentafd <francesco.lapenta@est.tech>

Author: lapentad

.mockery.yaml

@@ -1,62 +1,46 @@
-with-expecter: true
+template: testify
+template-data:
+  unroll-variadic: true
+filename: "mock_{{ .InterfaceName }}.go"
+dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+
 packages:
   sigs.k8s.io/controller-runtime/pkg/client:
     interfaces:
       Client:
         config:
-          dir: "test/mockery/mocks/external/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+          dir: "test/mockery/mocks/external/sigs.k8s.io/controller-runtime/pkg/client"
       Reader:
         config:
-          dir: "test/mockery/mocks/external/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+          dir: "test/mockery/mocks/external/sigs.k8s.io/controller-runtime/pkg/client"
       SubResourceWriter:
         config:
-          dir: "test/mockery/mocks/external/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+          dir: "test/mockery/mocks/external/sigs.k8s.io/controller-runtime/pkg/client"
       WithWatch:
         config:
-          dir: "test/mockery/mocks/external/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+          dir: "test/mockery/mocks/external/sigs.k8s.io/controller-runtime/pkg/client"
+
   github.com/nephio-project/porch/pkg/cache/crcache/meta:
     interfaces:
-      MetadataStore:
-        config:
-          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+      MetadataStore: {}
+
   github.com/nephio-project/porch/pkg/cache/dbcache:
     interfaces:
       dbSQLInterface:
         config:
-          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+          structname: "MockdbSQLInterface"
+
   github.com/nephio-project/porch/pkg/cache/types:
     interfaces:
-      Cache:
-        config:
-          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
-      RepoPRChangeNotifier:
-        config:
-          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+      Cache: {}
+      RepoPRChangeNotifier: {}
+
   github.com/nephio-project/porch/pkg/repository:
     interfaces:
-      Repository:
-        config:
-          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
-      PackageRevision:
-        config:
-          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
-      PackageRevisionDraft:
-        config:
-          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+      Repository: {}
+      PackageRevision: {}
+      PackageRevisionDraft: {}
+
   github.com/nephio-project/porch/pkg/engine:
     interfaces:
-      CaDEngine:
-        config:
-          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
-          outpkg: "{{.PackageName}}"
+      CaDEngine: {}

.mockery.yaml.bak

@@ -0,0 +1,62 @@
+with-expecter: true
+packages:
+  sigs.k8s.io/controller-runtime/pkg/client:
+    interfaces:
+      Client:
+        config:
+          dir: "test/mockery/mocks/external/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+      Reader:
+        config:
+          dir: "test/mockery/mocks/external/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+      SubResourceWriter:
+        config:
+          dir: "test/mockery/mocks/external/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+      WithWatch:
+        config:
+          dir: "test/mockery/mocks/external/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+  github.com/nephio-project/porch/pkg/cache/crcache/meta:
+    interfaces:
+      MetadataStore:
+        config:
+          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+  github.com/nephio-project/porch/pkg/cache/dbcache:
+    interfaces:
+      dbSQLInterface:
+        config:
+          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+  github.com/nephio-project/porch/pkg/cache/types:
+    interfaces:
+      Cache:
+        config:
+          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+      RepoPRChangeNotifier:
+        config:
+          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+  github.com/nephio-project/porch/pkg/repository:
+    interfaces:
+      Repository:
+        config:
+          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+      PackageRevision:
+        config:
+          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+      PackageRevisionDraft:
+        config:
+          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"
+  github.com/nephio-project/porch/pkg/engine:
+    interfaces:
+      CaDEngine:
+        config:
+          dir: "test/mockery/mocks/porch/{{.InterfaceDirRelative}}"
+          outpkg: "{{.PackageName}}"

default-mockery.mk

@@ -13,7 +13,7 @@
 #  limitations under the License.
 
 
-MOCKERY_VERSION=2.53.3
+MOCKERY_VERSION=3.5.5
 GIT_ROOT_DIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
 OS_ARCH ?= $(shell uname -m)
 OS ?= $(shell uname)