From b629674d19a1d2fb39a68b7ada7bdb6f89fa85e6 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 12 May 2022 10:31:56 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-vpp@main PR link: https://github.com/networkservicemesh/sdk-vpp/pull/580 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: de5e9ed Author: Artem Glazychev Date: 2022-05-12 17:31:13 +0700 Message: - Update registry client (#580) * Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main PR link: https://github.com/networkservicemesh/sdk-kernel/pull/470 Commit: 1ab1aa4 Author: Network Service Mesh Bot Date: 2022-05-12 04:08:46 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… Signed-off-by: NSMBot * Update registry client Signed-off-by: Artem Glazychev Signed-off-by: NSMBot --- go.mod | 4 ++-- go.sum | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 2180bdb..3857b0b 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/golang/protobuf v1.5.2 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 - github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18 + github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b - github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02 + github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index d1e7453..f03137d 100644 --- a/go.sum +++ b/go.sum @@ -199,13 +199,15 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0= github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 h1:xkwnRaajnnqFPEbj5FrVVDjSgp+o5tiHqVb8W5cOAfI= github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18 h1:gHQmGN6YFwGWkM7cxrUuB1BV2L0qvPkkyIl/Cq19gtw= github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s= +github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 h1:7ObtZZ4na7PIkco8XTIiGTgh9FhvDtTqKHTS1epR5HI= +github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s= github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5/go.mod h1:U+mFUYf5bwyQzlJnNu5crGv9qF4M9MbCks0iKmNBJNg= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220512090846-1ab1aa466ce0/go.mod h1:ajoJFtAjgQ/UyotcgIbAv3a+x/c5DW6KwuXaLdWxKsY= github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b h1:9RJC1InBV4P1feo+DxRfb22yyRB6zy27KoPwVyY7T84= github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b/go.mod h1:igDwkyjuNFKqQPaREIPUiE9cZYdg1SB/SO8Uyn8zh8Q= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02 h1:Yn9DxwCF/peF+M9n+AuCELMZeESf+x6vwyttU8pWLcc= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02/go.mod h1:B5XXx8QQg4IMEKHDHKT1MTpkOnAnjrbn07tfkx6Pogg= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74 h1:PMl1golx0Rtp90Eyy0gkN7lVZFM97jUuEO4whild9pc= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74/go.mod h1:ZWjTxAuyS5Z09mX4U/p953h8HsjzEiVucQb+diSiP9Y= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= From 492fcddd5edc0a463e4fa7526ca6209c081e05ed Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Thu, 12 May 2022 18:52:06 +0700 Subject: [PATCH 2/2] Update registry client Signed-off-by: Artem Glazychev --- go.mod | 2 +- go.sum | 6 ++---- main.go | 6 ++++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 3857b0b..23d8ff7 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 - github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b + github.com/networkservicemesh/sdk-sriov v0.0.0-20220512103059-d007eaaff930 github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 diff --git a/go.sum b/go.sum index f03137d..fc74d04 100644 --- a/go.sum +++ b/go.sum @@ -199,13 +199,11 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0= github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 h1:xkwnRaajnnqFPEbj5FrVVDjSgp+o5tiHqVb8W5cOAfI= github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s= github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 h1:7ObtZZ4na7PIkco8XTIiGTgh9FhvDtTqKHTS1epR5HI= github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5/go.mod h1:U+mFUYf5bwyQzlJnNu5crGv9qF4M9MbCks0iKmNBJNg= github.com/networkservicemesh/sdk-kernel v0.0.0-20220512090846-1ab1aa466ce0/go.mod h1:ajoJFtAjgQ/UyotcgIbAv3a+x/c5DW6KwuXaLdWxKsY= -github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b h1:9RJC1InBV4P1feo+DxRfb22yyRB6zy27KoPwVyY7T84= -github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b/go.mod h1:igDwkyjuNFKqQPaREIPUiE9cZYdg1SB/SO8Uyn8zh8Q= +github.com/networkservicemesh/sdk-sriov v0.0.0-20220512103059-d007eaaff930 h1:FbcQTVmjg62s+H4/9brgvO+XAfHcA4Sl3AqBr3eYBp8= +github.com/networkservicemesh/sdk-sriov v0.0.0-20220512103059-d007eaaff930/go.mod h1:oKbRtbPyipQCSiKiaDKHTFOx9P3bB8fzh+9UVmMjhY0= github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74 h1:PMl1golx0Rtp90Eyy0gkN7lVZFM97jUuEO4whild9pc= github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74/go.mod h1:ZWjTxAuyS5Z09mX4U/p953h8HsjzEiVucQb+diSiP9Y= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= diff --git a/main.go b/main.go index 63daa46..b3f50cf 100644 --- a/main.go +++ b/main.go @@ -189,7 +189,9 @@ func registerEndpoint(ctx context.Context, config *Config, source *workloadapi.X if config.RegisterService { for _, serviceName := range config.ServiceNames { - nsRegistryClient := registryclient.NewNetworkServiceRegistryClient(ctx, &config.ConnectTo, registryclient.WithDialOptions(clientOptions...)) + nsRegistryClient := registryclient.NewNetworkServiceRegistryClient(ctx, + registryclient.WithClientURL(&config.ConnectTo), + registryclient.WithDialOptions(clientOptions...)) _, err := nsRegistryClient.Register(ctx, ®istryapi.NetworkService{ Name: serviceName, Payload: config.Payload, @@ -203,7 +205,7 @@ func registerEndpoint(ctx context.Context, config *Config, source *workloadapi.X nseRegistryClient := registryclient.NewNetworkServiceEndpointRegistryClient( ctx, - &config.ConnectTo, + registryclient.WithClientURL(&config.ConnectTo), registryclient.WithDialOptions(clientOptions...), registryclient.WithNSEAdditionalFunctionality( registrysendfd.NewNetworkServiceEndpointRegistryClient(),