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

Commit0e58b93

Browse files
committed
fixup! more test fixes
1 parent6eeb500 commit0e58b93

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

‎coderd/batchstats/batcher_internal_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99

1010
"cdr.dev/slog"
1111
"cdr.dev/slog/sloggers/slogtest"
12+
"github.com/coder/coder/v2/codersdk"
1213

1314
agentproto"github.com/coder/coder/v2/agent/proto"
1415
"github.com/coder/coder/v2/coderd/database"
1516
"github.com/coder/coder/v2/coderd/database/dbgen"
1617
"github.com/coder/coder/v2/coderd/database/dbtestutil"
1718
"github.com/coder/coder/v2/coderd/database/dbtime"
1819
"github.com/coder/coder/v2/coderd/database/pubsub"
19-
"github.com/coder/coder/v2/coderd/rbac"
2020
"github.com/coder/coder/v2/cryptorand"
2121
)
2222

@@ -177,7 +177,7 @@ func setupDeps(t *testing.T, store database.Store, ps pubsub.Pubsub) deps {
177177
_,err:=store.InsertOrganizationMember(context.Background(), database.InsertOrganizationMemberParams{
178178
OrganizationID:org.ID,
179179
UserID:user.ID,
180-
Roles: []string{rbac.ScopedRoleOrgMember(org.ID)},
180+
Roles: []string{codersdk.RoleOrganizationMember},
181181
})
182182
require.NoError(t,err)
183183
tv:=dbgen.TemplateVersion(t,store, database.TemplateVersion{

‎coderd/database/dbauthz/customroles_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestUpsertCustomRoles(t *testing.T) {
3535
}
3636

3737
canAssignRole:= rbac.Role{
38-
Identifier:"can-assign",
38+
Identifier:rbac.RoleIdentifier{Name:"can-assign"},
3939
DisplayName:"",
4040
Site:rbac.Permissions(map[string][]policy.Action{
4141
rbac.ResourceAssignRole.Type: {policy.ActionRead,policy.ActionCreate},
@@ -51,7 +51,7 @@ func TestUpsertCustomRoles(t *testing.T) {
5151
all=append(all,t)
5252
case rbac.ExpandableRoles:
5353
all=append(all,must(t.Expand())...)
54-
casestring:
54+
caserbac.RoleIdentifier:
5555
all=append(all,must(rbac.RoleByName(t)))
5656
default:
5757
panic("unknown type")
@@ -80,7 +80,7 @@ func TestUpsertCustomRoles(t *testing.T) {
8080
{
8181
// No roles, so no assign role
8282
name:"no-roles",
83-
subject:rbac.RoleIdentifiers([]string{}),
83+
subject: rbac.RoleIdentifiers{},
8484
errorContains:"forbidden",
8585
},
8686
{

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ func (s *MethodTestSuite) TestOrganization() {
636636
check.Args(database.InsertOrganizationMemberParams{
637637
OrganizationID:o.ID,
638638
UserID:u.ID,
639-
Roles: []string{rbac.ScopedRoleOrgAdmin(o.ID)},
639+
Roles: []string{codersdk.RoleOrganizationAdmin},
640640
}).Asserts(
641641
rbac.ResourceAssignRole.InOrg(o.ID),policy.ActionAssign,
642642
rbac.ResourceOrganizationMember.InOrg(o.ID).WithID(u.ID),policy.ActionCreate)
@@ -664,7 +664,7 @@ func (s *MethodTestSuite) TestOrganization() {
664664
mem:=dbgen.OrganizationMember(s.T(),db, database.OrganizationMember{
665665
OrganizationID:o.ID,
666666
UserID:u.ID,
667-
Roles: []string{rbac.ScopedRoleOrgAdmin(o.ID)},
667+
Roles: []string{codersdk.RoleOrganizationAdmin},
668668
})
669669
out:=mem
670670
out.Roles= []string{}
@@ -1179,11 +1179,11 @@ func (s *MethodTestSuite) TestUser() {
11791179
}).Asserts(rbac.ResourceUserObject(link.UserID),policy.ActionUpdatePersonal).Returns(link)
11801180
}))
11811181
s.Run("UpdateUserRoles",s.Subtest(func(db database.Store,check*expects) {
1182-
u:=dbgen.User(s.T(),db, database.User{RBACRoles: []string{rbac.RoleTemplateAdmin()}})
1182+
u:=dbgen.User(s.T(),db, database.User{RBACRoles: []string{codersdk.RoleTemplateAdmin}})
11831183
o:=u
1184-
o.RBACRoles= []string{rbac.RoleUserAdmin()}
1184+
o.RBACRoles= []string{codersdk.RoleUserAdmin}
11851185
check.Args(database.UpdateUserRolesParams{
1186-
GrantedRoles: []string{rbac.RoleUserAdmin()},
1186+
GrantedRoles: []string{codersdk.RoleUserAdmin},
11871187
ID:u.ID,
11881188
}).Asserts(
11891189
u,policy.ActionRead,

0 commit comments

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