K8s/Folders: Remove kubernetesFolders flag and full path metadata (#99256)
* remove full path * remove more * remove KubernetesFolders tests * remove feature toggles * remove feature toggles * skip permissions test * skip permissions test --------- Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
This commit is contained in:
Ryan McKinley
co-authored by
Jack Baldry
Jack Baldry
parent
d39e57e836
commit
a037c6f344
+1
-347
@@ -8,18 +8,15 @@ import (
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/mock"
|
||||
"github.com/stretchr/testify/require"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
clientrest "k8s.io/client-go/rest"
|
||||
|
||||
"github.com/grafana/grafana/pkg/api/dtos"
|
||||
folderv0alpha1 "github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
|
||||
grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
|
||||
conversions "github.com/grafana/grafana/pkg/registry/apis/folders"
|
||||
"github.com/grafana/grafana/pkg/services/accesscontrol"
|
||||
"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
|
||||
acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
|
||||
@@ -532,349 +529,6 @@ func (m mockClientConfigProvider) GetDirectRestConfig(c *contextmodel.ReqContext
|
||||
|
||||
func (m mockClientConfigProvider) DirectlyServeHTTP(w http.ResponseWriter, r *http.Request) {}
|
||||
|
||||
func TestUpdateFolderLegacyAndUnifiedStorage(t *testing.T) {
|
||||
testuser := &user.User{ID: 99, UID: "fdxsqt7t5ryf4a", Login: "testuser"}
|
||||
testSignedInUser := &user.SignedInUser{UserID: 99, UserUID: "fdxsqt7t5ryf4a", Login: "testuser"}
|
||||
|
||||
legacyFolder := folder.Folder{
|
||||
UID: "ady4yobv315a8e",
|
||||
Title: "Example folder 226",
|
||||
URL: "/dashboards/f/ady4yobv315a8e/example-folder-226",
|
||||
CreatedBy: 99,
|
||||
CreatedByUID: "fdxsqt7t5ryf4a",
|
||||
Created: time.Date(2024, time.November, 29, 0, 42, 34, 0, time.UTC),
|
||||
UpdatedBy: 99,
|
||||
UpdatedByUID: "fdxsqt7t5ryf4a",
|
||||
Updated: time.Date(2024, time.November, 29, 0, 42, 34, 0, time.UTC),
|
||||
Version: 3,
|
||||
}
|
||||
|
||||
namespacer := func(_ int64) string { return "1" }
|
||||
unifiedStorageFolder, err := conversions.LegacyFolderToUnstructured(&legacyFolder, namespacer)
|
||||
require.NoError(t, err)
|
||||
|
||||
expectedFolder := dtos.Folder{
|
||||
UID: legacyFolder.UID,
|
||||
OrgID: 0,
|
||||
Title: legacyFolder.Title,
|
||||
URL: legacyFolder.URL,
|
||||
HasACL: false,
|
||||
CanSave: false,
|
||||
CanEdit: true,
|
||||
CanAdmin: false,
|
||||
CanDelete: false,
|
||||
CreatedBy: "testuser",
|
||||
Created: legacyFolder.Created,
|
||||
UpdatedBy: "testuser",
|
||||
Updated: legacyFolder.Updated,
|
||||
Version: legacyFolder.Version,
|
||||
}
|
||||
|
||||
mux := http.NewServeMux()
|
||||
|
||||
mux.HandleFunc("GET /apis/folder.grafana.app/v0alpha1/namespaces/default/folders/ady4yobv315a8e", func(w http.ResponseWriter, req *http.Request) {
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
w.WriteHeader(200)
|
||||
err := json.NewEncoder(w).Encode(unifiedStorageFolder)
|
||||
require.NoError(t, err)
|
||||
})
|
||||
mux.HandleFunc("PUT /apis/folder.grafana.app/v0alpha1/namespaces/default/folders/ady4yobv315a8e", func(w http.ResponseWriter, req *http.Request) {
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
w.WriteHeader(200)
|
||||
err := json.NewEncoder(w).Encode(unifiedStorageFolder)
|
||||
require.NoError(t, err)
|
||||
})
|
||||
|
||||
folderApiServerMock := httptest.NewServer(mux)
|
||||
defer folderApiServerMock.Close()
|
||||
|
||||
t.Run("happy path", func(t *testing.T) {
|
||||
type testCase struct {
|
||||
description string
|
||||
folderUID string
|
||||
legacyFolder folder.Folder
|
||||
expectedFolder dtos.Folder
|
||||
expectedFolderServiceError error
|
||||
unifiedStorageEnabled bool
|
||||
unifiedStorageMode grafanarest.DualWriterMode
|
||||
expectedCode int
|
||||
}
|
||||
|
||||
tcs := []testCase{
|
||||
{
|
||||
description: "Happy Path - Legacy",
|
||||
expectedCode: http.StatusOK,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: legacyFolder.UID,
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: false,
|
||||
},
|
||||
{
|
||||
description: "Happy Path - Unified storage, mode 1",
|
||||
expectedCode: http.StatusOK,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: legacyFolder.UID,
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: true,
|
||||
unifiedStorageMode: grafanarest.Mode1,
|
||||
},
|
||||
{
|
||||
description: "Happy Path - Unified storage, mode 2",
|
||||
expectedCode: http.StatusOK,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: legacyFolder.UID,
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: true,
|
||||
unifiedStorageMode: grafanarest.Mode2,
|
||||
},
|
||||
{
|
||||
description: "Happy Path - Unified storage, mode 3",
|
||||
expectedCode: http.StatusOK,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: legacyFolder.UID,
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: true,
|
||||
unifiedStorageMode: grafanarest.Mode3,
|
||||
},
|
||||
{
|
||||
description: "Happy Path - Unified storage, mode 4",
|
||||
expectedCode: http.StatusOK,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: legacyFolder.UID,
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: true,
|
||||
unifiedStorageMode: grafanarest.Mode4,
|
||||
},
|
||||
{
|
||||
description: "Folder Not Found - Legacy",
|
||||
expectedCode: http.StatusNotFound,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: "notfound",
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: false,
|
||||
expectedFolderServiceError: dashboards.ErrFolderNotFound,
|
||||
},
|
||||
{
|
||||
description: "Folder Not Found - Unified storage, mode 1",
|
||||
expectedCode: http.StatusNotFound,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: "notfound",
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: true,
|
||||
unifiedStorageMode: grafanarest.Mode1,
|
||||
},
|
||||
{
|
||||
description: "Folder Not Found - Unified storage, mode 2",
|
||||
expectedCode: http.StatusNotFound,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: "notfound",
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: true,
|
||||
unifiedStorageMode: grafanarest.Mode2,
|
||||
},
|
||||
{
|
||||
description: "Folder Not Found - Unified storage, mode 3",
|
||||
expectedCode: http.StatusNotFound,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: "notfound",
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: true,
|
||||
unifiedStorageMode: grafanarest.Mode3,
|
||||
},
|
||||
{
|
||||
description: "Folder Not Found - Unified storage, mode 4",
|
||||
expectedCode: http.StatusNotFound,
|
||||
legacyFolder: legacyFolder,
|
||||
folderUID: "notfound",
|
||||
expectedFolder: expectedFolder,
|
||||
unifiedStorageEnabled: true,
|
||||
unifiedStorageMode: grafanarest.Mode4,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tcs {
|
||||
t.Run(tc.description, func(t *testing.T) {
|
||||
setUpRBACGuardian(t)
|
||||
|
||||
cfg := setting.NewCfg()
|
||||
cfg.UnifiedStorage = map[string]setting.UnifiedStorageConfig{
|
||||
folderv0alpha1.RESOURCEGROUP: {
|
||||
DualWriterMode: tc.unifiedStorageMode,
|
||||
},
|
||||
}
|
||||
|
||||
featuresArr := []any{featuremgmt.FlagNestedFolders}
|
||||
if tc.unifiedStorageEnabled {
|
||||
featuresArr = append(featuresArr, featuremgmt.FlagKubernetesFolders)
|
||||
}
|
||||
|
||||
server := SetupAPITestServer(t, func(hs *HTTPServer) {
|
||||
hs.Cfg = cfg
|
||||
hs.folderService = &foldertest.FakeService{
|
||||
ExpectedFolder: &tc.legacyFolder,
|
||||
ExpectedError: tc.expectedFolderServiceError,
|
||||
}
|
||||
hs.QuotaService = quotatest.New(false, nil)
|
||||
hs.SearchService = &mockSearchService{
|
||||
ExpectedResult: model.HitList{},
|
||||
}
|
||||
hs.userService = &usertest.FakeUserService{
|
||||
ExpectedUser: testuser,
|
||||
ExpectedSignedInUser: testSignedInUser,
|
||||
}
|
||||
hs.Features = featuremgmt.WithFeatures(
|
||||
featuresArr...,
|
||||
)
|
||||
hs.clientConfigProvider = mockClientConfigProvider{
|
||||
host: folderApiServerMock.URL,
|
||||
}
|
||||
})
|
||||
|
||||
req := server.NewRequest(http.MethodPut, fmt.Sprintf("/api/folders/%s", tc.folderUID), strings.NewReader(`{"title":"new title"}`))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{
|
||||
1: accesscontrol.GroupScopesByActionContext(context.Background(), []accesscontrol.Permission{
|
||||
{Action: dashboards.ActionFoldersWrite, Scope: dashboards.ScopeFoldersAll},
|
||||
{Action: dashboards.ActionFoldersWrite, Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID("ady4yobv315a8e")},
|
||||
}),
|
||||
}})
|
||||
|
||||
res, err := server.Send(req)
|
||||
require.NoError(t, err)
|
||||
|
||||
require.Equal(t, tc.expectedCode, res.StatusCode)
|
||||
defer func() { require.NoError(t, res.Body.Close()) }()
|
||||
|
||||
if tc.expectedCode == http.StatusOK {
|
||||
body := dtos.Folder{}
|
||||
require.NoError(t, json.NewDecoder(res.Body).Decode(&body))
|
||||
|
||||
//nolint:staticcheck
|
||||
body.ID = 0
|
||||
body.Version = 0
|
||||
tc.expectedFolder.Version = 0
|
||||
require.Equal(t, tc.expectedFolder, body)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestToFolderCounts(t *testing.T) {
|
||||
var tests = []struct {
|
||||
name string
|
||||
input *unstructured.Unstructured
|
||||
expected *folder.DescendantCounts
|
||||
expectError bool
|
||||
}{
|
||||
{
|
||||
name: "with only counts from unified storage",
|
||||
input: &unstructured.Unstructured{
|
||||
Object: map[string]interface{}{
|
||||
"apiVersion": "folder.grafana.app/v0alpha1",
|
||||
"counts": []interface{}{
|
||||
map[string]interface{}{
|
||||
"group": "alpha",
|
||||
"resource": "folders",
|
||||
"count": int64(1),
|
||||
},
|
||||
map[string]interface{}{
|
||||
"group": "alpha",
|
||||
"resource": "dashboards",
|
||||
"count": int64(3),
|
||||
},
|
||||
map[string]interface{}{
|
||||
"group": "alpha",
|
||||
"resource": "alertRules",
|
||||
"count": int64(0),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: &folder.DescendantCounts{
|
||||
"folders": 1,
|
||||
"dashboards": 3,
|
||||
"alertRules": 0,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "with counts from both storages",
|
||||
input: &unstructured.Unstructured{
|
||||
Object: map[string]interface{}{
|
||||
"apiVersion": "folder.grafana.app/v0alpha1",
|
||||
"counts": []interface{}{
|
||||
map[string]interface{}{
|
||||
"group": "alpha",
|
||||
"resource": "folders",
|
||||
"count": int64(1),
|
||||
},
|
||||
map[string]interface{}{
|
||||
"group": "alpha",
|
||||
"resource": "dashboards",
|
||||
"count": int64(3),
|
||||
},
|
||||
map[string]interface{}{
|
||||
"group": "sql-fallback",
|
||||
"resource": "folders",
|
||||
"count": int64(0),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: &folder.DescendantCounts{
|
||||
"folders": 1,
|
||||
"dashboards": 3,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "it uses the values from sql-fallaback if not found in unified storage",
|
||||
input: &unstructured.Unstructured{
|
||||
Object: map[string]interface{}{
|
||||
"apiVersion": "folder.grafana.app/v0alpha1",
|
||||
"counts": []interface{}{
|
||||
map[string]interface{}{
|
||||
"group": "alpha",
|
||||
"resource": "dashboards",
|
||||
"count": int64(3),
|
||||
},
|
||||
map[string]interface{}{
|
||||
"group": "sql-fallback",
|
||||
"resource": "folders",
|
||||
"count": int64(2),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
expected: &folder.DescendantCounts{
|
||||
"folders": 2,
|
||||
"dashboards": 3,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "malformed input",
|
||||
input: &unstructured.Unstructured{
|
||||
Object: map[string]interface{}{
|
||||
"apiVersion": "folder.grafana.app/v0alpha1",
|
||||
"counts": map[string]interface{}{},
|
||||
},
|
||||
},
|
||||
expectError: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
actual, err := toFolderLegacyCounts(tc.input)
|
||||
if tc.expectError {
|
||||
require.Error(t, err)
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, tc.expected, actual)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// for now, test only the general folder
|
||||
func TestGetFolderLegacyAndUnifiedStorage(t *testing.T) {
|
||||
testuser := &user.User{ID: 99, UID: "fdxsqt7t5ryf4a", Login: "testuser"}
|
||||
@@ -971,7 +625,7 @@ func TestGetFolderLegacyAndUnifiedStorage(t *testing.T) {
|
||||
|
||||
featuresArr := []any{featuremgmt.FlagNestedFolders}
|
||||
if tc.unifiedStorageEnabled {
|
||||
featuresArr = append(featuresArr, featuremgmt.FlagKubernetesFolders)
|
||||
featuresArr = append(featuresArr, featuremgmt.FlagKubernetesFoldersServiceV2)
|
||||
}
|
||||
|
||||
server := SetupAPITestServer(t, func(hs *HTTPServer) {
|
||||
|
||||
Reference in New Issue
Block a user