Merge pull request #236 from ngrok/bmps/go-fix

chore: run go fix

Author: bmpngrok

internal/integration_tests/url_pooling_test.go

@@ -63,15 +63,13 @@ func TestListenWithURLAndPooling(t *testing.T) {
 
 	// Start handlers for both listeners
 	// Handler for first listener
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		defer close(processingDone)
 
 		// Signal that we're ready to accept connections
 		endpoint1Ready.Signal()
 
-		for i := 0; i < 5; i++ { // Handle up to 5 connections
+		for range 5 { // Handle up to 5 connections
 			conn, err := listener1.Accept()
 			if err != nil {
 				// Check if test is already finished before reporting errors
@@ -130,17 +128,15 @@ func TestListenWithURLAndPooling(t *testing.T) {
 				}
 			}(conn)
 		}
-	}()
+	})
 
 	// Handler for second listener
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 
 		// Signal that we're ready to accept connections
 		endpoint2Ready.Signal()
 
-		for i := 0; i < 5; i++ { // Handle up to 5 connections
+		for range 5 { // Handle up to 5 connections
 			conn, err := listener2.Accept()
 			if err != nil {
 				// Check if test is already finished before reporting errors
@@ -199,7 +195,7 @@ func TestListenWithURLAndPooling(t *testing.T) {
 				}
 			}(conn)
 		}
-	}()
+	})
 
 	// Wait for both endpoints to be ready to accept connections
 	endpoint1Ready.Wait(t)

internal/legacy/config/config_test.go

@@ -58,7 +58,7 @@ type testCases[T tunnelConfigPrivate, O any] []testCase[T, O]
 func (tc testCase[T, O]) Run(t *testing.T) {
 	t.Run(tc.name, func(t *testing.T) {
 		actualOpts, ok := tc.opts.(T)
-		require.Truef(t, ok, "Tunnel opts should have type %v", reflect.TypeOf(new(T)))
+		require.Truef(t, ok, "Tunnel opts should have type %v", reflect.TypeFor[*T]())
 		if tc.expectForwardsTo != nil {
 			require.Equal(t, *tc.expectForwardsTo, actualOpts.ForwardsTo())
 		}
@@ -84,7 +84,7 @@ func (tc testCase[T, O]) Run(t *testing.T) {
 			require.Nil(t, actualOpts.Opts())
 		} else if tc.expectOpts != nil {
 			opts, ok := actualOpts.Opts().(*O)
-			require.Truef(t, ok, "Opts has the type %v", reflect.TypeOf((*O)(nil)))
+			require.Truef(t, ok, "Opts has the type %v", reflect.TypeFor[*O]())
 			tc.expectOpts(t, opts)
 		}
 	})

internal/tunnel/client/raw_session_test.go

@@ -50,11 +50,9 @@ testloop:
 		r := NewRawSession(logger, muxado.Client(&dummyStream{}, nil), nil, nil)
 
 		wg := sync.WaitGroup{}
-		wg.Add(1)
 
 		// Call onHeartbeat as fast as we can in the background.
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			for {
 				select {
 				case <-ctx.Done():
@@ -63,7 +61,7 @@ testloop:
 				}
 				r.(*rawSession).onHeartbeat(time.Millisecond*1, false)
 			}
-		}()
+		})
 
 		// Verify that closing the session while a heartbeat is in flight won't
 		// cause a panic

internal/tunnel/proto/msg.go

@@ -61,8 +61,8 @@ func (ne ngrokError) Unwrap() error {
 func (ne ngrokError) Msg() string {
 	errMsg := ne.Inner.Error()
 	out := []string{}
-	lines := strings.Split(errMsg, "\n")
-	for _, line := range lines {
+	lines := strings.SplitSeq(errMsg, "\n")
+	for line := range lines {
 		line = strings.Trim(line, " \t\n\r")
 		if line == "" || ngrokErrorCodeRegex.MatchString(line) {
 			continue