Do not export convert functions

BrunoQuaresma · BrunoQuaresma · commit dda580945dcd · 2022-05-09T16:17:03.000Z
diff --git a/coderd/roles.go b/coderd/roles.go
@@ -15,7 +15,7 @@ func (*api) assignableSiteRoles(rw http.ResponseWriter, _ *http.Request) {
 	// TODO: @emyrk in the future, allow granular subsets of roles to be returned based on the
 	// 	role of the user.
 	roles := rbac.SiteRoles()
-	httpapi.Write(rw, http.StatusOK, ConvertRoles(roles))
+	httpapi.Write(rw, http.StatusOK, convertRoles(roles))
 }
 
 // assignableSiteRoles returns all site wide roles that can be assigned.
@@ -24,20 +24,20 @@ func (*api) assignableOrgRoles(rw http.ResponseWriter, r *http.Request) {
 	// 	role of the user.
 	organization := httpmw.OrganizationParam(r)
 	roles := rbac.OrganizationRoles(organization.ID)
-	httpapi.Write(rw, http.StatusOK, ConvertRoles(roles))
+	httpapi.Write(rw, http.StatusOK, convertRoles(roles))
 }
 
-func ConvertRole(role rbac.Role) codersdk.Role {
+func convertRole(role rbac.Role) codersdk.Role {
 	return codersdk.Role{
 		DisplayName: role.DisplayName,
 		Name:        role.Name,
 	}
 }
 
-func ConvertRoles(roles []rbac.Role) []codersdk.Role {
+func convertRoles(roles []rbac.Role) []codersdk.Role {
 	converted := make([]codersdk.Role, 0, len(roles))
 	for _, role := range roles {
-		converted = append(converted, ConvertRole(role))
+		converted = append(converted, convertRole(role))
 	}
 	return converted
 }
diff --git a/coderd/roles_test.go b/coderd/roles_test.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/coderd"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/rbac"
 	"github.com/coder/coder/codersdk"
@@ -85,7 +84,7 @@ func TestListRoles(t *testing.T) {
 			APICall: func() ([]codersdk.Role, error) {
 				return orgAdmin.ListOrganizationRoles(ctx, admin.OrganizationID)
 			},
-			ExpectedRoles: coderd.ConvertRoles(rbac.OrganizationRoles(admin.OrganizationID)),
+			ExpectedRoles: convertRoles(rbac.OrganizationRoles(admin.OrganizationID)),
 		},
 		{
 			Name: "OrgAdminListOtherOrg",
@@ -100,14 +99,14 @@ func TestListRoles(t *testing.T) {
 			APICall: func() ([]codersdk.Role, error) {
 				return client.ListSiteRoles(ctx)
 			},
-			ExpectedRoles: coderd.ConvertRoles(rbac.SiteRoles()),
+			ExpectedRoles: convertRoles(rbac.SiteRoles()),
 		},
 		{
 			Name: "AdminListOrg",
 			APICall: func() ([]codersdk.Role, error) {
 				return client.ListOrganizationRoles(ctx, admin.OrganizationID)
 			},
-			ExpectedRoles: coderd.ConvertRoles(rbac.OrganizationRoles(admin.OrganizationID)),
+			ExpectedRoles: convertRoles(rbac.OrganizationRoles(admin.OrganizationID)),
 		},
 	}
 
@@ -128,3 +127,18 @@ func TestListRoles(t *testing.T) {
 		})
 	}
 }
+
+func convertRole(role rbac.Role) codersdk.Role {
+	return codersdk.Role{
+		DisplayName: role.DisplayName,
+		Name:        role.Name,
+	}
+}
+
+func convertRoles(roles []rbac.Role) []codersdk.Role {
+	converted := make([]codersdk.Role, 0, len(roles))
+	for _, role := range roles {
+		converted = append(converted, convertRole(role))
+	}
+	return converted
+}

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, 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,20 +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, ConvertRoles(roles))`
	`27`	`+ httpapi.Write(rw, http.StatusOK, convertRoles(roles))`
`28`	`28`	`}`
`29`	`29`
`30`		`-func ConvertRole(role rbac.Role) codersdk.Role {`
	`30`	`+func convertRole(role rbac.Role) codersdk.Role {`
`31`	`31`	`return codersdk.Role{`
`32`	`32`	`DisplayName: role.DisplayName,`
`33`	`33`	`Name: role.Name,`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-func ConvertRoles(roles []rbac.Role) []codersdk.Role {`
	`37`	`+func convertRoles(roles []rbac.Role) []codersdk.Role {`
`38`	`38`	`converted := make([]codersdk.Role, 0, len(roles))`
`39`	`39`	`for _, role := range roles {`
`40`		`- converted = append(converted, ConvertRole(role))`
	`40`	`+ converted = append(converted, convertRole(role))`
`41`	`41`	`}`
`42`	`42`	`return converted`
`43`	`43`	`}`