From e04189b85fd2a6623feaed3d8f8c7202382ff334 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 23:42:19 +0000 Subject: [PATCH 1/2] Bump google.golang.org/grpc from 1.42.0 to 1.43.0 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.42.0 to 1.43.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.42.0...v1.43.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 43e3a99891..192d54fa17 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( golang.org/x/tools v0.1.8 google.golang.org/api v0.63.0 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa - google.golang.org/grpc v1.42.0 + google.golang.org/grpc v1.43.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 google.golang.org/protobuf v1.27.1 ) diff --git a/go.sum b/go.sum index 5996379244..97932ccb48 100644 --- a/go.sum +++ b/go.sum @@ -1384,8 +1384,8 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= From 250b096dd44d65b3211e8944df3b9055b672e424 Mon Sep 17 00:00:00 2001 From: Martin Hutchinson Date: Tue, 21 Dec 2021 09:17:46 +0000 Subject: [PATCH 2/2] Updated usages to non-deprecated forms --- client/rpcflags/rpcflags.go | 3 ++- client/rpcflags/rpcflags_test.go | 3 ++- integration/admin/admin_integration_test.go | 3 ++- integration/log_integration_test.go | 3 ++- integration/quota/quota_test.go | 4 ++-- quota/etcd/quotaapi/quota_server_test.go | 3 ++- storage/cloudspanner/getdb_test.go | 3 ++- testonly/integration/logenv.go | 3 ++- testonly/mdm/mdmtest/main.go | 3 ++- testonly/mock_server.go | 3 ++- 10 files changed, 20 insertions(+), 11 deletions(-) diff --git a/client/rpcflags/rpcflags.go b/client/rpcflags/rpcflags.go index 964442723e..351a351568 100644 --- a/client/rpcflags/rpcflags.go +++ b/client/rpcflags/rpcflags.go @@ -20,6 +20,7 @@ import ( "github.com/golang/glog" "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/credentials/insecure" ) // tlsCertFile is the flag-assigned value for the path to the Trillian server's TLS certificate. @@ -32,7 +33,7 @@ func NewClientDialOptionsFromFlags() ([]grpc.DialOption, error) { if *tlsCertFile == "" { glog.Warning("Using an insecure gRPC connection to Trillian") - dialOpts = append(dialOpts, grpc.WithInsecure()) + dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials())) } else { creds, err := credentials.NewClientTLSFromFile(*tlsCertFile, "") if err != nil { diff --git a/client/rpcflags/rpcflags_test.go b/client/rpcflags/rpcflags_test.go index 90c7f4057a..654bfb6ecd 100644 --- a/client/rpcflags/rpcflags_test.go +++ b/client/rpcflags/rpcflags_test.go @@ -27,13 +27,14 @@ import ( "github.com/google/trillian/testonly/setup" "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/credentials/insecure" ) func TestNewClientDialOptionsFromFlagsWithTLSCertFileNotSet(t *testing.T) { // Set up Trillian servers const numSequencers = 2 serverOpts := []grpc.ServerOption{} - clientOpts := []grpc.DialOption{grpc.WithInsecure()} + clientOpts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())} logEnv, err := integration.NewLogEnvWithGRPCOptions(context.Background(), numSequencers, serverOpts, clientOpts) if err != nil { t.Fatal(err) diff --git a/integration/admin/admin_integration_test.go b/integration/admin/admin_integration_test.go index 528e4d2674..c38f9bb597 100644 --- a/integration/admin/admin_integration_test.go +++ b/integration/admin/admin_integration_test.go @@ -32,6 +32,7 @@ import ( "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" @@ -604,7 +605,7 @@ func setupAdminServer(ctx context.Context, t *testing.T) (*testServer, error) { } }() - ts.conn, err = grpc.Dial(ts.lis.Addr().String(), grpc.WithInsecure()) + ts.conn, err = grpc.Dial(ts.lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { ts.closeAll() return nil, err diff --git a/integration/log_integration_test.go b/integration/log_integration_test.go index 13471eef44..1ba10863cb 100644 --- a/integration/log_integration_test.go +++ b/integration/log_integration_test.go @@ -21,6 +21,7 @@ import ( "time" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "github.com/google/trillian" "github.com/google/trillian/client" @@ -80,7 +81,7 @@ func TestLiveLogIntegration(t *testing.T) { defer cancel() // TODO: Other options apart from insecure connections - conn, err := grpc.DialContext(ctx, *serverFlag, grpc.WithInsecure()) + conn, err := grpc.DialContext(ctx, *serverFlag, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { t.Fatalf("Failed to connect to log server: %v", err) } diff --git a/integration/quota/quota_test.go b/integration/quota/quota_test.go index 6d0918f568..a0835413f0 100644 --- a/integration/quota/quota_test.go +++ b/integration/quota/quota_test.go @@ -41,6 +41,7 @@ import ( "github.com/google/trillian/util/clock" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/status" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" @@ -240,8 +241,7 @@ func newTestServer(registry extension.Registry) (*testServer, error) { s.close() return nil, err } - - s.conn, err = grpc.Dial(s.lis.Addr().String(), grpc.WithInsecure()) + s.conn, err = grpc.Dial(s.lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { s.close() return nil, err diff --git a/quota/etcd/quotaapi/quota_server_test.go b/quota/etcd/quotaapi/quota_server_test.go index fcc82c079f..ca545b1a8e 100644 --- a/quota/etcd/quotaapi/quota_server_test.go +++ b/quota/etcd/quotaapi/quota_server_test.go @@ -36,6 +36,7 @@ import ( "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" ) @@ -805,7 +806,7 @@ func startServer(etcdClient *clientv3.Client) (quotapb.QuotaClient, func(), erro quotapb.RegisterQuotaServer(s, NewServer(etcdClient)) go s.Serve(lis) - conn, err = grpc.Dial(lis.Addr().String(), grpc.WithInsecure()) + conn, err = grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { cleanup() return nil, nil, err diff --git a/storage/cloudspanner/getdb_test.go b/storage/cloudspanner/getdb_test.go index e0546cd4b0..dbda74e4f2 100644 --- a/storage/cloudspanner/getdb_test.go +++ b/storage/cloudspanner/getdb_test.go @@ -29,6 +29,7 @@ import ( "cloud.google.com/go/spanner/spannertest" "google.golang.org/api/option" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" database "cloud.google.com/go/spanner/admin/database/apiv1" databasepb "google.golang.org/genproto/googleapis/spanner/admin/database/v1" @@ -94,7 +95,7 @@ func inMemClient(ctx context.Context, t testing.TB, dbName string, statements [] srv.SetLogger(t.Logf) dialCtx, cancel := context.WithTimeout(ctx, 1*time.Second) defer cancel() - conn, err := grpc.DialContext(dialCtx, srv.Addr, grpc.WithInsecure()) + conn, err := grpc.DialContext(dialCtx, srv.Addr, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { t.Fatalf("Dialing in-memory fake: %v", err) } diff --git a/testonly/integration/logenv.go b/testonly/integration/logenv.go index 6800ff3d4c..6e75740bbf 100644 --- a/testonly/integration/logenv.go +++ b/testonly/integration/logenv.go @@ -25,6 +25,7 @@ import ( "github.com/golang/glog" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "github.com/google/trillian" "github.com/google/trillian/extension" @@ -164,7 +165,7 @@ func NewLogEnvWithRegistryAndGRPCOptions(ctx context.Context, numSequencers int, // Connect to the server. if clientOpts == nil { - clientOpts = []grpc.DialOption{grpc.WithInsecure()} + clientOpts = []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())} } cc, err := grpc.Dial(addr, clientOpts...) diff --git a/testonly/mdm/mdmtest/main.go b/testonly/mdm/mdmtest/main.go index f38af9a84b..ca320cfd48 100644 --- a/testonly/mdm/mdmtest/main.go +++ b/testonly/mdm/mdmtest/main.go @@ -31,6 +31,7 @@ import ( "github.com/google/trillian/util" "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/types/known/durationpb" ) @@ -68,7 +69,7 @@ func innerMain(ctx context.Context) error { }() } - dialOpts := []grpc.DialOption{grpc.WithInsecure()} + dialOpts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())} c, err := grpc.Dial(*rpcServer, dialOpts...) if err != nil { glog.Exitf("Failed to create log client conn: %v", err) diff --git a/testonly/mock_server.go b/testonly/mock_server.go index 8f1a8ceddb..fb8345fe75 100644 --- a/testonly/mock_server.go +++ b/testonly/mock_server.go @@ -21,6 +21,7 @@ import ( "github.com/google/trillian" "github.com/google/trillian/testonly/tmock" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" ) // MockServer implements the TrillianAdminServer, and TrillianLogServer. @@ -49,7 +50,7 @@ func NewMockServer(ctrl *gomock.Controller) (*MockServer, func(), error) { } go grpcServer.Serve(lis) - cc, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure()) + cc, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { grpcServer.Stop() lis.Close()