Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit96ae781

Browse files
committed
Fix comments
1 parent003f752 commit96ae781

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎cli/agent_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestWorkspaceAgent(t *testing.T) {
3131

3232
client,db:=coderdtest.NewWithDatabase(t,nil)
3333
user:=coderdtest.CreateFirstUser(t,client)
34-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
34+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
3535
OrganizationID:user.OrganizationID,
3636
OwnerID:user.UserID,
3737
})
@@ -65,11 +65,11 @@ func TestWorkspaceAgent(t *testing.T) {
6565
AzureCertificates:certificates,
6666
})
6767
user:=coderdtest.CreateFirstUser(t,client)
68-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
68+
ws:=dbfake.Workspace(t,db, database.Workspace{
6969
OrganizationID:user.OrganizationID,
7070
OwnerID:user.UserID,
7171
})
72-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
72+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
7373
Name:"somename",
7474
Type:"someinstance",
7575
Agents: []*proto.Agent{{
@@ -107,11 +107,11 @@ func TestWorkspaceAgent(t *testing.T) {
107107
AWSCertificates:certificates,
108108
})
109109
user:=coderdtest.CreateFirstUser(t,client)
110-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
110+
ws:=dbfake.Workspace(t,db, database.Workspace{
111111
OrganizationID:user.OrganizationID,
112112
OwnerID:user.UserID,
113113
})
114-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
114+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
115115
Name:"somename",
116116
Type:"someinstance",
117117
Agents: []*proto.Agent{{
@@ -150,11 +150,11 @@ func TestWorkspaceAgent(t *testing.T) {
150150
})
151151
owner:=coderdtest.CreateFirstUser(t,client)
152152
member,memberUser:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
153-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
153+
ws:=dbfake.Workspace(t,db, database.Workspace{
154154
OrganizationID:owner.OrganizationID,
155155
OwnerID:memberUser.ID,
156156
})
157-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
157+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
158158
Name:"somename",
159159
Type:"someinstance",
160160
Agents: []*proto.Agent{{
@@ -207,7 +207,7 @@ func TestWorkspaceAgent(t *testing.T) {
207207

208208
client,db:=coderdtest.NewWithDatabase(t,nil)
209209
user:=coderdtest.CreateFirstUser(t,client)
210-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
210+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
211211
OrganizationID:user.OrganizationID,
212212
OwnerID:user.UserID,
213213
})

‎coderd/database/dbfake/dbfake.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
sdkproto"github.com/coder/coder/v2/provisionersdk/proto"
2020
)
2121

22-
//CreateWorkspace inserts a workspace into the database.
23-
funcCreateWorkspace(t testing.TB,db database.Store,seed database.Workspace) database.Workspace {
22+
//Workspace inserts a workspace into the database.
23+
funcWorkspace(t testing.TB,db database.Store,seed database.Workspace) database.Workspace {
2424
t.Helper()
2525

2626
// This intentionally fulfills the minimum requirements of the schema.
@@ -37,13 +37,13 @@ func CreateWorkspace(t testing.TB, db database.Store, seed database.Workspace) d
3737
returndbgen.Workspace(t,db,seed)
3838
}
3939

40-
//CreateWorkspaceWithAgent is a helper that generates a workspace with a single resource
40+
//WorkspaceWithAgent is a helper that generates a workspace with a single resource
4141
// that has an agent attached to it. The agent token is returned.
42-
funcCreateWorkspaceWithAgent(t testing.TB,db database.Store,seed database.Workspace) (database.Workspace,string) {
42+
funcWorkspaceWithAgent(t testing.TB,db database.Store,seed database.Workspace) (database.Workspace,string) {
4343
t.Helper()
4444
authToken:=uuid.NewString()
45-
ws:=CreateWorkspace(t,db,seed)
46-
CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
45+
ws:=Workspace(t,db,seed)
46+
WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
4747
Name:"example",
4848
Type:"aws_instance",
4949
Agents: []*proto.Agent{{
@@ -56,8 +56,8 @@ func CreateWorkspaceWithAgent(t testing.TB, db database.Store, seed database.Wor
5656
returnws,authToken
5757
}
5858

59-
//CreateWorkspaceBuild inserts a build and a successful job into the database.
60-
funcCreateWorkspaceBuild(t testing.TB,db database.Store,ws database.Workspace,seed database.WorkspaceBuild,resources...*sdkproto.Resource) database.WorkspaceBuild {
59+
//WorkspaceBuild inserts a build and a successful job into the database.
60+
funcWorkspaceBuild(t testing.TB,db database.Store,ws database.Workspace,seed database.WorkspaceBuild,resources...*sdkproto.Resource) database.WorkspaceBuild {
6161
t.Helper()
6262
jobID:=uuid.New()
6363
seed.JobID=jobID

‎coderd/workspaceagents_test.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ func TestWorkspaceAgent(t *testing.T) {
4242
tmpDir:=t.TempDir()
4343
anotherClient,anotherUser:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID)
4444

45-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
45+
ws:=dbfake.Workspace(t,db, database.Workspace{
4646
OrganizationID:user.OrganizationID,
4747
OwnerID:anotherUser.ID,
4848
})
49-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
49+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
5050
Name:"aws_instance",
5151
Agents: []*proto.Agent{{
5252
Id:uuid.NewString(),
@@ -67,11 +67,11 @@ func TestWorkspaceAgent(t *testing.T) {
6767
client,db:=coderdtest.NewWithDatabase(t,nil)
6868
user:=coderdtest.CreateFirstUser(t,client)
6969
tmpDir:=t.TempDir()
70-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
70+
ws:=dbfake.Workspace(t,db, database.Workspace{
7171
OrganizationID:user.OrganizationID,
7272
OwnerID:user.UserID,
7373
})
74-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
74+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
7575
Name:"aws_instance",
7676
Agents: []*proto.Agent{{
7777
Id:uuid.NewString(),
@@ -99,11 +99,11 @@ func TestWorkspaceAgent(t *testing.T) {
9999

100100
wantTroubleshootingURL:="https://example.com/troubleshoot"
101101

102-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
102+
ws:=dbfake.Workspace(t,db, database.Workspace{
103103
OwnerID:user.UserID,
104104
OrganizationID:user.OrganizationID,
105105
})
106-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
106+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
107107
Name:"example",
108108
Type:"aws_instance",
109109
Agents: []*proto.Agent{{
@@ -139,7 +139,7 @@ func TestWorkspaceAgent(t *testing.T) {
139139
t.Parallel()
140140
client,db:=coderdtest.NewWithDatabase(t,nil)
141141
user:=coderdtest.CreateFirstUser(t,client)
142-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
142+
ws:=dbfake.Workspace(t,db, database.Workspace{
143143
OrganizationID:user.OrganizationID,
144144
OwnerID:user.UserID,
145145
})
@@ -152,7 +152,7 @@ func TestWorkspaceAgent(t *testing.T) {
152152
PortForwardingHelper:true,
153153
SshHelper:true,
154154
}
155-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
155+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
156156
Name:"example",
157157
Type:"aws_instance",
158158
Agents: []*proto.Agent{
@@ -191,11 +191,11 @@ func TestWorkspaceAgent(t *testing.T) {
191191
apps.WebTerminal=false
192192

193193
// Creating another workspace is easier
194-
ws=dbfake.CreateWorkspace(t,db, database.Workspace{
194+
ws=dbfake.Workspace(t,db, database.Workspace{
195195
OrganizationID:user.OrganizationID,
196196
OwnerID:user.UserID,
197197
})
198-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
198+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
199199
Name:"example",
200200
Type:"aws_instance",
201201
Agents: []*proto.Agent{
@@ -225,7 +225,7 @@ func TestWorkspaceAgentLogs(t *testing.T) {
225225
ctx:=testutil.Context(t,testutil.WaitMedium)
226226
client,db:=coderdtest.NewWithDatabase(t,nil)
227227
user:=coderdtest.CreateFirstUser(t,client)
228-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
228+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
229229
OrganizationID:user.OrganizationID,
230230
OwnerID:user.UserID,
231231
})
@@ -267,7 +267,7 @@ func TestWorkspaceAgentLogs(t *testing.T) {
267267
ctx:=testutil.Context(t,testutil.WaitMedium)
268268
client,db:=coderdtest.NewWithDatabase(t,nil)
269269
user:=coderdtest.CreateFirstUser(t,client)
270-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
270+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
271271
OrganizationID:user.OrganizationID,
272272
OwnerID:user.UserID,
273273
})
@@ -309,7 +309,7 @@ func TestWorkspaceAgentLogs(t *testing.T) {
309309
ctx:=testutil.Context(t,testutil.WaitMedium)
310310
client,db:=coderdtest.NewWithDatabase(t,nil)
311311
user:=coderdtest.CreateFirstUser(t,client)
312-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
312+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
313313
OrganizationID:user.OrganizationID,
314314
OwnerID:user.UserID,
315315
})
@@ -352,7 +352,7 @@ func TestWorkspaceAgentListen(t *testing.T) {
352352

353353
client,db:=coderdtest.NewWithDatabase(t,nil)
354354
user:=coderdtest.CreateFirstUser(t,client)
355-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
355+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
356356
OrganizationID:user.OrganizationID,
357357
OwnerID:user.UserID,
358358
})
@@ -438,7 +438,7 @@ func TestWorkspaceAgentTailnet(t *testing.T) {
438438
client,db:=coderdtest.NewWithDatabase(t,nil)
439439
user:=coderdtest.CreateFirstUser(t,client)
440440

441-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
441+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
442442
OrganizationID:user.OrganizationID,
443443
OwnerID:user.UserID,
444444
})
@@ -477,7 +477,7 @@ func TestWorkspaceAgentTailnetDirectDisabled(t *testing.T) {
477477
DeploymentValues:dv,
478478
})
479479
user:=coderdtest.CreateFirstUser(t,client)
480-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
480+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
481481
OrganizationID:user.OrganizationID,
482482
OwnerID:user.UserID,
483483
})
@@ -540,7 +540,7 @@ func TestWorkspaceAgentListeningPorts(t *testing.T) {
540540
require.NoError(t,err)
541541

542542
user:=coderdtest.CreateFirstUser(t,client)
543-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
543+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
544544
OrganizationID:user.OrganizationID,
545545
OwnerID:user.UserID,
546546
})
@@ -765,11 +765,11 @@ func TestWorkspaceAgentAppHealth(t *testing.T) {
765765
},
766766
},
767767
}
768-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
768+
ws:=dbfake.Workspace(t,db, database.Workspace{
769769
OrganizationID:user.OrganizationID,
770770
OwnerID:user.UserID,
771771
})
772-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
772+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
773773
Name:"example",
774774
Type:"aws_instance",
775775
Agents: []*proto.Agent{{
@@ -840,7 +840,7 @@ func TestWorkspaceAgentReportStats(t *testing.T) {
840840

841841
client,db:=coderdtest.NewWithDatabase(t,nil)
842842
user:=coderdtest.CreateFirstUser(t,client)
843-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
843+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
844844
OrganizationID:user.OrganizationID,
845845
OwnerID:user.UserID,
846846
})
@@ -881,7 +881,7 @@ func TestWorkspaceAgent_LifecycleState(t *testing.T) {
881881

882882
client,db:=coderdtest.NewWithDatabase(t,nil)
883883
user:=coderdtest.CreateFirstUser(t,client)
884-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
884+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
885885
OrganizationID:user.OrganizationID,
886886
OwnerID:user.UserID,
887887
})
@@ -947,11 +947,11 @@ func TestWorkspaceAgent_Metadata(t *testing.T) {
947947
client,db:=coderdtest.NewWithDatabase(t,nil)
948948
user:=coderdtest.CreateFirstUser(t,client)
949949
authToken:=uuid.NewString()
950-
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
950+
ws:=dbfake.Workspace(t,db, database.Workspace{
951951
OrganizationID:user.OrganizationID,
952952
OwnerID:user.UserID,
953953
})
954-
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
954+
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
955955
Name:"example",
956956
Type:"aws_instance",
957957
Agents: []*proto.Agent{{
@@ -1111,7 +1111,7 @@ func TestWorkspaceAgent_Startup(t *testing.T) {
11111111

11121112
client,db:=coderdtest.NewWithDatabase(t,nil)
11131113
user:=coderdtest.CreateFirstUser(t,client)
1114-
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
1114+
ws,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
11151115
OrganizationID:user.OrganizationID,
11161116
OwnerID:user.UserID,
11171117
})
@@ -1156,7 +1156,7 @@ func TestWorkspaceAgent_Startup(t *testing.T) {
11561156

11571157
client,db:=coderdtest.NewWithDatabase(t,nil)
11581158
user:=coderdtest.CreateFirstUser(t,client)
1159-
_,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
1159+
_,authToken:=dbfake.WorkspaceWithAgent(t,db, database.Workspace{
11601160
OrganizationID:user.OrganizationID,
11611161
OwnerID:user.UserID,
11621162
})
@@ -1204,7 +1204,7 @@ func TestWorkspaceAgent_UpdatedDERP(t *testing.T) {
12041204
api.DERPMapper.Store(&derpMapFn)
12051205

12061206
// Start workspace a workspace agent.
1207-
ws,agentToken:=dbfake.CreateWorkspaceWithAgent(t,api.Database, database.Workspace{
1207+
ws,agentToken:=dbfake.WorkspaceWithAgent(t,api.Database, database.Workspace{
12081208
OrganizationID:user.OrganizationID,
12091209
OwnerID:user.UserID,
12101210
})

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp