linting

Emyrk · Emyrk · commit 470c31c0334d · 2024-06-10T14:08:42.000-05:00
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -584,7 +584,7 @@ func (q *querier) authorizeUpdateFileTemplate(ctx context.Context, file database
 
 // convertToOrganizationRoles converts a set of scoped role names to their unique
 // scoped names.
-func (q *querier) convertToOrganizationRoles(organizationID uuid.UUID, names []string) ([]rbac.RoleIdentifier, error) {
+func (*querier) convertToOrganizationRoles(organizationID uuid.UUID, names []string) ([]rbac.RoleIdentifier, error) {
 	uniques := make([]rbac.RoleIdentifier, 0, len(names))
 	for _, name := range names {
 		// This check is a developer safety check. Old code might try to invoke this code path with
@@ -600,7 +600,7 @@ func (q *querier) convertToOrganizationRoles(organizationID uuid.UUID, names []s
 }
 
 // convertToDeploymentRoles converts string role names into deployment wide roles.
-func (q *querier) convertToDeploymentRoles(names []string) []rbac.RoleIdentifier {
+func (*querier) convertToDeploymentRoles(names []string) []rbac.RoleIdentifier {
 	uniques := make([]rbac.RoleIdentifier, 0, len(names))
 	for _, name := range names {
 		uniques = append(uniques, rbac.RoleIdentifier{Name: name})
diff --git a/coderd/rbac/roles.go b/coderd/rbac/roles.go
@@ -96,11 +96,11 @@ func (r RoleIdentifier) String() string {
 	return r.Name
 }
 
-func (p *RoleIdentifier) MarshalJSON() ([]byte, error) {
-	return json.Marshal(p.String())
+func (r *RoleIdentifier) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.String())
 }
 
-func (p *RoleIdentifier) UnmarshalJSON(data []byte) error {
+func (r *RoleIdentifier) UnmarshalJSON(data []byte) error {
 	var str string
 	err := json.Unmarshal(data, &str)
 	if err != nil {
@@ -112,7 +112,7 @@ func (p *RoleIdentifier) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	*p = v
+	*r = v
 	return nil
 }
 
diff --git a/coderd/roles_test.go b/coderd/roles_test.go
@@ -52,10 +52,10 @@ func TestListRoles(t *testing.T) {
 				return x, err
 			},
 			ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
-				rbac.RoleIdentifier{Name: codersdk.RoleOwner}:         false,
-				rbac.RoleIdentifier{Name: codersdk.RoleAuditor}:       false,
-				rbac.RoleIdentifier{Name: codersdk.RoleTemplateAdmin}: false,
-				rbac.RoleIdentifier{Name: codersdk.RoleUserAdmin}:     false,
+				{Name: codersdk.RoleOwner}:         false,
+				{Name: codersdk.RoleAuditor}:       false,
+				{Name: codersdk.RoleTemplateAdmin}: false,
+				{Name: codersdk.RoleUserAdmin}:     false,
 			}),
 		},
 		{
@@ -81,10 +81,10 @@ func TestListRoles(t *testing.T) {
 				return orgAdmin.ListSiteRoles(ctx)
 			},
 			ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
-				rbac.RoleIdentifier{Name: codersdk.RoleOwner}:         false,
-				rbac.RoleIdentifier{Name: codersdk.RoleAuditor}:       false,
-				rbac.RoleIdentifier{Name: codersdk.RoleTemplateAdmin}: false,
-				rbac.RoleIdentifier{Name: codersdk.RoleUserAdmin}:     false,
+				{Name: codersdk.RoleOwner}:         false,
+				{Name: codersdk.RoleAuditor}:       false,
+				{Name: codersdk.RoleTemplateAdmin}: false,
+				{Name: codersdk.RoleUserAdmin}:     false,
 			}),
 		},
 		{
@@ -110,10 +110,10 @@ func TestListRoles(t *testing.T) {
 				return client.ListSiteRoles(ctx)
 			},
 			ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
-				rbac.RoleIdentifier{Name: codersdk.RoleOwner}:         true,
-				rbac.RoleIdentifier{Name: codersdk.RoleAuditor}:       true,
-				rbac.RoleIdentifier{Name: codersdk.RoleTemplateAdmin}: true,
-				rbac.RoleIdentifier{Name: codersdk.RoleUserAdmin}:     true,
+				{Name: codersdk.RoleOwner}:         true,
+				{Name: codersdk.RoleAuditor}:       true,
+				{Name: codersdk.RoleTemplateAdmin}: true,
+				{Name: codersdk.RoleUserAdmin}:     true,
 			}),
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,11 @@ func (r RoleIdentifier) String() string {`
`96`	`96`	`return r.Name`
`97`	`97`	`}`
`98`	`98`
`99`		`-func (p *RoleIdentifier) MarshalJSON() ([]byte, error) {`
`100`		`- return json.Marshal(p.String())`
	`99`	`+func (r *RoleIdentifier) MarshalJSON() ([]byte, error) {`
	`100`	`+ return json.Marshal(r.String())`
`101`	`101`	`}`
`102`	`102`
`103`		`-func (p *RoleIdentifier) UnmarshalJSON(data []byte) error {`
	`103`	`+func (r *RoleIdentifier) UnmarshalJSON(data []byte) error {`
`104`	`104`	`var str string`
`105`	`105`	`err := json.Unmarshal(data, &str)`
`106`	`106`	`if err != nil {`
`@@ -112,7 +112,7 @@ func (p *RoleIdentifier) UnmarshalJSON(data []byte) error {`
`112`	`112`	`return err`
`113`	`113`	`}`
`114`	`114`
`115`		`- *p = v`
	`115`	`+ *r = v`
`116`	`116`	`return nil`
`117`	`117`	`}`
`118`	`118`