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

Fix dependencies #242

Merged
merged 1 commit into from
Feb 21, 2023
Merged

Fix dependencies #242

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
4 changes: 4 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,11 @@ issues:
- path: 'main.go'
linters:
- revive
text: 'package-comments: should have a package comment'
- path: main.go
linters:
- funlen
text: "Function 'main'"
exclude-use-default: false
max-issues-per-linter: 0
max-same-issues: 0
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ require (
github.com/antonfisher/nested-logrus-formatter v1.3.1
github.com/edwarnicke/debug v1.0.0
github.com/edwarnicke/exechelper v1.0.3
github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29
github.com/edwarnicke/grpcfd v1.1.2
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1
github.com/networkservicemesh/sdk v0.5.1-0.20230214013943-438ec051e69b
github.com/networkservicemesh/sdk-k8s v0.0.0-20230214093953-233b1ac6214a
github.com/networkservicemesh/sdk-ovs v0.0.0-20230214124556-742c7ea96b1a
github.com/networkservicemesh/sdk-sriov v0.0.0-20230214123342-528783e52303
github.com/networkservicemesh/sdk v0.5.1-0.20230221131021-bcd1eb0f52b4
github.com/networkservicemesh/sdk-k8s v0.0.0-20230221132440-43b4f167f9de
github.com/networkservicemesh/sdk-ovs v0.0.0-20230221134133-6136ea55d805
github.com/networkservicemesh/sdk-sriov v0.0.0-20230221132402-5b03677ef136
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand All @@ -39,7 +40,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ebay/go-ovn v0.1.1-0.20210731003635-d96abc06b52c // indirect
github.com/ebay/libovsdb v0.2.1-0.20200719163122-3332afaeb27c // indirect
github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 // indirect
github.com/edwarnicke/serialize v1.0.7 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
Expand Down Expand Up @@ -69,7 +69,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230214122858-b7a1313f02af // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230221131057-f339c7f9142b // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/ovn-org/libovsdb v0.6.1-0.20210824154155-9cab5b210dce // indirect
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20210826171620-f06c53111a31 // indirect
Expand Down
20 changes: 10 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,16 +436,16 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 h1:RxNKksXsXsnDsEo+Cfn43pdPfML024ad//QcdKfgXK4=
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20230214013943-438ec051e69b h1:DAAqODDVm0Pm3bCfSfOKD71fRkfbDn746oiFcBuIjfk=
github.com/networkservicemesh/sdk v0.5.1-0.20230214013943-438ec051e69b/go.mod h1:4w0ue1+jI3lHNdSr+rzSpFIBwoGfM5vRcjVkNKZNRxk=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230214093953-233b1ac6214a h1:giqwEayFMl4AM9gauq7LnNKMhgRURJ3Ymf2QVIUciMk=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230214093953-233b1ac6214a/go.mod h1:URGvn9eMZv/YKxL9WcmK62xuNAatVS4q8h+oZfT193I=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230214122858-b7a1313f02af h1:eIXf3IXkRZnL3xS6fEzR6WEElxHLf4Zm4Gy2WXRsMoA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230214122858-b7a1313f02af/go.mod h1:PA9AjrnlqpFOKpjU2IKOXmiw5afBNI+HdBxtz2pjrRU=
github.com/networkservicemesh/sdk-ovs v0.0.0-20230214124556-742c7ea96b1a h1:g+MtqabIVRj+fMGVI2v6g0lnWlODc+2KHk30uxWtazQ=
github.com/networkservicemesh/sdk-ovs v0.0.0-20230214124556-742c7ea96b1a/go.mod h1:iovc1NKTLe4bvFOEOwhJyzAzFmZDCABxx8A481rF2mM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230214123342-528783e52303 h1:dENMp3Dy0HRU8CveGhD36Cmhr/wNriJH0ly3CrVK95Y=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230214123342-528783e52303/go.mod h1:1OwsVqQvKFSuZfltjsrNSc314BOkTdMFp5yq3yltuqw=
github.com/networkservicemesh/sdk v0.5.1-0.20230221131021-bcd1eb0f52b4 h1:VDof/obB0MvjQNP4xpCi9yYV1f1jkAc/3+Xy1Zkh84Q=
github.com/networkservicemesh/sdk v0.5.1-0.20230221131021-bcd1eb0f52b4/go.mod h1:4w0ue1+jI3lHNdSr+rzSpFIBwoGfM5vRcjVkNKZNRxk=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230221132440-43b4f167f9de h1:w4JglmzBohsAcRQiyAW8JlVDETRUm5roT7V6XDO7hw8=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230221132440-43b4f167f9de/go.mod h1:gf/Dc0MBA4gg4Wf7y43AZ1QC7kbUL3FCb3MxLpTOLhk=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230221131057-f339c7f9142b h1:ol6+zl0zD+lhqbEahuCngwBABy9mVxXmwTfkszwmE4M=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230221131057-f339c7f9142b/go.mod h1:Aw+hwenxdbGscpueyDOP91Jf8jL7UIzbRs+Mmt4PiJo=
github.com/networkservicemesh/sdk-ovs v0.0.0-20230221134133-6136ea55d805 h1:SQDzT7HxD45cCBS0eqJw3/hckmazuGXoBQeFNhhYcBE=
github.com/networkservicemesh/sdk-ovs v0.0.0-20230221134133-6136ea55d805/go.mod h1:4uxuYad3Jrogq0oRC+ed0z0S4GENVsWTES9JtwR5GZs=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230221132402-5b03677ef136 h1:/QNKqVPx0g2mXp8+LYwZ1cG+8pFk+/EbYxMGV1Utec8=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230221132402-5b03677ef136/go.mod h1:xEl/7kX1tbF90ZtE5k6cwkXof76EUYVKMr9tptKIjpg=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
Expand Down
7 changes: 4 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (

nested "github.com/antonfisher/nested-logrus-formatter"
"github.com/edwarnicke/debug"
"github.com/edwarnicke/genericsync"
"github.com/edwarnicke/grpcfd"
"github.com/kelseyhightower/envconfig"
registryapi "github.com/networkservicemesh/api/pkg/api/registry"
Expand All @@ -58,11 +59,11 @@ import (
monitorauthorize "github.com/networkservicemesh/sdk/pkg/tools/monitorconnection/authorize"
"github.com/networkservicemesh/sdk/pkg/tools/opentelemetry"
"github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"
"github.com/networkservicemesh/sdk/pkg/tools/spire"
"github.com/networkservicemesh/sdk/pkg/tools/token"
"github.com/networkservicemesh/sdk/pkg/tools/tracing"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/spiffe/go-spiffe/v2/spiffeid"
"github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig"
"github.com/spiffe/go-spiffe/v2/svid/x509svid"
"github.com/spiffe/go-spiffe/v2/workloadapi"
Expand Down Expand Up @@ -324,7 +325,7 @@ func createInterposeEndpoint(ctx context.Context, config *Config, tlsClientConfi

func createKernelInterposeEndpoint(ctx context.Context, config *Config, tlsConfig *tls.Config, source x509svid.Source,
egressTunnelIP net.IP, l2cMap map[string]*ovsutil.L2ConnectionPoint) (endpoint.Endpoint, error) {
var spiffeidmap spire.SpiffeIDConnectionMap
var spiffeidmap genericsync.Map[spiffeid.ID, *genericsync.Map[string, struct{}]]

return forwarder.NewKernelServer(
ctx,
Expand Down Expand Up @@ -380,7 +381,7 @@ func createSriovInterposeEndpoint(ctx context.Context, config *Config, tlsConfig
return nil, err
}

var spiffeidmap spire.SpiffeIDConnectionMap
var spiffeidmap genericsync.Map[spiffeid.ID, *genericsync.Map[string, struct{}]]

return forwarder.NewSriovServer(
ctx,
Expand Down