Skip to content

Commit cd619be

Browse files
Liam Cervantejbonhag
Liam Cervante
and
jbonhag
authored
Upgrade go-tfe from 1.51.0 to 1.58.0 (#35495) (#35541)
* go get github.com/hashicorp/go-tfe@v1.58.0 * Switch to go.uber.org/mock for mocks Co-authored-by: Jeff Bonhag <jbonhag@hashicorp.com>
1 parent 4e32c4e commit cd619be

File tree

18 files changed

+175
-154
lines changed

18 files changed

+175
-154
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ require (
1717
github.com/davecgh/go-spew v1.1.1
1818
github.com/dylanmei/winrmtest v0.0.0-20210303004826-fbc9ae56efb6
1919
github.com/go-test/deep v1.0.3
20-
github.com/golang/mock v1.6.0
2120
github.com/google/go-cmp v0.6.0
2221
github.com/google/uuid v1.3.1
2322
github.com/hashicorp/cli v1.1.6
@@ -29,7 +28,7 @@ require (
2928
github.com/hashicorp/go-plugin v1.6.0
3029
github.com/hashicorp/go-retryablehttp v0.7.7
3130
github.com/hashicorp/go-slug v0.15.0
32-
github.com/hashicorp/go-tfe v1.51.0
31+
github.com/hashicorp/go-tfe v1.58.0
3332
github.com/hashicorp/go-uuid v1.0.3
3433
github.com/hashicorp/go-version v1.6.0
3534
github.com/hashicorp/hcl v1.0.0
@@ -70,6 +69,7 @@ require (
7069
go.opentelemetry.io/otel v1.24.0
7170
go.opentelemetry.io/otel/sdk v1.24.0
7271
go.opentelemetry.io/otel/trace v1.24.0
72+
go.uber.org/mock v0.4.0
7373
golang.org/x/crypto v0.21.0
7474
golang.org/x/mod v0.16.0
7575
golang.org/x/net v0.23.0

‎go.sum‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
519519
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
520520
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
521521
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
522-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
523522
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
524523
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
525524
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -684,8 +683,8 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX
684683
github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
685684
github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
686685
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
687-
github.com/hashicorp/go-tfe v1.51.0 h1:nZIIMOGxzKJvL6fNO3wS/wpTdLVGHUMT6up82H9eJCE=
688-
github.com/hashicorp/go-tfe v1.51.0/go.mod h1:yZ/FCqBsOZ/e75kL29JYqAsKctL1Tti2zYcIoQh69Ck=
686+
github.com/hashicorp/go-tfe v1.58.0 h1:aJXrStDBG+YJLkgDYswfNiKTRHQxKqT/9C1VuvujRkE=
687+
github.com/hashicorp/go-tfe v1.58.0/go.mod h1:XnTtBj3tVQ4uFkcFsv8Grn+O1CVcIcceL1uc2AgUcaU=
689688
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
690689
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
691690
github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -1082,6 +1081,8 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
10821081
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
10831082
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
10841083
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
1084+
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
1085+
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
10851086
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
10861087
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
10871088
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

‎internal/backend/remote-state/http/mock_server_test.go‎

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

‎internal/backend/remote-state/http/server_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package http
55

6-
//go:generate go run github.com/golang/mock/mockgen -package $GOPACKAGE -source $GOFILE -destination mock_$GOFILE
6+
//go:generate go run go.uber.org/mock/mockgen -package $GOPACKAGE -source $GOFILE -destination mock_$GOFILE
77

88
import (
99
"context"
@@ -22,12 +22,12 @@ import (
2222
"syscall"
2323
"testing"
2424

25-
"github.com/golang/mock/gomock"
2625
"github.com/hashicorp/terraform/internal/addrs"
2726
"github.com/hashicorp/terraform/internal/backend"
2827
"github.com/hashicorp/terraform/internal/configs"
2928
"github.com/hashicorp/terraform/internal/states"
3029
"github.com/zclconf/go-cty/cty"
30+
"go.uber.org/mock/gomock"
3131
)
3232

3333
const sampleState = `

‎internal/cloud/backend_apply_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import (
1313
"testing"
1414
"time"
1515

16-
gomock "github.com/golang/mock/gomock"
1716
"github.com/google/go-cmp/cmp"
1817
"github.com/hashicorp/cli"
1918
tfe "github.com/hashicorp/go-tfe"
2019
mocks "github.com/hashicorp/go-tfe/mocks"
2120
version "github.com/hashicorp/go-version"
21+
gomock "go.uber.org/mock/gomock"
2222

2323
"github.com/hashicorp/terraform/internal/addrs"
2424
"github.com/hashicorp/terraform/internal/backend/backendrun"

‎internal/cloud/backend_run_warning_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/golang/mock/gomock"
1312
"github.com/hashicorp/cli"
1413
"github.com/hashicorp/go-tfe"
1514
tfemocks "github.com/hashicorp/go-tfe/mocks"
15+
"go.uber.org/mock/gomock"
1616
)
1717

1818
func MockAllRunEvents(t *testing.T, client *tfe.Client) (fullRunID string, emptyRunID string) {

‎internal/cloud/backend_taskStages_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010
"testing"
1111

12-
"github.com/golang/mock/gomock"
1312
"github.com/hashicorp/go-tfe"
1413
tfemocks "github.com/hashicorp/go-tfe/mocks"
14+
"go.uber.org/mock/gomock"
1515
)
1616

1717
func MockAllTaskStages(t *testing.T, client *tfe.Client) (RunID string) {

‎internal/cloudplugin/cloudplugin1/grpc_client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"io"
1212
"testing"
1313

14-
"github.com/golang/mock/gomock"
1514
"github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1"
1615
"github.com/hashicorp/terraform/internal/cloudplugin/mock_cloudproto1"
16+
"go.uber.org/mock/gomock"
1717
)
1818

1919
var mockError = "this is a mock error"

‎internal/cloudplugin/mock_cloudproto1/generate.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) HashiCorp, Inc.
22
// SPDX-License-Identifier: BUSL-1.1
33

4-
//go:generate go run github.com/golang/mock/mockgen -destination mock.go github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1 CommandServiceClient,CommandService_ExecuteClient
4+
//go:generate go run go.uber.org/mock/mockgen -destination mock.go github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1 CommandServiceClient,CommandService_ExecuteClient
55

66
package mock_cloudproto1

‎internal/cloudplugin/mock_cloudproto1/mock.go‎

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

0 commit comments

Comments
 (0)