Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapt to networkservicemesh/sdk#1083 #232

Merged
merged 1 commit into from
Oct 14, 2021
Merged

Adapt to networkservicemesh/sdk#1083 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion internal/imports/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
package imports

//go:generate bash -c "rm -rf imports_linux.go"
//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go get github.com/edwarnicke/[email protected].0"
//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go get github.com/edwarnicke/[email protected].2"
//go:generate bash -c "GOOS=linux ${GOPATH}/bin/imports-gen"
3 changes: 1 addition & 2 deletions internal/imports/imports_linux.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)

Expand Down