Skip to content

Commit 6011cad

Browse files
felixgaterufelixgateru
authored
NOISSUE - Update Mockery version and config (#2784)
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
1 parent e56b868 commit 6011cad

File tree

99 files changed

+23376
-9116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+23376
-9116
lines changed

‎.github/workflows/check-generated-files.yaml‎

Lines changed: 9 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -115,50 +115,9 @@ jobs:
115115
- name: Check Mocks are up to Date
116116
if: steps.changes.outputs.mocks == 'true'
117117
run: |
118-
MOCKERY_VERSION=v2.43.2
119-
go install github.com/vektra/mockery/v2@$MOCKERY_VERSION
120-
121-
mv ./auth/mocks/token_client.go ./auth/mocks/token_client.go.tmp
122-
mv ./auth/mocks/authz.go ./auth/mocks/authz.go.tmp
123-
mv ./auth/mocks/keys.go ./auth/mocks/keys.go.tmp
124-
mv ./auth/mocks/service.go ./auth/mocks/service.go.tmp
125-
mv ./domains/mocks/domains_client.go ./domains/mocks/domains_client.go.tmp
126-
mv ./domains/mocks/repository.go ./domains/mocks/repository.go.tmp
127-
mv ./domains/mocks/service.go ./domains/mocks/service.go.tmp
128-
mv ./channels/mocks/repository.go ./channels/mocks/repository.go.tmp
129-
mv ./channels/mocks/channels_client.go ./channels/mocks/channels_client.go.tmp
130-
mv ./channels/mocks/service.go ./channels/mocks/service.go.tmp
131-
mv ./groups/private/mocks/service.go ./groups/private/mocks/service.go.tmp
132-
mv ./groups/mocks/repository.go ./groups/mocks/repository.go.tmp
133-
mv ./groups/mocks/groups_client.go ./groups/mocks/groups_client.go.tmp
134-
mv ./groups/mocks/service.go ./groups/mocks/service.go.tmp
135-
mv ./users/mocks/hasher.go ./users/mocks/hasher.go.tmp
136-
mv ./users/mocks/emailer.go ./users/mocks/emailer.go.tmp
137-
mv ./users/mocks/repository.go ./users/mocks/repository.go.tmp
138-
mv ./users/mocks/service.go ./users/mocks/service.go.tmp
139-
mv ./journal/mocks/repository.go ./journal/mocks/repository.go.tmp
140-
mv ./journal/mocks/service.go ./journal/mocks/service.go.tmp
141-
mv ./certs/mocks/pki.go ./certs/mocks/pki.go.tmp
142-
mv ./certs/mocks/service.go ./certs/mocks/service.go.tmp
143-
mv ./clients/private/mocks/service.go ./clients/private/mocks/service.go.tmp
144-
mv ./clients/mocks/repository.go ./clients/mocks/repository.go.tmp
145-
mv ./clients/mocks/clients_client.go ./clients/mocks/clients_client.go.tmp
146-
mv ./clients/mocks/cache.go ./clients/mocks/cache.go.tmp
147-
mv ./clients/mocks/service.go ./clients/mocks/service.go.tmp
148-
mv ./readers/mocks/messages.go ./readers/mocks/messages.go.tmp
149-
mv ./pkg/sdk/mocks/sdk.go ./pkg/sdk/mocks/sdk.go.tmp
150-
mv ./pkg/messaging/mocks/pubsub.go ./pkg/messaging/mocks/pubsub.go.tmp
151-
mv ./pkg/authn/mocks/authn.go ./pkg/authn/mocks/authn.go.tmp
152-
mv ./pkg/roles/mocks/rolesRepo.go ./pkg/roles/mocks/rolesRepo.go.tmp
153-
mv ./pkg/roles/mocks/provisioner.go ./pkg/roles/mocks/provisioner.go.tmp
154-
mv ./pkg/roles/mocks/rolemanager.go ./pkg/roles/mocks/rolemanager.go.tmp
155-
mv ./pkg/oauth2/mocks/provider.go ./pkg/oauth2/mocks/provider.go.tmp
156-
mv ./pkg/authz/mocks/authz.go ./pkg/authz/mocks/authz.go.tmp
157-
mv ./pkg/events/mocks/subscriber.go ./pkg/events/mocks/subscriber.go.tmp
158-
mv ./pkg/events/mocks/publisher.go ./pkg/events/mocks/publisher.go.tmp
159-
mv ./pkg/policies/mocks/evaluator.go ./pkg/policies/mocks/evaluator.go.tmp
160-
mv ./pkg/policies/mocks/service.go ./pkg/policies/mocks/service.go.tmp
161-
mv ./consumers/mocks/notifier.go ./consumers/mocks/notifier.go.tmp
118+
for f in $(find . -type f -path '*/mocks/*.go' ! -name 'doc.go'); do
119+
mv $f $f.tmp
120+
done
162121
163122
make mocks
164123
@@ -168,50 +127,12 @@ jobs:
168127
local entity_name=$2
169128
170129
if ! cmp -s "$file_path" "$tmp_file_path"; then
171-
echo "Error: Generated mocks for $entity_name are out of sync!"
172-
echo "Please run 'make mocks' with mockery version $MOCKERY_VERSION and commit the changes."
173-
exit 1
130+
echo "Error: Generated mocks for $entity_name are out of sync!"
131+
echo "Please run 'make mocks' with mockery version $MOCKERY_VERSION and commit the changes."
132+
exit 1
174133
fi
175134
}
176135
177-
check_mock_changes ./auth/mocks/token_client.go " ./auth/mocks/token_client.go"
178-
check_mock_changes ./auth/mocks/authz.go " ./auth/mocks/authz.go"
179-
check_mock_changes ./auth/mocks/keys.go " ./auth/mocks/keys.go"
180-
check_mock_changes ./auth/mocks/service.go " ./auth/mocks/service.go"
181-
check_mock_changes ./domains/mocks/domains_client.go " ./domains/mocks/domains_client.go"
182-
check_mock_changes ./domains/mocks/repository.go " ./domains/mocks/repository.go"
183-
check_mock_changes ./domains/mocks/service.go " ./domains/mocks/service.go"
184-
check_mock_changes ./channels/mocks/repository.go " ./channels/mocks/repository.go"
185-
check_mock_changes ./channels/mocks/channels_client.go " ./channels/mocks/channels_client.go"
186-
check_mock_changes ./channels/mocks/service.go " ./channels/mocks/service.go"
187-
check_mock_changes ./groups/private/mocks/service.go " ./groups/private/mocks/service.go"
188-
check_mock_changes ./groups/mocks/repository.go " ./groups/mocks/repository.go"
189-
check_mock_changes ./groups/mocks/groups_client.go " ./groups/mocks/groups_client.go"
190-
check_mock_changes ./groups/mocks/service.go " ./groups/mocks/service.go"
191-
check_mock_changes ./users/mocks/hasher.go " ./users/mocks/hasher.go"
192-
check_mock_changes ./users/mocks/emailer.go " ./users/mocks/emailer.go"
193-
check_mock_changes ./users/mocks/repository.go " ./users/mocks/repository.go"
194-
check_mock_changes ./users/mocks/service.go " ./users/mocks/service.go"
195-
check_mock_changes ./journal/mocks/repository.go " ./journal/mocks/repository.go"
196-
check_mock_changes ./journal/mocks/service.go " ./journal/mocks/service.go"
197-
check_mock_changes ./certs/mocks/pki.go " ./certs/mocks/pki.go"
198-
check_mock_changes ./certs/mocks/service.go " ./certs/mocks/service.go"
199-
check_mock_changes ./clients/private/mocks/service.go " ./clients/private/mocks/service.go"
200-
check_mock_changes ./clients/mocks/repository.go " ./clients/mocks/repository.go"
201-
check_mock_changes ./clients/mocks/clients_client.go " ./clients/mocks/clients_client.go"
202-
check_mock_changes ./clients/mocks/cache.go " ./clients/mocks/cache.go"
203-
check_mock_changes ./clients/mocks/service.go " ./clients/mocks/service.go"
204-
check_mock_changes ./readers/mocks/messages.go " ./readers/mocks/messages.go"
205-
check_mock_changes ./pkg/sdk/mocks/sdk.go " ./pkg/sdk/mocks/sdk.go"
206-
check_mock_changes ./pkg/messaging/mocks/pubsub.go " ./pkg/messaging/mocks/pubsub.go"
207-
check_mock_changes ./pkg/authn/mocks/authn.go " ./pkg/authn/mocks/authn.go"
208-
check_mock_changes ./pkg/roles/mocks/rolesRepo.go " ./pkg/roles/mocks/rolesRepo.go"
209-
check_mock_changes ./pkg/roles/mocks/provisioner.go " ./pkg/roles/mocks/provisioner.go"
210-
check_mock_changes ./pkg/roles/mocks/rolemanager.go " ./pkg/roles/mocks/rolemanager.go"
211-
check_mock_changes ./pkg/oauth2/mocks/provider.go " ./pkg/oauth2/mocks/provider.go"
212-
check_mock_changes ./pkg/authz/mocks/authz.go " ./pkg/authz/mocks/authz.go"
213-
check_mock_changes ./pkg/events/mocks/subscriber.go " ./pkg/events/mocks/subscriber.go"
214-
check_mock_changes ./pkg/events/mocks/publisher.go " ./pkg/events/mocks/publisher.go"
215-
check_mock_changes ./pkg/policies/mocks/evaluator.go " ./pkg/policies/mocks/evaluator.go"
216-
check_mock_changes ./pkg/policies/mocks/service.go " ./pkg/policies/mocks/service.go"
217-
check_mock_changes ./consumers/mocks/notifier.go " ./consumers/mocks/notifier.go"
136+
for f in $(find . -type f -path '*/mocks/*.go' ! -name 'doc.go'); do
137+
check_mock_changes $f "$f"
138+
done

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DOCKER_PROJECT ?= $(shell echo $(subst $(space),,$(USER_REPO)) | sed -E 's/[^a-z
2121
DOCKER_COMPOSE_COMMANDS_SUPPORTED := up down config restart
2222
DEFAULT_DOCKER_COMPOSE_COMMAND := up
2323
GRPC_MTLS_CERT_FILES_EXISTS = 0
24-
MOCKERY_VERSION=v2.43.2
24+
MOCKERY_VERSION=v3.0.0-beta.6
2525
PKG_PROTO_GEN_OUT_DIR=api/grpc
2626
INTERNAL_PROTO_DIR=internal/proto
2727
INTERNAL_PROTO_FILES := $(shell find $(INTERNAL_PROTO_DIR) -name "*.proto" | sed 's|$(INTERNAL_PROTO_DIR)/||')
@@ -118,8 +118,8 @@ install:
118118
done
119119

120120
mocks:
121-
@which mockery > /dev/null || go install github.com/vektra/mockery/v2@$(MOCKERY_VERSION)
122-
@unset MOCKERY_VERSION && go generate ./...
121+
@which mockery > /dev/null || go install github.com/vektra/mockery/v3@$(MOCKERY_VERSION)
122+
@unset MOCKERY_VERSION
123123
mockery --config ./tools/config/.mockery.yaml
124124

125125

‎auth/callback.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ type callback struct {
2424
}
2525

2626
// CallBack send auth request to an external service.
27-
//
28-
//go:generate mockery --name CallBack --output=./mocks --filename callback.go --quiet --note "Copyright (c) Abstract Machines"
2927
type CallBack interface {
3028
Authorize(ctx context.Context, pr policies.Policy) error
3129
}

‎auth/hasher.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ package auth
55

66
// Hasher specifies an API for generating hashes of an arbitrary textual
77
// content.
8-
//
9-
//go:generate mockery --name Hasher --output=./mocks --filename hasher.go --quiet --note "Copyright (c) Abstract Machines"
108
type Hasher interface {
119
// Hash generates the hashed string from plain-text.
1210
Hash(string) (string, error)

‎auth/keys.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ func (key Key) Expired() bool {
9191
}
9292

9393
// KeyRepository specifies Key persistence API.
94-
//
95-
//go:generate mockery --name KeyRepository --output=./mocks --filename keys.go --quiet --note "Copyright (c) Abstract Machines"
9694
type KeyRepository interface {
9795
// Save persists the Key. A non-nil error is returned to indicate
9896
// operation failure

‎auth/mocks/authz.go‎

Lines changed: 59 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)