From 0fc77371b9ac4a7fa8482f0ea7b81e6fb0726300 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Wed, 13 Oct 2021 18:13:03 -0500 Subject: [PATCH] Adapt to networkservicemesh/sdk#1083 Signed-off-by: Ed Warnicke --- go.mod | 2 +- go.sum | 4 ++-- internal/imports/imports_linux.go | 18 +++++++++--------- main.go | 3 +-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 5961800..9d729f3 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/edwarnicke/exechelper v1.0.3 github.com/edwarnicke/grpcfd v0.1.1 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d + github.com/networkservicemesh/sdk v0.5.1-0.20211013215105-e4c4722a5125 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0-beta.6 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 418826d..a4c483e 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/nats-io/stan.go v0.6.0/go.mod h1:eIcD5bi3pqbHT/xIIvXMwvzXYElgouBvaVRftaE+eac= github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e h1:PO6tDo/bGLJqz1qiqCecht/HqMWCKunAds2U9Hvc0yM= github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU= -github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d h1:x45/M58BggOOrFa5dCVn+xS80lPdoNO29UDQbrooSOA= -github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d/go.mod h1:j/XeYOfyRzuQBV4llU+qTOhN7aZSMO6scfHI9adWdzc= +github.com/networkservicemesh/sdk v0.5.1-0.20211013215105-e4c4722a5125 h1:Ugmr8FiRUnPX4XKvx46FfeDkPd5DmJb7VvZneBHNR+I= +github.com/networkservicemesh/sdk v0.5.1-0.20211013215105-e4c4722a5125/go.mod h1:j/XeYOfyRzuQBV4llU+qTOhN7aZSMO6scfHI9adWdzc= 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/imports/imports_linux.go b/internal/imports/imports_linux.go index d979337..19b8032 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -4,12 +4,20 @@ package imports import ( _ "context" _ "fmt" + _ "net" + _ "net/url" + _ "os" + _ "os/signal" + _ "path/filepath" + _ "syscall" + _ "testing" + _ "time" + _ "github.com/antonfisher/nested-logrus-formatter" _ "github.com/edwarnicke/exechelper" _ "github.com/edwarnicke/grpcfd" _ "github.com/kelseyhightower/envconfig" _ "github.com/networkservicemesh/sdk/pkg/networkservice/chains/nsmgrproxy" - _ "github.com/networkservicemesh/sdk/pkg/networkservice/common/connect" _ "github.com/networkservicemesh/sdk/pkg/registry/common/connect" _ "github.com/networkservicemesh/sdk/pkg/tools/debug" _ "github.com/networkservicemesh/sdk/pkg/tools/grpcutils" @@ -30,12 +38,4 @@ import ( _ "google.golang.org/grpc" _ "google.golang.org/grpc/credentials" _ "google.golang.org/grpc/health/grpc_health_v1" - _ "net" - _ "net/url" - _ "os" - _ "os/signal" - _ "path/filepath" - _ "syscall" - _ "testing" - _ "time" ) diff --git a/main.go b/main.go index b71c3c8..85f68b4 100644 --- a/main.go +++ b/main.go @@ -36,7 +36,6 @@ import ( registryconnect "github.com/networkservicemesh/sdk/pkg/registry/common/connect" "github.com/networkservicemesh/sdk/pkg/networkservice/chains/nsmgrproxy" - "github.com/networkservicemesh/sdk/pkg/networkservice/common/connect" "github.com/networkservicemesh/sdk/pkg/tools/jaeger" "github.com/networkservicemesh/sdk/pkg/tools/spiffejwt" @@ -157,7 +156,7 @@ func main() { nsmgrproxy.WithName(config.Name), nsmgrproxy.WithListenOn(listenURL), nsmgrproxy.WithRegistryConnectOptions(registryconnect.WithDialOptions(dialOptions...)), - nsmgrproxy.WithConnectOptions(connect.WithDialOptions(dialOptions...)), + nsmgrproxy.WithDialOptions(dialOptions...), nsmgrproxy.WithMapIPFilePath(config.MapIPFilePath), ).Register(server)