carpawell/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1644] services/tree: Do not use deprecated gRPC options

Browse source 
Get rid of `grpc.WithInsecure`.

Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
This commit is contained in:
Evgenii Stratonikov 2022-07-30 10:24:16 +03:00 committed by fyrchik
parent 8d0884e74f
commit 4558f30575
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/services/tree/cache.go
View file

@ -11,6 +11,7 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/network" "github.com/nspcc-dev/neofs-node/pkg/network"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/connectivity" "google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials/insecure"
) )
type clientCache struct { type clientCache struct {
@ -85,7 +86,7 @@ func dialTreeService(ctx context.Context, netmapAddr string) (*grpc.ClientConn,
// FIXME(@fyrchik): ugly hack #1322 // FIXME(@fyrchik): ugly hack #1322
if !strings.HasPrefix(netAddr.URIAddr(), "grpcs:") { if !strings.HasPrefix(netAddr.URIAddr(), "grpcs:") {
opts = append(opts, grpc.WithInsecure()) opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
} }
ctx, cancel := context.WithTimeout(ctx, defaultClientConnectTimeout) ctx, cancel := context.WithTimeout(ctx, defaultClientConnectTimeout)

3
pkg/services/tree/sync.go
View file

@ -11,6 +11,7 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/network" "github.com/nspcc-dev/neofs-node/pkg/network"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id" cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
) )
// Synchronize tries to synchronize log starting from the last stored height. // Synchronize tries to synchronize log starting from the last stored height.
@ -33,7 +34,7 @@ func (s *Service) Synchronize(ctx context.Context, cid cid.ID, treeID string) er
return false return false
} }
cc, err := grpc.DialContext(ctx, a.URIAddr(), grpc.WithInsecure()) cc, err := grpc.DialContext(ctx, a.URIAddr(), grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil { if err != nil {
// Failed to connect, try the next address. // Failed to connect, try the next address.
return false return false