fix test

ethanndickson · ethanndickson · commit 2e08d191fdf1 · 2024-08-29T11:18:50.000Z
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -7,13 +7,11 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	"unicode"
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 	"tailscale.com/tailcfg"
 
-	"github.com/coder/coder/v2/coderd/healthcheck/health"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/codersdk/healthsdk"
 	"github.com/coder/coder/v2/codersdk/workspacesdk"
@@ -394,13 +392,13 @@ func (d ConnDiags) splitDiagnostics() (general, client, agent []string) {
 
 	if d.AgentNetcheck != nil {
 		for _, msg := range d.AgentNetcheck.Interfaces.Warnings {
-			agent = append(agent, formatHealthMessage(msg))
+			agent = append(agent, msg.Message)
 		}
 	}
 
 	if d.LocalInterfaces != nil {
 		for _, msg := range d.LocalInterfaces.Warnings {
-			client = append(client, formatHealthMessage(msg))
+			client = append(client, msg.Message)
 		}
 	}
 
@@ -441,21 +439,12 @@ 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
 }
-
-func formatHealthMessage(msg health.Message) string {
-	if msg.Code != health.CodeInterfaceSmallMTU {
-		return msg.Message
-	}
-	r := []rune(strings.Replace(msg.Message, ", which may cause problems with direct connections", "", -1))
-	out := string(append([]rune{unicode.ToUpper(r[0])}, r[1:]...))
-	return fmt.Sprintf("%s, which may degrade the quality of direct connections", out)
-}
diff --git a/cli/cliui/agent_test.go b/cli/cliui/agent_test.go
@@ -817,7 +817,7 @@ func TestConnDiagnostics(t *testing.T) {
 					Interfaces: healthsdk.InterfacesReport{
 						BaseReport: healthsdk.BaseReport{
 							Warnings: []health.Message{
-								health.Messagef(health.CodeInterfaceSmallMTU, "network interface eth0 has MTU 1280, (less than 1378), which may cause problems with direct connections"),
+								health.Messagef(health.CodeInterfaceSmallMTU, "Network interface eth0 has MTU 1280, (less than 1378), which may degrade the quality of direct connections"),
 							},
 						},
 					},
@@ -838,7 +838,7 @@ func TestConnDiagnostics(t *testing.T) {
 				LocalInterfaces: &healthsdk.InterfacesReport{
 					BaseReport: healthsdk.BaseReport{
 						Warnings: []health.Message{
-							health.Messagef(health.CodeInterfaceSmallMTU, "network interface eth1 has MTU 1310, (less than 1378), which may cause problems with direct connections"),
+							health.Messagef(health.CodeInterfaceSmallMTU, "Network interface eth1 has MTU 1310, (less than 1378), which may degrade the quality of direct connections"),
 						},
 					},
 				},
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,16 +161,16 @@ 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)
+				return xerrors.Errorf("Failed to retrieve connection info from server: %w\n", err)
 			}
 			connDiags.ConnInfo = connInfo
 			ifReport, err := healthsdk.RunInterfacesReport()
@@ -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
@@ -67,6 +67,7 @@ func TestPing(t *testing.T) {
 
 		pty.ExpectMatch("pong from " + workspace.Name)
 		pty.ExpectMatch("✔ received remote agent data from Coder networking coordinator")
+		pty.ExpectMatch("✔ You are connected directly (p2p)")
 		cancel()
 		<-cmdDone
 	})
