Fix formatting and removed nolint statement from tests

Signed-off-by: Raunak Madan <[email protected]>

Author: CodexRaunak

integration-tests/meshsync_as_binary_with_k8s_cluster_integration_test.go

@@ -55,10 +55,6 @@ func TestMeshsyncBinaryWithK8sClusterIntegration(t *testing.T) {
 	}
 }
 
-// TODO fix cyclop error
-// integration-tests/k8s_cluster_integration_test.go:74:1: calculated cyclomatic complexity for function runWithMeshsyncBinaryAndk8sClusterMeshsyncBinaryTestCase is 11, max is 10 (cyclop)
-//
-//nolint:cyclop
 func runMeshsyncBinaryWithK8sClusterTestCase(
 	br broker.Handler,
 	tcIndex int,
@@ -107,7 +103,7 @@ func runMeshsyncBinaryWithK8sClusterTestCase(
 			timeout = tc.waitMeshsyncTimeout
 		}
 
-        waitForMeshsync(t, cmd, timeout)
+		waitForMeshsync(t, cmd, timeout)
 
 		// Step 4: do final assertion, if any
 		if tc.finalHandler != nil {
@@ -151,28 +147,26 @@ func withMeshsyncBinaryPrepareMeshsyncCMD(
 }
 
 func waitForMeshsync(
-    t *testing.T,
-    cmd *exec.Cmd,
-    timeout time.Duration,
+	t *testing.T,
+	cmd *exec.Cmd,
+	timeout time.Duration,
 ) {
-    errCh := make(chan error)
-
-	go func(cmd0 *exec.Cmd, errCh0 chan<- error) {
-			errCh0 <- cmd0.Wait()
-		}(cmd, errCh)
-
-    select {
-    case err := <-errCh:
-        if err != nil {
-            t.Fatalf("error running binary: %v", err)
-        }
-    case <-time.After(timeout):
-        if err := cmd.Process.Signal(syscall.SIGTERM); err != nil {
-            t.Fatalf("error terminating meshsync command: %v", err)
-        }
-		t.Logf("processing after timeout %d", timeout)
+	errCh := make(chan error)
 
-    }
-}
+	go func() {
+		errCh <- cmd.Wait()
+	}()
 
+	select {
+	case err := <-errCh:
+		if err != nil {
+			t.Fatalf("error running binary: %v", err)
+		}
+	case <-time.After(timeout):
+		if err := cmd.Process.Signal(syscall.SIGTERM); err != nil {
+			t.Fatalf("error terminating meshsync command: %v", err)
+		}
+		t.Logf("processing after timeout %d", timeout)
 
+	}
+}

integration-tests/meshsync_as_library_with_k8s_cluster_custom_broker_integration_test.go

@@ -35,10 +35,6 @@ func TestMeshsyncLibraryWithK8sClusterCustomBrokerIntegration(t *testing.T) {
 	}
 }
 
-// TODO fix cyclop error
-// integration-tests/k8s_cluster_meshsync_as_library_integration_test.go:47:1: calculated cyclomatic complexity for function runWithMeshsyncLibraryAndk8sClusterTestCase is 15, max is 10 (cyclop)
-//
-//nolint:cyclop
 func runWithMeshsyncLibraryAndk8sClusterCustomBrokerTestCase(
 	br broker.Handler,
 	tcIndex int,
@@ -87,15 +83,15 @@ func runWithMeshsyncLibraryAndk8sClusterCustomBrokerTestCase(
 
 		// Step 3: run meshsync library
 		runMeshsyncLibraryAsync(br, log, tc, errCh)
-		
+
 		// intentionally big timeout to wait till the run execution ended
 		timeout := time.Duration(time.Hour * 24)
 		if tc.waitMeshsyncTimeout > 0 {
 			timeout = tc.waitMeshsyncTimeout
 		}
 
 		handleLibraryCompletion(t, errCh, timeout, tc)
-		
+
 		// Step 4: do final assertion, if any
 		if tc.finalHandler != nil {
 			tc.finalHandler(t, resultData)
@@ -143,11 +139,11 @@ func runMeshsyncLibraryAsync(
 	errCh chan<- error,
 ) {
 	go func() {
-    runOptions := make([]libmeshsync.OptionsSetter, 0, len(tc.meshsyncRunOptions))
-    runOptions = append(runOptions, tc.meshsyncRunOptions...)
-    runOptions = append(runOptions, libmeshsync.WithBrokerHandler(br))
+		runOptions := make([]libmeshsync.OptionsSetter, 0, len(tc.meshsyncRunOptions)+1)
+		runOptions = append(runOptions, tc.meshsyncRunOptions...)
+		runOptions = append(runOptions, libmeshsync.WithBrokerHandler(br))
 
-    errCh <- libmeshsync.Run(log, runOptions...)
+		errCh <- libmeshsync.Run(log, runOptions...)
 	}()
 }
 
@@ -193,5 +189,3 @@ func validateErrorOutcome(
 		t.Fatalf("must end with error")
 	}
 }
-
-