From 2b6291acee0c507ad306231024b5fe277e234c33 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Wed, 9 Nov 2022 17:58:46 +0000 Subject: [PATCH 1/3] Update go.mod and go.sum to latest version from networkservicemesh/sdk@main PR link: https://github.com/networkservicemesh/sdk/pull/1380 Commit: e51c7ad Author: Network Service Mesh Bot Date: 2022-11-08 05:45:00 -0600 Message: - Update go.mod and go.sum to latest version from networkservicemesh/api@main (#1380) PR link: https://github.com/networkservicemesh/api/pull/150 Commit: f71f283 Author: Nikita Skrynnik Date: 2022-11-08 17:52:51 +0700 Message: - add automerge reusable workflow (#150) Signed-off-by: Nikita Skrynnik Signed-off-by: NSMBot Signed-off-by: Nikita Skrynnik Signed-off-by: NSMBot --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5eeac5b..766ca6c 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/fsnotify/fsnotify v1.5.4 github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.2.0 - github.com/networkservicemesh/api v1.4.1-0.20220711153918-a59689088578 - github.com/networkservicemesh/sdk v0.5.1-0.20221013082556-9ae27f8b63af + github.com/networkservicemesh/api v1.6.2-0.20221108105251-f71f283feaa5 + github.com/networkservicemesh/sdk v0.5.1-0.20221108114500-e51c7ad0404f github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/stretchr/testify v1.8.0 diff --git a/go.sum b/go.sum index ba2cecf..3d77a94 100644 --- a/go.sum +++ b/go.sum @@ -340,10 +340,10 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -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.20221013082556-9ae27f8b63af h1:6X3VF4J+jWYWYsQ+Nnx/B0dSFWh79X8SmoaOeEiucuI= -github.com/networkservicemesh/sdk v0.5.1-0.20221013082556-9ae27f8b63af/go.mod h1:YnWv4wspKOtfFsc7kC5tfs7n95Snj3C0MRCal7yytVE= +github.com/networkservicemesh/api v1.6.2-0.20221108105251-f71f283feaa5 h1:qgxeoWsMBTgfa1DZOBD0KumvmhCBuLf9me4/Mcu1WzY= +github.com/networkservicemesh/api v1.6.2-0.20221108105251-f71f283feaa5/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/sdk v0.5.1-0.20221108114500-e51c7ad0404f h1:BxZ7OIrqZW2afI8ls9KMoDHx+Y5VhrpL1bjFOt5z5jc= +github.com/networkservicemesh/sdk v0.5.1-0.20221108114500-e51c7ad0404f/go.mod h1:R8RssOQQngiDgmX+DzO7X43Ye4xSfNdc2asv27qewKY= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= From 4c6dd456a94bab63130138b7c3a7210f2fa84173 Mon Sep 17 00:00:00 2001 From: Vyacheslav Tumanov Date: Wed, 16 Nov 2022 14:36:29 +0500 Subject: [PATCH 2/3] Rename FakeDNSResolver to fakeResolver Signed-off-by: Vyacheslav Tumanov --- pkg/registry/chains/registryk8s/registry-k8s_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/registry/chains/registryk8s/registry-k8s_test.go b/pkg/registry/chains/registryk8s/registry-k8s_test.go index 516d7ba..c8bb032 100644 --- a/pkg/registry/chains/registryk8s/registry-k8s_test.go +++ b/pkg/registry/chains/registryk8s/registry-k8s_test.go @@ -168,7 +168,7 @@ func TestNSMGR_InterdomainUseCase(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) defer cancel() - var dnsServer = new(sandbox.FakeDNSResolver) + var dnsServer = new(sandbox.fakeResolver) cluster1 := sandbox.NewBuilder(ctx, t). SetNodesCount(1). @@ -240,7 +240,7 @@ func TestNSMGR_FloatingInterdomainUseCase(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) defer cancel() - var dnsServer = new(sandbox.FakeDNSResolver) + var dnsServer = new(sandbox.fakeResolver) cluster1 := sandbox.NewBuilder(ctx, t). SetNodesCount(1). From 93727f6943ec19cae5b783d708af85a0ec03027e Mon Sep 17 00:00:00 2001 From: Vyacheslav Tumanov Date: Wed, 16 Nov 2022 14:43:33 +0500 Subject: [PATCH 3/3] Fix unexported type Signed-off-by: Vyacheslav Tumanov --- pkg/registry/chains/registryk8s/registry-k8s_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/registry/chains/registryk8s/registry-k8s_test.go b/pkg/registry/chains/registryk8s/registry-k8s_test.go index c8bb032..be8253a 100644 --- a/pkg/registry/chains/registryk8s/registry-k8s_test.go +++ b/pkg/registry/chains/registryk8s/registry-k8s_test.go @@ -168,7 +168,7 @@ func TestNSMGR_InterdomainUseCase(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) defer cancel() - var dnsServer = new(sandbox.fakeResolver) + var dnsServer = sandbox.NewFakeResolver() cluster1 := sandbox.NewBuilder(ctx, t). SetNodesCount(1). @@ -240,7 +240,7 @@ func TestNSMGR_FloatingInterdomainUseCase(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) defer cancel() - var dnsServer = new(sandbox.fakeResolver) + var dnsServer = sandbox.NewFakeResolver() cluster1 := sandbox.NewBuilder(ctx, t). SetNodesCount(1).