From 4cc5591649815e3c5d5cb891604303808d062bc0 Mon Sep 17 00:00:00 2001 From: Vladimir Popov Date: Tue, 4 May 2021 12:17:08 +0700 Subject: [PATCH] Manually update to the latest sdk version Signed-off-by: Vladimir Popov --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/manager/manager.go | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index a671303f..25404e0d 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( github.com/edwarnicke/grpcfd v0.0.0-20210219150442-10fb469a6976 github.com/edwarnicke/serialize v1.0.7 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v0.0.0-20210417193417-dd329f8d6b7a - github.com/networkservicemesh/sdk v0.0.0-20210430045004-5ca26c9032e8 + github.com/networkservicemesh/api v0.0.0-20210502014900-961930476ee1 + github.com/networkservicemesh/sdk v0.0.0-20210503165807-dd0fc3c8b62b github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/sirupsen/logrus v1.7.0 github.com/spiffe/go-spiffe/v2 v2.0.0-beta.2 diff --git a/go.sum b/go.sum index b075c0cf..193a4a8d 100644 --- a/go.sum +++ b/go.sum @@ -119,10 +119,10 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nats-io/stan.go v0.6.0/go.mod h1:eIcD5bi3pqbHT/xIIvXMwvzXYElgouBvaVRftaE+eac= -github.com/networkservicemesh/api v0.0.0-20210417193417-dd329f8d6b7a h1:BakXE3Zu+KLMYEgwcfL3zsff5J1DxCt/rI60x6KU5Q4= -github.com/networkservicemesh/api v0.0.0-20210417193417-dd329f8d6b7a/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU= -github.com/networkservicemesh/sdk v0.0.0-20210430045004-5ca26c9032e8 h1:7uhvQYuqL11SJyx7A58TJ+d/RVvQuaNFxTEGmQPRQ5E= -github.com/networkservicemesh/sdk v0.0.0-20210430045004-5ca26c9032e8/go.mod h1:wV3wbgR7d7BaHJ8yPHtkXEj9jZ0WvZWsfHJMarV4VQ0= +github.com/networkservicemesh/api v0.0.0-20210502014900-961930476ee1 h1:HNm4SS79Bx14cAXoLkIs/GB2KSJI+zT19ttDIu6Ofuc= +github.com/networkservicemesh/api v0.0.0-20210502014900-961930476ee1/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU= +github.com/networkservicemesh/sdk v0.0.0-20210503165807-dd0fc3c8b62b h1:WxasLvQFMQREUVACdH0LEz5GIkKTc/Q3Cvr1r4rUoUU= +github.com/networkservicemesh/sdk v0.0.0-20210503165807-dd0fc3c8b62b/go.mod h1:uKeG+m5riQr0jllVp/vyeYJP2ruu1kyM8ejLWAKJwUo= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= diff --git a/internal/manager/manager.go b/internal/manager/manager.go index 791fe4d3..a3d8887d 100644 --- a/internal/manager/manager.go +++ b/internal/manager/manager.go @@ -29,12 +29,6 @@ import ( "github.com/edwarnicke/grpcfd" - "github.com/networkservicemesh/sdk/pkg/networkservice/chains/nsmgr" - - "github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize" - "github.com/networkservicemesh/sdk/pkg/tools/grpcutils" - "github.com/networkservicemesh/sdk/pkg/tools/token" - "github.com/sirupsen/logrus" "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" "github.com/spiffe/go-spiffe/v2/svid/x509svid" @@ -42,11 +36,16 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "github.com/networkservicemesh/sdk/pkg/networkservice/chains/nsmgr" + "github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize" + "github.com/networkservicemesh/sdk/pkg/networkservice/common/connect" + "github.com/networkservicemesh/sdk/pkg/tools/grpcutils" "github.com/networkservicemesh/sdk/pkg/tools/log" "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger" "github.com/networkservicemesh/sdk/pkg/tools/log/spanlogger" "github.com/networkservicemesh/sdk/pkg/tools/opentracing" "github.com/networkservicemesh/sdk/pkg/tools/spiffejwt" + "github.com/networkservicemesh/sdk/pkg/tools/token" "github.com/networkservicemesh/cmd-nsmgr/internal/config" ) @@ -140,7 +139,8 @@ func RunNsmgr(ctx context.Context, configuration *config.Config) error { nsmgr.WithURL(m.getPublicURL()), nsmgr.WithAuthorizeServer(authorize.NewServer()), nsmgr.WithRegistryClientConn(regConn), - nsmgr.WithDialOptions(clientOptions...), + nsmgr.WithConnectOptions( + connect.WithDialOptions(clientOptions...)), ) // If we Listen on Unix socket for local connections we need to be sure folder are exist