Skip to content

Commit a1a3913

Browse files
committed
Migrate to mockery's packages configuration
This drops the `go:generate` lines and adds mocks for all files. This makes generating mocks a lot faster and avoids the need to annotate interfaces. Previously `make generated_files` took 75 seconds on my machine; now it only takes 4 seconds despite the increased amount of generated code. See https://vektra.github.io/mockery/latest/migrating_to_packages/ for more details.
1 parent 09da83f commit a1a3913

File tree

229 files changed

+17421
-303
lines changed

Some content is hidden

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

229 files changed

+17421
-303
lines changed

.mockery.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
with-expecter: True
2+
inpackage: True
3+
dir: "{{.InterfaceDir}}"
4+
mockname: "{{.Mock}}{{.InterfaceName | camelcase}}"
5+
outpkg: "{{.PackageName}}"
6+
filename: "mock_{{.InterfaceName}}.go"
7+
all: True
8+
packages:
9+
gitlab.com/gitlab-org/gitlab-runner:
10+
config:
11+
recursive: True
12+
exclude:
13+
- executors/internal/autoscaler

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export PATH := $(localBin):$(PATH)
4848
# Development Tools
4949
GOCOVER_COBERTURA = gocover-cobertura
5050

51-
MOCKERY_VERSION ?= 2.43.0
51+
MOCKERY_VERSION ?= 2.53.3
5252
MOCKERY = mockery
5353

5454
PROTOC := $(localBin)/protoc
@@ -194,6 +194,7 @@ generated_files: $(GENERATED_FILES_TOOLS)
194194
find . -type f -name '*.pb.go' -delete
195195
go generate -v -x ./...
196196
cd ./helpers/runner_wrapper/api && go generate -v -x ./...
197+
mockery
197198

198199
check_generated_files: generated_files
199200
# Checking the differences

cache/adapter.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ type GoCloudURL struct {
2222
Environment map[string]string
2323
}
2424

25-
//go:generate mockery --name=Adapter --inpackage
2625
type Adapter interface {
2726
GetDownloadURL(context.Context) PresignedURL
2827
GetUploadURL(context.Context) PresignedURL

cache/azure/credentials_resolver.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"gitlab.com/gitlab-org/gitlab-runner/common"
88
)
99

10-
//go:generate mockery --name=credentialsResolver --inpackage
1110
type credentialsResolver interface {
1211
Resolve() error
1312
Signer() (sasSigner, error)

cache/azure/mock_blobTokenGenerator.go

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

cache/azure/mock_credentialsResolver.go

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

0 commit comments

Comments
 (0)