Commit01a492e

committed

SlimRole has organizaton scope now in response, remove from the name

1 parent5bd1280 commit01a492eCopy full SHA for 01a492e

File tree

+29

-14

lines changed

+29

-14

lines changed

Lines changed: 13 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,13 +204,6 @@ func Group(group database.Group, members []database.User) codersdk.Group {`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
`207`		`-funcSlimRole(role rbac.Role) codersdk.SlimRole {`
`208`		`-return codersdk.SlimRole{`
`209`		`-DisplayName:role.DisplayName,`
`210`		`-Name:role.Name,`
`211`		`-}`
`212`		`-}`
`213`		`-`
`214`	`207`	`funcTemplateInsightsParameters(parameterRows []database.GetTemplateParameterInsightsRow) ([]codersdk.TemplateParameterUsage,error) {`
`215`	`208`	`// Use a stable sort, similarly to how we would sort in the query, note that`
`216`	`209`	`// we don't sort in the query because order varies depending on the table`
`@@ -525,6 +518,19 @@ func ProvisionerDaemon(dbDaemon database.ProvisionerDaemon) codersdk.Provisioner`
`525`	`518`	`returnresult`
`526`	`519`	`}`
`527`	`520`
	`521`	`+funcSlimRole(role rbac.Role) codersdk.SlimRole {`
	`522`	`+roleName,orgIDStr,err:=rbac.RoleSplit(role.Name)`
	`523`	`+iferr!=nil {`
	`524`	`+roleName=role.Name`
	`525`	`+}`
	`526`	`+`
	`527`	`+return codersdk.SlimRole{`
	`528`	`+DisplayName:role.DisplayName,`
	`529`	`+Name:roleName,`
	`530`	`+OrganizationID:orgIDStr,`
	`531`	`+}`
	`532`	`+}`
	`533`	`+`
`528`	`534`	`funcRBACRole(role rbac.Role) codersdk.Role {`
`529`	`535`	`roleName,orgIDStr,err:=rbac.RoleSplit(role.Name)`
`530`	`536`	`iferr!=nil {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func convertOrganizationMember(mem database.OrganizationMember) codersdk.Organiz`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`for_,roleName:=rangemem.Roles {`
`71`		`-rbacRole,_:=rbac.RoleByName(roleName)`
	`71`	`+rbacRole,_:=rbac.RoleByName(rbac.RoleName(roleName,mem.OrganizationID.String()))`
`72`	`72`	`convertedMember.Roles=append(convertedMember.Roles,db2sdk.SlimRole(rbacRole))`
`73`	`73`	`}`
`74`	`74`	`returnconvertedMember`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,14 @@ func RoleMember() string {`
`70`	`70`	`returnRoleName(member,"")`
`71`	`71`	`}`
`72`	`72`
	`73`	`+funcStaticRoleOrgAdmin()string {`
	`74`	`+returnorgAdmin`
	`75`	`+}`
	`76`	`+`
	`77`	`+funcStaticRoleOrgMember()string {`
	`78`	`+returnorgMember`
	`79`	`+}`
	`80`	`+`
`73`	`81`	`funcRoleOrgAdmin(organizationID uuid.UUID)string {`
`74`	`82`	`returnRoleName(orgAdmin,organizationID.String())`
`75`	`83`	`}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -986,7 +986,7 @@ func TestGrantSiteRoles(t *testing.T) {`
`986`	`986`	`Name:"OrgRoleInSite",`
`987`	`987`	`Client:admin,`
`988`	`988`	`AssignToUser:codersdk.Me,`
`989`		`-Roles: []string{rbac.RoleOrgAdmin(first.OrganizationID)},`
	`989`	`+Roles: []string{rbac.StaticRoleOrgAdmin()},`
`990`	`990`	`Error:true,`
`991`	`991`	`StatusCode:http.StatusBadRequest,`
`992`	`992`	`},`
`@@ -1029,7 +1029,7 @@ func TestGrantSiteRoles(t *testing.T) {`
`1029`	`1029`	`Client:orgAdmin,`
`1030`	`1030`	`OrgID:randOrg.ID,`
`1031`	`1031`	`AssignToUser:randOrgUser.ID.String(),`
`1032`		`-Roles: []string{rbac.RoleOrgMember(randOrg.ID)},`
	`1032`	`+Roles: []string{rbac.StaticRoleOrgMember()},`
`1033`	`1033`	`Error:true,`
`1034`	`1034`	`StatusCode:http.StatusNotFound,`
`1035`	`1035`	`},`
`@@ -1047,9 +1047,9 @@ func TestGrantSiteRoles(t *testing.T) {`
`1047`	`1047`	`Client:orgAdmin,`
`1048`	`1048`	`OrgID:first.OrganizationID,`
`1049`	`1049`	`AssignToUser:newUser,`
`1050`		`-Roles: []string{rbac.RoleOrgAdmin(first.OrganizationID)},`
	`1050`	`+Roles: []string{rbac.StaticRoleOrgAdmin()},`
`1051`	`1051`	`ExpectedRoles: []string{`
`1052`		`-rbac.RoleOrgAdmin(first.OrganizationID),`
	`1052`	`+rbac.StaticRoleOrgAdmin(),`
`1053`	`1053`	`},`
`1054`	`1054`	`Error:false,`
`1055`	`1055`	`},`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@ import (`
`14`	`14`	`// and it would require extra db calls to fetch this information. The UI does`
`15`	`15`	`// not need it, so most api calls will use this structure that omits information.`
`16`	`16`	`typeSlimRolestruct {`
`17`		-Namestring`json:"name"`
`18`		-DisplayNamestring`json:"display_name"`
	`17`	+Namestring`json:"name"`
	`18`	+DisplayNamestring`json:"display_name"`
	`19`	+OrganizationIDstring`json:"organization_id"`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`typeAssignableRolesstruct {`

Comments

(0)