chore: attempt to fix windows goleak failures (#8753)

coadler · web-flow · commit 5cfa7082d15a · 2023-07-26T18:50:13.000-05:00
diff --git a/cli/templateedit_test.go b/cli/templateedit_test.go
@@ -355,9 +355,9 @@ func TestTemplateEdit(t *testing.T) {
 
 				// Otherwise, proxy the request to the real API server.
 				rp := httputil.NewSingleHostReverseProxy(client.URL)
-				rp.Transport = &http.Transport{
-					DisableKeepAlives: true,
-				}
+				tp := &http.Transport{}
+				defer tp.CloseIdleConnections()
+				rp.Transport = tp
 				rp.ServeHTTP(w, r)
 			}))
 			t.Cleanup(proxy.Close)
@@ -367,6 +367,7 @@ func TestTemplateEdit(t *testing.T) {
 			require.NoError(t, err)
 			proxyClient := codersdk.New(proxyURL)
 			proxyClient.SetSessionToken(client.SessionToken())
+			t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
 
 			cases := []struct {
 				name  string
@@ -484,9 +485,9 @@ func TestTemplateEdit(t *testing.T) {
 
 				// Otherwise, proxy the request to the real API server.
 				rp := httputil.NewSingleHostReverseProxy(client.URL)
-				rp.Transport = &http.Transport{
-					DisableKeepAlives: true,
-				}
+				tp := &http.Transport{}
+				defer tp.CloseIdleConnections()
+				rp.Transport = tp
 				rp.ServeHTTP(w, r)
 			}))
 			defer proxy.Close()
@@ -496,6 +497,7 @@ func TestTemplateEdit(t *testing.T) {
 			require.NoError(t, err)
 			proxyClient := codersdk.New(proxyURL)
 			proxyClient.SetSessionToken(client.SessionToken())
+			t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
 
 			// Test the cli command.
 			cmdArgs := []string{
@@ -604,9 +606,9 @@ func TestTemplateEdit(t *testing.T) {
 
 				// Otherwise, proxy the request to the real API server.
 				rp := httputil.NewSingleHostReverseProxy(client.URL)
-				rp.Transport = &http.Transport{
-					DisableKeepAlives: true,
-				}
+				tp := &http.Transport{}
+				defer tp.CloseIdleConnections()
+				rp.Transport = tp
 				rp.ServeHTTP(w, r)
 			}))
 			defer proxy.Close()
@@ -616,6 +618,7 @@ func TestTemplateEdit(t *testing.T) {
 			require.NoError(t, err)
 			proxyClient := codersdk.New(proxyURL)
 			proxyClient.SetSessionToken(client.SessionToken())
+			t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
 
 			// Test the cli command.
 			cmdArgs := []string{
@@ -695,9 +698,9 @@ func TestTemplateEdit(t *testing.T) {
 
 				// Otherwise, proxy the request to the real API server.
 				rp := httputil.NewSingleHostReverseProxy(client.URL)
-				rp.Transport = &http.Transport{
-					DisableKeepAlives: true,
-				}
+				tp := &http.Transport{}
+				defer tp.CloseIdleConnections()
+				rp.Transport = tp
 				rp.ServeHTTP(w, r)
 			}))
 			defer proxy.Close()
@@ -707,6 +710,7 @@ func TestTemplateEdit(t *testing.T) {
 			require.NoError(t, err)
 			proxyClient := codersdk.New(proxyURL)
 			proxyClient.SetSessionToken(client.SessionToken())
+			t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
 
 			// Test the cli command.
 			cmdArgs := []string{
@@ -831,9 +835,9 @@ func TestTemplateEdit(t *testing.T) {
 
 				// Otherwise, proxy the request to the real API server.
 				rp := httputil.NewSingleHostReverseProxy(client.URL)
-				rp.Transport = &http.Transport{
-					DisableKeepAlives: true,
-				}
+				tp := &http.Transport{}
+				defer tp.CloseIdleConnections()
+				rp.Transport = tp
 				rp.ServeHTTP(w, r)
 			}))
 			defer proxy.Close()
@@ -843,6 +847,7 @@ func TestTemplateEdit(t *testing.T) {
 			require.NoError(t, err)
 			proxyClient := codersdk.New(proxyURL)
 			proxyClient.SetSessionToken(client.SessionToken())
+			t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
 
 			// Test the cli command with --allow-user-autostart.
 			cmdArgs := []string{
@@ -940,9 +945,9 @@ func TestTemplateEdit(t *testing.T) {
 
 				// Otherwise, proxy the request to the real API server.
 				rp := httputil.NewSingleHostReverseProxy(client.URL)
-				rp.Transport = &http.Transport{
-					DisableKeepAlives: true,
-				}
+				tp := &http.Transport{}
+				defer tp.CloseIdleConnections()
+				rp.Transport = tp
 				rp.ServeHTTP(w, r)
 			}))
 			defer proxy.Close()
@@ -952,6 +957,7 @@ func TestTemplateEdit(t *testing.T) {
 			require.NoError(t, err)
 			proxyClient := codersdk.New(proxyURL)
 			proxyClient.SetSessionToken(client.SessionToken())
+			t.Cleanup(proxyClient.HTTPClient.CloseIdleConnections)
 
 			// Test the cli command.
 			cmdArgs := []string{
