coder
diff --git a/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 7 additions & 7 deletions b/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 7 additions & 7 deletions
diff --git a/‎coderd/database/modelmethods.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/modelmethods.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/rbac/authz.go
Lines changed: 2 additions & 2 deletions b/‎coderd/rbac/authz.go
Lines changed: 2 additions & 2 deletions
@@ -584,12 +584,12 @@ func (q *querier) authorizeUpdateFileTemplate(ctx context.Context, file database
 
 // uniqueOrganizationRoles converts a set of scoped role names to their unique
 // scoped names.
-func (q *querier) uniqueOrganizationRoles(organizationID uuid.UUID, names []string) ([]rbac.UniqueRoleName, error) {
-	uniques := make([]rbac.UniqueRoleName, 0, len(names))
+func (q *querier) uniqueOrganizationRoles(organizationID uuid.UUID, names []string) ([]rbac.RoleName, error) {
+	uniques := make([]rbac.RoleName, 0, len(names))
 	for _, name := range names {
 		// This check is a developer safety check. Old code might try to invoke this code path with
 		// organization id suffixes. Catch this and return a nice error so it can be fixed.
-		_, foundOrg, _ := rbac.RoleSplit(rbac.UniqueRoleName(name))
+		_, foundOrg, _ := rbac.RoleSplit(rbac.RoleName(name))
 		if foundOrg != "" {
 			return nil, xerrors.Errorf("attempt to assign a role %q, remove the ':<organization_id> suffix", name)
 		}
@@ -601,7 +601,7 @@ func (q *querier) uniqueOrganizationRoles(organizationID uuid.UUID, names []stri
 }
 
 // canAssignRoles handles assigning built in and custom roles.
-func (q *querier) canAssignRoles(ctx context.Context, orgID *uuid.UUID, added, removed []rbac.UniqueRoleName) error {
+func (q *querier) canAssignRoles(ctx context.Context, orgID *uuid.UUID, added, removed []rbac.RoleName) error {
 	actor, ok := ActorFromContext(ctx)
 	if !ok {
 		return NoActorError
@@ -615,7 +615,7 @@ func (q *querier) canAssignRoles(ctx context.Context, orgID *uuid.UUID, added, r
 	}
 
 	grantedRoles := append(added, removed...)
-	customRoles := make([]rbac.UniqueRoleName, 0)
+	customRoles := make([]rbac.RoleName, 0)
 	// Validate that the roles being assigned are valid.
 	for _, r := range grantedRoles {
 		roleOrgIDStr, isOrgRole := rbac.IsOrgRole(r)
@@ -647,7 +647,7 @@ func (q *querier) canAssignRoles(ctx context.Context, orgID *uuid.UUID, added, r
 		}
 	}
 
-	customRolesMap := make(map[rbac.UniqueRoleName]struct{}, len(customRoles))
+	customRolesMap := make(map[rbac.RoleName]struct{}, len(customRoles))
 	for _, r := range customRoles {
 		customRolesMap[r] = struct{}{}
 	}
@@ -2867,7 +2867,7 @@ func (q *querier) UpdateMemberRoles(ctx context.Context, arg database.UpdateMemb
 
 	// The 'rbac' package expects role names to be scoped.
 	// Convert the argument roles for validation.
-	scopedGranted := make([]rbac.UniqueRoleName, 0, len(arg.GrantedRoles))
+	scopedGranted := make([]rbac.RoleName, 0, len(arg.GrantedRoles))
 	for _, grantedRole := range arg.GrantedRoles {
 		// This check is a developer safety check. Old code might try to invoke this code path with
 		// organization id suffixes. Catch this and return a nice error so it can be fixed.
 
@@ -375,7 +375,7 @@ func (p ProvisionerJob) FinishedAt() time.Time {
 	return time.Time{}
 }
 
-func (r CustomRole) UniqueName() rbac.UniqueRoleName {
+func (r CustomRole) UniqueName() rbac.RoleName {
 	if r.OrganizationID.UUID == uuid.Nil {
 		return rbac.RoleName(r.Name, "")
 	}
 
@@ -114,9 +114,9 @@ func (s Subject) SafeScopeName() string {
 }
 
 // SafeRoleNames prevent nil pointer dereference.
-func (s Subject) SafeRoleNames() []UniqueRoleName {
+func (s Subject) SafeRoleNames() []RoleName {
 	if s.Roles == nil {
-		return []UniqueRoleName{}
+		return []RoleName{}
 	}
 	return s.Roles.Names()
 }
Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ func (p ProvisionerJob) FinishedAt() time.Time {`
`375`	`375`	`return time.Time{}`
`376`	`376`	`}`
`377`	`377`
`378`		`-func (r CustomRole) UniqueName() rbac.UniqueRoleName {`
	`378`	`+func (r CustomRole) UniqueName() rbac.RoleName {`
`379`	`379`	`if r.OrganizationID.UUID == uuid.Nil {`
`380`	`380`	`return rbac.RoleName(r.Name, "")`
`381`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,9 @@ func (s Subject) SafeScopeName() string {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`// SafeRoleNames prevent nil pointer dereference.`
`117`		`-func (s Subject) SafeRoleNames() []UniqueRoleName {`
	`117`	`+func (s Subject) SafeRoleNames() []RoleName {`
`118`	`118`	`if s.Roles == nil {`
`119`		`- return []UniqueRoleName{}`
	`119`	`+ return []RoleName{}`
`120`	`120`	`}`
`121`	`121`	`return s.Roles.Names()`
`122`	`122`	`}`