@@ -27,8 +27,8 @@ func TestAgent(t *testing.T) {
27
27
28
28
for _ , tc := range []struct {
29
29
name string
30
- iter []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error
31
- logs chan []codersdk.WorkspaceAgentStartupLog
30
+ iter []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error
31
+ logs chan []codersdk.WorkspaceAgentLog
32
32
opts cliui.AgentOptions
33
33
want []string
34
34
wantErr bool
@@ -38,12 +38,12 @@ func TestAgent(t *testing.T) {
38
38
opts : cliui.AgentOptions {
39
39
FetchInterval : time .Millisecond ,
40
40
},
41
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
42
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
41
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
42
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
43
43
agent .Status = codersdk .WorkspaceAgentConnecting
44
44
return nil
45
45
},
46
- func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentStartupLog ) error {
46
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentLog ) error {
47
47
agent .Status = codersdk .WorkspaceAgentConnected
48
48
agent .FirstConnectedAt = ptr .Ref (time .Now ())
49
49
return nil
@@ -62,18 +62,18 @@ func TestAgent(t *testing.T) {
62
62
opts : cliui.AgentOptions {
63
63
FetchInterval : 1 * time .Millisecond ,
64
64
},
65
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
66
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
65
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
66
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
67
67
agent .Status = codersdk .WorkspaceAgentConnecting
68
68
agent .LifecycleState = codersdk .WorkspaceAgentLifecycleStarting
69
69
agent .StartedAt = ptr .Ref (time .Now ())
70
70
return nil
71
71
},
72
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
72
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
73
73
agent .Status = codersdk .WorkspaceAgentTimeout
74
74
return nil
75
75
},
76
- func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentStartupLog ) error {
76
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentLog ) error {
77
77
agent .Status = codersdk .WorkspaceAgentConnected
78
78
agent .FirstConnectedAt = ptr .Ref (time .Now ())
79
79
agent .LifecycleState = codersdk .WorkspaceAgentLifecycleReady
@@ -95,8 +95,8 @@ func TestAgent(t *testing.T) {
95
95
opts : cliui.AgentOptions {
96
96
FetchInterval : 1 * time .Millisecond ,
97
97
},
98
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
99
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
98
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
99
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
100
100
agent .Status = codersdk .WorkspaceAgentDisconnected
101
101
agent .FirstConnectedAt = ptr .Ref (time .Now ().Add (- 1 * time .Minute ))
102
102
agent .LastConnectedAt = ptr .Ref (time .Now ().Add (- 1 * time .Minute ))
@@ -106,7 +106,7 @@ func TestAgent(t *testing.T) {
106
106
agent .ReadyAt = ptr .Ref (time .Now ())
107
107
return nil
108
108
},
109
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
109
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
110
110
agent .Status = codersdk .WorkspaceAgentConnected
111
111
agent .LastConnectedAt = ptr .Ref (time .Now ())
112
112
return nil
@@ -125,24 +125,24 @@ func TestAgent(t *testing.T) {
125
125
FetchInterval : time .Millisecond ,
126
126
Wait : true ,
127
127
},
128
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
129
- func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentStartupLog ) error {
128
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
129
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentLog ) error {
130
130
agent .Status = codersdk .WorkspaceAgentConnected
131
131
agent .FirstConnectedAt = ptr .Ref (time .Now ())
132
132
agent .LifecycleState = codersdk .WorkspaceAgentLifecycleStarting
133
133
agent .StartedAt = ptr .Ref (time .Now ())
134
- logs <- []codersdk.WorkspaceAgentStartupLog {
134
+ logs <- []codersdk.WorkspaceAgentLog {
135
135
{
136
136
CreatedAt : time .Now (),
137
137
Output : "Hello world" ,
138
138
},
139
139
}
140
140
return nil
141
141
},
142
- func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentStartupLog ) error {
142
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentLog ) error {
143
143
agent .LifecycleState = codersdk .WorkspaceAgentLifecycleReady
144
144
agent .ReadyAt = ptr .Ref (time .Now ())
145
- logs <- []codersdk.WorkspaceAgentStartupLog {
145
+ logs <- []codersdk.WorkspaceAgentLog {
146
146
{
147
147
CreatedAt : time .Now (),
148
148
Output : "Bye now" ,
@@ -164,14 +164,14 @@ func TestAgent(t *testing.T) {
164
164
FetchInterval : time .Millisecond ,
165
165
Wait : true ,
166
166
},
167
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
168
- func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentStartupLog ) error {
167
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
168
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentLog ) error {
169
169
agent .Status = codersdk .WorkspaceAgentConnected
170
170
agent .FirstConnectedAt = ptr .Ref (time .Now ())
171
171
agent .StartedAt = ptr .Ref (time .Now ())
172
172
agent .LifecycleState = codersdk .WorkspaceAgentLifecycleStartError
173
173
agent .ReadyAt = ptr .Ref (time .Now ())
174
- logs <- []codersdk.WorkspaceAgentStartupLog {
174
+ logs <- []codersdk.WorkspaceAgentLog {
175
175
{
176
176
CreatedAt : time .Now (),
177
177
Output : "Hello world" ,
@@ -193,8 +193,8 @@ func TestAgent(t *testing.T) {
193
193
opts : cliui.AgentOptions {
194
194
FetchInterval : time .Millisecond ,
195
195
},
196
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
197
- func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentStartupLog ) error {
196
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
197
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentLog ) error {
198
198
agent .Status = codersdk .WorkspaceAgentDisconnected
199
199
agent .LifecycleState = codersdk .WorkspaceAgentLifecycleOff
200
200
return nil
@@ -208,21 +208,21 @@ func TestAgent(t *testing.T) {
208
208
FetchInterval : time .Millisecond ,
209
209
Wait : true ,
210
210
},
211
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
212
- func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentStartupLog ) error {
211
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
212
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentLog ) error {
213
213
agent .Status = codersdk .WorkspaceAgentConnected
214
214
agent .FirstConnectedAt = ptr .Ref (time .Now ())
215
215
agent .LifecycleState = codersdk .WorkspaceAgentLifecycleStarting
216
216
agent .StartedAt = ptr .Ref (time .Now ())
217
- logs <- []codersdk.WorkspaceAgentStartupLog {
217
+ logs <- []codersdk.WorkspaceAgentLog {
218
218
{
219
219
CreatedAt : time .Now (),
220
220
Output : "Hello world" ,
221
221
},
222
222
}
223
223
return nil
224
224
},
225
- func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentStartupLog ) error {
225
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , logs chan []codersdk.WorkspaceAgentLog ) error {
226
226
agent .ReadyAt = ptr .Ref (time .Now ())
227
227
agent .LifecycleState = codersdk .WorkspaceAgentLifecycleShuttingDown
228
228
return nil
@@ -241,12 +241,12 @@ func TestAgent(t *testing.T) {
241
241
FetchInterval : time .Millisecond ,
242
242
Wait : true ,
243
243
},
244
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
245
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
244
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
245
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
246
246
agent .Status = codersdk .WorkspaceAgentConnecting
247
247
return nil
248
248
},
249
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
249
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
250
250
return xerrors .New ("bad" )
251
251
},
252
252
},
@@ -261,13 +261,13 @@ func TestAgent(t *testing.T) {
261
261
FetchInterval : time .Millisecond ,
262
262
Wait : true ,
263
263
},
264
- iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentStartupLog ) error {
265
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
264
+ iter : []func (context.Context , * codersdk.WorkspaceAgent , chan []codersdk.WorkspaceAgentLog ) error {
265
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
266
266
agent .Status = codersdk .WorkspaceAgentTimeout
267
267
agent .TroubleshootingURL = "https://troubleshoot"
268
268
return nil
269
269
},
270
- func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentStartupLog ) error {
270
+ func (_ context.Context , agent * codersdk.WorkspaceAgent , _ chan []codersdk.WorkspaceAgentLog ) error {
271
271
return xerrors .New ("bad" )
272
272
},
273
273
},
@@ -294,7 +294,7 @@ func TestAgent(t *testing.T) {
294
294
CreatedAt : time .Now (),
295
295
LifecycleState : codersdk .WorkspaceAgentLifecycleCreated ,
296
296
}
297
- logs := make (chan []codersdk.WorkspaceAgentStartupLog , 1 )
297
+ logs := make (chan []codersdk.WorkspaceAgentLog , 1 )
298
298
299
299
cmd := & clibase.Cmd {
300
300
Handler : func (inv * clibase.Invocation ) error {
@@ -306,12 +306,12 @@ func TestAgent(t *testing.T) {
306
306
}
307
307
return agent , err
308
308
}
309
- tc .opts .FetchLogs = func (ctx context.Context , _ uuid.UUID , _ int64 , follow bool ) (<- chan []codersdk.WorkspaceAgentStartupLog , io.Closer , error ) {
309
+ tc .opts .FetchLogs = func (ctx context.Context , _ uuid.UUID , _ int64 , follow bool ) (<- chan []codersdk.WorkspaceAgentLog , io.Closer , error ) {
310
310
if follow {
311
311
return logs , closeFunc (func () error { return nil }), nil
312
312
}
313
313
314
- fetchLogs := make (chan []codersdk.WorkspaceAgentStartupLog , 1 )
314
+ fetchLogs := make (chan []codersdk.WorkspaceAgentLog , 1 )
315
315
select {
316
316
case <- ctx .Done ():
317
317
return nil , nil , ctx .Err ()
0 commit comments