Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1498dcd

Browse files
committed
Expand 'orgs' to 'organizations' in func namings
1 parent95b9a14 commit1498dcd

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

‎coderd/rbac/builtin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ func IsOrgRole(roleName string) (string, bool) {
145145
return"",false
146146
}
147147

148-
//ListOrgRoles lists all roles that can be applied to an organization user
148+
//ListOrganizationRoles lists all roles that can be applied to an organization user
149149
// in the given organization.
150150
// Note: This should be a list in a database, but until then we build
151151
// the list from the builtins.
152-
funcListOrgRoles(organizationID uuid.UUID) []string {
152+
funcListOrganizationRoles(organizationID uuid.UUID) []string {
153153
varroles []string
154154
forrole:=rangebuiltInRoles {
155155
_,scope,err:=roleSplit(role)

‎coderd/roles_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ func TestListRoles(t *testing.T) {
5959
{
6060
Name:"OrgMemberListOrg",
6161
APICall:func() ([]string,error) {
62-
returnmember.ListOrgRoles(ctx,admin.OrganizationID)
62+
returnmember.ListOrganizationRoles(ctx,admin.OrganizationID)
6363
},
6464
Authorized:false,
6565
},
6666
{
6767
Name:"NonOrgMemberListOrg",
6868
APICall:func() ([]string,error) {
69-
returnmember.ListOrgRoles(ctx,uuid.New())
69+
returnmember.ListOrganizationRoles(ctx,uuid.New())
7070
},
7171
Authorized:false,
7272
},
@@ -81,15 +81,15 @@ func TestListRoles(t *testing.T) {
8181
{
8282
Name:"OrgAdminListOrg",
8383
APICall:func() ([]string,error) {
84-
returnorgAdmin.ListOrgRoles(ctx,admin.OrganizationID)
84+
returnorgAdmin.ListOrganizationRoles(ctx,admin.OrganizationID)
8585
},
8686
Authorized:true,
87-
ExpectedRoles:rbac.ListOrgRoles(admin.OrganizationID),
87+
ExpectedRoles:rbac.ListOrganizationRoles(admin.OrganizationID),
8888
},
8989
{
9090
Name:"OrgAdminListOtherOrg",
9191
APICall:func() ([]string,error) {
92-
returnorgAdmin.ListOrgRoles(ctx,uuid.New())
92+
returnorgAdmin.ListOrganizationRoles(ctx,uuid.New())
9393
},
9494
Authorized:false,
9595
},
@@ -105,10 +105,10 @@ func TestListRoles(t *testing.T) {
105105
{
106106
Name:"AdminListOrg",
107107
APICall:func() ([]string,error) {
108-
returnclient.ListOrgRoles(ctx,admin.OrganizationID)
108+
returnclient.ListOrganizationRoles(ctx,admin.OrganizationID)
109109
},
110110
Authorized:true,
111-
ExpectedRoles:rbac.ListOrgRoles(admin.OrganizationID),
111+
ExpectedRoles:rbac.ListOrganizationRoles(admin.OrganizationID),
112112
},
113113
}
114114

‎codersdk/roles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func (c *Client) ListSiteRoles(ctx context.Context) ([]string, error) {
2222
returnroles,json.NewDecoder(res.Body).Decode(&roles)
2323
}
2424

25-
func (c*Client)ListOrgRoles(ctx context.Context,org uuid.UUID) ([]string,error) {
25+
func (c*Client)ListOrganizationRoles(ctx context.Context,org uuid.UUID) ([]string,error) {
2626
res,err:=c.request(ctx,http.MethodGet,fmt.Sprintf("/api/v2/organizations/%s/members/roles",org.String()),nil)
2727
iferr!=nil {
2828
returnnil,err

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp