Skip to content

Commit aaa3b31

Browse files
kylecarbskylecarbs
authored
chore: add echo helper to create an agent with token (coder#6576)
This should reduce some LOC and duplication in tests!
1 parent d05b482 commit aaa3b31

11 files changed

Lines changed: 84 additions & 363 deletions

‎cli/agent_test.go‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,8 @@ func TestWorkspaceAgent(t *testing.T) {
3131
})
3232
user := coderdtest.CreateFirstUser(t, client)
3333
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
34-
Parse: echo.ParseComplete,
35-
ProvisionApply: []*proto.Provision_Response{{
36-
Type: &proto.Provision_Response_Complete{
37-
Complete: &proto.Provision_Complete{
38-
Resources: []*proto.Resource{{
39-
Name: "somename",
40-
Type: "someinstance",
41-
Agents: []*proto.Agent{{
42-
Id: uuid.NewString(),
43-
Name: "someagent",
44-
Auth: &proto.Agent_Token{
45-
Token: authToken,
46-
},
47-
}},
48-
}},
49-
},
50-
},
51-
}},
34+
Parse: echo.ParseComplete,
35+
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
5236
})
5337
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
5438
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

‎cli/configssh_test.go‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,7 @@ func TestConfigSSH(t *testing.T) {
9494
},
9595
},
9696
}},
97-
ProvisionApply: []*proto.Provision_Response{{
98-
Type: &proto.Provision_Response_Complete{
99-
Complete: &proto.Provision_Complete{
100-
Resources: []*proto.Resource{{
101-
Name: "example",
102-
Type: "aws_instance",
103-
Agents: []*proto.Agent{{
104-
Id: uuid.NewString(),
105-
Name: "example",
106-
Auth: &proto.Agent_Token{
107-
Token: authToken,
108-
},
109-
}},
110-
}},
111-
},
112-
},
113-
}},
97+
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
11498
})
11599
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
116100
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

‎cli/gitssh_test.go‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/coder/coder/coderd/coderdtest"
2525
"github.com/coder/coder/codersdk"
2626
"github.com/coder/coder/provisioner/echo"
27-
"github.com/coder/coder/provisionersdk/proto"
2827
"github.com/coder/coder/pty/ptytest"
2928
"github.com/coder/coder/testutil"
3029
)
@@ -48,23 +47,9 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*codersdk.Client, str
4847
// setup template
4948
agentToken := uuid.NewString()
5049
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
51-
Parse: echo.ParseComplete,
52-
ProvisionPlan: echo.ProvisionComplete,
53-
ProvisionApply: []*proto.Provision_Response{{
54-
Type: &proto.Provision_Response_Complete{
55-
Complete: &proto.Provision_Complete{
56-
Resources: []*proto.Resource{{
57-
Name: "somename",
58-
Type: "someinstance",
59-
Agents: []*proto.Agent{{
60-
Auth: &proto.Agent_Token{
61-
Token: agentToken,
62-
},
63-
}},
64-
}},
65-
},
66-
},
67-
}},
50+
Parse: echo.ParseComplete,
51+
ProvisionPlan: echo.ProvisionComplete,
52+
ProvisionApply: echo.ProvisionApplyWithAgent(agentToken),
6853
})
6954
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
7055
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

‎cli/portforward_test.go‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/coder/coder/coderd/coderdtest"
1818
"github.com/coder/coder/codersdk"
1919
"github.com/coder/coder/provisioner/echo"
20-
"github.com/coder/coder/provisionersdk/proto"
2120
"github.com/coder/coder/pty/ptytest"
2221
"github.com/coder/coder/testutil"
2322
)
@@ -293,23 +292,9 @@ func runAgent(t *testing.T, client *codersdk.Client, userID uuid.UUID) codersdk.
293292
// Setup template
294293
agentToken := uuid.NewString()
295294
version := coderdtest.CreateTemplateVersion(t, client, orgID, &echo.Responses{
296-
Parse: echo.ParseComplete,
297-
ProvisionPlan: echo.ProvisionComplete,
298-
ProvisionApply: []*proto.Provision_Response{{
299-
Type: &proto.Provision_Response_Complete{
300-
Complete: &proto.Provision_Complete{
301-
Resources: []*proto.Resource{{
302-
Name: "somename",
303-
Type: "someinstance",
304-
Agents: []*proto.Agent{{
305-
Auth: &proto.Agent_Token{
306-
Token: agentToken,
307-
},
308-
}},
309-
}},
310-
},
311-
},
312-
}},
295+
Parse: echo.ParseComplete,
296+
ProvisionPlan: echo.ProvisionComplete,
297+
ProvisionApply: echo.ProvisionApplyWithAgent(agentToken),
313298
})
314299

