*: modernize: waitgroup

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

core/metrics/cgroups/metrics_test.go

@@ -94,10 +94,8 @@ func TestRegressionIssue6772(t *testing.T) {
 	var wg sync.WaitGroup
 	for i := range maxItem {
 		id := i
-		wg.Add(1)
 
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 
 			err := collector.Add(
 				&mockStatT{
@@ -110,7 +108,7 @@ func TestRegressionIssue6772(t *testing.T) {
 			if err != nil {
 				errCh <- err
 			}
-		}()
+		})
 	}
 
 	finishedCh := make(chan struct{})

core/runtime/v2/shim_windows.go

@@ -71,8 +71,7 @@ func openShimLog(ctx context.Context, bundle *Bundle, dialer func(string, time.D
 	dpc := &deferredPipeConnection{
 		ctx: ctx,
 	}
-	dpc.wg.Add(1)
-	go func() {
+	dpc.wg.Go(func() {
 		c, conerr := dialer(
 			fmt.Sprintf("\\\\.\\pipe\\containerd-shim-%s-%s-log", ns, bundle.ID),
 			time.Second*10,
@@ -81,8 +80,7 @@ func openShimLog(ctx context.Context, bundle *Bundle, dialer func(string, time.D
 			dpc.conerr = fmt.Errorf("failed to connect to shim log: %w", conerr)
 		}
 		dpc.c = c
-		dpc.wg.Done()
-	}()
+	})
 	return dpc, nil
 }
 

integration/client/container_checkpoint_test.go

@@ -119,11 +119,9 @@ func TestCheckpointRestorePTY(t *testing.T) {
 		wg  sync.WaitGroup
 		buf = bytes.NewBuffer(nil)
 	)
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		io.Copy(buf, direct.Stdout)
-	}()
+	})
 
 	if container, err = client.Restore(ctx, id, checkpoint, []RestoreOpts{
 		WithRestoreImage,

integration/client/container_linux_test.go

@@ -528,11 +528,9 @@ func TestContainerAttach(t *testing.T) {
 		wg  sync.WaitGroup
 		buf = bytes.NewBuffer(nil)
 	)
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		io.Copy(buf, direct.Stdout)
-	}()
+	})
 
 	task, err := container.NewTask(ctx, direct.IOCreate)
 	if err != nil {
@@ -623,11 +621,9 @@ func testContainerUser(t *testing.T, userstr, expectedOutput string) {
 		wg  sync.WaitGroup
 		buf = bytes.NewBuffer(nil)
 	)
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		io.Copy(buf, direct.Stdout)
-	}()
+	})
 
 	container, err := client.NewContainer(ctx, id,
 		WithNewSnapshot(id, image),
@@ -701,11 +697,9 @@ func TestContainerAttachProcess(t *testing.T) {
 		wg  sync.WaitGroup
 		buf = bytes.NewBuffer(nil)
 	)
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		io.Copy(buf, direct.Stdout)
-	}()
+	})
 
 	task, err := container.NewTask(ctx, empty())
 	if err != nil {
@@ -872,11 +866,9 @@ func TestContainerUserID(t *testing.T) {
 		wg  sync.WaitGroup
 		buf = bytes.NewBuffer(nil)
 	)
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		io.Copy(buf, direct.Stdout)
-	}()
+	})
 
 	// sys user in the busybox image has a uid and gid of 3.
 	container, err := client.NewContainer(ctx, id,

integration/client/mount_manager_linux_test.go

@@ -159,11 +159,9 @@ func TestMountAtRuntime(t *testing.T) {
 		wg  sync.WaitGroup
 		buf = bytes.NewBuffer(nil)
 	)
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		io.Copy(buf, direct.Stdout)
-	}()
+	})
 
 	task, err = container2.NewTask(ctx, direct.IOCreate, containerd.WithRootFS(m))
 	require.NoError(t, err)

integration/oom_linux_test.go

@@ -93,9 +93,7 @@ version = 3
 		t.Logf("Creating %d running container and wait for them OOMKilled", n)
 		var wg sync.WaitGroup
 		for _, podCtx := range podCtxs {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 
 				cntrID := podCtx.createContainer(fmt.Sprintf("round-%d-running", round), busyboxImage,
 					criruntime.ContainerState_CONTAINER_RUNNING,
@@ -134,7 +132,7 @@ version = 3
 				}, time.Second, 90*time.Second), "wait for container %s to exit", cntrID)
 
 				assert.NoError(t, ctrd.criRuntimeService(t).RemoveContainer(cntrID), "failed to remove container %s", cntrID)
-			}()
+			})
 		}
 		wg.Wait()
 	}

integration/sandbox_clean_remove_test.go

@@ -149,14 +149,12 @@ func TestSandboxStopWithNilCNIResult(t *testing.T) {
 	injectCNIFailpoint(t, sbConfig, conf)
 
 	var wg sync.WaitGroup
-	wg.Add(1)
 
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		t.Log("Create a sandbox (will hang on CNI Add)")
 		_, err := runtimeService.RunPodSandbox(sbConfig, failpointRuntimeHandler)
 		assert.Error(t, err)
-	}()
+	})
 
 	t.Log("Wait for CNI Add to start running")
 	assert.NoError(t, ensureCNIAddRunning(t, sbName), "CNI Add should be running")

integration/sandbox_run_rollback_test.go

@@ -256,15 +256,13 @@ func TestRunPodSandboxAndTeardownCNISlow(t *testing.T) {
 	injectCNIFailpoint(t, sbConfig, conf)
 
 	var wg sync.WaitGroup
-	wg.Add(1)
 
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		t.Log("Create a sandbox")
 		_, err := runtimeService.RunPodSandbox(sbConfig, failpointRuntimeHandler)
 		require.Error(t, err)
 		require.ErrorContains(t, err, "error reading from server: EOF")
-	}()
+	})
 
 	assert.NoError(t, ensureCNIAddRunning(t, sbName), "check that failpoint CNI.Add is running")
 

internal/cri/io/helpers_windows.go

@@ -40,16 +40,14 @@ func openPipe(ctx context.Context, fn string, flag int, perm os.FileMode) (io.Re
 		return nil, err
 	}
 	p := &pipe{l: l}
-	p.conWg.Add(1)
-	go func() {
-		defer p.conWg.Done()
+	p.conWg.Go(func() {
 		c, err := l.Accept()
 		if err != nil {
 			p.conErr = err
 			return
 		}
 		p.con = c
-	}()
+	})
 	go func() {
 		<-ctx.Done()
 		p.Close()