Skip to content

Commit 171dbf0

Browse files
EmyrkEmyrk
committed
cleanup
1 parent d41e95a commit 171dbf0

File tree

15 files changed

+43
-59
lines changed

15 files changed

+43
-59
lines changed

‎coderd/audit.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,12 @@ func (api *API) convertAuditLog(ctx context.Context, dblog database.GetAuditLogs
196196
CreatedAt: dblog.UserCreatedAt.Time,
197197
Status: codersdk.UserStatus(dblog.UserStatus.UserStatus),
198198
},
199-
Roles: []codersdk.Role{},
199+
Roles: []codersdk.SlimRole{},
200200
}
201201

202202
for _, roleName := range dblog.UserRoles {
203203
rbacRole, _ := rbac.RoleByName(roleName)
204-
user.Roles = append(user.Roles, db2sdk.Role(rbacRole))
204+
user.Roles = append(user.Roles, db2sdk.SlimRole(rbacRole))
205205
}
206206
}
207207

‎coderd/database/db2sdk/db2sdk.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,17 +167,17 @@ func User(user database.User, organizationIDs []uuid.UUID) codersdk.User {
167167
convertedUser := codersdk.User{
168168
ReducedUser: ReducedUser(user),
169169
OrganizationIDs: organizationIDs,
170-
Roles: make([]codersdk.Role, 0, len(user.RBACRoles)),
170+
Roles: make([]codersdk.SlimRole, 0, len(user.RBACRoles)),
171171
}
172172

173173
for _, roleName := range user.RBACRoles {
174174
rbacRole, err := rbac.RoleByName(roleName)
175175
if err == nil {
176-
convertedUser.Roles = append(convertedUser.Roles, Role(rbacRole))
176+
convertedUser.Roles = append(convertedUser.Roles, SlimRole(rbacRole))
177177
} else {
178178
// TODO: Fix this for custom roles to display the actual display_name
179179
// Requires plumbing either a cached role value, or the db.
180-
convertedUser.Roles = append(convertedUser.Roles, codersdk.Role{
180+
convertedUser.Roles = append(convertedUser.Roles, codersdk.SlimRole{
181181
Name: roleName,
182182
})
183183
}
@@ -205,8 +205,8 @@ func Group(group database.Group, members []database.User) codersdk.Group {
205205
}
206206
}
207207

208-
func Role(role rbac.Role) codersdk.Role {
209-
return codersdk.Role{
208+
func SlimRole(role rbac.Role) codersdk.SlimRole {
209+
return codersdk.SlimRole{
210210
DisplayName: role.DisplayName,
211211
Name: role.Name,
212212
}
@@ -526,8 +526,8 @@ func ProvisionerDaemon(dbDaemon database.ProvisionerDaemon) codersdk.Provisioner
526526
return result
527527
}
528528

529-
func RolePermissions(role rbac.Role) codersdk.RolePermissions {
530-
return codersdk.RolePermissions{
529+
func Role(role rbac.Role) codersdk.Role {
530+
return codersdk.Role{
531531
Name: role.Name,
532532
DisplayName: role.DisplayName,
533533
SitePermissions: List(role.Site, Permission),
@@ -544,16 +544,16 @@ func Permission(permission rbac.Permission) codersdk.Permission {
544544
}
545545
}
546546

547-
func RolePermissionsDB(role codersdk.RolePermissions) rbac.Role {
547+
func RoleToRBAC(role codersdk.Role) rbac.Role {
548548
return rbac.Role{
549549
Name: role.Name,
550550
DisplayName: role.DisplayName,
551-
Site: List(role.SitePermissions, PermissionToDB),
552-
Org: Map(role.OrganizationPermissions, ListLazy(PermissionToDB)),
553-
User: List(role.UserPermissions, PermissionToDB),
551+
Site: List(role.SitePermissions, PermissionToRBAC),
552+
Org: Map(role.OrganizationPermissions, ListLazy(PermissionToRBAC)),
553+
User: List(role.UserPermissions, PermissionToRBAC),
554554
}
555555
}
556-
func PermissionToDB(permission codersdk.Permission) rbac.Permission {
556+
func PermissionToRBAC(permission codersdk.Permission) rbac.Permission {
557557
return rbac.Permission{
558558
Negate: permission.Negate,
559559
ResourceType: string(permission.ResourceType),

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3361,10 +3361,10 @@ func (q *querier) UpsertApplicationName(ctx context.Context, value string) error
33613361
return q.db.UpsertApplicationName(ctx, value)
33623362
}
33633363

3364-
// UpsertCustomRole does a series of authz checks to protect custom routes.
3364+
// UpsertCustomRole does a series of authz checks to protect custom roles.
33653365
// - Check custom roles are valid for their resource types + actions
33663366
// - Check the actor can create the custom role
3367-
// - Check the custom role does not grant perms the user does not have
3367+
// - Check the custom role does not grant perms the actor does not have
33683368
// - Prevent negative perms
33693369
// - Prevent roles with site and org permissions.
33703370
func (q *querier) UpsertCustomRole(ctx context.Context, arg database.UpsertCustomRoleParams) (database.CustomRole, error) {

‎coderd/database/dbmem/dbmem.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -896,10 +896,6 @@ func (q *FakeQuerier) getLatestWorkspaceAppByTemplateIDUserIDSlugNoLock(ctx cont
896896
return database.WorkspaceApp{}, sql.ErrNoRows
897897
}
898898

899-
func (q *FakeQuerier) CustomRoles(ctx context.Context, lookupRoles []string) ([]database.CustomRole, error) {
900-
panic("not implemented")
901-
}
902-
903899
func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
904900
return xerrors.New("AcquireLock must only be called within a transaction")
905901
}

‎coderd/database/migrations/000209_custom_roles.down.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
DROP INDEX IF EXISTS idx_custom_roles_name_lower;
2+
DROP TABLE IF EXISTS custom_roles;

‎coderd/members.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ func convertOrganizationMember(mem database.OrganizationMember) codersdk.Organiz
9999
OrganizationID: mem.OrganizationID,
100100
CreatedAt: mem.CreatedAt,
101101
UpdatedAt: mem.UpdatedAt,
102-
Roles: make([]codersdk.Role, 0, len(mem.Roles)),
102+
Roles: make([]codersdk.SlimRole, 0, len(mem.Roles)),
103103
}
104104

105105
for _, roleName := range mem.Roles {
106106
rbacRole, _ := rbac.RoleByName(roleName)
107-
convertedMember.Roles = append(convertedMember.Roles, db2sdk.Role(rbacRole))
107+
convertedMember.Roles = append(convertedMember.Roles, db2sdk.SlimRole(rbacRole))
108108
}
109109
return convertedMember
110110
}

‎coderd/roles.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ func (api *API) assignableSiteRoles(rw http.ResponseWriter, r *http.Request) {
2929
}
3030

3131
roles := rbac.SiteRoles()
32-
33-
3432
httpapi.Write(ctx, rw, http.StatusOK, assignableRoles(actorRoles.Roles, roles))
3533
}
3634

@@ -68,7 +66,7 @@ func assignableRoles(actorRoles rbac.ExpandableRoles, roles []rbac.Role) []coder
6866
continue
6967
}
7068
assignable = append(assignable, codersdk.AssignableRoles{
71-
Role: codersdk.Role{
69+
SlimRole: codersdk.SlimRole{
7270
Name: role.Name,
7371
DisplayName: role.DisplayName,
7472
},

‎coderd/roles_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ func TestListRoles(t *testing.T) {
143143
}
144144
}
145145

146-
func convertRole(roleName string) codersdk.Role {
146+
func convertRole(roleName string) codersdk.SlimRole {
147147
role, _ := rbac.RoleByName(roleName)
148-
return codersdk.Role{
148+
return codersdk.SlimRole{
149149
DisplayName: role.DisplayName,
150150
Name: role.Name,
151151
}
@@ -156,7 +156,7 @@ func convertRoles(assignableRoles map[string]bool) []codersdk.AssignableRoles {
156156
for roleName, assignable := range assignableRoles {
157157
role := convertRole(roleName)
158158
converted = append(converted, codersdk.AssignableRoles{
159-
Role: role,
159+
SlimRole: role,
160160
Assignable: assignable,
161161
})
162162
}

‎coderd/users_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ func TestGrantSiteRoles(t *testing.T) {
10491049
c.AssignToUser = newUser.ID.String()
10501050
}
10511051

1052-
var newRoles []codersdk.Role
1052+
var newRoles []codersdk.SlimRole
10531053
if c.OrgID != uuid.Nil {
10541054
// Org assign
10551055
var mem codersdk.OrganizationMember

‎codersdk/organizations.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ type Organization struct {
4848
}
4949

5050
type OrganizationMember struct {
51-
UserID uuid.UUID `db:"user_id" json:"user_id" format:"uuid"`
52-
OrganizationID uuid.UUID `db:"organization_id" json:"organization_id" format:"uuid"`
53-
CreatedAt time.Time `db:"created_at" json:"created_at" format:"date-time"`
54-
UpdatedAt time.Time `db:"updated_at" json:"updated_at" format:"date-time"`
55-
Roles []Role `db:"roles" json:"roles"`
51+
UserID uuid.UUID `db:"user_id" json:"user_id" format:"uuid"`
52+
OrganizationID uuid.UUID `db:"organization_id" json:"organization_id" format:"uuid"`
53+
CreatedAt time.Time `db:"created_at" json:"created_at" format:"date-time"`
54+
UpdatedAt time.Time `db:"updated_at" json:"updated_at" format:"date-time"`
55+
Roles []SlimRole `db:"roles" json:"roles"`
5656
}
5757

5858
// CreateTemplateVersionRequest enables callers to create a new Template Version.

0 commit comments

Comments
 (0)