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

Commitdce7f09

Browse files
committed
linting
1 parent521ffcd commitdce7f09

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ func (q *querier) authorizeUpdateFileTemplate(ctx context.Context, file database
584584

585585
// convertToOrganizationRoles converts a set of scoped role names to their unique
586586
// scoped names.
587-
func (q*querier)convertToOrganizationRoles(organizationID uuid.UUID,names []string) ([]rbac.RoleIdentifier,error) {
587+
func (*querier)convertToOrganizationRoles(organizationID uuid.UUID,names []string) ([]rbac.RoleIdentifier,error) {
588588
uniques:=make([]rbac.RoleIdentifier,0,len(names))
589589
for_,name:=rangenames {
590590
// 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
600600
}
601601

602602
// convertToDeploymentRoles converts string role names into deployment wide roles.
603-
func (q*querier)convertToDeploymentRoles(names []string) []rbac.RoleIdentifier {
603+
func (*querier)convertToDeploymentRoles(names []string) []rbac.RoleIdentifier {
604604
uniques:=make([]rbac.RoleIdentifier,0,len(names))
605605
for_,name:=rangenames {
606606
uniques=append(uniques, rbac.RoleIdentifier{Name:name})

‎coderd/rbac/roles.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ func (r RoleIdentifier) String() string {
9696
returnr.Name
9797
}
9898

99-
func (p*RoleIdentifier)MarshalJSON() ([]byte,error) {
100-
returnjson.Marshal(p.String())
99+
func (r*RoleIdentifier)MarshalJSON() ([]byte,error) {
100+
returnjson.Marshal(r.String())
101101
}
102102

103-
func (p*RoleIdentifier)UnmarshalJSON(data []byte)error {
103+
func (r*RoleIdentifier)UnmarshalJSON(data []byte)error {
104104
varstrstring
105105
err:=json.Unmarshal(data,&str)
106106
iferr!=nil {
@@ -112,7 +112,7 @@ func (p *RoleIdentifier) UnmarshalJSON(data []byte) error {
112112
returnerr
113113
}
114114

115-
*p=v
115+
*r=v
116116
returnnil
117117
}
118118

‎coderd/roles_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ func TestListRoles(t *testing.T) {
5252
returnx,err
5353
},
5454
ExpectedRoles:convertRoles(map[rbac.RoleIdentifier]bool{
55-
rbac.RoleIdentifier{Name:codersdk.RoleOwner}:false,
56-
rbac.RoleIdentifier{Name:codersdk.RoleAuditor}:false,
57-
rbac.RoleIdentifier{Name:codersdk.RoleTemplateAdmin}:false,
58-
rbac.RoleIdentifier{Name:codersdk.RoleUserAdmin}:false,
55+
{Name:codersdk.RoleOwner}:false,
56+
{Name:codersdk.RoleAuditor}:false,
57+
{Name:codersdk.RoleTemplateAdmin}:false,
58+
{Name:codersdk.RoleUserAdmin}:false,
5959
}),
6060
},
6161
{
@@ -81,10 +81,10 @@ func TestListRoles(t *testing.T) {
8181
returnorgAdmin.ListSiteRoles(ctx)
8282
},
8383
ExpectedRoles:convertRoles(map[rbac.RoleIdentifier]bool{
84-
rbac.RoleIdentifier{Name:codersdk.RoleOwner}:false,
85-
rbac.RoleIdentifier{Name:codersdk.RoleAuditor}:false,
86-
rbac.RoleIdentifier{Name:codersdk.RoleTemplateAdmin}:false,
87-
rbac.RoleIdentifier{Name:codersdk.RoleUserAdmin}:false,
84+
{Name:codersdk.RoleOwner}:false,
85+
{Name:codersdk.RoleAuditor}:false,
86+
{Name:codersdk.RoleTemplateAdmin}:false,
87+
{Name:codersdk.RoleUserAdmin}:false,
8888
}),
8989
},
9090
{
@@ -110,10 +110,10 @@ func TestListRoles(t *testing.T) {
110110
returnclient.ListSiteRoles(ctx)
111111
},
112112
ExpectedRoles:convertRoles(map[rbac.RoleIdentifier]bool{
113-
rbac.RoleIdentifier{Name:codersdk.RoleOwner}:true,
114-
rbac.RoleIdentifier{Name:codersdk.RoleAuditor}:true,
115-
rbac.RoleIdentifier{Name:codersdk.RoleTemplateAdmin}:true,
116-
rbac.RoleIdentifier{Name:codersdk.RoleUserAdmin}:true,
113+
{Name:codersdk.RoleOwner}:true,
114+
{Name:codersdk.RoleAuditor}:true,
115+
{Name:codersdk.RoleTemplateAdmin}:true,
116+
{Name:codersdk.RoleUserAdmin}:true,
117117
}),
118118
},
119119
{

0 commit comments

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