MG-2193 - Generate mocks for proto interface (#2324)

Signed-off-by: JeffMboya <[email protected]>
absmach · Jul 12, 2024 · 468362a · 468362a
1 parent 04c3594
commit 468362a
Show file tree

Hide file tree

Showing 23 changed files with 1,330 additions and 191 deletions.
diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
@@ -76,6 +76,7 @@ jobs:
               - "twins/states.go"
               - "twins/service.go"
               - "journal/journal.go"
+              - "magistrala/auth_grpc.pb.go"
 
       - name: Set up protoc
         if: steps.changes.outputs.proto == 'true'
@@ -160,6 +161,7 @@ jobs:
           mv ./twins/mocks/cache.go ./twins/mocks/cache.go.tmp
           mv ./journal/mocks/repository.go ./journal/mocks/repository.go.tmp
           mv ./journal/mocks/service.go ./journal/mocks/service.go.tmp
+          mv ./auth/mocks/auth_client.go ./auth/mocks/auth_client.go.tmp
 
           make mocks
 
@@ -213,3 +215,4 @@ jobs:
           check_mock_changes ./twins/mocks/cache.go "Twins Cache ./twins/mocks/cache.go"
           check_mock_changes ./journal/mocks/repository.go "Journal Repository ./journal/mocks/repository.go"
           check_mock_changes ./journal/mocks/service.go "Journal Service ./journal/mocks/service.go"
+          check_mock_changes ./auth/mocks/auth_client.go "Auth Service Client ./auth/mocks/auth_client.go"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -27,6 +27,7 @@ jobs:
         uses: golangci/golangci-lint-action@v6
         with:
           version: v1.59.1
+          args: --config ./tools/config/.golangci.yml
 
       - name: Build all Binaries
         run: |

diff --git a/Makefile b/Makefile
@@ -99,7 +99,7 @@ FILTERED_SERVICES = $(filter-out $(RUN_ADDON_ARGS), $(SERVICES))
 
 all: $(SERVICES)
 
-.PHONY: all $(SERVICES) dockers dockers_dev latest release run run_addons grpc_mtls_certs check_mtls check_certs test_api
+.PHONY: all $(SERVICES) dockers dockers_dev latest release run run_addons grpc_mtls_certs check_mtls check_certs test_api mocks
 
 clean:
 	rm -rf ${BUILD_DIR}
@@ -121,6 +121,7 @@ install:
 mocks:
 	@which mockery > /dev/null || go install github.com/vektra/mockery/v2@$(MOCKERY_VERSION)
 	@unset MOCKERY_VERSION && go generate ./...
+	mockery --config ./tools/config/mockery.yaml
 
 
 DIRS = consumers readers postgres internal opcua

diff --git a/auth/api/grpc/endpoint_test.go b/auth/api/grpc/endpoint_test.go
@@ -1012,7 +1012,7 @@ func TestListPermissions(t *testing.T) {
 }
 
 func TestDeleteEntityPolicies(t *testing.T) {
-	conn, err := grpc.Dial(authAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(authAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	assert.Nil(t, err, fmt.Sprintf("Unexpected error creating client connection %s", err))
 	client := grpcapi.NewClient(conn, time.Second)