Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.

Commit ef6489c

Browse files
valaparthvirm3l
andauthored
Add mockgen installation to the script (#6604)
* Add mockgen installation to the script Signed-off-by: Parthvi Vala <pvala@redhat.com> * Use go install -mod=readonly instead of installing the binary Signed-off-by: Parthvi Vala <pvala@redhat.com> * Add mockgen installation to goget-tools target incase the user wants to run the script individually Signed-off-by: Parthvi Vala <pvala@redhat.com> * Update Makefile Co-authored-by: Armel Soro <armel@rm3l.org> --------- Signed-off-by: Parthvi Vala <pvala@redhat.com> Co-authored-by: Armel Soro <asoro@redhat.com> Co-authored-by: Armel Soro <armel@rm3l.org>
1 parent 26c90d7 commit ef6489c

2 files changed

Lines changed: 34 additions & 25 deletions

File tree

‎Makefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ GOLANGCI_LINT_VERSION=1.49.0
6868

6969
RUN_GINKGO = go run -mod=vendor github.com/onsi/ginkgo/v2/ginkgo
7070

71+
# making sure that mockgen binary version is the same as github.com/golang/mock library version
72+
GO_MOCK_LIBRARY_VERSION = $(shell go list -mod=readonly -m -f '{{.Version}}' github.com/golang/mock)
73+
7174
default: bin
7275

7376
.PHONY: help
@@ -127,8 +130,9 @@ clean:
127130
@rm -rf $(FILES)
128131

129132
.PHONY: goget-tools
130-
goget-tools:
131-
(cd / && go install -mod=mod github.com/golangci/golangci-lint/cmd/golangci-lint@v$(GOLANGCI_LINT_VERSION))
133+
goget-tools: ## Install binaries of the tools used by odo (current list: golangci-lint, mockgen)
134+
cd / && go install -mod=mod github.com/golangci/golangci-lint/cmd/golangci-lint@v$(GOLANGCI_LINT_VERSION)
135+
cd / && go install -mod=mod github.com/golang/mock/mockgen@$(GO_MOCK_LIBRARY_VERSION)
132136

133137
.PHONY: goget-ginkgo
134138
goget-ginkgo:

‎scripts/mockgen.sh‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,97 @@
11
#!/usr/bin/env bash
22

3-
# Use this script to regererate generated mock files
3+
# Use this script to regenerate generated mock files
44
# after changing signatures of interfaces in these packages
55

6-
mockgen -source=pkg/kclient/interface.go \
6+
gomockVersion=$(go list -mod=readonly -m -f '{{.Version}}' github.com/golang/mock)
7+
mockgen="go run -mod=readonly github.com/golang/mock/mockgen@$gomockVersion"
8+
9+
echo Using mockgen "$($mockgen --version)"
10+
11+
$mockgen -source=pkg/kclient/interface.go \
712
-package kclient \
813
-destination pkg/kclient/mock_Client.go
914

10-
mockgen -source=pkg/storage/storage.go \
15+
$mockgen -source=pkg/storage/storage.go \
1116
-package storage \
1217
-destination pkg/storage/mock_Client.go
1318

14-
mockgen -source=pkg/devfile/image/image.go \
19+
$mockgen -source=pkg/devfile/image/image.go \
1520
-package image \
1621
-destination pkg/devfile/image/mock_Backend.go
1722

18-
mockgen -source=pkg/odo/cmdline/cmdline.go \
23+
$mockgen -source=pkg/odo/cmdline/cmdline.go \
1924
-package cmdline \
2025
-destination pkg/odo/cmdline/mock.go
2126

22-
mockgen -source=pkg/project/project.go \
27+
$mockgen -source=pkg/project/project.go \
2328
-package project \
2429
-destination pkg/project/mock.go
2530

26-
mockgen -source=pkg/preference/preference.go \
31+
$mockgen -source=pkg/preference/preference.go \
2732
-package preference \
2833
-destination pkg/preference/mock.go
2934

30-
mockgen -source=pkg/auth/interface.go \
35+
$mockgen -source=pkg/auth/interface.go \
3136
-package auth \
3237
-destination pkg/auth/mock.go
3338

34-
mockgen -source=pkg/init/backend/interface.go \
39+
$mockgen -source=pkg/init/backend/interface.go \
3540
-package backend \
3641
-destination pkg/init/backend/mock.go
3742

38-
mockgen -source=pkg/init/asker/interface.go \
43+
$mockgen -source=pkg/init/asker/interface.go \
3944
-package asker \
4045
-destination pkg/init/asker/mock.go
4146

42-
mockgen -source=pkg/init/interface.go \
47+
$mockgen -source=pkg/init/interface.go \
4348
-package init \
4449
-destination pkg/init/mock.go
4550

46-
mockgen -source=pkg/registry/interface.go \
51+
$mockgen -source=pkg/registry/interface.go \
4752
-package registry \
4853
-destination pkg/registry/mock.go
4954

50-
mockgen -source=pkg/deploy/interface.go \
55+
$mockgen -source=pkg/deploy/interface.go \
5156
-package deploy \
5257
-destination pkg/deploy/mock.go
5358

54-
mockgen -source=pkg/libdevfile/libdevfile.go \
59+
$mockgen -source=pkg/libdevfile/libdevfile.go \
5560
-package libdevfile \
5661
-destination pkg/libdevfile/handler_mock.go
5762

58-
mockgen -source=pkg/watch/interface.go \
63+
$mockgen -source=pkg/watch/interface.go \
5964
-package watch \
6065
-destination pkg/watch/mock.go
6166

62-
mockgen -source=pkg/component/delete/interface.go \
67+
$mockgen -source=pkg/component/delete/interface.go \
6368
-package delete \
6469
-destination pkg/component/delete/mock.go
6570

66-
mockgen -source=pkg/dev/interface.go \
71+
$mockgen -source=pkg/dev/interface.go \
6772
-package dev \
6873
-destination pkg/dev/mock.go
6974

70-
mockgen -source=pkg/alizer/interface.go \
75+
$mockgen -source=pkg/alizer/interface.go \
7176
-package alizer \
7277
-destination pkg/alizer/mock.go
7378

74-
mockgen -source=pkg/binding/interface.go \
79+
$mockgen -source=pkg/binding/interface.go \
7580
-package binding \
7681
-destination pkg/binding/mock.go
7782

78-
mockgen -source=pkg/binding/backend/interface.go \
83+
$mockgen -source=pkg/binding/backend/interface.go \
7984
-package backend \
8085
-destination pkg/binding/backend/mock.go
8186

82-
mockgen -source=pkg/sync/interface.go \
87+
$mockgen -source=pkg/sync/interface.go \
8388
-package sync \
8489
-destination pkg/sync/mock.go
8590

86-
mockgen -source=pkg/exec/interface.go \
91+
$mockgen -source=pkg/exec/interface.go \
8792
-package exec \
8893
-destination pkg/exec/mock.go
8994

90-
mockgen -source=pkg/podman/interface.go \
95+
$mockgen -source=pkg/podman/interface.go \
9196
-package podman \
9297
-destination pkg/podman/mock.go

0 commit comments

Comments
 (0)