mirror of
https://github.com/grafana/grafana.git
synced 2024-11-25 10:20:29 -06:00
d89a8a3a82
* Nested Folders: Fix /api/folders pagination We used to check access to the root folders after fetching them from the DB with pagination. This fix splits logic for fetching folders in: - fetching subfolders - fetching root folders and refactors the query for the latter so that is filters by folders with permissions * Add tests * Update benchmarks
89 lines
3.3 KiB
Go
89 lines
3.3 KiB
Go
package tests
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"net/url"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/go-openapi/strfmt"
|
|
goapi "github.com/grafana/grafana-openapi-client-go/client"
|
|
"github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions"
|
|
"github.com/grafana/grafana/pkg/services/org"
|
|
"github.com/grafana/grafana/pkg/services/org/orgimpl"
|
|
"github.com/grafana/grafana/pkg/services/quota/quotaimpl"
|
|
"github.com/grafana/grafana/pkg/services/sqlstore"
|
|
"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
|
|
"github.com/grafana/grafana/pkg/services/user"
|
|
"github.com/grafana/grafana/pkg/services/user/userimpl"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func CreateUser(t *testing.T, store *sqlstore.SQLStore, cmd user.CreateUserCommand) int64 {
|
|
t.Helper()
|
|
|
|
store.Cfg.AutoAssignOrg = true
|
|
store.Cfg.AutoAssignOrgId = 1
|
|
|
|
quotaService := quotaimpl.ProvideService(store, store.Cfg)
|
|
orgService, err := orgimpl.ProvideService(store, store.Cfg, quotaService)
|
|
require.NoError(t, err)
|
|
usrSvc, err := userimpl.ProvideService(store, orgService, store.Cfg, nil, nil, quotaService, supportbundlestest.NewFakeBundleService())
|
|
require.NoError(t, err)
|
|
|
|
u, err := usrSvc.Create(context.Background(), &cmd)
|
|
require.NoError(t, err)
|
|
return u.ID
|
|
}
|
|
|
|
func GetClient(host string, username string, password string) *goapi.GrafanaHTTPAPI {
|
|
cfg := &goapi.TransportConfig{
|
|
// Host is the doman name or IP address of the host that serves the API.
|
|
Host: host,
|
|
// BasePath is the URL prefix for all API paths, relative to the host root.
|
|
BasePath: "/api",
|
|
// Schemes are the transfer protocols used by the API (http or https).
|
|
Schemes: []string{"http"},
|
|
// APIKey is an optional API key or service account token.
|
|
APIKey: os.Getenv("API_ACCESS_TOKEN"),
|
|
// BasicAuth is optional basic auth credentials.
|
|
BasicAuth: url.UserPassword(username, password),
|
|
// OrgID provides an optional organization ID.
|
|
// OrgID is only supported with BasicAuth since API keys are already org-scoped.
|
|
OrgID: 1,
|
|
// TLSConfig provides an optional configuration for a TLS client
|
|
TLSConfig: &tls.Config{},
|
|
// NumRetries contains the optional number of attempted retries
|
|
NumRetries: 3,
|
|
// RetryTimeout sets an optional time to wait before retrying a request
|
|
RetryTimeout: 0,
|
|
// RetryStatusCodes contains the optional list of status codes to retry
|
|
// Use "x" as a wildcard for a single digit (default: [429, 5xx])
|
|
RetryStatusCodes: []string{"420", "5xx"},
|
|
// HTTPHeaders contains an optional map of HTTP headers to add to each request
|
|
HTTPHeaders: map[string]string{},
|
|
}
|
|
return goapi.NewHTTPClientWithConfig(strfmt.Default, cfg)
|
|
}
|
|
|
|
func RemoveFolderPermission(t *testing.T, store resourcepermissions.Store, orgID int64, role org.RoleType, uid string) {
|
|
t.Helper()
|
|
|
|
// remove org role permissions from folder
|
|
_, _ = store.SetBuiltInResourcePermission(context.Background(), orgID, string(role), resourcepermissions.SetResourcePermissionCommand{
|
|
Resource: "folders",
|
|
ResourceID: uid,
|
|
ResourceAttribute: "uid",
|
|
}, nil)
|
|
|
|
// remove org role children permissions from folder
|
|
for _, c := range role.Children() {
|
|
_, _ = store.SetBuiltInResourcePermission(context.Background(), orgID, string(c), resourcepermissions.SetResourcePermissionCommand{
|
|
Resource: "folders",
|
|
ResourceID: uid,
|
|
ResourceAttribute: "uid",
|
|
}, nil)
|
|
}
|
|
}
|