Commit87c474b

committed

Move convertRole(s) to coderd

1 parentb1bb55f commit87c474bCopy full SHA for 87c474b

File tree

+21

-21

lines changed

+21

-21

lines changed

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func (api) assignableSiteRoles(rw http.ResponseWriter, _ http.Request) {`
`15`	`15`	`// TODO: @emyrk in the future, allow granular subsets of roles to be returned based on the`
`16`	`16`	`// role of the user.`
`17`	`17`	`roles:=rbac.SiteRoles()`
`18`		`-httpapi.Write(rw,http.StatusOK,codersdk.ConvertRoles(roles))`
	`18`	`+httpapi.Write(rw,http.StatusOK,ConvertRoles(roles))`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`// assignableSiteRoles returns all site wide roles that can be assigned.`
`@@ -24,5 +24,20 @@ func (api) assignableOrgRoles(rw http.ResponseWriter, r http.Request) {`
`24`	`24`	`// role of the user.`
`25`	`25`	`organization:=httpmw.OrganizationParam(r)`
`26`	`26`	`roles:=rbac.OrganizationRoles(organization.ID)`
`27`		`-httpapi.Write(rw,http.StatusOK,codersdk.ConvertRoles(roles))`
	`27`	`+httpapi.Write(rw,http.StatusOK,ConvertRoles(roles))`
	`28`	`+}`
	`29`	`+`
	`30`	`+funcConvertRole(role rbac.Role) codersdk.Role {`
	`31`	`+return codersdk.Role{`
	`32`	`+DisplayName:role.DisplayName,`
	`33`	`+Name:role.Name,`
	`34`	`+}`
	`35`	`+}`
	`36`	`+`
	`37`	`+funcConvertRoles(roles []rbac.Role) []codersdk.Role {`
	`38`	`+converted:=make([]codersdk.Role,0,len(roles))`
	`39`	`+for_,role:=rangeroles {`
	`40`	`+converted=append(converted,ConvertRole(role))`
	`41`	`+}`
	`42`	`+returnconverted`
`28`	`43`	`}`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/stretchr/testify/require"`
`9`	`9`
	`10`	`+"github.com/coder/coder/coderd"`
`10`	`11`	`"github.com/coder/coder/coderd/coderdtest"`
`11`	`12`	`"github.com/coder/coder/coderd/rbac"`
`12`	`13`	`"github.com/coder/coder/codersdk"`
`@@ -84,7 +85,7 @@ func TestListRoles(t *testing.T) {`
`84`	`85`	`APICall:func() ([]codersdk.Role,error) {`
`85`	`86`	`returnorgAdmin.ListOrganizationRoles(ctx,admin.OrganizationID)`
`86`	`87`	`},`
`87`		`-ExpectedRoles:codersdk.ConvertRoles(rbac.OrganizationRoles(admin.OrganizationID)),`
	`88`	`+ExpectedRoles:coderd.ConvertRoles(rbac.OrganizationRoles(admin.OrganizationID)),`
`88`	`89`	`},`
`89`	`90`	`{`
`90`	`91`	`Name:"OrgAdminListOtherOrg",`
`@@ -99,14 +100,14 @@ func TestListRoles(t *testing.T) {`
`99`	`100`	`APICall:func() ([]codersdk.Role,error) {`
`100`	`101`	`returnclient.ListSiteRoles(ctx)`
`101`	`102`	`},`
`102`		`-ExpectedRoles:codersdk.ConvertRoles(rbac.SiteRoles()),`
	`103`	`+ExpectedRoles:coderd.ConvertRoles(rbac.SiteRoles()),`
`103`	`104`	`},`
`104`	`105`	`{`
`105`	`106`	`Name:"AdminListOrg",`
`106`	`107`	`APICall:func() ([]codersdk.Role,error) {`
`107`	`108`	`returnclient.ListOrganizationRoles(ctx,admin.OrganizationID)`
`108`	`109`	`},`
`109`		`-ExpectedRoles:codersdk.ConvertRoles(rbac.OrganizationRoles(admin.OrganizationID)),`
	`110`	`+ExpectedRoles:coderd.ConvertRoles(rbac.OrganizationRoles(admin.OrganizationID)),`
`110`	`111`	`},`
`111`	`112`	`}`
`112`	`113`

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"net/http"`
`8`	`8`
`9`		`-"github.com/coder/coder/coderd/rbac"`
`10`	`9`	`"github.com/google/uuid"`
`11`	`10`	`)`
`12`	`11`
`@@ -44,18 +43,3 @@ func (c *Client) ListOrganizationRoles(ctx context.Context, org uuid.UUID) ([]Ro`
`44`	`43`	`varroles []Role`
`45`	`44`	`returnroles,json.NewDecoder(res.Body).Decode(&roles)`
`46`	`45`	`}`
`47`		`-`
`48`		`-funcConvertRole(role rbac.Role)Role {`
`49`		`-returnRole{`
`50`		`-DisplayName:role.DisplayName,`
`51`		`-Name:role.Name,`
`52`		`-}`
`53`		`-}`
`54`		`-`
`55`		`-funcConvertRoles(roles []rbac.Role) []Role {`
`56`		`-converted:=make([]Role,0,len(roles))`
`57`		`-for_,role:=rangeroles {`
`58`		`-converted=append(converted,ConvertRole(role))`
`59`		`-}`
`60`		`-returnconverted`
`61`		`-}`

Comments

(0)