Replace golang/mock with go.uber.org/mock

jbonhag · jbonhag · commit e8973c78c567 · 2024-07-23T17:38:50.000-04:00
diff --git a/go.mod b/go.mod
@@ -17,7 +17,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dylanmei/winrmtest v0.0.0-20210303004826-fbc9ae56efb6
 	github.com/go-test/deep v1.0.3
-	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.3.1
 	github.com/hashicorp/cli v1.1.6
@@ -70,6 +69,7 @@ require (
 	go.opentelemetry.io/otel v1.24.0
 	go.opentelemetry.io/otel/sdk v1.24.0
 	go.opentelemetry.io/otel/trace v1.24.0
+	go.uber.org/mock v0.4.0
 	golang.org/x/crypto v0.21.0
 	golang.org/x/mod v0.16.0
 	golang.org/x/net v0.23.0
@@ -251,7 +251,6 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	go.uber.org/mock v0.4.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
 	golang.org/x/sync v0.7.0 // indirect
diff --git a/go.sum b/go.sum
@@ -517,7 +517,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
diff --git a/internal/backend/remote-state/http/mock_server_test.go b/internal/backend/remote-state/http/mock_server_test.go
diff --git a/internal/backend/remote-state/http/server_test.go b/internal/backend/remote-state/http/server_test.go
@@ -3,7 +3,7 @@
 
 package http
 
-//go:generate go run github.com/golang/mock/mockgen -package $GOPACKAGE -source $GOFILE -destination mock_$GOFILE
+//go:generate go run go.uber.org/mock/mockgen -package $GOPACKAGE -source $GOFILE -destination mock_$GOFILE
 
 import (
 	"context"
@@ -22,12 +22,12 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/backend"
 	"github.com/hashicorp/terraform/internal/configs"
 	"github.com/hashicorp/terraform/internal/states"
 	"github.com/zclconf/go-cty/cty"
+	"go.uber.org/mock/gomock"
 )
 
 const sampleState = `
diff --git a/internal/cloud/backend_apply_test.go b/internal/cloud/backend_apply_test.go
@@ -13,12 +13,12 @@ import (
 	"testing"
 	"time"
 
-	gomock "github.com/golang/mock/gomock"
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/cli"
 	tfe "github.com/hashicorp/go-tfe"
 	mocks "github.com/hashicorp/go-tfe/mocks"
 	version "github.com/hashicorp/go-version"
+	gomock "go.uber.org/mock/gomock"
 
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/backend/backendrun"
diff --git a/internal/cloud/backend_run_warning_test.go b/internal/cloud/backend_run_warning_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/mock/gomock"
 	"github.com/hashicorp/cli"
 	"github.com/hashicorp/go-tfe"
 	tfemocks "github.com/hashicorp/go-tfe/mocks"
+	"go.uber.org/mock/gomock"
 )
 
 func MockAllRunEvents(t *testing.T, client *tfe.Client) (fullRunID string, emptyRunID string) {
diff --git a/internal/cloud/backend_taskStages_test.go b/internal/cloud/backend_taskStages_test.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/hashicorp/go-tfe"
 	tfemocks "github.com/hashicorp/go-tfe/mocks"
+	"go.uber.org/mock/gomock"
 )
 
 func MockAllTaskStages(t *testing.T, client *tfe.Client) (RunID string) {
diff --git a/internal/cloudplugin/cloudplugin1/grpc_client_test.go b/internal/cloudplugin/cloudplugin1/grpc_client_test.go
@@ -11,9 +11,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1"
 	"github.com/hashicorp/terraform/internal/cloudplugin/mock_cloudproto1"
+	"go.uber.org/mock/gomock"
 )
 
 var mockError = "this is a mock error"
diff --git a/internal/cloudplugin/mock_cloudproto1/generate.go b/internal/cloudplugin/mock_cloudproto1/generate.go
@@ -1,6 +1,6 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-//go:generate go run github.com/golang/mock/mockgen -destination mock.go github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1 CommandServiceClient,CommandService_ExecuteClient
+//go:generate go run go.uber.org/mock/mockgen -destination mock.go github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1 CommandServiceClient,CommandService_ExecuteClient
 
 package mock_cloudproto1
diff --git a/internal/cloudplugin/mock_cloudproto1/mock.go b/internal/cloudplugin/mock_cloudproto1/mock.go
diff --git a/internal/plugin/grpc_provider_test.go b/internal/plugin/grpc_provider_test.go
@@ -8,13 +8,13 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/configs/hcl2shim"
 	"github.com/hashicorp/terraform/internal/providers"
 	"github.com/hashicorp/terraform/internal/tfdiags"
 	"github.com/zclconf/go-cty/cty"
+	"go.uber.org/mock/gomock"
 
 	mockproto "github.com/hashicorp/terraform/internal/plugin/mock_proto"
 	proto "github.com/hashicorp/terraform/internal/tfplugin5"
diff --git a/internal/plugin/grpc_provisioner_test.go b/internal/plugin/grpc_provisioner_test.go
@@ -7,13 +7,13 @@ import (
 	"io"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/terraform/internal/configs/hcl2shim"
 	"github.com/hashicorp/terraform/internal/provisioners"
 	proto "github.com/hashicorp/terraform/internal/tfplugin5"
 	"github.com/zclconf/go-cty/cty"
+	"go.uber.org/mock/gomock"
 
 	mockproto "github.com/hashicorp/terraform/internal/plugin/mock_proto"
 )
diff --git a/internal/plugin/mock_proto/generate.go b/internal/plugin/mock_proto/generate.go
@@ -1,6 +1,6 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-//go:generate go run github.com/golang/mock/mockgen -destination mock.go github.com/hashicorp/terraform/internal/tfplugin5 ProviderClient,ProvisionerClient,Provisioner_ProvisionResourceClient,Provisioner_ProvisionResourceServer
+//go:generate go run go.uber.org/mock/mockgen -destination mock.go github.com/hashicorp/terraform/internal/tfplugin5 ProviderClient,ProvisionerClient,Provisioner_ProvisionResourceClient,Provisioner_ProvisionResourceServer
 
 package mock_tfplugin5
diff --git a/internal/plugin/mock_proto/mock.go b/internal/plugin/mock_proto/mock.go
diff --git a/internal/plugin6/grpc_provider_test.go b/internal/plugin6/grpc_provider_test.go
@@ -8,14 +8,14 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/configs/hcl2shim"
 	"github.com/hashicorp/terraform/internal/providers"
 	"github.com/hashicorp/terraform/internal/tfdiags"
 	"github.com/zclconf/go-cty/cty"
+	"go.uber.org/mock/gomock"
 
 	mockproto "github.com/hashicorp/terraform/internal/plugin6/mock_proto"
 	proto "github.com/hashicorp/terraform/internal/tfplugin6"
diff --git a/internal/plugin6/mock_proto/generate.go b/internal/plugin6/mock_proto/generate.go
@@ -1,6 +1,6 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-//go:generate go run github.com/golang/mock/mockgen -destination mock.go github.com/hashicorp/terraform/internal/tfplugin6 ProviderClient
+//go:generate go run go.uber.org/mock/mockgen -destination mock.go github.com/hashicorp/terraform/internal/tfplugin6 ProviderClient
 
 package mock_tfplugin6
diff --git a/internal/plugin6/mock_proto/mock.go b/internal/plugin6/mock_proto/mock.go
diff --git a/tools/tools.go b/tools/tools.go
@@ -7,7 +7,7 @@
 package tools
 
 import (
-	_ "github.com/golang/mock/mockgen"
+	_ "go.uber.org/mock/mockgen"
 	_ "github.com/mitchellh/gox"
 	_ "github.com/nishanths/exhaustive"
 	_ "golang.org/x/tools/cmd/cover"

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ import (`
`9`	`9`	`"strings"`
`10`	`10`	`"testing"`
`11`	`11`
`12`		`- "github.com/golang/mock/gomock"`
`13`	`12`	`"github.com/hashicorp/go-tfe"`
`14`	`13`	`tfemocks "github.com/hashicorp/go-tfe/mocks"`
	`14`	`+ "go.uber.org/mock/gomock"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func MockAllTaskStages(t testing.T, client tfe.Client) (RunID string) {`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ import (`
`11`	`11`	`"io"`
`12`	`12`	`"testing"`
`13`	`13`
`14`		`- "github.com/golang/mock/gomock"`
`15`	`14`	`"github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1"`
`16`	`15`	`"github.com/hashicorp/terraform/internal/cloudplugin/mock_cloudproto1"`
	`16`	`+ "go.uber.org/mock/gomock"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`var mockError = "this is a mock error"`