- Notifications
You must be signed in to change notification settings - Fork928
feat: Implement view for workspace builds to include rbac info#6371
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Closed
Uh oh!
There was an error while loading.Please reload this page.
Closed
Changes fromall commits
Commits
Show all changes
13 commits Select commitHold shift + click to select a range
1979cde feat: Implement view for workspace builds to include rbac info
Emyrk4c0cd84 chore: Use workspace build as RBAC object
Emyrkef9936f Merge remote-tracking branch 'origin/main' into stevenmasley/rbac_views
Emyrk0b98766 Remove uneeded extra code
Emyrk8a26947 UsePostFilter
Emyrk6bee9af Remove some db round trips
Emyrk81165d5 Fix dbgen unit test
Emyrke252c04 Fix compile issue
Emyrk961ffaf Merge remote-tracking branch 'origin/main' into stevenmasley/rbac_views
Emyrkb698672 fix merge
Emyrk3ce72c5 rename migration file +1
Emyrkc3c2702 Merge remote-tracking branch 'origin/main' into stevenmasley/rbac_views
Emyrkc3218f7 fix fake
EmyrkFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
86 changes: 25 additions & 61 deletionscoderd/database/dbauthz/querier.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1139,24 +1139,11 @@ func (q *querier) GetWorkspaces(ctx context.Context, arg database.GetWorkspacesP | ||
| } | ||
| func (q *querier) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) { | ||
| return fetch(q.log, q.auth, q.db.GetLatestWorkspaceBuildByWorkspaceID)(ctx, workspaceID) | ||
| } | ||
Comment on lines 1141 to 1143 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. This is the diff we are going for. Before we had to do a workspace fetch, now we do not. This happens for a lot of objects (template versions, provisoner jobs, params, etc). | ||
| func (q *querier) GetLatestWorkspaceBuildsByWorkspaceIDs(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceBuild, error) { | ||
| return fetchWithPostFilter(q.auth, q.db.GetLatestWorkspaceBuildsByWorkspaceIDs)(ctx, ids) | ||
| } | ||
| func (q *querier) GetWorkspaceAgentByID(ctx context.Context, id uuid.UUID) (database.WorkspaceAgent, error) { | ||
| @@ -1235,34 +1222,15 @@ func (q *querier) GetWorkspaceAppsByAgentID(ctx context.Context, agentID uuid.UU | ||
| } | ||
| func (q *querier) GetWorkspaceBuildByID(ctx context.Context, buildID uuid.UUID) (database.WorkspaceBuild, error) { | ||
| return fetch(q.log, q.auth, q.db.GetWorkspaceBuildByID)(ctx, buildID) | ||
| } | ||
| func (q *querier) GetWorkspaceBuildByJobID(ctx context.Context, jobID uuid.UUID) (database.WorkspaceBuild, error) { | ||
| return fetch(q.log, q.auth, q.db.GetWorkspaceBuildByJobID)(ctx, jobID) | ||
| } | ||
| func (q *querier) GetWorkspaceBuildByWorkspaceIDAndBuildNumber(ctx context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndBuildNumberParams) (database.WorkspaceBuild, error) { | ||
| return fetch(q.log, q.auth, q.db.GetWorkspaceBuildByWorkspaceIDAndBuildNumber)(ctx, arg) | ||
| } | ||
| func (q *querier) GetWorkspaceBuildParameters(ctx context.Context, workspaceBuildID uuid.UUID) ([]database.WorkspaceBuildParameter, error) { | ||
| @@ -1277,10 +1245,19 @@ func (q *querier) GetWorkspaceBuildParameters(ctx context.Context, workspaceBuil | ||
| } | ||
| func (q *querier) GetWorkspaceBuildsByWorkspaceID(ctx context.Context, arg database.GetWorkspaceBuildsByWorkspaceIDParams) ([]database.WorkspaceBuild, error) { | ||
| builds, err := q.db.GetWorkspaceBuildsByWorkspaceID(ctx, arg) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if len(builds) == 0 { | ||
| return nil, sql.ErrNoRows | ||
| } | ||
| // All builds come from the same workspace, so we only need to check the first one. | ||
| err = q.authorizeContext(ctx, rbac.ActionRead, builds[0]) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return builds, nil | ||
| } | ||
| func (q *querier) GetWorkspaceByAgentID(ctx context.Context, agentID uuid.UUID) (database.Workspace, error) { | ||
| @@ -1340,11 +1317,7 @@ func (q *querier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID uuid.U | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| obj = build | ||
| default: | ||
| return nil, xerrors.Errorf("unknown job type: %s", job.Type) | ||
| } | ||
| @@ -1360,10 +1333,10 @@ func (q *querier) InsertWorkspace(ctx context.Context, arg database.InsertWorksp | ||
| return insert(q.log, q.auth, obj, q.db.InsertWorkspace)(ctx, arg) | ||
| } | ||
| func (q *querier) InsertWorkspaceBuild(ctx context.Context, arg database.InsertWorkspaceBuildParams) (database.WorkspaceBuildThin, error) { | ||
| w, err := q.db.GetWorkspaceByID(ctx, arg.WorkspaceID) | ||
| if err != nil { | ||
| return database.WorkspaceBuildThin{}, err | ||
| } | ||
Comment on lines 1337 to 1340 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Since you still have the workspace here, this doesn't need to be thin right? Or is it a requirement because of the sqlc generating the interface? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. It's because of SQLc interface | ||
| var action rbac.Action = rbac.ActionUpdate | ||
| @@ -1372,7 +1345,7 @@ func (q *querier) InsertWorkspaceBuild(ctx context.Context, arg database.InsertW | ||
| } | ||
| if err = q.authorizeContext(ctx, action, w); err != nil { | ||
| return database.WorkspaceBuildThin{}, err | ||
| } | ||
| return q.db.InsertWorkspaceBuild(ctx, arg) | ||
| @@ -1385,12 +1358,7 @@ func (q *querier) InsertWorkspaceBuildParameters(ctx context.Context, arg databa | ||
| return err | ||
| } | ||
| err = q.authorizeContext(ctx, rbac.ActionUpdate, build) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| @@ -1448,19 +1416,15 @@ func (q *querier) UpdateWorkspaceAutostart(ctx context.Context, arg database.Upd | ||
| return update(q.log, q.auth, fetch, q.db.UpdateWorkspaceAutostart)(ctx, arg) | ||
| } | ||
| func (q *querier) UpdateWorkspaceBuildByID(ctx context.Context, arg database.UpdateWorkspaceBuildByIDParams) (database.WorkspaceBuildThin, error) { | ||
| build, err := q.db.GetWorkspaceBuildByID(ctx, arg.ID) | ||
| if err != nil { | ||
| return database.WorkspaceBuildThin{}, err | ||
| } | ||
| err = q.authorizeContext(ctx, rbac.ActionUpdate, build) | ||
| if err != nil { | ||
| return database.WorkspaceBuildThin{}, err | ||
| } | ||
| return q.db.UpdateWorkspaceBuildByID(ctx, arg) | ||
42 changes: 21 additions & 21 deletionscoderd/database/dbauthz/querier_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletioncoderd/database/dbauthz/system.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.