fix: close reconnecting pty conn when exiting agent

kylecarbs · kylecarbs · commit 0ccc7b63ccba · 2023-01-29T19:31:28.000Z
Fixes https://github.com/coder/coder/actions/runs/4038282899/jobs/6942170850
diff --git a/agent/agent.go b/agent/agent.go
@@ -437,6 +437,14 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
 				logger.Debug(ctx, "accept pty failed", slog.Error(err))
 				return
 			}
+			closed := make(chan struct{})
+			_ = a.trackConnGoroutine(func() {
+				select {
+				case <-network.Closed():
+				case <-closed:
+				}
+				_ = conn.Close()
+			})
 			// This cannot use a JSON decoder, since that can
 			// buffer additional data that is required for the PTY.
 			rawLen := make([]byte, 2)
@@ -455,9 +463,10 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
 			if err != nil {
 				continue
 			}
-			go func() {
+			_ = a.trackConnGoroutine(func() {
+				defer close(closed)
 				_ = a.handleReconnectingPTY(ctx, logger, msg, conn)
-			}()
+			})
 		}
 	}); err != nil {
 		return nil, err
