Skip to content

DEV-46158 Allow Editors to Manage Alerting Provisioning #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2024
Merged

DEV-46158 Allow Editors to Manage Alerting Provisioning #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/services/ngalert/accesscontrol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ var (
},
},
},
Grants: []string{string(org.RoleAdmin)},
Grants: []string{string(org.RoleEditor), string(org.RoleAdmin)}, // LOGZ.IO GRAFANA CHANGE :: DEV-46158 - Allow editors to manage alerting provisioning
}

alertingProvisioningReaderWithSecretsRole = accesscontrol.RoleRegistration{
Expand Down
36 changes: 24 additions & 12 deletions pkg/tests/api/alerting/api_provisioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,17 @@ func TestIntegrationProvisioning(t *testing.T) {
require.Equal(t, 403, resp.StatusCode)
})

t.Run("editor GET should 403", func(t *testing.T) {
// LOGZ.IO GRAFANA CHANGE :: DEV-46158 - Allow editors to manage alerting provisioning
t.Run("editor GET should succeed", func(t *testing.T) {
req := createTestRequest("GET", url, "editor", "")

resp, err := http.DefaultClient.Do(req)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())

require.Equal(t, 403, resp.StatusCode)
require.Equal(t, 200, resp.StatusCode)
})
// LOGZ.IO GRAFANA CHANGE :: End

t.Run("admin GET should succeed", func(t *testing.T) {
req := createTestRequest("GET", url, "admin", "")
Expand Down Expand Up @@ -148,15 +150,17 @@ func TestIntegrationProvisioning(t *testing.T) {
require.Equal(t, 403, resp.StatusCode)
})

t.Run("editor PUT should 403", func(t *testing.T) {
// LOGZ.IO GRAFANA CHANGE :: DEV-46158 - Allow editors to manage alerting provisioning
t.Run("editor PUT should succeed", func(t *testing.T) {
req := createTestRequest("PUT", url, "editor", body)

resp, err := http.DefaultClient.Do(req)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())

require.Equal(t, 403, resp.StatusCode)
require.Equal(t, 202, resp.StatusCode)
})
// LOGZ.IO GRAFANA CHANGE :: End

t.Run("admin PUT should succeed", func(t *testing.T) {
req := createTestRequest("PUT", url, "admin", body)
Expand Down Expand Up @@ -200,15 +204,17 @@ func TestIntegrationProvisioning(t *testing.T) {
require.Equal(t, 403, resp.StatusCode)
})

t.Run("editor GET should 403", func(t *testing.T) {
// LOGZ.IO GRAFANA CHANGE :: DEV-46158 - Allow editors to manage alerting provisioning
t.Run("editor GET should succeed", func(t *testing.T) {
req := createTestRequest("GET", url, "editor", "")

resp, err := http.DefaultClient.Do(req)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())

require.Equal(t, 403, resp.StatusCode)
require.Equal(t, 200, resp.StatusCode)
})
// LOGZ.IO GRAFANA CHANGE :: End

t.Run("admin GET should succeed", func(t *testing.T) {
req := createTestRequest("GET", url, "admin", "")
Expand Down Expand Up @@ -240,15 +246,17 @@ func TestIntegrationProvisioning(t *testing.T) {
require.Equal(t, 403, resp.StatusCode)
})

t.Run("editor POST should 403", func(t *testing.T) {
// LOGZ.IO GRAFANA CHANGE :: DEV-46158 - Allow editors to manage alerting provisioning
t.Run("editor POST should succeed", func(t *testing.T) {
req := createTestRequest("POST", url, "editor", body)

resp, err := http.DefaultClient.Do(req)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())

require.Equal(t, 403, resp.StatusCode)
require.Equal(t, 202, resp.StatusCode)
})
// LOGZ.IO GRAFANA CHANGE :: End

t.Run("admin POST should succeed", func(t *testing.T) {
req := createTestRequest("POST", url, "admin", body)
Expand Down Expand Up @@ -284,15 +292,17 @@ func TestIntegrationProvisioning(t *testing.T) {
require.Equal(t, 403, resp.StatusCode)
})

t.Run("editor GET should 403", func(t *testing.T) {
// LOGZ.IO GRAFANA CHANGE :: DEV-46158 - Allow editors to manage alerting provisioning
t.Run("editor GET should succeed", func(t *testing.T) {
req := createTestRequest("GET", url, "editor", "")

resp, err := http.DefaultClient.Do(req)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())

require.Equal(t, 403, resp.StatusCode)
require.Equal(t, 200, resp.StatusCode)
})
// LOGZ.IO GRAFANA CHANGE :: End

t.Run("admin GET should succeed", func(t *testing.T) {
req := createTestRequest("GET", url, "admin", "")
Expand Down Expand Up @@ -328,15 +338,17 @@ func TestIntegrationProvisioning(t *testing.T) {
require.Equal(t, 403, resp.StatusCode)
})

t.Run("editor GET should 403", func(t *testing.T) {
// LOGZ.IO GRAFANA CHANGE :: DEV-46158 - Allow editors to manage alerting provisioning
t.Run("editor GET should succeed", func(t *testing.T) {
req := createTestRequest("GET", url, "editor", "")

resp, err := http.DefaultClient.Do(req)
require.NoError(t, err)
require.NoError(t, resp.Body.Close())

require.Equal(t, 403, resp.StatusCode)
require.Equal(t, 200, resp.StatusCode)
})
// LOGZ.IO GRAFANA CHANGE :: End

t.Run("admin GET should succeed", func(t *testing.T) {
req := createTestRequest("GET", url, "admin", "")
Expand Down