feat(support): add agent magicsock HTML

johnstcn · johnstcn · commit 17103d083436 · 2024-03-13T17:01:34.000Z
diff --git a/cli/support.go b/cli/support.go
@@ -175,6 +175,7 @@ func writeBundle(src *support.Bundle, dest *zip.Writer) error {
 		"network/tailnet_debug.html":     src.Network.TailnetDebug,
 		"workspace/build_logs.txt":       humanizeBuildLogs(src.Workspace.BuildLogs),
 		"agent/logs.txt":                 string(src.Agent.Logs),
+		"agent/magicsock.html":           string(src.Agent.MagicsockHTML),
 		"agent/startup_logs.txt":         humanizeAgentLogs(src.Agent.StartupLogs),
 		"workspace/template_file.zip":    string(templateVersionBytes),
 		"logs.txt":                       strings.Join(src.Logs, "\n"),
diff --git a/cli/support_test.go b/cli/support_test.go
@@ -166,6 +166,9 @@ func assertBundleContents(t *testing.T, path string) {
 		case "agent/logs.txt":
 			bs := readBytesFromZip(t, f)
 			require.NotEmpty(t, bs, "logs should not be empty")
+		case "agent/magicsock.html":
+			bs := readBytesFromZip(t, f)
+			require.NotEmpty(t, bs, "agent magicsock should not be empty")
 		case "agent/manifest.json":
 			var v agentsdk.Manifest
 			decodeJSONFromZip(t, f, &v)
diff --git a/support/support.go b/support/support.go
@@ -62,6 +62,7 @@ type Agent struct {
 	Agent           codersdk.WorkspaceAgent                        `json:"agent"`
 	ListeningPorts  *codersdk.WorkspaceAgentListeningPortsResponse `json:"listening_ports"`
 	Logs            []byte                                         `json:"logs"`
+	MagicsockHTML   []byte                                         `json:"magicsock_html"`
 	Manifest        *agentsdk.Manifest                             `json:"manifest"`
 	PeerDiagnostics *tailnet.PeerDiagnostics                       `json:"peer_diagnostics"`
 	PingResult      *ipnstate.PingResult                           `json:"ping_result"`
@@ -340,6 +341,15 @@ func AgentInfo(ctx context.Context, client *codersdk.Client, log slog.Logger, ag
 				return nil
 			})
 
+			eg.Go(func() error {
+				msBytes, err := conn.DebugMagicsock(ctx)
+				if err != nil {
+					return xerrors.Errorf("get agent magicsock page: %w", err)
+				}
+				a.MagicsockHTML = msBytes
+				return nil
+			})
+
 			eg.Go(func() error {
 				tokenBytes, err := runCmd(ctx, client, agentID, `echo $CODER_AGENT_TOKEN`)
 				if err != nil {
diff --git a/support/support_test.go b/support/support_test.go
@@ -72,6 +72,7 @@ func TestRun(t *testing.T) {
 		require.NotNil(t, bun.Agent.Agent)
 		require.NotNil(t, bun.Agent.ListeningPorts)
 		require.NotNil(t, bun.Agent.Logs)
+		require.NotNil(t, bun.Agent.MagicsockHTML)
 		require.NotNil(t, bun.Agent.Manifest)
 		require.NotNil(t, bun.Agent.PeerDiagnostics)
 		require.NotNil(t, bun.Agent.PingResult)
