NO-ISSUE: Update Dockerfile to use go.uber.org/mock (#911)

The change to use `go.uber.org/mock` instead of the deprecated `github.com/golang/mock` was was mostly done in the past. But the _Dockerfile_ wasn't updated to use the new `mockgen` command. As a result if one installs the `mockgen` with the command from the dockerfile and then runs `make generate` the resulting code doesn't build: ``` $ grep mockgen Dockerfile.assisted-installer-build go install github.com/golang/mock/[email protected] && \ $ go install github.com/golang/mock/[email protected] $ make generate go generate .. make format make[1]: Entering directory '/files/projects/assisted-installer/repository' make[1]: Leaving directory '/files/projects/assisted-installer/repository' $ make build CGO_ENABLED=0 go build -o build/installer src/main/main.go src/main/drymock/dry_mode_k8s_mock.go:308:36: cannot use mockController (variable of type *"go.uber.org/mock/gomock".Controller) as *"github.com/golang/mock/gomock".Controller value in argument to k8s_client.NewMockK8SClient make: *** [Makefile:68: installer] Error 1 ``` To avoid this issue this patch updates the _Dockerfile_ to use the `go.uber.org/mock` package. There are also some minor white space changes introduced by running `go generate`. Signed-off-by: Juan Hernandez <[email protected]>
openshift · Dec 20, 2024 · 5fb31e8 · 5fb31e8
1 parent 77f6881
commit 5fb31e8
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 1 deletion.
diff --git a/Dockerfile.assisted-installer-build b/Dockerfile.assisted-installer-build
@@ -5,7 +5,7 @@ ENV GOFLAGS=""
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.2 && \ 
   go install golang.org/x/tools/cmd/[email protected] && \
   go install github.com/onsi/ginkgo/[email protected] && \
-  go install github.com/golang/mock/mockgen@v1.6.0 && \
+  go install go.uber.org/mock/mockgen@v0.4.0 && \
   go install gotest.tools/[email protected] && \
   go install github.com/axw/gocov/[email protected] && \
   go install github.com/AlekSi/[email protected]

diff --git a/src/assisted_installer_controller/mock_reboots_notifier.go b/src/assisted_installer_controller/mock_reboots_notifier.go
diff --git a/src/ignition/mock_ignition.go b/src/ignition/mock_ignition.go
diff --git a/src/inventory_client/mock_inventory_client.go b/src/inventory_client/mock_inventory_client.go
diff --git a/src/k8s_client/mock_k8s_client.go b/src/k8s_client/mock_k8s_client.go
diff --git a/src/ops/execute/mock_execute.go b/src/ops/execute/mock_execute.go
diff --git a/src/ops/mock_ops.go b/src/ops/mock_ops.go