Skip to content

Commit 95fb596

Browse files
ammarioammario
authored
Refactor Provisioner to distinguish Plan and Apply (coder#5036)
1 parent 71601f4 commit 95fb596

37 files changed

Lines changed: 926 additions & 632 deletions

‎cli/agent_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestWorkspaceAgent(t *testing.T) {
3030
user := coderdtest.CreateFirstUser(t, client)
3131
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
3232
Parse: echo.ParseComplete,
33-
Provision: []*proto.Provision_Response{{
33+
ProvisionApply: []*proto.Provision_Response{{
3434
Type: &proto.Provision_Response_Complete{
3535
Complete: &proto.Provision_Complete{
3636
Resources: []*proto.Resource{{
@@ -93,7 +93,7 @@ func TestWorkspaceAgent(t *testing.T) {
9393
user := coderdtest.CreateFirstUser(t, client)
9494
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
9595
Parse: echo.ParseComplete,
96-
Provision: []*proto.Provision_Response{{
96+
ProvisionApply: []*proto.Provision_Response{{
9797
Type: &proto.Provision_Response_Complete{
9898
Complete: &proto.Provision_Complete{
9999
Resources: []*proto.Resource{{
@@ -156,7 +156,7 @@ func TestWorkspaceAgent(t *testing.T) {
156156
user := coderdtest.CreateFirstUser(t, client)
157157
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
158158
Parse: echo.ParseComplete,
159-
Provision: []*proto.Provision_Response{{
159+
ProvisionApply: []*proto.Provision_Response{{
160160
Type: &proto.Provision_Response_Complete{
161161
Complete: &proto.Provision_Complete{
162162
Resources: []*proto.Resource{{

‎cli/configssh_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestConfigSSH(t *testing.T) {
6868
authToken := uuid.NewString()
6969
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
7070
Parse: echo.ParseComplete,
71-
ProvisionDryRun: []*proto.Provision_Response{{
71+
ProvisionPlan: []*proto.Provision_Response{{
7272
Type: &proto.Provision_Response_Complete{
7373
Complete: &proto.Provision_Complete{
7474
Resources: []*proto.Resource{{
@@ -82,7 +82,7 @@ func TestConfigSSH(t *testing.T) {
8282
},
8383
},
8484
}},
85-
Provision: []*proto.Provision_Response{{
85+
ProvisionApply: []*proto.Provision_Response{{
8686
Type: &proto.Provision_Response_Complete{
8787
Complete: &proto.Provision_Complete{
8888
Resources: []*proto.Resource{{
@@ -662,9 +662,9 @@ func TestConfigSSH_Hostnames(t *testing.T) {
662662
user := coderdtest.CreateFirstUser(t, client)
663663
// authToken := uuid.NewString()
664664
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
665-
Parse: echo.ParseComplete,
666-
ProvisionDryRun: provisionResponse,
667-
Provision: provisionResponse,
665+
Parse: echo.ParseComplete,
666+
ProvisionPlan: provisionResponse,
667+
ProvisionApply: provisionResponse,
668668
})
669669
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
670670
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

‎cli/create_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ func TestCreate(t *testing.T) {
2626
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
2727
user := coderdtest.CreateFirstUser(t, client)
2828
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
29-
Parse: echo.ParseComplete,
30-
Provision: provisionCompleteWithAgent,
31-
ProvisionDryRun: provisionCompleteWithAgent,
29+
Parse: echo.ParseComplete,
30+
ProvisionApply: provisionCompleteWithAgent,
31+
ProvisionPlan: provisionCompleteWithAgent,
3232
})
3333
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
3434
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -144,9 +144,9 @@ func TestCreate(t *testing.T) {
144144

145145
defaultValue := "something"
146146
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
147-
Parse: createTestParseResponseWithDefault(defaultValue),
148-
Provision: echo.ProvisionComplete,
149-
ProvisionDryRun: echo.ProvisionComplete,
147+
Parse: createTestParseResponseWithDefault(defaultValue),
148+
ProvisionApply: echo.ProvisionComplete,
149+
ProvisionPlan: echo.ProvisionComplete,
150150
})
151151

152152
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -185,9 +185,9 @@ func TestCreate(t *testing.T) {
185185

186186
defaultValue := "something"
187187
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
188-
Parse: createTestParseResponseWithDefault(defaultValue),
189-
Provision: echo.ProvisionComplete,
190-
ProvisionDryRun: echo.ProvisionComplete,
188+
Parse: createTestParseResponseWithDefault(defaultValue),
189+
ProvisionApply: echo.ProvisionComplete,
190+
ProvisionPlan: echo.ProvisionComplete,
191191
})
192192

193193
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -228,9 +228,9 @@ func TestCreate(t *testing.T) {
228228

229229
defaultValue := "something"
230230
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
231-
Parse: createTestParseResponseWithDefault(defaultValue),
232-
Provision: echo.ProvisionComplete,
233-
ProvisionDryRun: echo.ProvisionComplete,
231+
Parse: createTestParseResponseWithDefault(defaultValue),
232+
ProvisionApply: echo.ProvisionComplete,
233+
ProvisionPlan: echo.ProvisionComplete,
234234
})
235235
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
236236
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -264,7 +264,7 @@ func TestCreate(t *testing.T) {
264264
},
265265
},
266266
}},
267-
ProvisionDryRun: []*proto.Provision_Response{
267+
ProvisionPlan: []*proto.Provision_Response{
268268
{
269269
Type: &proto.Provision_Response_Complete{
270270
Complete: &proto.Provision_Complete{},

‎cli/gitssh_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*codersdk.Client, str
4848
// setup template
4949
agentToken := uuid.NewString()
5050
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
51-
Parse: echo.ParseComplete,
52-
ProvisionDryRun: echo.ProvisionComplete,
53-
Provision: []*proto.Provision_Response{{
51+
Parse: echo.ParseComplete,
52+
ProvisionPlan: echo.ProvisionComplete,
53+
ProvisionApply: []*proto.Provision_Response{{
5454
Type: &proto.Provision_Response_Complete{
5555
Complete: &proto.Provision_Complete{
5656
Resources: []*proto.Resource{{

‎cli/portforward_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@ func runAgent(t *testing.T, client *codersdk.Client, userID uuid.UUID) codersdk.
293293
// Setup template
294294
agentToken := uuid.NewString()
295295
version := coderdtest.CreateTemplateVersion(t, client, orgID, &echo.Responses{
296-
Parse: echo.ParseComplete,
297-
ProvisionDryRun: echo.ProvisionComplete,
298-
Provision: []*proto.Provision_Response{{
296+
Parse: echo.ParseComplete,
297+
ProvisionPlan: echo.ProvisionComplete,
298+
ProvisionApply: []*proto.Provision_Response{{
299299
Type: &proto.Provision_Response_Complete{
300300
Complete: &proto.Provision_Complete{
301301
Resources: []*proto.Resource{{

‎cli/show_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ func TestShow(t *testing.T) {
1818
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
1919
user := coderdtest.CreateFirstUser(t, client)
2020
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
21-
Parse: echo.ParseComplete,
22-
Provision: provisionCompleteWithAgent,
23-
ProvisionDryRun: provisionCompleteWithAgent,
21+
Parse: echo.ParseComplete,
22+
ProvisionApply: provisionCompleteWithAgent,
23+
ProvisionPlan: provisionCompleteWithAgent,
2424
})
2525
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
2626
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

‎cli/ssh_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func setupWorkspaceForAgent(t *testing.T, mutate func([]*proto.Agent) []*proto.A
4242
user := coderdtest.CreateFirstUser(t, client)
4343
agentToken := uuid.NewString()
4444
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
45-
Parse: echo.ParseComplete,
46-
ProvisionDryRun: echo.ProvisionComplete,
47-
Provision: []*proto.Provision_Response{{
45+
Parse: echo.ParseComplete,
46+
ProvisionPlan: echo.ProvisionComplete,
47+
ProvisionApply: []*proto.Provision_Response{{
4848
Type: &proto.Provision_Response_Complete{
4949
Complete: &proto.Provision_Complete{
5050
Resources: []*proto.Resource{{

‎cli/state_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestStatePull(t *testing.T) {
2525
wantState := []byte("some state")
2626
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
2727
Parse: echo.ParseComplete,
28-
Provision: []*proto.Provision_Response{{
28+
ProvisionApply: []*proto.Provision_Response{{
2929
Type: &proto.Provision_Response_Complete{
3030
Complete: &proto.Provision_Complete{
3131
State: wantState,
@@ -53,7 +53,7 @@ func TestStatePull(t *testing.T) {
5353
wantState := []byte("some state")
5454
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
5555
Parse: echo.ParseComplete,
56-
Provision: []*proto.Provision_Response{{
56+
ProvisionApply: []*proto.Provision_Response{{
5757
Type: &proto.Provision_Response_Complete{
5858
Complete: &proto.Provision_Complete{
5959
State: wantState,
@@ -82,8 +82,8 @@ func TestStatePush(t *testing.T) {
8282
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
8383
user := coderdtest.CreateFirstUser(t, client)
8484
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
85-
Parse: echo.ParseComplete,
86-
Provision: echo.ProvisionComplete,
85+
Parse: echo.ParseComplete,
86+
ProvisionApply: echo.ProvisionComplete,
8787
})
8888
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
8989
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -107,8 +107,8 @@ func TestStatePush(t *testing.T) {
107107
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
108108
user := coderdtest.CreateFirstUser(t, client)
109109
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
110-
Parse: echo.ParseComplete,
111-
Provision: echo.ProvisionComplete,
110+
Parse: echo.ParseComplete,
111+
ProvisionApply: echo.ProvisionComplete,
112112
})
113113
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
114114
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

‎cli/templatecreate_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ func TestTemplateCreate(t *testing.T) {
4343
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
4444
coderdtest.CreateFirstUser(t, client)
4545
source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
46-
Parse: echo.ParseComplete,
47-
Provision: provisionCompleteWithAgent,
46+
Parse: echo.ParseComplete,
47+
ProvisionApply: provisionCompleteWithAgent,
4848
})
4949
args := []string{
5050
"templates",
@@ -89,9 +89,9 @@ func TestTemplateCreate(t *testing.T) {
8989
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
9090
coderdtest.CreateFirstUser(t, client)
9191
source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
92-
Parse: createTestParseResponse(),
93-
Provision: echo.ProvisionComplete,
94-
ProvisionDryRun: echo.ProvisionComplete,
92+
Parse: createTestParseResponse(),
93+
ProvisionApply: echo.ProvisionComplete,
94+
ProvisionPlan: echo.ProvisionComplete,
9595
})
9696
cmd, root := clitest.New(t, "templates", "create", "my-template", "--directory", source, "--test.provisioner", string(database.ProvisionerTypeEcho))
9797
clitest.SetupConfig(t, client, root)
@@ -125,9 +125,9 @@ func TestTemplateCreate(t *testing.T) {
125125
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
126126
coderdtest.CreateFirstUser(t, client)
127127
source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
128-
Parse: createTestParseResponse(),
129-
Provision: echo.ProvisionComplete,
130-
ProvisionDryRun: echo.ProvisionComplete,
128+
Parse: createTestParseResponse(),
129+
ProvisionApply: echo.ProvisionComplete,
130+
ProvisionPlan: echo.ProvisionComplete,
131131
})
132132
tempDir := t.TempDir()
133133
removeTmpDirUntilSuccessAfterTest(t, tempDir)
@@ -164,9 +164,9 @@ func TestTemplateCreate(t *testing.T) {
164164
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
165165
coderdtest.CreateFirstUser(t, client)
166166
source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
167-
Parse: createTestParseResponse(),
168-
Provision: echo.ProvisionComplete,
169-
ProvisionDryRun: echo.ProvisionComplete,
167+
Parse: createTestParseResponse(),
168+
ProvisionApply: echo.ProvisionComplete,
169+
ProvisionPlan: echo.ProvisionComplete,
170170
})
171171
tempDir := t.TempDir()
172172
removeTmpDirUntilSuccessAfterTest(t, tempDir)
@@ -204,8 +204,8 @@ func TestTemplateCreate(t *testing.T) {
204204

205205
create := func() error {
206206
source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
207-
Parse: echo.ParseComplete,
208-
Provision: provisionCompleteWithAgent,
207+
Parse: echo.ParseComplete,
208+
ProvisionApply: provisionCompleteWithAgent,
209209
})
210210
args := []string{
211211
"templates",

‎cli/templatepull_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,6 @@ func genTemplateVersionSource() *echo.Responses {
146146
},
147147
},
148148
},
149-
Provision: echo.ProvisionComplete,
149+
ProvisionApply: echo.ProvisionComplete,
150150
}
151151
}

0 commit comments

Comments
 (0)