Skip to content

Commit c12309b

Browse files
authored
Merge pull request #387 from kubernetes-sigs/dependabot/go_modules/go.uber.org/mock-0.5.1
🌱 Bump go.uber.org/mock from 0.5.0 to 0.5.1
2 parents 3461218 + 80467f8 commit c12309b

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
123123
CLUSTER_API_VERSION := $(call get_go_version,sigs.k8s.io/cluster-api)
124124
CLUSTER_API_CRD_LOCATION = tmp/cluster-api/crd
125125

126-
MOCKGEN_VER := v0.4.0
126+
MOCKGEN_PKG := go.uber.org/mock
127+
MOCKGEN_VER := $(call get_go_version,$(MOCKGEN_PKG))
127128
MOCKGEN_BIN := mockgen
128129
MOCKGEN := $(TOOLS_BIN_DIR)/$(MOCKGEN_BIN)-$(MOCKGEN_VER)
129130

@@ -798,7 +799,7 @@ $(KUSTOMIZE): # Build kustomize from tools folder.
798799
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
799800

800801
$(MOCKGEN): ## Build mockgen from tools folder.
801-
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) go.uber.org/mock/mockgen $(MOCKGEN_BIN) $(MOCKGEN_VER)
802+
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(MOCKGEN_PKG)/$(MOCKGEN_BIN) $(MOCKGEN_BIN) $(MOCKGEN_VER)
802803

803804
$(SETUP_ENVTEST): # Build setup-envtest from tools folder.
804805
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(SETUP_ENVTEST_PKG) $(SETUP_ENVTEST_BIN) $(SETUP_ENVTEST_VER)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/onsi/gomega v1.37.0
1212
github.com/pkg/errors v0.9.1
1313
github.com/spf13/pflag v1.0.6
14-
go.uber.org/mock v0.5.0
14+
go.uber.org/mock v0.5.1
1515
gopkg.in/yaml.v2 v2.4.0
1616
helm.sh/helm/v3 v3.16.4
1717
k8s.io/api v0.31.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,8 @@ go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
521521
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
522522
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
523523
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
524-
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
525-
go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
524+
go.uber.org/mock v0.5.1 h1:ASgazW/qBmR+A32MYFDB6E2POoTgOwT509VP0CT/fjs=
525+
go.uber.org/mock v0.5.1/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
526526
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
527527
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
528528
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=

internal/mocks/helm_client_mock.go

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

0 commit comments

Comments
 (0)