Skip to content

Commit 64b9523

Browse files
EmyrkEmyrk
committed
test: fixes all tests with granular provisioner steps
1 parent 3c9ea20 commit 64b9523

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+884
-738
lines changed

‎cli/create_test.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,10 @@ func TestCreate(t *testing.T) {
302302
func prepareEchoResponses(parameters []*proto.RichParameter, presets ...*proto.Preset) *echo.Responses {
303303
return &echo.Responses{
304304
Parse: echo.ParseComplete,
305-
ProvisionPlan: []*proto.Response{
305+
ProvisionGraph: []*proto.Response{
306306
{
307-
Type: &proto.Response_Plan{
308-
Plan: &proto.PlanComplete{
307+
Type: &proto.Response_Graph{
308+
Graph: &proto.GraphComplete{
309309
Parameters: parameters,
310310
Presets: presets,
311311
},
@@ -1573,11 +1573,13 @@ func TestCreateValidateRichParameters(t *testing.T) {
15731573
func TestCreateWithGitAuth(t *testing.T) {
15741574
t.Parallel()
15751575
echoResponses := &echo.Responses{
1576-
Parse: echo.ParseComplete,
1577-
ProvisionPlan: []*proto.Response{
1576+
Parse: echo.ParseComplete,
1577+
ProvisionInit: echo.InitComplete,
1578+
ProvisionPlan: echo.PlanComplete,
1579+
ProvisionGraph: []*proto.Response{
15781580
{
1579-
Type: &proto.Response_Plan{
1580-
Plan: &proto.PlanComplete{
1581+
Type: &proto.Response_Graph{
1582+
Graph: &proto.GraphComplete{
15811583
ExternalAuthProviders: []*proto.ExternalAuthProviderResource{{Id: "github"}},
15821584
},
15831585
},

‎cli/restart_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,10 @@ func TestRestartWithParameters(t *testing.T) {
306306
echoResponses := func() *echo.Responses {
307307
return &echo.Responses{
308308
Parse: echo.ParseComplete,
309-
ProvisionPlan: []*proto.Response{
309+
ProvisionGraph: []*proto.Response{
310310
{
311-
Type: &proto.Response_Plan{
312-
Plan: &proto.PlanComplete{
311+
Type: &proto.Response_Graph{
312+
Graph: &proto.GraphComplete{
313313
Parameters: []*proto.RichParameter{
314314
{
315315
Name: immutableParameterName,

‎cli/ssh_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func TestSSH(t *testing.T) {
155155
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, &echo.Responses{
156156
Parse: echo.ParseComplete,
157157
ProvisionPlan: echo.PlanComplete,
158-
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
158+
ProvisionGraph: echo.ProvisionGraphWithAgent(authToken),
159159
})
160160
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
161161
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
@@ -244,7 +244,7 @@ func TestSSH(t *testing.T) {
244244
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, &echo.Responses{
245245
Parse: echo.ParseComplete,
246246
ProvisionPlan: echo.PlanComplete,
247-
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
247+
ProvisionGraph: echo.ProvisionGraphWithAgent(authToken),
248248
})
249249
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
250250
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
@@ -305,7 +305,7 @@ func TestSSH(t *testing.T) {
305305
echoResponses := &echo.Responses{
306306
Parse: echo.ParseComplete,
307307
ProvisionPlan: echo.PlanComplete,
308-
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
308+
ProvisionGraph: echo.ProvisionGraphWithAgent(authToken),
309309
}
310310

311311
version := coderdtest.CreateTemplateVersion(t, ownerClient, owner.OrganizationID, echoResponses)
@@ -326,7 +326,7 @@ func TestSSH(t *testing.T) {
326326
echoResponses2 := &echo.Responses{
327327
Parse: echo.ParseComplete,
328328
ProvisionPlan: echo.PlanComplete,
329-
ProvisionApply: echo.ProvisionApplyWithAgent(authToken2),
329+
ProvisionGraph: echo.ProvisionGraphWithAgent(authToken2),
330330
}
331331
version = coderdtest.UpdateTemplateVersion(t, ownerClient, owner.OrganizationID, echoResponses2, template.ID)
332332
coderdtest.AwaitTemplateVersionJobCompleted(t, ownerClient, version.ID)
@@ -655,7 +655,7 @@ func TestSSH(t *testing.T) {
655655
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, &echo.Responses{
656656
Parse: echo.ParseComplete,
657657
ProvisionPlan: echo.PlanComplete,
658-
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
658+
ProvisionGraph: echo.ProvisionGraphWithAgent(authToken),
659659
})
660660
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
661661
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)

‎cli/start_test.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ const (
3636
func mutableParamsResponse() *echo.Responses {
3737
return &echo.Responses{
3838
Parse: echo.ParseComplete,
39-
ProvisionPlan: []*proto.Response{
39+
ProvisionGraph: []*proto.Response{
4040
{
41-
Type: &proto.Response_Plan{
42-
Plan: &proto.PlanComplete{
41+
Type: &proto.Response_Graph{
42+
Graph: &proto.GraphComplete{
4343
Parameters: []*proto.RichParameter{
4444
{
4545
Name: mutableParameterName,
@@ -59,10 +59,10 @@ func mutableParamsResponse() *echo.Responses {
5959
func immutableParamsResponse() *echo.Responses {
6060
return &echo.Responses{
6161
Parse: echo.ParseComplete,
62-
ProvisionPlan: []*proto.Response{
62+
ProvisionGraph: []*proto.Response{
6363
{
64-
Type: &proto.Response_Plan{
65-
Plan: &proto.PlanComplete{
64+
Type: &proto.Response_Graph{
65+
Graph: &proto.GraphComplete{
6666
Parameters: []*proto.RichParameter{
6767
{
6868
Name: immutableParameterName,
@@ -83,11 +83,13 @@ func TestStart(t *testing.T) {
8383

8484
echoResponses := func() *echo.Responses {
8585
return &echo.Responses{
86-
Parse: echo.ParseComplete,
87-
ProvisionPlan: []*proto.Response{
86+
Parse: echo.ParseComplete,
87+
ProvisionInit: echo.InitComplete,
88+
ProvisionPlan: echo.PlanComplete,
89+
ProvisionGraph: []*proto.Response{
8890
{
89-
Type: &proto.Response_Plan{
90-
Plan: &proto.PlanComplete{
91+
Type: &proto.Response_Graph{
92+
Graph: &proto.GraphComplete{
9193
Parameters: []*proto.RichParameter{
9294
{
9395
Name: ephemeralParameterName,

‎cli/task_test.go‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -285,19 +285,10 @@ func createAITaskTemplate(t *testing.T, client *codersdk.Client, orgID uuid.UUID
285285
taskAppID := uuid.New()
286286
version := coderdtest.CreateTemplateVersion(t, client, orgID, &echo.Responses{
287287
Parse: echo.ParseComplete,
288-
ProvisionPlan: []*proto.Response{
288+
ProvisionGraph: []*proto.Response{
289289
{
290-
Type: &proto.Response_Plan{
291-
Plan: &proto.PlanComplete{
292-
HasAiTasks: true,
293-
},
294-
},
295-
},
296-
},
297-
ProvisionApply: []*proto.Response{
298-
{
299-
Type: &proto.Response_Apply{
300-
Apply: &proto.ApplyComplete{
290+
Type: &proto.Response_Graph{
291+
Graph: &proto.GraphComplete{
301292
Resources: []*proto.Resource{
302293
{
303294
Name: "example",
@@ -321,6 +312,7 @@ func createAITaskTemplate(t *testing.T, client *codersdk.Client, orgID uuid.UUID
321312
},
322313
},
323314
},
315+
HasAiTasks: true,
324316
AiTasks: []*proto.AITask{
325317
{
326318
AppId: taskAppID.String(),

‎cli/templatepresets_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,10 @@ func TestTemplatePresets(t *testing.T) {
282282
func templateWithPresets(presets []*proto.Preset) *echo.Responses {
283283
return &echo.Responses{
284284
Parse: echo.ParseComplete,
285-
ProvisionPlan: []*proto.Response{
285+
ProvisionGraph: []*proto.Response{
286286
{
287-
Type: &proto.Response_Plan{
288-
Plan: &proto.PlanComplete{
287+
Type: &proto.Response_Graph{
288+
Graph: &proto.GraphComplete{
289289
Presets: presets,
290290
},
291291
},

‎cli/templatepush_test.go‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,31 +1323,10 @@ func createEchoResponsesWithTemplateVariables(templateVariables []*proto.Templat
13231323
func completeWithAgent() *echo.Responses {
13241324
return &echo.Responses{
13251325
Parse: echo.ParseComplete,
1326-
ProvisionPlan: []*proto.Response{
1326+
ProvisionGraph: []*proto.Response{
13271327
{
1328-
Type: &proto.Response_Plan{
1329-
Plan: &proto.PlanComplete{
1330-
Resources: []*proto.Resource{
1331-
{
1332-
Type: "compute",
1333-
Name: "main",
1334-
Agents: []*proto.Agent{
1335-
{
1336-
Name: "smith",
1337-
OperatingSystem: "linux",
1338-
Architecture: "i386",
1339-
},
1340-
},
1341-
},
1342-
},
1343-
},
1344-
},
1345-
},
1346-
},
1347-
ProvisionApply: []*proto.Response{
1348-
{
1349-
Type: &proto.Response_Apply{
1350-
Apply: &proto.ApplyComplete{
1328+
Type: &proto.Response_Graph{
1329+
Graph: &proto.GraphComplete{
13511330
Resources: []*proto.Resource{
13521331
{
13531332
Type: "compute",

‎cli/templateversionarchive_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ func TestTemplateVersionsArchive(t *testing.T) {
7171
Parse: echo.ParseComplete,
7272
ProvisionApply: echo.ApplyFailed,
7373
ProvisionPlan: echo.PlanFailed,
74+
ProvisionInit: echo.InitComplete,
7475
}, func(request *codersdk.CreateTemplateVersionRequest) {
7576
request.TemplateID = template.ID
7677
})

‎coderd/activitybump_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestWorkspaceActivityBump(t *testing.T) {
5858
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
5959
Parse: echo.ParseComplete,
6060
ProvisionPlan: echo.PlanComplete,
61-
ProvisionApply: echo.ProvisionApplyWithAgent(agentToken),
61+
ProvisionGraph: echo.ProvisionGraphWithAgent(agentToken),
6262
})
6363
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
6464
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)

‎coderd/aitasks_test.go‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,11 @@ func TestTasks(t *testing.T) {
6161
taskAppID := uuid.New()
6262
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
6363
Parse: echo.ParseComplete,
64-
ProvisionPlan: []*proto.Response{
64+
ProvisionGraph: []*proto.Response{
6565
{
66-
Type: &proto.Response_Plan{
67-
Plan: &proto.PlanComplete{
66+
Type: &proto.Response_Graph{
67+
Graph: &proto.GraphComplete{
6868
HasAiTasks: true,
69-
},
70-
},
71-
},
72-
},
73-
ProvisionApply: []*proto.Response{
74-
{
75-
Type: &proto.Response_Apply{
76-
Apply: &proto.ApplyComplete{
7769
Resources: []*proto.Resource{
7870
{
7971
Name: "example",
@@ -945,8 +937,8 @@ func TestTasksCreate(t *testing.T) {
945937
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
946938
Parse: echo.ParseComplete,
947939
ProvisionApply: echo.ApplyComplete,
948-
ProvisionPlan: []*proto.Response{
949-
{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
940+
ProvisionGraph: []*proto.Response{
941+
{Type: &proto.Response_Graph{Graph: &proto.GraphComplete{
950942
HasAiTasks: true,
951943
}}},
952944
},
@@ -989,8 +981,8 @@ func TestTasksCreate(t *testing.T) {
989981
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
990982
Parse: echo.ParseComplete,
991983
ProvisionApply: echo.ApplyComplete,
992-
ProvisionPlan: []*proto.Response{
993-
{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
984+
ProvisionGraph: []*proto.Response{
985+
{Type: &proto.Response_Graph{Graph: &proto.GraphComplete{
994986
Parameters: []*proto.RichParameter{{Name: codersdk.AITaskPromptParameterName, Type: "string"}},
995987
HasAiTasks: true,
996988
}}},
@@ -1091,8 +1083,8 @@ func TestTasksCreate(t *testing.T) {
10911083
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
10921084
Parse: echo.ParseComplete,
10931085
ProvisionApply: echo.ApplyComplete,
1094-
ProvisionPlan: []*proto.Response{
1095-
{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
1086+
ProvisionGraph: []*proto.Response{
1087+
{Type: &proto.Response_Graph{Graph: &proto.GraphComplete{
10961088
HasAiTasks: true,
10971089
}}},
10981090
},
@@ -1212,8 +1204,8 @@ func TestTasksCreate(t *testing.T) {
12121204
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
12131205
Parse: echo.ParseComplete,
12141206
ProvisionApply: echo.ApplyComplete,
1215-
ProvisionPlan: []*proto.Response{
1216-
{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
1207+
ProvisionGraph: []*proto.Response{
1208+
{Type: &proto.Response_Graph{Graph: &proto.GraphComplete{
12171209
HasAiTasks: true,
12181210
}}},
12191211
},
@@ -1269,8 +1261,8 @@ func TestTasksCreate(t *testing.T) {
12691261
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
12701262
Parse: echo.ParseComplete,
12711263
ProvisionApply: echo.ApplyComplete,
1272-
ProvisionPlan: []*proto.Response{
1273-
{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
1264+
ProvisionGraph: []*proto.Response{
1265+
{Type: &proto.Response_Graph{Graph: &proto.GraphComplete{
12741266
HasAiTasks: true,
12751267
}}},
12761268
},
@@ -1303,8 +1295,8 @@ func TestTasksCreate(t *testing.T) {
13031295
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
13041296
Parse: echo.ParseComplete,
13051297
ProvisionApply: echo.ApplyComplete,
1306-
ProvisionPlan: []*proto.Response{
1307-
{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
1298+
ProvisionGraph: []*proto.Response{
1299+
{Type: &proto.Response_Graph{Graph: &proto.GraphComplete{
13081300
HasAiTasks: true,
13091301
}}},
13101302
},
@@ -1353,8 +1345,8 @@ func TestTasksCreate(t *testing.T) {
13531345
version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
13541346
Parse: echo.ParseComplete,
13551347
ProvisionApply: echo.ApplyComplete,
1356-
ProvisionPlan: []*proto.Response{
1357-
{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
1348+
ProvisionGraph: []*proto.Response{
1349+
{Type: &proto.Response_Graph{Graph: &proto.GraphComplete{
13581350
HasAiTasks: true,
13591351
}}},
13601352
},
@@ -1365,8 +1357,8 @@ func TestTasksCreate(t *testing.T) {
13651357
version2 := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
13661358
Parse: echo.ParseComplete,
13671359
ProvisionApply: echo.ApplyComplete,
1368-
ProvisionPlan: []*proto.Response{
1369-
{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
1360+
ProvisionGraph: []*proto.Response{
1361+
{Type: &proto.Response_Graph{Graph: &proto.GraphComplete{
13701362
HasAiTasks: true,
13711363
}}},
13721364
},

0 commit comments

Comments
 (0)