apply suggestions

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

.golangci.yml

@@ -29,14 +29,14 @@ linters-settings:
   goimports:
     local-prefixes: github.com/networkservicemesh/sdk
   gocyclo:
-    min-complexity: 17
+    min-complexity: 15
   maligned:
     suggest-new: true
   dupl:
     threshold: 150
   funlen:
     Lines: 110
-    Statements: 60
+    Statements: 50
   goconst:
     min-len: 2
     min-occurrences: 2

pkg/networkservice/chains/nsmgr/forwarder_test.go

@@ -98,7 +98,7 @@ func testForwarderShouldBeSelectedCorrectlyOnNSMgrRestart(t *testing.T, nodeNum,
 	require.Equal(t, pathSegmentCount, len(conn.Path.PathSegments))
 	require.Equal(t, expectedForwarderName, conn.GetPath().GetPathSegments()[2].Name)
 
-	for i := 0; i < 2; i++ {
+	for i := 0; i < 10; i++ {
 		request.Connection = conn.Clone()
 		conn, err = nsc.Request(ctx, request.Clone())
 		require.NoError(t, err)

pkg/networkservice/common/discoverforwarder/server.go

@@ -100,23 +100,11 @@ func (d *discoverForwarderServer) Request(ctx context.Context, request *networks
 			datapathForwarder = segments[pathIndex+1].Name
 		}
 
-		for _, candidate := range nses {
-			if candidate.Name != datapathForwarder {
-				continue
-			}
-			u, err := url.Parse(candidate.Url)
-
-			if err != nil {
-				logger.Errorf("can not parse forwarder=%v url=%v error=%v", candidate.Name, u, err.Error())
-				return nil, errors.WithStack(err)
-			}
-
-			resp, err := next.Server(ctx).Request(clienturlctx.WithClientURL(ctx, u), request)
-			if err != nil {
-				continue
+		for i, candidate := range nses {
+			if candidate.Name == datapathForwarder {
+				nses[0], nses[i] = nses[i], nses[0]
+				break
 			}
-			storeForwarderName(ctx, candidate.Name)
-			return resp, nil
 		}
 
 		var candidatesErr = errors.New("all forwarders have failed")