Skip to content

Commit

Permalink
u
Browse files Browse the repository at this point in the history 
Signed-off-by: Nikita Skrynnik <[email protected]>
  • Loading branch information
@NikitaSkrynnik
NikitaSkrynnik committed Jul 11, 2023
1 parent 2566922 commit 251f724
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 72 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/NikitaSkrynnik/cmd-nse-vfio
go 1.20

require (
github.com/NikitaSkrynnik/api v1.0.1-0.20230711064101-51396a9946fc
github.com/NikitaSkrynnik/sdk v0.5.1-0.20230711085827-4db638c6c620
github.com/antonfisher/nested-logrus-formatter v1.3.1
github.com/edwarnicke/exechelper v1.0.2
github.com/edwarnicke/grpcfd v1.1.2
github.com/golang/protobuf v1.5.3
github.com/kelseyhightower/envconfig v1.4.0
github.com/NikitaSkrynnik/api v1.9.1-0.20230627143611-9785eacf9687
github.com/NikitaSkrynnik/sdk v0.5.1-0.20230710100721-01bb35f8c3d6
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/NikitaSkrynnik/api v1.0.1-0.20230711064101-51396a9946fc h1:yMHA//UiNxW0WKekqIPvKBvIheAVmNiaMe0eMoxBBOg=
github.com/NikitaSkrynnik/api v1.0.1-0.20230711064101-51396a9946fc/go.mod h1:6va68ed+AyiYRSNK/RQ91XEZdYHDfb6xVyBzjVhlGVs=
github.com/NikitaSkrynnik/sdk v0.5.1-0.20230711085827-4db638c6c620 h1:u4zscFeqA1YcfdmBj43M5h8/GGvqKT0BnXpMF5jzAYY=
github.com/NikitaSkrynnik/sdk v0.5.1-0.20230711085827-4db638c6c620/go.mod h1:zmGb/Hc6WN95sfc0vf5cz6IdbsaY/t76jtFlaMnIrB8=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
Expand Down Expand Up @@ -194,10 +198,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
github.com/NikitaSkrynnik/api v1.9.1-0.20230627143611-9785eacf9687 h1:Kb6h5eMQpRF4jwRIJjD/uciTsA5Fr0b61fFUmyyVVh4=
github.com/NikitaSkrynnik/api v1.9.1-0.20230627143611-9785eacf9687/go.mod h1:DO7D13Y4x/A8tQ2cQyUWa9o5wi7XHUB8+vITWRKreCc=
github.com/NikitaSkrynnik/sdk v0.5.1-0.20230710100721-01bb35f8c3d6 h1:Pl1/e4k+i6+QYyW5NPiocwHK70r4c5qXIkzzoy4EYnQ=
github.com/NikitaSkrynnik/sdk v0.5.1-0.20230710100721-01bb35f8c3d6/go.mod h1:r9XRbQ6UlS0+hefduzFb1cX9j3W/XNOqFqUlcQk7xYM=
github.com/open-policy-agent/opa v0.44.0 h1:sEZthsrWBqIN+ShTMJ0Hcz6a3GkYsY4FaB2S/ou2hZk=
github.com/open-policy-agent/opa v0.44.0/go.mod h1:YpJaFIk5pq89n/k72c1lVvfvR5uopdJft2tMg1CW/yU=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/kelseyhightower/envconfig"
"github.com/pkg/errors"

"github.com/networkservicemesh/sdk/pkg/tools/cidr"
"github.com/NikitaSkrynnik/sdk/pkg/tools/cidr"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/networkservicemesh/cmd-nse-vfio/internal/config"
"github.com/NikitaSkrynnik/cmd-nse-vfio/internal/config"
)

