From 3568be151b0bf85ce5c354fc15b4768b61c484bb Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Fri, 16 Sep 2022 19:16:35 +0700 Subject: [PATCH 1/3] update sdk ref Signed-off-by: Nikita Skrynnik --- go.mod | 2 +- go.sum | 4 ++-- main.go | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 17670b6..292d945 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/golang/protobuf v1.5.2 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578 - github.com/networkservicemesh/sdk v0.5.1-0.20220914233340-97e00ecbb074 + github.com/networkservicemesh/sdk v0.5.1-0.20220916121847-88b2169efe99 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.0.0 github.com/stretchr/testify v1.8.0 diff --git a/go.sum b/go.sum index 4d63d46..5245f7d 100644 --- a/go.sum +++ b/go.sum @@ -193,8 +193,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578 h1:2MZD6SGFULqTgMKA8BFy7F+ldRErAyxsWht7oCwCVRM= github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220914233340-97e00ecbb074 h1:UzfImaVm+EnC6gFlT4KmcAvaYLPgHcuXLBoMOfalvMY= -github.com/networkservicemesh/sdk v0.5.1-0.20220914233340-97e00ecbb074/go.mod h1:YnWv4wspKOtfFsc7kC5tfs7n95Snj3C0MRCal7yytVE= +github.com/networkservicemesh/sdk v0.5.1-0.20220916121847-88b2169efe99 h1:kidNCyBjAx0T3ynKbMggWhVtzpVohvVuy7zW8bYobU0= +github.com/networkservicemesh/sdk v0.5.1-0.20220916121847-88b2169efe99/go.mod h1:YnWv4wspKOtfFsc7kC5tfs7n95Snj3C0MRCal7yytVE= 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= diff --git a/main.go b/main.go index f655fee..3f15efa 100644 --- a/main.go +++ b/main.go @@ -16,6 +16,7 @@ //go:build !windows +// Package main defines a registry-memory application package main import ( From d86db43774f7b880f69c66726c3f377702aaa45c Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Fri, 16 Sep 2022 19:35:09 +0700 Subject: [PATCH 2/3] add opa policy chain elements Signed-off-by: Nikita Skrynnik --- main.go | 9 ++++++++- pkg/imports/imports_linux.go | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 3f15efa..daafce9 100644 --- a/main.go +++ b/main.go @@ -42,6 +42,7 @@ import ( "google.golang.org/grpc/credentials" "github.com/networkservicemesh/sdk/pkg/registry/chains/memory" + "github.com/networkservicemesh/sdk/pkg/registry/common/authorize" "github.com/networkservicemesh/sdk/pkg/tools/debug" "github.com/networkservicemesh/sdk/pkg/tools/grpcutils" "github.com/networkservicemesh/sdk/pkg/tools/log" @@ -144,7 +145,13 @@ func main() { ), ), ) - memory.NewServer(ctx, time.Minute, &config.ProxyRegistryURL, clientOptions...).Register(server) + memory.NewServer( + ctx, + memory.WithAuthorizeNSRegistryServer(authorize.NewNetworkServiceRegistryServer()), + memory.WithAuthorizeNSERegistryServer(authorize.NewNetworkServiceEndpointRegistryServer()), + memory.WithExpireDuration(time.Minute), + memory.WithProxyRegistryURL(&config.ProxyRegistryURL), + memory.WithDialOptions(clientOptions...)).Register(server) for i := 0; i < len(config.ListenOn); i++ { srvErrCh := grpcutils.ListenAndServe(ctx, &config.ListenOn[i], server) diff --git a/pkg/imports/imports_linux.go b/pkg/imports/imports_linux.go index 5350f5f..751a1d0 100644 --- a/pkg/imports/imports_linux.go +++ b/pkg/imports/imports_linux.go @@ -12,6 +12,7 @@ import ( _ "github.com/kelseyhightower/envconfig" _ "github.com/networkservicemesh/api/pkg/api/registry" _ "github.com/networkservicemesh/sdk/pkg/registry/chains/memory" + _ "github.com/networkservicemesh/sdk/pkg/registry/common/authorize" _ "github.com/networkservicemesh/sdk/pkg/registry/common/begin" _ "github.com/networkservicemesh/sdk/pkg/registry/common/refresh" _ "github.com/networkservicemesh/sdk/pkg/registry/core/next" From 42806a16480dfc744d243c430256af46e8c5cce0 Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Fri, 16 Sep 2022 19:39:34 +0700 Subject: [PATCH 3/3] fix linter Signed-off-by: Nikita Skrynnik --- main.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/main.go b/main.go index daafce9..bc56737 100644 --- a/main.go +++ b/main.go @@ -139,9 +139,7 @@ func main() { grpc.WithDefaultCallOptions(grpc.WaitForReady(true)), grpc.WithTransportCredentials( grpcfd.TransportCredentials( - credentials.NewTLS( - tlsClientConfig, - ), + credentials.NewTLS(tlsClientConfig), ), ), )