From e04d4529435dcbb55c0a7bde0cccfab6f8693fff Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 12 May 2022 16:46:00 +0000 Subject: [PATCH] Update go.mod and go.sum to latest version from networkservicemesh/sdk@main PR link: https://github.com/networkservicemesh/sdk/pull/1284 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: dc8b0c0 Author: Network Service Mesh Bot Date: 2022-05-12 11:45:27 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/ap… Signed-off-by: NSMBot Signed-off-by: Ed Warnicke --- go.mod | 4 ++-- go.sum | 12 ++++++------ .../networkservice/setiptables4nattemplate/server.go | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index de767339..d4ebfae9 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 github.com/golang/protobuf v1.5.2 - github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 - github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 + github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b + github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.0 github.com/vishvananda/netlink v1.1.1-0.20220118170537-d6b03fdeb845 diff --git a/go.sum b/go.sum index e3e45fa0..d8b89b30 100644 --- a/go.sum +++ b/go.sum @@ -36,10 +36,10 @@ github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.1 h1:DX7uPQ4WgAWfoh+NGGlbJQswnYIVvz0SRlLS3rPZQDA= github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.0 h1:j4LrlVXgrbIWO83mmQUnK0Hi+YnbD+vzrE1z/EphbFE= -github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4= -github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk= github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4= +github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4= +github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk= github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -75,10 +75,10 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -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.20220512090615-4f565a9784e0 h1:7ObtZZ4na7PIkco8XTIiGTgh9FhvDtTqKHTS1epR5HI= -github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s= +github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b h1:suJRTlWU7/N0gF3FdcN9kCf1MO5Z7CdVSBdb2JTkLhk= +github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894 h1:J69KOXLObKnmtGaR7/uEw3PII/HqNkLwFQwdZffDdyE= +github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894/go.mod h1:7Aa9sCLOVzhsbR7LBJ1nSK/YCzd/EO/YK3BbHPB0puw= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/pkg/kernel/networkservice/setiptables4nattemplate/server.go b/pkg/kernel/networkservice/setiptables4nattemplate/server.go index 0caecc9d..44fc347c 100644 --- a/pkg/kernel/networkservice/setiptables4nattemplate/server.go +++ b/pkg/kernel/networkservice/setiptables4nattemplate/server.go @@ -30,21 +30,21 @@ import ( ) type setIPTablesTemplateServer struct { - template string + rulesTemplate []string } // NewServer - returns a new networkservice.NetworkServiceServer that writes IP Tables rules template // to kernel mechanism -func NewServer(template string) networkservice.NetworkServiceServer { +func NewServer(rulesTemplate []string) networkservice.NetworkServiceServer { return &setIPTablesTemplateServer{ - template: template, + rulesTemplate: rulesTemplate, } } func (s *setIPTablesTemplateServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) { mechanism := kernel.ToMechanism(request.GetConnection().GetMechanism()) if mechanism != nil { - mechanism.SetIPTables4NatTemplate(s.template) + mechanism.SetIPTables4NatTemplate(s.rulesTemplate) } return next.Server(ctx).Request(ctx, request)