diff --git a/codersdk/healthsdk/interfaces.go b/codersdk/healthsdk/interfaces.go
@@ -72,7 +72,7 @@ func generateInterfacesReport(st *interfaces.State) (report InterfacesReport) {
 			report.Severity = health.SeverityWarning
 			report.Warnings = append(report.Warnings,
 				health.Messagef(health.CodeInterfaceSmallMTU,
-					"network interface %s has MTU %d (less than %d), which may cause problems with direct connections", iface.Name, iface.MTU, safeMTU),
+					"Network interface %s has MTU %d (less than %d), which may degrade the quality of direct connections", iface.Name, iface.MTU, safeMTU),
 			)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,11 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`	`"strings"`
`9`	`9`	`"time"`
`10`		`- "unicode"`
`11`	`10`
`12`	`11`	`"github.com/google/uuid"`
`13`	`12`	`"golang.org/x/xerrors"`
`14`	`13`	`"tailscale.com/tailcfg"`
`15`	`14`
`16`		`- "github.com/coder/coder/v2/coderd/healthcheck/health"`
`17`	`15`	`"github.com/coder/coder/v2/codersdk"`
`18`	`16`	`"github.com/coder/coder/v2/codersdk/healthsdk"`
`19`	`17`	`"github.com/coder/coder/v2/codersdk/workspacesdk"`
`@@ -394,13 +392,13 @@ func (d ConnDiags) splitDiagnostics() (general, client, agent []string) {`
`394`	`392`
`395`	`393`	`if d.AgentNetcheck != nil {`
`396`	`394`	`for _, msg := range d.AgentNetcheck.Interfaces.Warnings {`
`397`		`- agent = append(agent, formatHealthMessage(msg))`
	`395`	`+ agent = append(agent, msg.Message)`
`398`	`396`	`}`
`399`	`397`	`}`
`400`	`398`
`401`	`399`	`if d.LocalInterfaces != nil {`
`402`	`400`	`for _, msg := range d.LocalInterfaces.Warnings {`
`403`		`- client = append(client, formatHealthMessage(msg))`
	`401`	`+ client = append(client, msg.Message)`
`404`	`402`	`}`
`405`	`403`	`}`
`406`	`404`
`@@ -441,21 +439,12 @@ func (d ConnDiags) splitDiagnostics() (general, client, agent []string) {`
`441`	`439`	`}`
`442`	`440`	`}`
`443`	`441`
`444`		`- if true {`
	`442`	`+ if d.ClientIPIsAWS {`
`445`	`443`	`client = append(client, "Client IP address is within an AWS range (AWS uses hard NAT)")`
`446`	`444`	`}`
`447`	`445`
`448`		`- if true {`
	`446`	`+ if d.AgentIPIsAWS {`
`449`	`447`	`agent = append(agent, "Agent IP address is within an AWS range (AWS uses hard NAT)")`
`450`	`448`	`}`
`451`	`449`	`return general, client, agent`
`452`	`450`	`}`
`453`		`-`
`454`		`-func formatHealthMessage(msg health.Message) string {`
`455`		`- if msg.Code != health.CodeInterfaceSmallMTU {`
`456`		`- return msg.Message`
`457`		`- }`
`458`		`- r := []rune(strings.Replace(msg.Message, ", which may cause problems with direct connections", "", -1))`
`459`		`- out := string(append([]rune{unicode.ToUpper(r[0])}, r[1:]...))`
`460`		`- return fmt.Sprintf("%s, which may degrade the quality of direct connections", out)`
`461`		`-}`
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,16 +161,16 @@ 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`		`- return xerrors.Errorf("Failed to retrieve connection info from server: %v\n", err)`
	`173`	`+ return xerrors.Errorf("Failed to retrieve connection info from server: %w\n", err)`
`174`	`174`	`}`
`175`	`175`	`connDiags.ConnInfo = connInfo`
`176`	`176`	`ifReport, err := healthsdk.RunInterfacesReport()`
`@@ -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)`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func generateInterfacesReport(st *interfaces.State) (report InterfacesReport) {`
`72`	`72`	`report.Severity = health.SeverityWarning`
`73`	`73`	`report.Warnings = append(report.Warnings,`
`74`	`74`	`health.Messagef(health.CodeInterfaceSmallMTU,`
`75`		`- "network interface %s has MTU %d (less than %d), which may cause problems with direct connections", iface.Name, iface.MTU, safeMTU),`
	`75`	`+ "Network interface %s has MTU %d (less than %d), which may degrade the quality of direct connections", iface.Name, iface.MTU, safeMTU),`
`76`	`76`	`)`
`77`	`77`	`}`
`78`	`78`	`}`