fix: resolve deferUnlambda linting issues by simplifying defer statements

sreya · sreya · commit d3581a8083bb · 2025-03-26T06:09:01.000Z
Fixed occurrences of unnecessary function wrapping in defer statements in:
- provisionerd/provisionerd.go
- enterprise/coderd/proxyhealth/proxyhealth.go
- cli/ssh.go
- coderd/devtunnel/tunnel_test.go

This improves code readability by using the direct form of defer when possible.
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -452,16 +452,12 @@ func (r *RootCmd) ssh() *serpent.Command {
 				if err != nil {
 					return err
 				}
-				defer func() {
-					_ = pty.RestoreTerminal(stdinFile.Fd(), inState)
-				}()
+				defer pty.RestoreTerminal(stdinFile.Fd(), inState)
 				outState, err := pty.MakeOutputRaw(stdoutFile.Fd())
 				if err != nil {
 					return err
 				}
-				defer func() {
-					_ = pty.RestoreTerminal(stdoutFile.Fd(), outState)
-				}()
+				defer pty.RestoreTerminal(stdoutFile.Fd(), outState)
 
 				windowChange := listenWindowSize(ctx)
 				go func() {
diff --git a/coderd/devtunnel/tunnel_test.go b/coderd/devtunnel/tunnel_test.go
@@ -111,8 +111,8 @@ func TestTunnel(t *testing.T) {
 				err := server.Serve(tun.Listener)
 				assert.Equal(t, http.ErrServerClosed, err)
 			}()
-			defer func() { _ = server.Close() }()
-			defer func() { tun.Listener.Close() }()
+			defer server.Close()
+			defer tun.Listener.Close()
 
 			require.Eventually(t, func() bool {
 				req, err := http.NewRequestWithContext(ctx, http.MethodGet, tun.URL.String(), nil)
diff --git a/enterprise/coderd/proxyhealth/proxyhealth.go b/enterprise/coderd/proxyhealth/proxyhealth.go
@@ -216,7 +216,7 @@ func (p *ProxyHealth) ProxyHosts() []string {
 // unreachable.
 func (p *ProxyHealth) runOnce(ctx context.Context, now time.Time) (map[uuid.UUID]ProxyStatus, error) {
 	// Record from the given time.
-	defer func() { p.healthCheckDuration.Observe(time.Since(now).Seconds()) }()
+	defer p.healthCheckDuration.Observe(time.Since(now).Seconds())
 
 	//nolint:gocritic // Proxy health is a system service.
 	proxies, err := p.db.GetWorkspaceProxies(dbauthz.AsSystemRestricted(ctx))
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -288,7 +288,7 @@ func (p *Server) client() (proto.DRPCProvisionerDaemonClient, bool) {
 func (p *Server) acquireLoop() {
 	defer p.opts.Logger.Debug(p.closeContext, "acquire loop exited")
 	defer p.wg.Done()
-	defer func() { close(p.acquireDoneCh) }()
+	defer close(p.acquireDoneCh)
 	ctx := p.closeContext
 	for {
 		if p.acquireExit() {
