Skip to content

chore: create type for unique role names #13506

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 11, 2024
Merged

chore: create type for unique role names #13506

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4f18d66
chore: create type for unique role names
Emyrk Jun 7, 2024
fc8d414
WIP
Emyrk Jun 7, 2024
7be7755
Work on switching the string to a struct
Emyrk Jun 7, 2024
1bc2cdf
Continue to fix all compile issues
Emyrk Jun 7, 2024
d88c836
Compiling
Emyrk Jun 7, 2024
175a03f
fix assign
Emyrk Jun 7, 2024
3f7e2cb
fix unit test
Emyrk Jun 7, 2024
056fc17
Add codersdk roles
Emyrk Jun 7, 2024
7651a18
refactor name to RoleIdentifier
Emyrk Jun 10, 2024
dadd284
more fixups
Emyrk Jun 10, 2024
8988224
more test fixes
Emyrk Jun 10, 2024
521ffcd
fixup! more test fixes
Emyrk Jun 10, 2024
dce7f09
linting
Emyrk Jun 10, 2024
cc68903
fixup test
Emyrk Jun 10, 2024
fa2f704
linting
Emyrk Jun 10, 2024
9bf3298
add comment
Emyrk Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
linting
  • Loading branch information
@Emyrk
Emyrk committed Jun 10, 2024
commit dce7f0970f72b1edf9d80f09e53c45a8d6d6aab5
4 changes: 2 additions & 2 deletions coderd/database/dbauthz/dbauthz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ func (q *querier) authorizeUpdateFileTemplate(ctx context.Context, file database

// convertToOrganizationRoles converts a set of scoped role names to their unique
// scoped names.
func (q *querier) convertToOrganizationRoles(organizationID uuid.UUID, names []string) ([]rbac.RoleIdentifier, error) {
func (*querier) convertToOrganizationRoles(organizationID uuid.UUID, names []string) ([]rbac.RoleIdentifier, error) {
uniques := make([]rbac.RoleIdentifier, 0, len(names))
for _, name := range names {
// This check is a developer safety check. Old code might try to invoke this code path with
Expand All @@ -600,7 +600,7 @@ func (q *querier) convertToOrganizationRoles(organizationID uuid.UUID, names []s
}

// convertToDeploymentRoles converts string role names into deployment wide roles.
func (q *querier) convertToDeploymentRoles(names []string) []rbac.RoleIdentifier {
func (*querier) convertToDeploymentRoles(names []string) []rbac.RoleIdentifier {
uniques := make([]rbac.RoleIdentifier, 0, len(names))
for _, name := range names {
uniques = append(uniques, rbac.RoleIdentifier{Name: name})
Expand Down
8 changes: 4 additions & 4 deletions coderd/rbac/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ func (r RoleIdentifier) String() string {
return r.Name
}

func (p *RoleIdentifier) MarshalJSON() ([]byte, error) {
return json.Marshal(p.String())
func (r *RoleIdentifier) MarshalJSON() ([]byte, error) {
return json.Marshal(r.String())
}

func (p *RoleIdentifier) UnmarshalJSON(data []byte) error {
func (r *RoleIdentifier) UnmarshalJSON(data []byte) error {
var str string
err := json.Unmarshal(data, &str)
if err != nil {
Expand All @@ -112,7 +112,7 @@ func (p *RoleIdentifier) UnmarshalJSON(data []byte) error {
return err
}

*p = v
*r = v
return nil
}

Expand Down
24 changes: 12 additions & 12 deletions coderd/roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ func TestListRoles(t *testing.T) {
return x, err
},
ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
rbac.RoleIdentifier{Name: codersdk.RoleOwner}: false,
rbac.RoleIdentifier{Name: codersdk.RoleAuditor}: false,
rbac.RoleIdentifier{Name: codersdk.RoleTemplateAdmin}: false,
rbac.RoleIdentifier{Name: codersdk.RoleUserAdmin}: false,
{Name: codersdk.RoleOwner}: false,
{Name: codersdk.RoleAuditor}: false,
{Name: codersdk.RoleTemplateAdmin}: false,
{Name: codersdk.RoleUserAdmin}: false,
}),
},
{
Expand All @@ -81,10 +81,10 @@ func TestListRoles(t *testing.T) {
return orgAdmin.ListSiteRoles(ctx)
},
ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
rbac.RoleIdentifier{Name: codersdk.RoleOwner}: false,
rbac.RoleIdentifier{Name: codersdk.RoleAuditor}: false,
rbac.RoleIdentifier{Name: codersdk.RoleTemplateAdmin}: false,
rbac.RoleIdentifier{Name: codersdk.RoleUserAdmin}: false,
{Name: codersdk.RoleOwner}: false,
{Name: codersdk.RoleAuditor}: false,
{Name: codersdk.RoleTemplateAdmin}: false,
{Name: codersdk.RoleUserAdmin}: false,
}),
},
{
Expand All @@ -110,10 +110,10 @@ func TestListRoles(t *testing.T) {
return client.ListSiteRoles(ctx)
},
ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
rbac.RoleIdentifier{Name: codersdk.RoleOwner}: true,
rbac.RoleIdentifier{Name: codersdk.RoleAuditor}: true,
rbac.RoleIdentifier{Name: codersdk.RoleTemplateAdmin}: true,
rbac.RoleIdentifier{Name: codersdk.RoleUserAdmin}: true,
{Name: codersdk.RoleOwner}: true,
{Name: codersdk.RoleAuditor}: true,
{Name: codersdk.RoleTemplateAdmin}: true,
{Name: codersdk.RoleUserAdmin}: true,
}),
},
{
Expand Down