From a804e3f84c8c812df0e721a65d8f59c38f73d9be Mon Sep 17 00:00:00 2001 From: ykadowak Date: Fri, 19 Jan 2024 07:24:07 +0000 Subject: [PATCH 1/5] Fix references to loop variable from within nested function --- pkg/gateway/lb/usecase/vald_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/gateway/lb/usecase/vald_test.go b/pkg/gateway/lb/usecase/vald_test.go index c6e32773f0..788f517fda 100644 --- a/pkg/gateway/lb/usecase/vald_test.go +++ b/pkg/gateway/lb/usecase/vald_test.go @@ -100,10 +100,11 @@ func Test_discovererClient(t *testing.T) { } for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + test := tt + t.Run(test.name, func(t *testing.T) { t.Parallel() - client, err := discovererClient(tt.cfg, tt.dopts, tt.aopts, errgroup.Get()) - tt.assert(t, client, err) + client, err := discovererClient(test.cfg, test.dopts, test.aopts, errgroup.Get()) + test.assert(t, client, err) }) } } From 7d6098353a5b590abfbb2a5105d61138ec539063 Mon Sep 17 00:00:00 2001 From: ykadowak Date: Fri, 19 Jan 2024 07:27:14 +0000 Subject: [PATCH 2/5] Skip necessary lock erroneously passed by valu --- internal/client/v1/client/discoverer/discover_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/client/v1/client/discoverer/discover_test.go b/internal/client/v1/client/discoverer/discover_test.go index fb4b403227..2f802af0bf 100644 --- a/internal/client/v1/client/discoverer/discover_test.go +++ b/internal/client/v1/client/discoverer/discover_test.go @@ -66,7 +66,7 @@ func Test_client_GetReadClient(t *testing.T) { client: &mockClient, readClient: &mockReadClient, readReplicaReplicas: 1, - roundRobin: counter, + roundRobin: counter, // skipcq: VET-V0008 }, want: &mockReadClient, } @@ -80,7 +80,7 @@ func Test_client_GetReadClient(t *testing.T) { client: &mockClient, readClient: &mockReadClient, readReplicaReplicas: 1, - roundRobin: counter, + roundRobin: counter, // skipcq: VET-V0008 }, want: &mockClient, } @@ -100,14 +100,16 @@ func Test_client_GetReadClient(t *testing.T) { } }(), } + // skipcq: VET-V0008 for _, tc := range tests { + // skipcq: VET-V0008 test := tc t.Run(test.name, func(t *testing.T) { c := &client{ client: test.fields.client, readClient: test.fields.readClient, readReplicaReplicas: test.fields.readReplicaReplicas, - roundRobin: test.fields.roundRobin, + roundRobin: test.fields.roundRobin, // skipcq: VET-V0008 } got := c.GetReadClient() if !reflect.DeepEqual(got, test.want) { From 3db92a8826640bcbef18c6ec2dc9ddd485905b86 Mon Sep 17 00:00:00 2001 From: ykadowak Date: Fri, 19 Jan 2024 07:28:02 +0000 Subject: [PATCH 3/5] Refactor discovererClient function signature --- pkg/gateway/lb/usecase/vald.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/gateway/lb/usecase/vald.go b/pkg/gateway/lb/usecase/vald.go index b8dc5e3948..b348b66639 100644 --- a/pkg/gateway/lb/usecase/vald.go +++ b/pkg/gateway/lb/usecase/vald.go @@ -46,7 +46,7 @@ type run struct { gateway service.Gateway } -func discovererClient(cfg *config.Data, dopts []grpc.Option, aopts []grpc.Option, eg errgroup.Group) (discoverer.Client, error) { +func discovererClient(cfg *config.Data, dopts, aopts []grpc.Option, eg errgroup.Group) (discoverer.Client, error) { var discovererOpts []discoverer.Option discovererOpts = append(discovererOpts, discoverer.WithAutoConnect(true), From 532767756d666ad288fa42506075b45997962da7 Mon Sep 17 00:00:00 2001 From: ykadowak Date: Fri, 19 Jan 2024 07:29:02 +0000 Subject: [PATCH 4/5] format --- pkg/gateway/lb/usecase/vald_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/gateway/lb/usecase/vald_test.go b/pkg/gateway/lb/usecase/vald_test.go index 788f517fda..f8a60a09d5 100644 --- a/pkg/gateway/lb/usecase/vald_test.go +++ b/pkg/gateway/lb/usecase/vald_test.go @@ -23,10 +23,9 @@ import ( "github.com/stretchr/testify/require" "github.com/vdaas/vald/internal/client/v1/client/discoverer" iconfig "github.com/vdaas/vald/internal/config" + "github.com/vdaas/vald/internal/net/grpc" "github.com/vdaas/vald/internal/sync/errgroup" "github.com/vdaas/vald/pkg/gateway/lb/config" - - "github.com/vdaas/vald/internal/net/grpc" ) func Test_discovererClient(t *testing.T) { From c79952e13ad2c0b126ca997bb71219d238a86c69 Mon Sep 17 00:00:00 2001 From: ykadowak Date: Fri, 19 Jan 2024 07:44:28 +0000 Subject: [PATCH 5/5] skip copylocks --- .../v1/client/discoverer/discover_test.go | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/internal/client/v1/client/discoverer/discover_test.go b/internal/client/v1/client/discoverer/discover_test.go index 2f802af0bf..345d68eb3f 100644 --- a/internal/client/v1/client/discoverer/discover_test.go +++ b/internal/client/v1/client/discoverer/discover_test.go @@ -66,7 +66,9 @@ func Test_client_GetReadClient(t *testing.T) { client: &mockClient, readClient: &mockReadClient, readReplicaReplicas: 1, - roundRobin: counter, // skipcq: VET-V0008 + //nolint: govet,copylocks + //skipcq: VET-V0008 + roundRobin: counter, }, want: &mockReadClient, } @@ -80,7 +82,9 @@ func Test_client_GetReadClient(t *testing.T) { client: &mockClient, readClient: &mockReadClient, readReplicaReplicas: 1, - roundRobin: counter, // skipcq: VET-V0008 + //nolint: govet,copylocks + //skipcq: VET-V0008 + roundRobin: counter, }, want: &mockClient, } @@ -94,22 +98,28 @@ func Test_client_GetReadClient(t *testing.T) { client: &mockClient, readClient: &mockReadClient, readReplicaReplicas: 3, - roundRobin: counter, + //nolint: govet,copylocks + //skipcq: VET-V0008 + roundRobin: counter, }, want: &mockClient, } }(), } - // skipcq: VET-V0008 + //nolint: govet,copylocks + //skipcq: VET-V0008 for _, tc := range tests { - // skipcq: VET-V0008 + //nolint: govet,copylocks + //skipcq: VET-V0008 test := tc t.Run(test.name, func(t *testing.T) { c := &client{ client: test.fields.client, readClient: test.fields.readClient, readReplicaReplicas: test.fields.readReplicaReplicas, - roundRobin: test.fields.roundRobin, // skipcq: VET-V0008 + //nolint: govet,copylocks + //skipcq: VET-V0008 + roundRobin: test.fields.roundRobin, } got := c.GetReadClient() if !reflect.DeepEqual(got, test.want) {