fix test

ethanndickson · ethanndickson · commit e162ec9282dc · 2024-08-29T09:04:41.000Z
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -441,11 +441,11 @@ func (d ConnDiags) splitDiagnostics() (general, client, agent []string) {
 		}
 	}
 
-	if true {
+	if d.ClientIPIsAWS {
 		client = append(client, "Client IP address is within an AWS range (AWS uses hard NAT)")
 	}
 
-	if true {
+	if d.AgentIPIsAWS {
 		agent = append(agent, "Agent IP address is within an AWS range (AWS uses hard NAT)")
 	}
 	return general, client, agent
diff --git a/cli/ping.go b/cli/ping.go
@@ -148,8 +148,8 @@ func (r *RootCmd) ping() *serpent.Command {
 					break
 				}
 			}
-			ctx, cancel = context.WithTimeout(inv.Context(), 30*time.Second)
-			defer cancel()
+			diagCtx, diagCancel := context.WithTimeout(inv.Context(), 30*time.Second)
+			defer diagCancel()
 			diags := conn.GetPeerDiagnostics()
 			cliui.PeerDiagnostics(inv.Stdout, diags)
 
@@ -161,14 +161,14 @@ func (r *RootCmd) ping() *serpent.Command {
 				Verbose:       r.verbose,
 			}
 
-			awsRanges, err := cliutil.FetchAWSIPRanges(ctx, cliutil.AWSIPRangesURL)
+			awsRanges, err := cliutil.FetchAWSIPRanges(diagCtx, cliutil.AWSIPRangesURL)
 			if err != nil {
 				opts.Logger.Debug(inv.Context(), "failed to retrieve AWS IP ranges", slog.Error(err))
 			}
 
 			connDiags.ClientIPIsAWS = isAWSIP(awsRanges, ni)
 
-			connInfo, err := client.AgentConnectionInfoGeneric(ctx)
+			connInfo, err := client.AgentConnectionInfoGeneric(diagCtx)
 			if err != nil || connInfo.DERPMap == nil {
 				return xerrors.Errorf("Failed to retrieve connection info from server: %v\n", err)
 			}
@@ -180,7 +180,7 @@ func (r *RootCmd) ping() *serpent.Command {
 				_, _ = fmt.Fprintf(inv.Stdout, "Failed to retrieve local interfaces report: %v\n", err)
 			}
 
-			agentNetcheck, err := conn.Netcheck(ctx)
+			agentNetcheck, err := conn.Netcheck(diagCtx)
 			if err == nil {
 				connDiags.AgentNetcheck = &agentNetcheck
 				connDiags.AgentIPIsAWS = isAWSIP(awsRanges, agentNetcheck.NetInfo)
diff --git a/cli/ping_test.go b/cli/ping_test.go
@@ -39,7 +39,6 @@ func TestPing(t *testing.T) {
 		})
 
 		pty.ExpectMatch("pong from " + workspace.Name)
-		cancel()
 		<-cmdDone
 	})
 
@@ -67,7 +66,6 @@ func TestPing(t *testing.T) {
 
 		pty.ExpectMatch("pong from " + workspace.Name)
 		pty.ExpectMatch("✔ received remote agent data from Coder networking coordinator")
-		cancel()
 		<-cmdDone
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -441,11 +441,11 @@ func (d ConnDiags) splitDiagnostics() (general, client, agent []string) {`
`441`	`441`	`}`
`442`	`442`	`}`
`443`	`443`
`444`		`- if true {`
	`444`	`+ if d.ClientIPIsAWS {`
`445`	`445`	`client = append(client, "Client IP address is within an AWS range (AWS uses hard NAT)")`
`446`	`446`	`}`
`447`	`447`
`448`		`- if true {`
	`448`	`+ if d.AgentIPIsAWS {`
`449`	`449`	`agent = append(agent, "Agent IP address is within an AWS range (AWS uses hard NAT)")`
`450`	`450`	`}`
`451`	`451`	`return general, client, agent`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ func (r RootCmd) ping() serpent.Command {`
`148`	`148`	`break`
`149`	`149`	`}`
`150`	`150`	`}`
`151`		`- ctx, cancel = context.WithTimeout(inv.Context(), 30*time.Second)`
`152`		`- defer cancel()`
	`151`	`+ diagCtx, diagCancel := context.WithTimeout(inv.Context(), 30*time.Second)`
	`152`	`+ defer diagCancel()`
`153`	`153`	`diags := conn.GetPeerDiagnostics()`
`154`	`154`	`cliui.PeerDiagnostics(inv.Stdout, diags)`
`155`	`155`
`@@ -161,14 +161,14 @@ func (r RootCmd) ping() serpent.Command {`
`161`	`161`	`Verbose: r.verbose,`
`162`	`162`	`}`
`163`	`163`
`164`		`- awsRanges, err := cliutil.FetchAWSIPRanges(ctx, cliutil.AWSIPRangesURL)`
	`164`	`+ awsRanges, err := cliutil.FetchAWSIPRanges(diagCtx, cliutil.AWSIPRangesURL)`
`165`	`165`	`if err != nil {`
`166`	`166`	`opts.Logger.Debug(inv.Context(), "failed to retrieve AWS IP ranges", slog.Error(err))`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`connDiags.ClientIPIsAWS = isAWSIP(awsRanges, ni)`
`170`	`170`
`171`		`- connInfo, err := client.AgentConnectionInfoGeneric(ctx)`
	`171`	`+ connInfo, err := client.AgentConnectionInfoGeneric(diagCtx)`
`172`	`172`	`if err != nil \|\| connInfo.DERPMap == nil {`
`173`	`173`	`return xerrors.Errorf("Failed to retrieve connection info from server: %v\n", err)`
`174`	`174`	`}`
`@@ -180,7 +180,7 @@ func (r RootCmd) ping() serpent.Command {`
`180`	`180`	`_, _ = fmt.Fprintf(inv.Stdout, "Failed to retrieve local interfaces report: %v\n", err)`
`181`	`181`	`}`
`182`	`182`
`183`		`- agentNetcheck, err := conn.Netcheck(ctx)`
	`183`	`+ agentNetcheck, err := conn.Netcheck(diagCtx)`
`184`	`184`	`if err == nil {`
`185`	`185`	`connDiags.AgentNetcheck = &agentNetcheck`
`186`	`186`	`connDiags.AgentIPIsAWS = isAWSIP(awsRanges, agentNetcheck.NetInfo)`