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

Commitc4af28b

Browse files
chore: remove outdated code
1 parent5895d55 commitc4af28b

File tree

20 files changed

+55
-78
lines changed

20 files changed

+55
-78
lines changed

‎coderd/agentapi/devcontainer_agent.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ func (a *DevContainerAgentAPI) CreateDevContainerAgent(ctx context.Context, req
5858
MOTDFile:"",
5959
DisplayApps: []database.DisplayApp{},
6060
DisplayOrder:0,
61+
APIKeyScope:parentAgent.APIKeyScope,
6162
})
6263
iferr!=nil {
6364
returnnil,xerrors.Errorf("insert dev container agent: %w",err)
@@ -89,7 +90,7 @@ func (a *DevContainerAgentAPI) ListDevContainerAgents(ctx context.Context, _ *ag
8990
//nolint:gocritic // We are the Dev Container Agent API, so this is safe.
9091
ctx=dbauthz.AsDevContainerAgentAPI(ctx)
9192

92-
workspaceAgents,err:=a.Database.GetWorkspaceAgentsWithParentID(ctx,uuid.NullUUID{Valid:true,UUID:a.AgentID})
93+
workspaceAgents,err:=a.Database.GetWorkspaceAgentsWithParentID(ctx,a.AgentID)
9394
iferr!=nil {
9495
returnnil,err
9596
}

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ var (
328328
Identifier: rbac.RoleIdentifier{Name:"devcontaineragentapi"},
329329
DisplayName:"Dev Container Agent API",
330330
Site:rbac.Permissions(map[string][]policy.Action{
331-
rbac.ResourceWorkspaceAgent.Type: {policy.ActionRead,policy.ActionCreate,policy.ActionDelete},
331+
rbac.ResourceWorkspace.Type: {policy.ActionRead,policy.ActionCreateAgent,policy.ActionDeleteAgent},
332332
}),
333333
Org:map[string][]rbac.Permission{},
334334
User: []rbac.Permission{},
@@ -1507,12 +1507,12 @@ func (q *querier) DeleteWebpushSubscriptions(ctx context.Context, ids []uuid.UUI
15071507
}
15081508

15091509
func (q*querier)DeleteWorkspaceAgentByID(ctx context.Context,id uuid.UUID)error {
1510-
agent,err:=q.db.GetWorkspaceAgentByID(ctx,id)
1510+
workspace,err:=q.db.GetWorkspaceByAgentID(ctx,id)
15111511
iferr!=nil {
15121512
returnerr
15131513
}
15141514

1515-
iferr:=q.authorizeContext(ctx,policy.ActionDelete,agent);err!=nil {
1515+
iferr:=q.authorizeContext(ctx,policy.ActionDeleteAgent,workspace);err!=nil {
15161516
returnerr
15171517
}
15181518

@@ -3100,10 +3100,16 @@ func (q *querier) GetWorkspaceAgentsInLatestBuildByWorkspaceID(ctx context.Conte
31003100
returnq.db.GetWorkspaceAgentsInLatestBuildByWorkspaceID(ctx,workspace.ID)
31013101
}
31023102

3103-
func (q*querier)GetWorkspaceAgentsWithParentID(ctx context.Context,parentID uuid.NullUUID) ([]database.WorkspaceAgent,error) {
3104-
iferr:=q.authorizeContext(ctx,policy.ActionRead,rbac.ResourceWorkspaceAgent);err!=nil {
3103+
func (q*querier)GetWorkspaceAgentsWithParentID(ctx context.Context,parentID uuid.UUID) ([]database.WorkspaceAgent,error) {
3104+
workspace,err:=q.db.GetWorkspaceByAgentID(ctx,parentID)
3105+
iferr!=nil {
3106+
returnnil,err
3107+
}
3108+
3109+
iferr:=q.authorizeContext(ctx,policy.ActionRead,workspace);err!=nil {
31053110
returnnil,err
31063111
}
3112+
31073113
returnq.db.GetWorkspaceAgentsWithParentID(ctx,parentID)
31083114
}
31093115

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4035,18 +4035,41 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40354035
}))
40364036
s.Run("DeleteWorkspaceAgentByID",s.Subtest(func(db database.Store,check*expects) {
40374037
_=dbgen.User(s.T(),db, database.User{})
4038-
pj:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{})
4039-
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:pj.ID})
4038+
u:=dbgen.User(s.T(),db, database.User{})
4039+
o:=dbgen.Organization(s.T(),db, database.Organization{})
4040+
j:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{Type:database.ProvisionerJobTypeWorkspaceBuild})
4041+
tpl:=dbgen.Template(s.T(),db, database.Template{CreatedBy:u.ID,OrganizationID:o.ID})
4042+
tv:=dbgen.TemplateVersion(s.T(),db, database.TemplateVersion{
4043+
TemplateID: uuid.NullUUID{UUID:tpl.ID,Valid:true},
4044+
JobID:j.ID,
4045+
OrganizationID:o.ID,
4046+
CreatedBy:u.ID,
4047+
})
4048+
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{OwnerID:u.ID,TemplateID:tpl.ID,OrganizationID:o.ID})
4049+
_=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:j.ID,TemplateVersionID:tv.ID})
4050+
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:j.ID})
40404051
agent:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
4041-
check.Args(agent.ID).Asserts(rbac.ResourceWorkspaceAgent.WithID(agent.ID),policy.ActionDelete)
4052+
_=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID,ParentID: uuid.NullUUID{Valid:true,UUID:agent.ID}})
4053+
check.Args(agent.ID).Asserts(ws,policy.ActionDeleteAgent)
40424054
}))
40434055
s.Run("GetWorkspaceAgentsWithParentID",s.Subtest(func(db database.Store,check*expects) {
40444056
_=dbgen.User(s.T(),db, database.User{})
4045-
pj:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{})
4046-
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:pj.ID})
4057+
u:=dbgen.User(s.T(),db, database.User{})
4058+
o:=dbgen.Organization(s.T(),db, database.Organization{})
4059+
j:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{Type:database.ProvisionerJobTypeWorkspaceBuild})
4060+
tpl:=dbgen.Template(s.T(),db, database.Template{CreatedBy:u.ID,OrganizationID:o.ID})
4061+
tv:=dbgen.TemplateVersion(s.T(),db, database.TemplateVersion{
4062+
TemplateID: uuid.NullUUID{UUID:tpl.ID,Valid:true},
4063+
JobID:j.ID,
4064+
OrganizationID:o.ID,
4065+
CreatedBy:u.ID,
4066+
})
4067+
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{OwnerID:u.ID,TemplateID:tpl.ID,OrganizationID:o.ID})
4068+
_=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:j.ID,TemplateVersionID:tv.ID})
4069+
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:j.ID})
40474070
agent:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
40484071
_=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID,ParentID: uuid.NullUUID{Valid:true,UUID:agent.ID}})
4049-
check.Args(uuid.NullUUID{Valid:true,UUID:agent.ID}).Asserts(rbac.ResourceWorkspaceAgent,policy.ActionRead)
4072+
check.Args(agent.ID).Asserts(ws,policy.ActionRead)
40504073
}))
40514074
s.Run("InsertWorkspaceAgent",s.Subtest(func(db database.Store,check*expects) {
40524075
u:=dbgen.User(s.T(),db, database.User{})

‎coderd/database/dbmem/dbmem.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7762,13 +7762,13 @@ func (q *FakeQuerier) GetWorkspaceAgentsInLatestBuildByWorkspaceID(ctx context.C
77627762
returnagents,nil
77637763
}
77647764

7765-
func (q*FakeQuerier)GetWorkspaceAgentsWithParentID(ctx context.Context,parentID uuid.NullUUID) ([]database.WorkspaceAgent,error) {
7765+
func (q*FakeQuerier)GetWorkspaceAgentsWithParentID(ctx context.Context,parentID uuid.UUID) ([]database.WorkspaceAgent,error) {
77667766
q.mutex.RLock()
77677767
deferq.mutex.RUnlock()
77687768

77697769
workspaceAgents:=make([]database.WorkspaceAgent,0)
77707770
for_,agent:=rangeq.workspaceAgents {
7771-
ifagent.ParentID!=parentID {
7771+
if!agent.ParentID.Valid||agent.ParentID.UUID!=parentID {
77727772
continue
77737773
}
77747774

‎coderd/database/dbmetrics/querymetrics.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/modelmethods.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,6 @@ type WorkspaceAgentConnectionStatus struct {
359359
DisconnectedAt*time.Time`json:"disconnected_at"`
360360
}
361361

362-
func (aWorkspaceAgent)RBACObject() rbac.Object {
363-
returnrbac.ResourceWorkspaceAgent.WithID(a.ID)
364-
}
365-
366362
func (aWorkspaceAgent)Status(inactiveTimeout time.Duration)WorkspaceAgentConnectionStatus {
367363
connectionTimeout:=time.Duration(a.ConnectionTimeoutSeconds)*time.Second
368364

‎coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/workspaceagents.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ WHERE workspace_builds.id = $1
332332
ORDER BYworkspace_agent_script_timings.script_id,workspace_agent_script_timings.started_at;
333333

334334
-- name: GetWorkspaceAgentsWithParentID :many
335-
SELECT*FROM workspace_agentsWHERE parent_id= $1;
335+
SELECT*FROM workspace_agentsWHERE parent_id= $1 :: uuid;
336336

337337
-- name: DeleteWorkspaceAgentByID :exec
338338
DELETEFROM workspace_agentsWHERE id= $1;

‎coderd/rbac/object_gen.go

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/rbac/policy/policy.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,4 @@ var RBACPermissions = map[string]PermissionDefinition{
343343
ActionCreate:actDef("create workspace agent devcontainers"),
344344
},
345345
},
346-
"workspace_agent": {
347-
Actions:map[Action]ActionDefinition{
348-
ActionRead:actDef("read workspace agent"),
349-
ActionCreate:actDef("create workspace agent"),
350-
ActionDelete:actDef("delete workspace agent"),
351-
},
352-
},
353346
}

‎coderd/rbac/roles_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -840,21 +840,6 @@ func TestRolePermissions(t *testing.T) {
840840
},
841841
},
842842
},
843-
{
844-
Name:"WorkspaceAgent",
845-
Actions: []policy.Action{policy.ActionRead,policy.ActionCreate,policy.ActionDelete},
846-
Resource:rbac.ResourceWorkspaceAgent,
847-
AuthorizeMap:map[bool][]hasAuthSubjects{
848-
true: {owner},
849-
false: {
850-
memberMe,orgMemberMe,otherOrgMember,
851-
orgAdmin,otherOrgAdmin,
852-
orgAuditor,otherOrgAuditor,
853-
templateAdmin,orgTemplateAdmin,otherOrgTemplateAdmin,
854-
userAdmin,orgUserAdmin,otherOrgUserAdmin,
855-
},
856-
},
857-
},
858843
// Members may read their own chats.
859844
{
860845
Name:"CreateReadUpdateDeleteMyChats",

‎codersdk/rbacresources_gen.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎docs/reference/api/members.md

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎docs/reference/api/schemas.md

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎site/src/api/rbacresourcesGenerated.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,6 @@ export const RBACResourceActions: Partial<
182182
stop:"allows stopping a workspace",
183183
update:"edit workspace settings (scheduling, permissions, parameters)",
184184
},
185-
workspace_agent:{
186-
create:"create workspace agent",
187-
delete:"delete workspace agent",
188-
read:"read workspace agent",
189-
},
190185
workspace_agent_devcontainers:{
191186
create:"create workspace agent devcontainers",
192187
},

‎site/src/api/typesGenerated.ts

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

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