Skip to content

Commit fec256d

Browse files
f0sself0ssel
committed
handle nil interface
1 parent 2d5d27a commit fec256d

File tree

9 files changed

+37
-50
lines changed

9 files changed

+37
-50
lines changed

‎agent/agent.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ type CoordinatorDialer func(context.Context) (net.Conn, error)
6767
// FetchMetadata is a function to obtain metadata for the agent.
6868
type FetchMetadata func(context.Context) (codersdk.WorkspaceAgentMetadata, error)
6969

70-
type FetchWorkspaceApps func(context.Context) ([]codersdk.WorkspaceApp, error)
71-
type PostWorkspaceAppHealth func(context.Context, codersdk.PostWorkspaceAppHealthsRequest) error
72-
7370
func New(options Options) io.Closer {
7471
if options.ReconnectingPTYTimeout == 0 {
7572
options.ReconnectingPTYTimeout = 5 * time.Minute
@@ -158,7 +155,9 @@ func (a *agent) run(ctx context.Context) {
158155
go a.runTailnet(ctx, metadata.DERPMap)
159156
}
160157

161-
go a.workspaceAppHealthReporter(ctx)
158+
if a.workspaceAppHealthReporter != nil {
159+
go a.workspaceAppHealthReporter(ctx)
160+
}
162161
}
163162

164163
func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {

‎agent/agent_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,6 @@ func setupAgent(t *testing.T, metadata codersdk.WorkspaceAgentMetadata, ptyTimeo
628628
return nil
629629
}), nil
630630
},
631-
WorkspaceAppHealthReporter: func(ctx context.Context) {},
632631
})
633632
t.Cleanup(func() {
634633
_ = closer.Close()

‎cli/configssh_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,9 @@ func TestConfigSSH(t *testing.T) {
107107
agentClient := codersdk.New(client.URL)
108108
agentClient.SessionToken = authToken
109109
agentCloser := agent.New(agent.Options{
110-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
111-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
112-
Logger: slogtest.Make(t, nil).Named("agent"),
113-
WorkspaceAppHealthReporter: func(context.Context) {},
110+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
111+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
112+
Logger: slogtest.Make(t, nil).Named("agent"),
114113
})
115114
defer func() {
116115
_ = agentCloser.Close()

‎cli/speedtest_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ func TestSpeedtest(t *testing.T) {
2424
agentClient := codersdk.New(client.URL)
2525
agentClient.SessionToken = agentToken
2626
agentCloser := agent.New(agent.Options{
27-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
28-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
29-
Logger: slogtest.Make(t, nil).Named("agent"),
30-
WorkspaceAppHealthReporter: func(context.Context) {},
27+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
28+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
29+
Logger: slogtest.Make(t, nil).Named("agent"),
3130
})
3231
defer agentCloser.Close()
3332
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)

‎cli/ssh_test.go

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,9 @@ func TestSSH(t *testing.T) {
8989
agentClient := codersdk.New(client.URL)
9090
agentClient.SessionToken = agentToken
9191
agentCloser := agent.New(agent.Options{
92-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
93-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
94-
Logger: slogtest.Make(t, nil).Named("agent"),
95-
WorkspaceAppHealthReporter: func(context.Context) {},
92+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
93+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
94+
Logger: slogtest.Make(t, nil).Named("agent"),
9695
})
9796
defer func() {
9897
_ = agentCloser.Close()
@@ -111,10 +110,9 @@ func TestSSH(t *testing.T) {
111110
agentClient := codersdk.New(client.URL)
112111
agentClient.SessionToken = agentToken
113112
agentCloser := agent.New(agent.Options{
114-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
115-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
116-
Logger: slogtest.Make(t, nil).Named("agent"),
117-
WorkspaceAppHealthReporter: func(context.Context) {},
113+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
114+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
115+
Logger: slogtest.Make(t, nil).Named("agent"),
118116
})
119117
<-ctx.Done()
120118
_ = agentCloser.Close()
@@ -180,10 +178,9 @@ func TestSSH(t *testing.T) {
180178
agentClient := codersdk.New(client.URL)
181179
agentClient.SessionToken = agentToken
182180
agentCloser := agent.New(agent.Options{
183-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
184-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
185-
Logger: slogtest.Make(t, nil).Named("agent"),
186-
WorkspaceAppHealthReporter: func(context.Context) {},
181+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
182+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
183+
Logger: slogtest.Make(t, nil).Named("agent"),
187184
})
188185
defer agentCloser.Close()
189186

‎coderd/templates_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,10 @@ func TestTemplateDAUs(t *testing.T) {
602602
agentClient := codersdk.New(client.URL)
603603
agentClient.SessionToken = authToken
604604
agentCloser := agent.New(agent.Options{
605-
Logger: slogtest.Make(t, nil),
606-
StatsReporter: agentClient.AgentReportStats,
607-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
608-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
609-
WorkspaceAppHealthReporter: func(context.Context) {},
605+
Logger: slogtest.Make(t, nil),
606+
StatsReporter: agentClient.AgentReportStats,
607+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
608+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
610609
})
611610
defer func() {
612611
_ = agentCloser.Close()

‎coderd/workspaceagents_test.go

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,9 @@ func TestWorkspaceAgentListen(t *testing.T) {
108108
agentClient := codersdk.New(client.URL)
109109
agentClient.SessionToken = authToken
110110
agentCloser := agent.New(agent.Options{
111-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
112-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
113-
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
114-
WorkspaceAppHealthReporter: func(context.Context) {},
111+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
112+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
113+
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
115114
})
116115
defer func() {
117116
_ = agentCloser.Close()
@@ -242,10 +241,9 @@ func TestWorkspaceAgentTailnet(t *testing.T) {
242241
agentClient := codersdk.New(client.URL)
243242
agentClient.SessionToken = authToken
244243
agentCloser := agent.New(agent.Options{
245-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
246-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
247-
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
248-
WorkspaceAppHealthReporter: func(context.Context) {},
244+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
245+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
246+
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
249247
})
250248
defer agentCloser.Close()
251249
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
@@ -308,10 +306,9 @@ func TestWorkspaceAgentPTY(t *testing.T) {
308306
agentClient := codersdk.New(client.URL)
309307
agentClient.SessionToken = authToken
310308
agentCloser := agent.New(agent.Options{
311-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
312-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
313-
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
314-
WorkspaceAppHealthReporter: func(context.Context) {},
309+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
310+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
311+
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
315312
})
316313
defer func() {
317314
_ = agentCloser.Close()

‎coderd/workspaceapps_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,10 @@ func setupProxyTest(t *testing.T, workspaceMutators ...func(*codersdk.CreateWork
103103
agentClient := codersdk.New(client.URL)
104104
agentClient.SessionToken = authToken
105105
agentCloser := agent.New(agent.Options{
106-
FetchMetadata: agentClient.WorkspaceAgentMetadata,
107-
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
108-
Logger: slogtest.Make(t, nil).Named("agent"),
109-
StatsReporter: agentClient.AgentReportStats,
110-
WorkspaceAppHealthReporter: func(context.Context) {},
106+
FetchMetadata: agentClient.WorkspaceAgentMetadata,
107+
CoordinatorDialer: agentClient.ListenWorkspaceAgentTailnet,
108+
Logger: slogtest.Make(t, nil).Named("agent"),
109+
StatsReporter: agentClient.AgentReportStats,
111110
})
112111
t.Cleanup(func() {
113112
_ = agentCloser.Close()

‎coderd/wsconncache/wsconncache_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,8 @@ func setupAgent(t *testing.T, metadata codersdk.WorkspaceAgentMetadata, ptyTimeo
158158
go coordinator.ServeAgent(serverConn, agentID)
159159
return clientConn, nil
160160
},
161-
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelInfo),
162-
ReconnectingPTYTimeout: ptyTimeout,
163-
WorkspaceAppHealthReporter: func(context.Context) {},
161+
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelInfo),
162+
ReconnectingPTYTimeout: ptyTimeout,
164163
})
165164
t.Cleanup(func() {
166165
_ = closer.Close()

0 commit comments

Comments
 (0)