Skip to content

Commit e08c781

Browse files
temporal-nicktemporal-nick
authored
use go tool for mockgen (#152)
1 parent a4ecf67 commit e08c781

6 files changed

Lines changed: 30 additions & 17 deletions

File tree

‎Makefile‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ s2s-proxy: $(ALL_SRC)
3333
update-tools:
3434
# When changing the golangci-lint version, update the version in .github/workflows/pull-request.yml
3535
$(GO_GET_TOOL) github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1
36-
go mod tidy --modfile=$(TOOLS_MOD_FILE)
36+
$(GO_GET_TOOL) go.uber.org/mock/mockgen@v0.5.0
37+
-go mod tidy --modfile=$(TOOLS_MOD_FILE) 2>/dev/null
3738

3839
# Refer to .golangci.yml for configuration options
3940
fmt:
@@ -48,7 +49,7 @@ bench:
4849
@go test -run '^$$' -benchmem -bench=. ./... $(BENCH_ARG)
4950

5051
.PHONY: genvisitor
51-
GENVISITOR_FLAGS ?= # -debug -dump-tree
52+
GENVISITOR_FLAGS ?= # -debug -dump-tre
5253
genvisitor:
5354
go run ./cmd/tools/genvisitor/ $(GENVISITOR_FLAGS) > proto/compat/repair_utf8_gen.go
5455
go fmt proto/compat/repair_utf8_gen.go
@@ -58,16 +59,9 @@ genvisitor:
5859
clean-mocks:
5960
@find . -name '*_mock.go' -delete
6061

61-
MOCKGEN_VER = v0.4.0
62-
mocks: clean-mocks
63-
@if [ "$$(mockgen -version)" != "$(MOCKGEN_VER)" ]; then \
64-
echo -e "ERROR: mockgen is not version $(MOCKGEN_VER)\n"; \
65-
echo -e " Run go install go.uber.org/mock/mockgen@$(MOCKGEN_VER)\n"; \
66-
echo -e " Or, bump MOCKGEN_VER in the Makefile\n"; \
67-
exit 1; \
68-
fi;
69-
@mockgen -source config/config.go -destination mocks/config/config_mock.go -package config
70-
@mockgen -source client/temporal_client.go -destination mocks/client/temporal_client_mock.go -package client
62+
mocks: clean-mocks update-tools
63+
$(GO_TOOL) mockgen -source config/config.go -destination mocks/config/config_mock.go -package config
64+
$(GO_TOOL) mockgen -source client/temporal_client.go -destination mocks/client/temporal_client_mock.go -package client
7165

7266
# Tests
7367
clean-tests:

‎develop/tools.mod‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ module tools
22

33
go 1.24.4
44

5-
tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint
5+
tool (
6+
github.com/golangci/golangci-lint/v2/cmd/golangci-lint
7+
go.uber.org/mock/mockgen
8+
)
69

710
require (
811
github.com/gogo/status v1.1.1
@@ -15,9 +18,9 @@ require (
1518
github.com/temporalio/s2s-proxy v0.1.3
1619
github.com/urfave/cli/v2 v2.27.7
1720
go.temporal.io/api v1.50.0
18-
go.temporal.io/server v1.27.2
21+
go.temporal.io/server v1.27.0-127.2
1922
go.uber.org/fx v1.24.0
20-
go.uber.org/mock v0.5.2
23+
go.uber.org/mock v0.5.0
2124
golang.org/x/text v0.26.0
2225
google.golang.org/grpc v1.71.0
2326
google.golang.org/protobuf v1.36.6

‎develop/tools.sum‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
218218
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
219219
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
220220
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
221+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
221222
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
222223
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
223224
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -559,6 +560,7 @@ go.temporal.io/api v1.50.0 h1:7s8Cn+fKfNx9G0v2Ge9We6X2WiCA3JvJ9JryeNbx1Bc=
559560
go.temporal.io/api v1.50.0/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
560561
go.temporal.io/sdk v1.33.0 h1:T91UzeRdlHTiMGgpygsItOH9+VSkg+M/mG85PqNjdog=
561562
go.temporal.io/sdk v1.33.0/go.mod h1:WwCmJZLy7zabz3ar5NRAQEygsdP8tgR9sDjISSHuWZw=
563+
go.temporal.io/server v1.27.0-127.2/go.mod h1:YCXcNd35p3adVdYHxbblEfPn2t247tACTKNMHk4HTJI=
562564
go.temporal.io/server v1.27.2 h1:EJBatFezrKinkebV8KZKidYEr8DZdFaoL0FvC4LSlU8=
563565
go.temporal.io/server v1.27.2/go.mod h1:6v5/iYPKipHW9dw4B48IeYoLlr2WsBHESXDQ4D8F3ys=
564566
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -573,6 +575,10 @@ go.uber.org/fx v1.24.0/go.mod h1:AmDeGyS+ZARGKM4tlH4FY2Jr63VjbEDJHtqXTGP5hbo=
573575
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
574576
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
575577
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
578+
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
579+
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
580+
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
581+
go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
576582
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
577583
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
578584
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ require (
7070
go.uber.org/dig v1.18.1 // indirect
7171
go.uber.org/multierr v1.11.0 // indirect
7272
go.uber.org/zap v1.27.0 // indirect
73+
golang.org/x/mod v0.24.0 // indirect
7374
golang.org/x/net v0.38.0 // indirect
7475
golang.org/x/sync v0.12.0 // indirect
7576
golang.org/x/sys v0.31.0 // indirect
7677
golang.org/x/time v0.11.0 // indirect
78+
golang.org/x/tools v0.31.0 // indirect
7779
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
7880
)

‎go.sum‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ go.temporal.io/api v1.46.0 h1:O1efPDB6O2B8uIeCDIa+3VZC7tZMvYsMZYQapSbHvCg=
154154
go.temporal.io/api v1.46.0/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
155155
go.temporal.io/sdk v1.33.0 h1:T91UzeRdlHTiMGgpygsItOH9+VSkg+M/mG85PqNjdog=
156156
go.temporal.io/sdk v1.33.0/go.mod h1:WwCmJZLy7zabz3ar5NRAQEygsdP8tgR9sDjISSHuWZw=
157+
go.temporal.io/server v1.27.0-127.2 h1:L/lglLPBH4evL9fBTeVkRbVZuhw11SSUpyCAJ5QyVEU=
158+
go.temporal.io/server v1.27.0-127.2/go.mod h1:YCXcNd35p3adVdYHxbblEfPn2t247tACTKNMHk4HTJI=
157159
go.temporal.io/server v1.27.2 h1:EJBatFezrKinkebV8KZKidYEr8DZdFaoL0FvC4LSlU8=
158160
go.temporal.io/server v1.27.2/go.mod h1:6v5/iYPKipHW9dw4B48IeYoLlr2WsBHESXDQ4D8F3ys=
159161
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -166,6 +168,8 @@ go.uber.org/fx v1.23.0/go.mod h1:o/D9n+2mLP6v1EG+qsdT1O8wKopYAsqZasju97SDFCU=
166168
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
167169
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
168170
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
171+
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
172+
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
169173
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
170174
go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
171175
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@@ -187,6 +191,8 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
187191
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
188192
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
189193
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
194+
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
195+
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
190196
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
191197
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
192198
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -237,6 +243,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
237243
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
238244
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
239245
golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
246+
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
247+
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
240248
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
241249
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
242250
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎mocks/config/config_mock.go‎

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

0 commit comments

Comments
 (0)