315300
// Create template and workspace

‎coderd/gitsshkey_test.go‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/coder/coder/coderd/gitsshkey"
1515
"github.com/coder/coder/codersdk/agentsdk"
1616
"github.com/coder/coder/provisioner/echo"
17-
"github.com/coder/coder/provisionersdk/proto"
1817
"github.com/coder/coder/testutil"
1918
)
2019

@@ -109,24 +108,9 @@ func TestAgentGitSSHKey(t *testing.T) {
109108
user := coderdtest.CreateFirstUser(t, client)
110109
authToken := uuid.NewString()
111110
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
112-
Parse: echo.ParseComplete,
113-
ProvisionPlan: echo.ProvisionComplete,
114-
ProvisionApply: []*proto.Provision_Response{{
115-
Type: &proto.Provision_Response_Complete{
116-
Complete: &proto.Provision_Complete{
117-
Resources: []*proto.Resource{{
118-
Name: "example",
119-
Type: "aws_instance",
120-
Agents: []*proto.Agent{{
121-
Id: uuid.NewString(),
122-
Auth: &proto.Agent_Token{
123-
Token: authToken,
124-
},
125-
}},
126-
}},
127-
},
128-
},
129-
}},
111+
Parse: echo.ParseComplete,
112+
ProvisionPlan: echo.ProvisionComplete,
113+
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
130114
})
131115
project := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
132116
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

‎coderd/insights_test.go‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/coder/coder/codersdk"
1616
"github.com/coder/coder/codersdk/agentsdk"
1717
"github.com/coder/coder/provisioner/echo"
18-
"github.com/coder/coder/provisionersdk/proto"
1918
"github.com/coder/coder/testutil"
2019
)
2120

@@ -31,24 +30,9 @@ func TestDeploymentInsights(t *testing.T) {
3130
user := coderdtest.CreateFirstUser(t, client)
3231
authToken := uuid.NewString()
3332
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
34-
Parse: echo.ParseComplete,
35-
ProvisionPlan: echo.ProvisionComplete,
36-
ProvisionApply: []*proto.Provision_Response{{
37-
Type: &proto.Provision_Response_Complete{
38-
Complete: &proto.Provision_Complete{
39-
Resources: []*proto.Resource{{
40-
Name: "example",
41-
Type: "aws_instance",
42-
Agents: []*proto.Agent{{
43-
Id: uuid.NewString(),
44-
Auth: &proto.Agent_Token{
45-
Token: authToken,
46-
},
47-
}},
48-
}},
49-
},
50-
},
51-
}},
33+
Parse: echo.ParseComplete,
34+
ProvisionPlan: echo.ProvisionComplete,
35+
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
5236
})
5337
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
5438
require.Empty(t, template.BuildTimeStats[codersdk.WorkspaceTransitionStart])

‎coderd/templates_test.go‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/coder/coder/codersdk"
2222
"github.com/coder/coder/codersdk/agentsdk"
2323
"github.com/coder/coder/provisioner/echo"
24-
"github.com/coder/coder/provisionersdk/proto"
2524
"github.com/coder/coder/testutil"
2625
)
2726

@@ -715,24 +714,9 @@ func TestTemplateMetrics(t *testing.T) {
715714
user := coderdtest.CreateFirstUser(t, client)
716715
authToken := uuid.NewString()
717716
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
718-
Parse: echo.ParseComplete,
719-
ProvisionPlan: echo.ProvisionComplete,
720-
ProvisionApply: []*proto.Provision_Response{{
721-
Type: &proto.Provision_Response_Complete{
722-
Complete: &proto.Provision_Complete{
723-
Resources: []*proto.Resource{{
724-
Name: "example",
725-
Type: "aws_instance",
726-
Agents: []*proto.Agent{{
727-
Id: uuid.NewString(),
728-
Auth: &proto.Agent_Token{
729-
Token: authToken,
730-
},
731-
}},
732-
}},
733-
},
734-
},
735-
}},
717+
Parse: echo.ParseComplete,
718+
ProvisionPlan: echo.ProvisionComplete,
719+
ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
736720
})
737721
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
738722
require.Equal(t, -1, template.ActiveUserCount)

0 commit comments

Comments
 (0)