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

Commit9e7ff9a

Browse files
committed
DB function was renamed/changed
1 parent3861a43 commit9e7ff9a

File tree

2 files changed

+27
-17
lines changed

2 files changed

+27
-17
lines changed

‎coderd/authzquery/workspace.go

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,24 @@ func (q *AuthzQuerier) UpdateWorkspaceAgentLifecycleStateByID(ctx context.Contex
120120
returnq.db.UpdateWorkspaceAgentLifecycleStateByID(ctx,arg)
121121
}
122122

123+
func (q*AuthzQuerier)UpdateWorkspaceAgentStartupByID(ctx context.Context,arg database.UpdateWorkspaceAgentStartupByIDParams)error {
124+
agent,err:=q.db.GetWorkspaceAgentByID(ctx,arg.ID)
125+
iferr!=nil {
126+
returnerr
127+
}
128+
129+
workspace,err:=q.db.GetWorkspaceByAgentID(ctx,agent.ID)
130+
iferr!=nil {
131+
returnerr
132+
}
133+
134+
iferr:=q.authorizeContext(ctx,rbac.ActionUpdate,workspace);err!=nil {
135+
returnerr
136+
}
137+
138+
returnq.db.UpdateWorkspaceAgentStartupByID(ctx,arg)
139+
}
140+
123141
func (q*AuthzQuerier)GetWorkspaceAppByAgentIDAndSlug(ctx context.Context,arg database.GetWorkspaceAppByAgentIDAndSlugParams) (database.WorkspaceApp,error) {
124142
// If we can fetch the workspace, we can fetch the apps. Use the authorized call.
125143
if_,err:=q.GetWorkspaceByAgentID(ctx,arg.AgentID);err!=nil {
@@ -373,14 +391,6 @@ func (q *AuthzQuerier) InsertAgentStat(ctx context.Context, arg database.InsertA
373391
returnq.db.InsertAgentStat(ctx,arg)
374392
}
375393

376-
func (q*AuthzQuerier)UpdateWorkspaceAgentVersionByID(ctx context.Context,arg database.UpdateWorkspaceAgentVersionByIDParams)error {
377-
// TODO: This is a workspace agent operation. Should users be able to query this?
378-
fetch:=func(ctx context.Context,arg database.UpdateWorkspaceAgentVersionByIDParams) (database.Workspace,error) {
379-
returnq.db.GetWorkspaceByAgentID(ctx,arg.ID)
380-
}
381-
returnupdate(q.log,q.auth,fetch,q.db.UpdateWorkspaceAgentVersionByID)(ctx,arg)
382-
}
383-
384394
func (q*AuthzQuerier)UpdateWorkspaceAppHealthByID(ctx context.Context,arg database.UpdateWorkspaceAppHealthByIDParams)error {
385395
// TODO: This is a workspace agent operation. Should users be able to query this?
386396
workspace,err:=q.db.GetWorkspaceByWorkspaceAppID(ctx,arg.ID)

‎coderd/authzquery/workspace_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,15 @@ func (s *MethodTestSuite) TestWorkspace() {
6868
LifecycleState:database.WorkspaceAgentLifecycleStateCreated,
6969
}).Asserts(ws,rbac.ActionUpdate).Returns()
7070
}))
71+
s.Run("UpdateWorkspaceAgentStartupByID",s.Subtest(func(db database.Store,check*expects) {
72+
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
73+
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
74+
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
75+
agt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
76+
check.Args(database.UpdateWorkspaceAgentStartupByIDParams{
77+
ID:agt.ID,
78+
}).Asserts(ws,rbac.ActionUpdate).Returns()
79+
}))
7180
s.Run("GetWorkspaceAppByAgentIDAndSlug",s.Subtest(func(db database.Store,check*expects) {
7281
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
7382
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
@@ -248,15 +257,6 @@ func (s *MethodTestSuite) TestWorkspace() {
248257
WorkspaceID:ws.ID,
249258
}).Asserts(ws,rbac.ActionUpdate)
250259
}))
251-
s.Run("UpdateWorkspaceAgentVersionByID",s.Subtest(func(db database.Store,check*expects) {
252-
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
253-
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
254-
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
255-
agt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
256-
check.Args(database.UpdateWorkspaceAgentVersionByIDParams{
257-
ID:agt.ID,
258-
}).Asserts(ws,rbac.ActionUpdate).Returns()
259-
}))
260260
s.Run("UpdateWorkspaceAppHealthByID",s.Subtest(func(db database.Store,check*expects) {
261261
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
262262
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})

0 commit comments

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