From 65e9cdd44448e7ca27d8059b372833e9843b4e6a Mon Sep 17 00:00:00 2001
From: Justin Bradford <jabradford@gmail.com>
Date: Fri, 19 Dec 2025 03:07:29 -0800
Subject: [PATCH] refactor: use WaitGroup.Go to replace wg.Add(1)/go/wg.Done()
 boilerplate (#222)

https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/modernize#hdr-Analyzer_waitgroup
---
 pkg/client/dns.go     |  7 ++-----
 pkg/client/service.go | 24 ++++++------------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/pkg/client/dns.go b/pkg/client/dns.go
index 5f508dad..7efd10bc 100644
--- a/pkg/client/dns.go
+++ b/pkg/client/dns.go
@@ -61,14 +61,11 @@ func (cli *Client) CreateIngressRecords(ctx context.Context, serviceID string) (
 			continue
 		}
 
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-
+		wg.Go(func() {
 			if err = verifyCaddyReachable(ctx, m.Machine); err == nil {
 				reachableMachines <- m.Machine
 			}
-		}()
+		})
 	}
 
 	go func() {
diff --git a/pkg/client/service.go b/pkg/client/service.go
index 08f0d42e..369d34ca 100644
--- a/pkg/client/service.go
+++ b/pkg/client/service.go
@@ -240,11 +240,7 @@ func (cli *Client) RemoveService(ctx context.Context, id string) error {
 
 	// Remove all containers on all machines that belong to the service.
 	for _, mc := range svc.Containers {
-		wg.Add(1)
-
-		go func() {
-			defer wg.Done()
-
+		wg.Go(func() {
 			err := cli.StopContainer(ctx, svc.ID, mc.Container.ID, container.StopOptions{})
 			if err != nil {
 				errCh <- fmt.Errorf("stop container '%s': %w", mc.Container.ID, err)
@@ -258,7 +254,7 @@ func (cli *Client) RemoveService(ctx context.Context, id string) error {
 			if err != nil && !errors.Is(err, api.ErrNotFound) {
 				errCh <- fmt.Errorf("remove container '%s': %w", mc.Container.ID, err)
 			}
-		}()
+		})
 	}
 
 	go func() {
@@ -286,16 +282,12 @@ func (cli *Client) StopService(ctx context.Context, id string, opts container.St
 
 	// Stop all containers on all machines that belong to the service.
 	for _, mc := range svc.Containers {
-		wg.Add(1)
-
-		go func() {
-			defer wg.Done()
-
+		wg.Go(func() {
 			err := cli.StopContainer(ctx, svc.ID, mc.Container.ID, opts)
 			if err != nil {
 				errCh <- fmt.Errorf("stop container '%s': %w", mc.Container.ID, err)
 			}
-		}()
+		})
 	}
 
 	go func() {
@@ -323,16 +315,12 @@ func (cli *Client) StartService(ctx context.Context, id string) error {
 
 	// Start all containers on all machines that belong to the service.
 	for _, mc := range svc.Containers {
-		wg.Add(1)
-
-		go func() {
-			defer wg.Done()
-
+		wg.Go(func() {
 			err := cli.StartContainer(ctx, svc.ID, mc.Container.ID)
 			if err != nil {
 				errCh <- fmt.Errorf("start container '%s': %w", mc.Container.ID, err)
 			}
-		}()
+		})
 	}
 
 	go func() {