MG-2173 - Generate mocks with mockery for Twins service (#2174)

Signed-off-by: nyagamunene <[email protected]>
absmach · Apr 23, 2024 · 8915b73 · 8915b73
1 parent 07635ad
commit 8915b73
Show file tree

Hide file tree

Showing 49 changed files with 1,591 additions and 892 deletions.
diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
@@ -72,6 +72,9 @@ jobs:
               - "certs/certs.go"
               - "certs/pki/vault.go"
               - "certs/service.go"
+              - "twins/twins.go"
+              - "twins/states.go"
+              - "twins/service.go"
 
       - name: Set up protoc
         if: steps.changes.outputs.proto == 'true'
@@ -115,7 +118,7 @@ jobs:
       - name: Check Mocks are up to Date
         if: steps.changes.outputs.mocks == 'true'
         run: |
-          MOCKERY_VERSION=v2.42.1
+          MOCKERY_VERSION=v2.42.3
           go install github.com/vektra/mockery/v2@$MOCKERY_VERSION
 
           mv ./pkg/sdk/mocks/sdk.go ./pkg/sdk/mocks/sdk.go.tmp
@@ -150,6 +153,10 @@ jobs:
           mv ./certs/mocks/certs.go ./certs/mocks/certs.go.tmp
           mv ./certs/mocks/pki.go ./certs/mocks/pki.go.tmp
           mv ./certs/mocks/service.go ./certs/mocks/service.go.tmp
+          mv ./twins/mocks/service.go ./twins/mocks/service.go.tmp
+          mv ./twins/mocks/states.go ./twins/mocks/states.go.tmp
+          mv ./twins/mocks/repository.go ./twins/mocks/repository.go.tmp
+          mv ./twins/mocks/cache.go ./twins/mocks/cache.go.tmp
 
           make mocks
 
@@ -197,3 +204,7 @@ jobs:
           check_mock_changes ./certs/mocks/certs.go "Certs Repository ./certs/mocks/certs.go"
           check_mock_changes ./certs/mocks/pki.go "PKI ./certs/mocks/pki.go"
           check_mock_changes ./certs/mocks/service.go "Certs Service ./certs/mocks/service.go"
+          check_mock_changes ./twins/mocks/service.go "Twins Service ./twins/mocks/service.go"
+          check_mock_changes ./twins/mocks/states.go "Twins States ./twins/mocks/states.go"
+          check_mock_changes ./twins/mocks/repository.go "Twins Repository ./twins/mocks/repository.go"
+          check_mock_changes ./twins/mocks/cache.go "Twins Cache ./twins/mocks/cache.go"
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ DOCKER_PROJECT ?= $(shell echo $(subst $(space),,$(USER_REPO)) | tr -c -s '[:aln
 DOCKER_COMPOSE_COMMANDS_SUPPORTED := up down config
 DEFAULT_DOCKER_COMPOSE_COMMAND  := up
 GRPC_MTLS_CERT_FILES_EXISTS = 0
-MOCKERY_VERSION=v2.42.1
+MOCKERY_VERSION=v2.42.3
 ifneq ($(MG_MESSAGE_BROKER_TYPE),)
     MG_MESSAGE_BROKER_TYPE := $(MG_MESSAGE_BROKER_TYPE)
 else

diff --git a/auth/mocks/agent.go b/auth/mocks/agent.go
diff --git a/auth/mocks/authz.go b/auth/mocks/authz.go
diff --git a/auth/mocks/domains.go b/auth/mocks/domains.go
diff --git a/auth/mocks/keys.go b/auth/mocks/keys.go
diff --git a/auth/mocks/service.go b/auth/mocks/service.go
diff --git a/bootstrap/mocks/configs.go b/bootstrap/mocks/configs.go
diff --git a/bootstrap/mocks/service.go b/bootstrap/mocks/service.go
diff --git a/certs/mocks/certs.go b/certs/mocks/certs.go
diff --git a/certs/mocks/pki.go b/certs/mocks/pki.go
diff --git a/certs/mocks/service.go b/certs/mocks/service.go
diff --git a/consumers/notifiers/mocks/notifier.go b/consumers/notifiers/mocks/notifier.go
diff --git a/consumers/notifiers/mocks/repository.go b/consumers/notifiers/mocks/repository.go
diff --git a/consumers/notifiers/mocks/service.go b/consumers/notifiers/mocks/service.go
diff --git a/invitations/mocks/repository.go b/invitations/mocks/repository.go
diff --git a/invitations/mocks/service.go b/invitations/mocks/service.go
diff --git a/lora/adapter_test.go b/lora/adapter_test.go
@@ -137,8 +137,6 @@ func TestPublish(t *testing.T) {
 		repoCall2 := connsRM.On("Get", context.Background(), mock.Anything).Return("", tc.connectionsErr)
 		repoCall3 := pub.On("Publish", context.Background(), tc.msg.ApplicationID, mock.Anything).Return(tc.publishErr)
 		err := svc.Publish(context.Background(), &tc.msg)
-		fmt.Println(err)
-		fmt.Println(tc.err)
 		assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
 		repoCall.Unset()
 		repoCall1.Unset()

diff --git a/lora/mocks/routes.go b/lora/mocks/routes.go
diff --git a/mqtt/mocks/events.go b/mqtt/mocks/events.go
diff --git a/pkg/events/mocks/publisher.go b/pkg/events/mocks/publisher.go
diff --git a/pkg/events/mocks/subscriber.go b/pkg/events/mocks/subscriber.go
diff --git a/pkg/groups/mocks/repository.go b/pkg/groups/mocks/repository.go
diff --git a/pkg/groups/mocks/service.go b/pkg/groups/mocks/service.go
diff --git a/pkg/messaging/mocks/pubsub.go b/pkg/messaging/mocks/pubsub.go
diff --git a/pkg/oauth2/mocks/provider.go b/pkg/oauth2/mocks/provider.go
diff --git a/pkg/sdk/mocks/sdk.go b/pkg/sdk/mocks/sdk.go
diff --git a/provision/mocks/service.go b/provision/mocks/service.go
diff --git a/readers/mocks/messages.go b/readers/mocks/messages.go
diff --git a/things/mocks/cache.go b/things/mocks/cache.go
diff --git a/things/mocks/repository.go b/things/mocks/repository.go
diff --git a/things/mocks/service.go b/things/mocks/service.go