Commitbc7fdce

committed

feat: add interfaces report to support bundle

1 parentdcebda4 commitbc7fdceCopy full SHA for bc7fdce

File tree

+20

-3

lines changed

+20

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ func writeBundle(src support.Bundle, dest zip.Writer) error {`
`254`	`254`	`"deployment/health.json":src.Deployment.HealthReport,`
`255`	`255`	`"network/connection_info.json":src.Network.ConnectionInfo,`
`256`	`256`	`"network/netcheck.json":src.Network.Netcheck,`
	`257`	`+"network/interfaces.json":src.Network.Interfaces,`
`257`	`258`	`"workspace/template.json":src.Workspace.Template,`
`258`	`259`	`"workspace/template_version.json":src.Workspace.TemplateVersion,`
`259`	`260`	`"workspace/parameters.json":src.Workspace.Parameters,`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,10 @@ func assertBundleContents(t *testing.T, path string, wantWorkspace bool, wantAge`
`197`	`197`	`varv derphealth.Report`
`198`	`198`	`decodeJSONFromZip(t,f,&v)`
`199`	`199`	`require.NotEmpty(t,v,"netcheck should not be empty")`
	`200`	`+case"network/interfaces.json":`
	`201`	`+varv healthsdk.InterfacesReport`
	`202`	`+decodeJSONFromZip(t,f,&v)`
	`203`	`+require.NotEmpty(t,v,"interfaces should not be empty")`
`200`	`204`	`case"workspace/workspace.json":`
`201`	`205`	`varv codersdk.Workspace`
`202`	`206`	`decodeJSONFromZip(t,f,&v)`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,10 @@ type Deployment struct {`
`47`	`47`
`48`	`48`	`typeNetworkstruct {`
`49`	`49`	`ConnectionInfo workspacesdk.AgentConnectionInfo`
`50`		-CoordinatorDebugstring`json:"coordinator_debug"`
`51`		-Netcheck*derphealth.Report`json:"netcheck"`
`52`		-TailnetDebugstring`json:"tailnet_debug"`
	`50`	+CoordinatorDebugstring`json:"coordinator_debug"`
	`51`	+Netcheck*derphealth.Report`json:"netcheck"`
	`52`	+TailnetDebugstring`json:"tailnet_debug"`
	`53`	+Interfaces healthsdk.InterfacesReport`json:"interfaces"`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`typeNetcheckstruct {`
`@@ -194,6 +195,15 @@ func NetworkInfo(ctx context.Context, client *codersdk.Client, log slog.Logger)`
`194`	`195`	`returnnil`
`195`	`196`	`})`
`196`	`197`
	`198`	`+eg.Go(func()error {`
	`199`	`+rpt,err:=healthsdk.RunInterfacesReport()`
	`200`	`+iferr!=nil {`
	`201`	`+returnxerrors.Errorf("run interfaces report: %w",err)`
	`202`	`+}`
	`203`	`+n.Interfaces=rpt`
	`204`	`+returnnil`
	`205`	`+})`
	`206`	`+`
`197`	`207`	`iferr:=eg.Wait();err!=nil {`
`198`	`208`	`log.Error(ctx,"fetch network information",slog.Error(err))`
`199`	`209`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ func TestRun(t *testing.T) {`
`66`	`66`	`assertNotNilNotEmpty(t,bun.Network.CoordinatorDebug,"network coordinator debug should be present")`
`67`	`67`	`assertNotNilNotEmpty(t,bun.Network.Netcheck,"network netcheck should be present")`
`68`	`68`	`assertNotNilNotEmpty(t,bun.Network.TailnetDebug,"network tailnet debug should be present")`
	`69`	`+assertNotNilNotEmpty(t,bun.Network.Interfaces,"network interfaces health should be present")`
`69`	`70`	`assertNotNilNotEmpty(t,bun.Workspace.Workspace,"workspace should be present")`
`70`	`71`	`assertSanitizedWorkspace(t,bun.Workspace.Workspace)`
`71`	`72`	`assertNotNilNotEmpty(t,bun.Workspace.BuildLogs,"workspace build logs should be present")`
`@@ -114,6 +115,7 @@ func TestRun(t *testing.T) {`
`114`	`115`	`assertNotNilNotEmpty(t,bun.Network.CoordinatorDebug,"network coordinator debug should be present")`
`115`	`116`	`assertNotNilNotEmpty(t,bun.Network.Netcheck,"network netcheck should be present")`
`116`	`117`	`assertNotNilNotEmpty(t,bun.Network.TailnetDebug,"network tailnet debug should be present")`
	`118`	`+assertNotNilNotEmpty(t,bun.Network.Interfaces,"network interfaces health should be present")`
`117`	`119`	`assert.Empty(t,bun.Workspace.Workspace,"did not expect workspace to be present")`
`118`	`120`	`assert.Empty(t,bun.Agent,"did not expect agent to be present")`
`119`	`121`	`assertNotNilNotEmpty(t,bun.Logs,"bundle logs should be present")`

Comments

(0)