Expand 'orgs' to 'organizations' in func namings

Emyrk · Emyrk · commit 1498dcd6dc5b · 2022-05-03T11:04:55.000-05:00
diff --git a/coderd/rbac/builtin.go b/coderd/rbac/builtin.go
@@ -145,11 +145,11 @@ func IsOrgRole(roleName string) (string, bool) {
 	return "", false
 }
 
-// ListOrgRoles lists all roles that can be applied to an organization user
+// ListOrganizationRoles lists all roles that can be applied to an organization user
 // in the given organization.
 // Note: This should be a list in a database, but until then we build
 // 	the list from the builtins.
-func ListOrgRoles(organizationID uuid.UUID) []string {
+func ListOrganizationRoles(organizationID uuid.UUID) []string {
 	var roles []string
 	for role := range builtInRoles {
 		_, scope, err := roleSplit(role)
diff --git a/coderd/roles_test.go b/coderd/roles_test.go
@@ -59,14 +59,14 @@ func TestListRoles(t *testing.T) {
 		{
 			Name: "OrgMemberListOrg",
 			APICall: func() ([]string, error) {
-				return member.ListOrgRoles(ctx, admin.OrganizationID)
+				return member.ListOrganizationRoles(ctx, admin.OrganizationID)
 			},
 			Authorized: false,
 		},
 		{
 			Name: "NonOrgMemberListOrg",
 			APICall: func() ([]string, error) {
-				return member.ListOrgRoles(ctx, uuid.New())
+				return member.ListOrganizationRoles(ctx, uuid.New())
 			},
 			Authorized: false,
 		},
@@ -81,15 +81,15 @@ func TestListRoles(t *testing.T) {
 		{
 			Name: "OrgAdminListOrg",
 			APICall: func() ([]string, error) {
-				return orgAdmin.ListOrgRoles(ctx, admin.OrganizationID)
+				return orgAdmin.ListOrganizationRoles(ctx, admin.OrganizationID)
 			},
 			Authorized:    true,
-			ExpectedRoles: rbac.ListOrgRoles(admin.OrganizationID),
+			ExpectedRoles: rbac.ListOrganizationRoles(admin.OrganizationID),
 		},
 		{
 			Name: "OrgAdminListOtherOrg",
 			APICall: func() ([]string, error) {
-				return orgAdmin.ListOrgRoles(ctx, uuid.New())
+				return orgAdmin.ListOrganizationRoles(ctx, uuid.New())
 			},
 			Authorized: false,
 		},
@@ -105,10 +105,10 @@ func TestListRoles(t *testing.T) {
 		{
 			Name: "AdminListOrg",
 			APICall: func() ([]string, error) {
-				return client.ListOrgRoles(ctx, admin.OrganizationID)
+				return client.ListOrganizationRoles(ctx, admin.OrganizationID)
 			},
 			Authorized:    true,
-			ExpectedRoles: rbac.ListOrgRoles(admin.OrganizationID),
+			ExpectedRoles: rbac.ListOrganizationRoles(admin.OrganizationID),
 		},
 	}
 
diff --git a/codersdk/roles.go b/codersdk/roles.go
@@ -22,7 +22,7 @@ func (c *Client) ListSiteRoles(ctx context.Context) ([]string, error) {
 	return roles, json.NewDecoder(res.Body).Decode(&roles)
 }
 
-func (c *Client) ListOrgRoles(ctx context.Context, org uuid.UUID) ([]string, error) {
+func (c *Client) ListOrganizationRoles(ctx context.Context, org uuid.UUID) ([]string, error) {
 	res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/members/roles", org.String()), nil)
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func (c *Client) ListSiteRoles(ctx context.Context) ([]string, error) {`
`22`	`22`	`return roles, json.NewDecoder(res.Body).Decode(&roles)`
`23`	`23`	`}`
`24`	`24`
`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) {`
`26`	`26`	`res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/members/roles", org.String()), nil)`
`27`	`27`	`if err != nil {`
`28`	`28`	`return nil, err`