func TestServiceConfig_UnmarshalBinary(t *testing.T) {
Expand Down
56 changes: 28 additions & 28 deletions internal/imports/imports_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@ import (
_ "github.com/edwarnicke/grpcfd"
_ "github.com/golang/protobuf/ptypes/empty"
_ "github.com/kelseyhightower/envconfig"
_ "github.com/networkservicemesh/api/pkg/api/networkservice"
_ "github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/noop"
_ "github.com/networkservicemesh/api/pkg/api/registry"
_ "github.com/networkservicemesh/sdk/pkg/networkservice/chains/endpoint"
_ "github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
_ "github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms"
_ "github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
_ "github.com/networkservicemesh/sdk/pkg/networkservice/ipam/groupipam"
_ "github.com/networkservicemesh/sdk/pkg/registry/chains/client"
_ "github.com/networkservicemesh/sdk/pkg/registry/common/authorize"
_ "github.com/networkservicemesh/sdk/pkg/registry/common/begin"
_ "github.com/networkservicemesh/sdk/pkg/registry/common/clientinfo"
_ "github.com/networkservicemesh/sdk/pkg/registry/common/expire"
_ "github.com/networkservicemesh/sdk/pkg/registry/common/memory"
_ "github.com/networkservicemesh/sdk/pkg/registry/common/recvfd"
_ "github.com/networkservicemesh/sdk/pkg/registry/common/sendfd"
_ "github.com/networkservicemesh/sdk/pkg/registry/core/adapters"
_ "github.com/networkservicemesh/sdk/pkg/registry/core/chain"
_ "github.com/networkservicemesh/sdk/pkg/tools/cidr"
_ "github.com/networkservicemesh/sdk/pkg/tools/debug"
_ "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/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/NikitaSkrynnik/api/pkg/api/networkservice"
_ "github.com/NikitaSkrynnik/api/pkg/api/networkservice/mechanisms/noop"
_ "github.com/NikitaSkrynnik/api/pkg/api/registry"
_ "github.com/NikitaSkrynnik/sdk/pkg/networkservice/chains/endpoint"
_ "github.com/NikitaSkrynnik/sdk/pkg/networkservice/common/authorize"
_ "github.com/NikitaSkrynnik/sdk/pkg/networkservice/common/mechanisms"
_ "github.com/NikitaSkrynnik/sdk/pkg/networkservice/core/next"
_ "github.com/NikitaSkrynnik/sdk/pkg/networkservice/ipam/groupipam"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/chains/client"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/common/authorize"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/common/begin"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/common/clientinfo"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/common/expire"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/common/memory"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/common/recvfd"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/common/sendfd"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/core/adapters"
_ "github.com/NikitaSkrynnik/sdk/pkg/registry/core/chain"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/cidr"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/debug"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/grpcutils"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/log"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/log/logruslogger"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/opentelemetry"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/spiffejwt"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/spire"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/token"
_ "github.com/NikitaSkrynnik/sdk/pkg/tools/tracing"
_ "github.com/pkg/errors"
_ "github.com/sirupsen/logrus"
_ "github.com/spiffe/go-spiffe/v2/bundle/x509bundle"
Expand Down
6 changes: 3 additions & 3 deletions internal/networkservice/mapserver/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"

"github.com/networkservicemesh/api/pkg/api/networkservice"
"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
"github.com/NikitaSkrynnik/api/pkg/api/networkservice"
"github.com/NikitaSkrynnik/sdk/pkg/networkservice/core/next"

"github.com/networkservicemesh/cmd-nse-vfio/internal/config"
"github.com/NikitaSkrynnik/cmd-nse-vfio/internal/config"
)

type mapServer struct {
Expand Down
42 changes: 21 additions & 21 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/networkservicemesh/api/pkg/api/networkservice"
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/noop"
"github.com/networkservicemesh/api/pkg/api/registry"
"github.com/networkservicemesh/sdk/pkg/networkservice/chains/endpoint"
"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms"
"github.com/networkservicemesh/sdk/pkg/networkservice/ipam/groupipam"
registryclient "github.com/networkservicemesh/sdk/pkg/registry/chains/client"
registryauthorize "github.com/networkservicemesh/sdk/pkg/registry/common/authorize"
"github.com/networkservicemesh/sdk/pkg/registry/common/clientinfo"
"github.com/networkservicemesh/sdk/pkg/registry/common/sendfd"
"github.com/networkservicemesh/sdk/pkg/tools/debug"
"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/opentelemetry"
"github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"
"github.com/networkservicemesh/sdk/pkg/tools/token"
"github.com/networkservicemesh/sdk/pkg/tools/tracing"
"github.com/NikitaSkrynnik/api/pkg/api/networkservice"
"github.com/NikitaSkrynnik/api/pkg/api/networkservice/mechanisms/noop"
"github.com/NikitaSkrynnik/api/pkg/api/registry"
"github.com/NikitaSkrynnik/sdk/pkg/networkservice/chains/endpoint"
"github.com/NikitaSkrynnik/sdk/pkg/networkservice/common/authorize"
"github.com/NikitaSkrynnik/sdk/pkg/networkservice/common/mechanisms"
"github.com/NikitaSkrynnik/sdk/pkg/networkservice/ipam/groupipam"
registryclient "github.com/NikitaSkrynnik/sdk/pkg/registry/chains/client"
registryauthorize "github.com/NikitaSkrynnik/sdk/pkg/registry/common/authorize"
"github.com/NikitaSkrynnik/sdk/pkg/registry/common/clientinfo"
"github.com/NikitaSkrynnik/sdk/pkg/registry/common/sendfd"
"github.com/NikitaSkrynnik/sdk/pkg/tools/debug"
"github.com/NikitaSkrynnik/sdk/pkg/tools/grpcutils"
"github.com/NikitaSkrynnik/sdk/pkg/tools/log"
"github.com/NikitaSkrynnik/sdk/pkg/tools/log/logruslogger"
"github.com/NikitaSkrynnik/sdk/pkg/tools/opentelemetry"
"github.com/NikitaSkrynnik/sdk/pkg/tools/spiffejwt"
"github.com/NikitaSkrynnik/sdk/pkg/tools/token"
"github.com/NikitaSkrynnik/sdk/pkg/tools/tracing"

"github.com/networkservicemesh/cmd-nse-vfio/internal/config"
"github.com/networkservicemesh/cmd-nse-vfio/internal/networkservice/mapserver"
"github.com/NikitaSkrynnik/cmd-nse-vfio/internal/config"
"github.com/NikitaSkrynnik/cmd-nse-vfio/internal/networkservice/mapserver"
)

func main() {
Expand Down
20 changes: 10 additions & 10 deletions suite_setup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

"github.com/networkservicemesh/api/pkg/api/registry"
"github.com/networkservicemesh/sdk/pkg/registry/common/begin"
"github.com/networkservicemesh/sdk/pkg/registry/common/expire"
"github.com/networkservicemesh/sdk/pkg/registry/common/memory"
registryrecvfd "github.com/networkservicemesh/sdk/pkg/registry/common/recvfd"
"github.com/networkservicemesh/sdk/pkg/registry/core/adapters"
registrychain "github.com/networkservicemesh/sdk/pkg/registry/core/chain"
"github.com/networkservicemesh/sdk/pkg/tools/log"
"github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
"github.com/networkservicemesh/sdk/pkg/tools/spire"
"github.com/NikitaSkrynnik/api/pkg/api/registry"
"github.com/NikitaSkrynnik/sdk/pkg/registry/common/begin"
"github.com/NikitaSkrynnik/sdk/pkg/registry/common/expire"
"github.com/NikitaSkrynnik/sdk/pkg/registry/common/memory"
registryrecvfd "github.com/NikitaSkrynnik/sdk/pkg/registry/common/recvfd"
"github.com/NikitaSkrynnik/sdk/pkg/registry/core/adapters"
registrychain "github.com/NikitaSkrynnik/sdk/pkg/registry/core/chain"
"github.com/NikitaSkrynnik/sdk/pkg/tools/log"
"github.com/NikitaSkrynnik/sdk/pkg/tools/log/logruslogger"
"github.com/NikitaSkrynnik/sdk/pkg/tools/spire"
)

func (f *TestSuite) SetupSuite() {
Expand Down
2 changes: 1 addition & 1 deletion suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/suite"
"google.golang.org/grpc"

"github.com/networkservicemesh/cmd-nse-vfio/internal/config"
"github.com/NikitaSkrynnik/cmd-nse-vfio/internal/config"
)

type TestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion suite_util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
"google.golang.org/grpc"

"github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
"github.com/NikitaSkrynnik/sdk/pkg/tools/grpcutils"
)

func (f *TestSuite) ListenAndServe(ctx context.Context, server *grpc.Server) <-chan error {
Expand Down

0 comments on commit 251f724

Please sign in to comment.