Commit17103d0

committed

feat(support): add agent magicsock HTML

1 parentce878c7 commit17103d0Copy full SHA for 17103d0

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ func writeBundle(src support.Bundle, dest zip.Writer) error {`
`175`	`175`	`"network/tailnet_debug.html":src.Network.TailnetDebug,`
`176`	`176`	`"workspace/build_logs.txt":humanizeBuildLogs(src.Workspace.BuildLogs),`
`177`	`177`	`"agent/logs.txt":string(src.Agent.Logs),`
	`178`	`+"agent/magicsock.html":string(src.Agent.MagicsockHTML),`
`178`	`179`	`"agent/startup_logs.txt":humanizeAgentLogs(src.Agent.StartupLogs),`
`179`	`180`	`"workspace/template_file.zip":string(templateVersionBytes),`
`180`	`181`	`"logs.txt":strings.Join(src.Logs,"\n"),`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,9 @@ func assertBundleContents(t *testing.T, path string) {`
`166`	`166`	`case"agent/logs.txt":`
`167`	`167`	`bs:=readBytesFromZip(t,f)`
`168`	`168`	`require.NotEmpty(t,bs,"logs should not be empty")`
	`169`	`+case"agent/magicsock.html":`
	`170`	`+bs:=readBytesFromZip(t,f)`
	`171`	`+require.NotEmpty(t,bs,"agent magicsock should not be empty")`
`169`	`172`	`case"agent/manifest.json":`
`170`	`173`	`varv agentsdk.Manifest`
`171`	`174`	`decodeJSONFromZip(t,f,&v)`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ type Agent struct {`
`62`	`62`	Agent codersdk.WorkspaceAgent`json:"agent"`
`63`	`63`	ListeningPorts*codersdk.WorkspaceAgentListeningPortsResponse`json:"listening_ports"`
`64`	`64`	Logs []byte`json:"logs"`
	`65`	+MagicsockHTML []byte`json:"magicsock_html"`
`65`	`66`	Manifest*agentsdk.Manifest`json:"manifest"`
`66`	`67`	PeerDiagnostics*tailnet.PeerDiagnostics`json:"peer_diagnostics"`
`67`	`68`	PingResult*ipnstate.PingResult`json:"ping_result"`
`@@ -340,6 +341,15 @@ func AgentInfo(ctx context.Context, client *codersdk.Client, log slog.Logger, ag`
`340`	`341`	`returnnil`
`341`	`342`	`})`
`342`	`343`
	`344`	`+eg.Go(func()error {`
	`345`	`+msBytes,err:=conn.DebugMagicsock(ctx)`
	`346`	`+iferr!=nil {`
	`347`	`+returnxerrors.Errorf("get agent magicsock page: %w",err)`
	`348`	`+}`
	`349`	`+a.MagicsockHTML=msBytes`
	`350`	`+returnnil`
	`351`	`+})`
	`352`	`+`
`343`	`353`	`eg.Go(func()error {`
`344`	`354`	tokenBytes,err:=runCmd(ctx,client,agentID,`echo $CODER_AGENT_TOKEN`)
`345`	`355`	`iferr!=nil {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ func TestRun(t *testing.T) {`
`72`	`72`	`require.NotNil(t,bun.Agent.Agent)`
`73`	`73`	`require.NotNil(t,bun.Agent.ListeningPorts)`
`74`	`74`	`require.NotNil(t,bun.Agent.Logs)`
	`75`	`+require.NotNil(t,bun.Agent.MagicsockHTML)`
`75`	`76`	`require.NotNil(t,bun.Agent.Manifest)`
`76`	`77`	`require.NotNil(t,bun.Agent.PeerDiagnostics)`
`77`	`78`	`require.NotNil(t,bun.Agent.PingResult)`

Comments

(0)