IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

reload permissions after create folder (#51288)

Browse Source
This commit is contained in:
Yuriy Tseretyan
2022-06-27 09:31:49 -04:00
committed by GitHub
parent 24790fdf57
commit 4a9872d108
5 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/tests/api/alerting/api_ruler_test.go
View File

@@ -47,8 +47,6 @@ func TestAlertRulePermissions(t *testing.T) {
// Create the namespace we'll save our alerts to.
apiClient.CreateFolder(t, "folder2", "folder2")
reloadCachedPermissions(t, grafanaListedAddr, "grafana", "password")
// Create rule under folder1
createRule(t, apiClient, "folder1")
@@ -178,7 +176,7 @@ func TestAlertRulePermissions(t *testing.T) {
// remove permissions from folder2
removeFolderPermission(t, permissionsStore, 1, userID, models.ROLE_EDITOR, "folder2")
reloadCachedPermissions(t, grafanaListedAddr, "grafana", "password")
apiClient.ReloadCachedPermissions(t)
// make sure that folder2 is not included in the response
// nolint:gosec
@@ -252,7 +250,7 @@ func TestAlertRulePermissions(t *testing.T) {
// Remove permissions from folder1.
removeFolderPermission(t, permissionsStore, 1, userID, models.ROLE_EDITOR, "folder1")
reloadCachedPermissions(t, grafanaListedAddr, "grafana", "password")
apiClient.ReloadCachedPermissions(t)
{
u := fmt.Sprintf("http://grafana:password@%s/api/ruler/grafana/api/v1/rules", grafanaListedAddr)
// nolint:gosec
@@ -405,8 +403,6 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
// Create the namespace under default organisation (orgID = 1) where we'll save our alerts to.
apiClient.CreateFolder(t, "default", "default")
reloadCachedPermissions(t, grafanaListedAddr, "grafana", "password")
interval, err := model.ParseDuration("10s")
require.NoError(t, err)
@@ -742,8 +738,6 @@ func TestRuleGroupSequence(t *testing.T) {
folder1Title := "folder1"
client.CreateFolder(t, util.GenerateShortUID(), folder1Title)
reloadCachedPermissions(t, grafanaListedAddr, "grafana", "password")
group1 := generateAlertRuleGroup(5, alertRuleGen())
group2 := generateAlertRuleGroup(5, alertRuleGen())