fix: agent panics on closed network

mtojek · mtojek · commit eda21b44061f · 2022-12-05T18:27:05.000+01:00
diff --git a/agent/agent.go b/agent/agent.go
@@ -262,7 +262,9 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (ne
 		return nil, xerrors.Errorf("create tailnet: %w", err)
 	}
 	defer func() {
-		if err != nil {
+		// Apparently, it's possible to shut down network via agent.Close().
+		// The condition `network != nil` prevents panic in tests.
+		if err != nil && network != nil {
 			network.Close()
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,9 @@ func (a agent) createTailnet(ctx context.Context, derpMap tailcfg.DERPMap) (ne`
`262`	`262`	`return nil, xerrors.Errorf("create tailnet: %w", err)`
`263`	`263`	`}`
`264`	`264`	`defer func() {`
`265`		`- if err != nil {`
	`265`	`+ // Apparently, it's possible to shut down network via agent.Close().`
	`266`	+ // The condition `network != nil` prevents panic in tests.
	`267`	`+ if err != nil && network != nil {`
`266`	`268`	`network.Close()`
`267`	`269`	`}`
`268`	`270`	`}()`