public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access Control: Pass db session to hooks (#44428)

Browse Source 
* Move hook calls to database and pass session
This commit is contained in:
Karl Persson
2022-01-25 17:12:00 +01:00
committed by GitHub
parent 9ab9fd802b
commit de2c5783fa
13 changed files with 138 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accesscontrol/database/resource_permissions_test.go
+7 -7
View File
@@ -70,7 +70,7 @@ func TestAccessControlStore_SetUserResourcePermission(t *testing.T) {
store, _ := setupTestEnv(t)
for _, s := range test.seeds {
_, err := store.SetUserResourcePermission(context.Background(), test.orgID, test.userID, s)
_, err := store.SetUserResourcePermission(context.Background(), test.orgID, test.userID, s, nil)
require.NoError(t, err)
}
@@ -78,7 +78,7 @@ func TestAccessControlStore_SetUserResourcePermission(t *testing.T) {
Actions: test.actions,
Resource: test.resource,
ResourceID: test.resourceID,
})
}, nil)
require.NoError(t, err)
if len(test.actions) == 0 {
@@ -148,7 +148,7 @@ func TestAccessControlStore_SetTeamResourcePermission(t *testing.T) {
store, _ := setupTestEnv(t)
for _, s := range test.seeds {
_, err := store.SetTeamResourcePermission(context.Background(), test.orgID, test.teamID, s)
_, err := store.SetTeamResourcePermission(context.Background(), test.orgID, test.teamID, s, nil)
require.NoError(t, err)
}
@@ -156,7 +156,7 @@ func TestAccessControlStore_SetTeamResourcePermission(t *testing.T) {
Actions: test.actions,
Resource: test.resource,
ResourceID: test.resourceID,
})
}, nil)
require.NoError(t, err)
if len(test.actions) == 0 {
@@ -226,7 +226,7 @@ func TestAccessControlStore_SetBuiltInResourcePermission(t *testing.T) {
store, _ := setupTestEnv(t)
for _, s := range test.seeds {
_, err := store.SetBuiltInResourcePermission(context.Background(), test.orgID, test.builtInRole, s)
_, err := store.SetBuiltInResourcePermission(context.Background(), test.orgID, test.builtInRole, s, nil)
require.NoError(t, err)
}
@@ -234,7 +234,7 @@ func TestAccessControlStore_SetBuiltInResourcePermission(t *testing.T) {
Actions: test.actions,
Resource: test.resource,
ResourceID: test.resourceID,
})
}, nil)
require.NoError(t, err)
if len(test.actions) == 0 {
@@ -356,7 +356,7 @@ func seedResourcePermissions(t *testing.T, store *AccessControlStore, sql *sqlst
Actions: actions,
Resource: resource,
ResourceID: resourceID,
})
}, nil)
require.NoError(t, err)
}
}