4982ca3b1d
* Add actions and scopes * add resource service for dashboard and folder * Add dashboard guardian with fgac permission evaluation * Add CanDelete function to guardian interface * Add CanDelete property to folder and dashboard dto and set values * change to correct function name * Add accesscontrol to folder endpoints * add access control to dashboard endpoints * check access for nav links * Add fixed roles for dashboard and folders * use correct package * add hack to override guardian Constructor if accesscontrol is enabled * Add services * Add function to handle api backward compatability * Add permissionServices to HttpServer * Set permission when new dashboard is created * Add default permission when creating new dashboard * Set default permission when creating folder and dashboard * Add access control filter for dashboard search * Add to accept list * Add accesscontrol to dashboardimport * Disable access control in tests * Add check to see if user is allow to create a dashboard * Use SetPermissions * Use function to set several permissions at once * remove permissions for folder and dashboard on delete * update required permission * set permission for provisioning * Add CanCreate to dashboard guardian and set correct permisisons for provisioning * Dont set admin on folder / dashboard creation * Add dashboard and folder permission migrations * Add tests for CanCreate * Add roles and update descriptions * Solve uid to id for dashboard and folder permissions * Add folder and dashboard actions to permission filter * Handle viewer_can_edit flag * set folder and dashboard permissions services * Add dashboard permissions when importing a new dashboard * Set access control permissions on provisioning * Pass feature flags and only set permissions if access control is enabled * only add default permissions for folders and dashboards without folders * Batch create permissions in migrations * Remove `dashboards:edit` action * Remove unused function from interface * Update pkg/services/guardian/accesscontrol_guardian_test.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
137 lines
4.2 KiB
Go
137 lines
4.2 KiB
Go
package provisioning
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/services/accesscontrol"
|
|
dashboardstore "github.com/grafana/grafana/pkg/services/dashboards"
|
|
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
|
"github.com/grafana/grafana/pkg/services/provisioning/dashboards"
|
|
"github.com/grafana/grafana/pkg/services/provisioning/utils"
|
|
"github.com/grafana/grafana/pkg/setting"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestProvisioningServiceImpl(t *testing.T) {
|
|
t.Run("Restart dashboard provisioning and stop service", func(t *testing.T) {
|
|
serviceTest := setup()
|
|
err := serviceTest.service.ProvisionDashboards(context.Background())
|
|
assert.Nil(t, err)
|
|
serviceTest.startService()
|
|
serviceTest.waitForPollChanges()
|
|
|
|
assert.Equal(t, 1, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called")
|
|
|
|
err = serviceTest.service.ProvisionDashboards(context.Background())
|
|
assert.Nil(t, err)
|
|
|
|
serviceTest.waitForPollChanges()
|
|
assert.Equal(t, 2, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called 2 times")
|
|
|
|
pollingCtx := serviceTest.mock.Calls.PollChanges[0].(context.Context)
|
|
assert.Equal(t, context.Canceled, pollingCtx.Err(), "Polling context from first call should have been cancelled")
|
|
assert.True(t, serviceTest.serviceRunning, "Service should be still running")
|
|
|
|
// Cancelling the root context and stopping the service
|
|
serviceTest.cancel()
|
|
serviceTest.waitForStop()
|
|
|
|
assert.False(t, serviceTest.serviceRunning, "Service should not be running")
|
|
assert.Equal(t, context.Canceled, serviceTest.serviceError, "Service should have returned canceled error")
|
|
})
|
|
|
|
t.Run("Failed reloading does not stop polling with old provisioned", func(t *testing.T) {
|
|
serviceTest := setup()
|
|
err := serviceTest.service.ProvisionDashboards(context.Background())
|
|
assert.Nil(t, err)
|
|
serviceTest.startService()
|
|
serviceTest.waitForPollChanges()
|
|
assert.Equal(t, 1, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called")
|
|
|
|
serviceTest.mock.ProvisionFunc = func(ctx context.Context) error {
|
|
return errors.New("Test error")
|
|
}
|
|
err = serviceTest.service.ProvisionDashboards(context.Background())
|
|
assert.NotNil(t, err)
|
|
serviceTest.waitForPollChanges()
|
|
|
|
// This should have been called with the old provisioner, after the last one failed.
|
|
assert.Equal(t, 2, len(serviceTest.mock.Calls.PollChanges), "PollChanges should have been called 2 times")
|
|
assert.True(t, serviceTest.serviceRunning, "Service should be still running")
|
|
|
|
// Cancelling the root context and stopping the service
|
|
serviceTest.cancel()
|
|
})
|
|
}
|
|
|
|
type serviceTestStruct struct {
|
|
waitForPollChanges func()
|
|
waitForStop func()
|
|
waitTimeout time.Duration
|
|
|
|
serviceRunning bool
|
|
serviceError error
|
|
|
|
startService func()
|
|
cancel func()
|
|
|
|
mock *dashboards.ProvisionerMock
|
|
service *ProvisioningServiceImpl
|
|
}
|
|
|
|
func setup() *serviceTestStruct {
|
|
serviceTest := &serviceTestStruct{}
|
|
serviceTest.waitTimeout = time.Second
|
|
|
|
pollChangesChannel := make(chan context.Context)
|
|
serviceStopped := make(chan interface{})
|
|
|
|
serviceTest.mock = dashboards.NewDashboardProvisionerMock()
|
|
serviceTest.mock.PollChangesFunc = func(ctx context.Context) {
|
|
pollChangesChannel <- ctx
|
|
}
|
|
|
|
serviceTest.service = newProvisioningServiceImpl(
|
|
func(context.Context, string, dashboardstore.DashboardProvisioningService, utils.OrgStore, featuremgmt.FeatureToggles, accesscontrol.PermissionsServices) (dashboards.DashboardProvisioner, error) {
|
|
return serviceTest.mock, nil
|
|
},
|
|
nil,
|
|
nil,
|
|
nil,
|
|
)
|
|
serviceTest.service.Cfg = setting.NewCfg()
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
serviceTest.cancel = cancel
|
|
|
|
serviceTest.startService = func() {
|
|
go func() {
|
|
serviceTest.serviceRunning = true
|
|
serviceTest.serviceError = serviceTest.service.Run(ctx)
|
|
serviceTest.serviceRunning = false
|
|
serviceStopped <- true
|
|
}()
|
|
}
|
|
|
|
serviceTest.waitForPollChanges = func() {
|
|
timeoutChan := time.After(serviceTest.waitTimeout)
|
|
select {
|
|
case <-pollChangesChannel:
|
|
case <-timeoutChan:
|
|
}
|
|
}
|
|
|
|
serviceTest.waitForStop = func() {
|
|
timeoutChan := time.After(serviceTest.waitTimeout)
|
|
select {
|
|
case <-serviceStopped:
|
|
case <-timeoutChan:
|
|
}
|
|
}
|
|
|
|
return serviceTest
|
|
}
|