Fix mocks (#88)

metal-stack · Feb 23, 2024 · ee25d59 · ee25d59
1 parent 37950af
commit ee25d59
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -59,13 +59,13 @@ mocks:
 		--user $$(id -u):$$(id -g) \
 		-w /work \
 		-v ${PWD}:/work \
-		vektra/mockery:v2.38.0 -r --keeptree --dir api/v1 --output api/v1/mocks --all
+		vektra/mockery:v2.42.0 -r --keeptree --dir api/v1 --output api/v1/mocks --all
 
 	docker run --rm \
 		--user $$(id -u):$$(id -g) \
 		-w /work \
 		-v ${PWD}:/work \
-		vektra/mockery:v2.38.0 -r --keeptree --dir pkg/datastore --output pkg/datastore/mocks --all
+		vektra/mockery:v2.42.0 -r --keeptree --dir pkg/datastore --output pkg/datastore/mocks --all
 
 .PHONY: postgres-up
 postgres-up: postgres-rm

diff --git a/api/v1/mocks/ProjectMemberServiceClient.go b/api/v1/mocks/ProjectMemberServiceClient.go
diff --git a/api/v1/mocks/ProjectMemberServiceServer.go b/api/v1/mocks/ProjectMemberServiceServer.go
diff --git a/api/v1/mocks/ProjectServiceClient.go b/api/v1/mocks/ProjectServiceClient.go
diff --git a/api/v1/mocks/ProjectServiceServer.go b/api/v1/mocks/ProjectServiceServer.go
diff --git a/api/v1/mocks/TenantServiceClient.go b/api/v1/mocks/TenantServiceClient.go
diff --git a/api/v1/mocks/TenantServiceServer.go b/api/v1/mocks/TenantServiceServer.go
diff --git a/api/v1/mocks/UnsafeProjectMemberServiceServer.go b/api/v1/mocks/UnsafeProjectMemberServiceServer.go
diff --git a/api/v1/mocks/UnsafeProjectServiceServer.go b/api/v1/mocks/UnsafeProjectServiceServer.go
diff --git a/api/v1/mocks/UnsafeTenantServiceServer.go b/api/v1/mocks/UnsafeTenantServiceServer.go
diff --git a/pkg/client/mock.go b/pkg/client/mock.go
@@ -5,14 +5,16 @@ import (
 )
 
 type MockClient struct {
-	psc v1.ProjectServiceClient
-	tsc v1.TenantServiceClient
+	psc  v1.ProjectServiceClient
+	tsc  v1.TenantServiceClient
+	pmsc v1.ProjectMemberServiceClient
 }
 
-func NewMock(psc v1.ProjectServiceClient, tsc v1.TenantServiceClient) *MockClient {
+func NewMock(psc v1.ProjectServiceClient, tsc v1.TenantServiceClient, pmsc v1.ProjectMemberServiceClient) *MockClient {
 	return &MockClient{
-		psc: psc,
-		tsc: tsc,
+		psc:  psc,
+		tsc:  tsc,
+		pmsc: pmsc,
 	}
 }
 
@@ -22,6 +24,9 @@ func (c *MockClient) Close() error {
 func (c *MockClient) Project() v1.ProjectServiceClient {
 	return c.psc
 }
+func (c *MockClient) ProjectMember() v1.ProjectMemberServiceClient {
+	return c.pmsc
+}
 
 func (c *MockClient) Tenant() v1.TenantServiceClient {
 	return c.tsc

diff --git a/pkg/datastore/mocks/Entity.go b/pkg/datastore/mocks/Entity.go
diff --git a/pkg/datastore/mocks/Storage.go b/pkg/datastore/mocks/Storage.go