K8s/Folders: Remove folder service from client (#94450)
* Support getting full path of UIDs * Use full path to set parents field * Update get folder test * Add folder store test for getting with full path UIDs * Add test for parsing parent titles * Test nested folder create payload
This commit is contained in:
@@ -3,6 +3,7 @@ package playlist
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"slices"
|
||||
|
||||
@@ -13,6 +14,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
|
||||
"github.com/grafana/grafana/pkg/api/dtos"
|
||||
folderv0alpha1 "github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
|
||||
grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
@@ -286,6 +288,24 @@ func TestIntegrationFoldersApp(t *testing.T) {
|
||||
|
||||
doFolderTests(t, helper)
|
||||
})
|
||||
|
||||
t.Run("with dual write (unified storage, mode 1, nested folders)", func(t *testing.T) {
|
||||
checkNestedCreate(t, apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
|
||||
AppModeProduction: true,
|
||||
DisableAnonymous: true,
|
||||
APIServerStorageType: "unified",
|
||||
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
|
||||
folderv0alpha1.RESOURCEGROUP: {
|
||||
DualWriterMode: grafanarest.Mode1,
|
||||
},
|
||||
},
|
||||
EnableFeatureToggles: []string{
|
||||
featuremgmt.FlagGrafanaAPIServerTestingWithExperimentalAPIs,
|
||||
featuremgmt.FlagNestedFolders,
|
||||
featuremgmt.FlagKubernetesFolders,
|
||||
},
|
||||
}))
|
||||
})
|
||||
}
|
||||
|
||||
func doFolderTests(t *testing.T, helper *apis.K8sTestHelper) *apis.K8sTestHelper {
|
||||
@@ -368,6 +388,49 @@ func doFolderTests(t *testing.T, helper *apis.K8sTestHelper) *apis.K8sTestHelper
|
||||
return helper
|
||||
}
|
||||
|
||||
func checkNestedCreate(t *testing.T, helper *apis.K8sTestHelper) {
|
||||
client := helper.GetResourceClient(apis.ResourceClientArgs{
|
||||
User: helper.Org1.Admin,
|
||||
GVR: gvr,
|
||||
})
|
||||
|
||||
parentPayload := `{
|
||||
"title": "Test/parent",
|
||||
"uid": ""
|
||||
}`
|
||||
parentCreate := apis.DoRequest(helper, apis.RequestParams{
|
||||
User: client.Args.User,
|
||||
Method: http.MethodPost,
|
||||
Path: "/api/folders",
|
||||
Body: []byte(parentPayload),
|
||||
}, &folder.Folder{})
|
||||
require.NotNil(t, parentCreate.Result)
|
||||
parentUID := parentCreate.Result.UID
|
||||
require.NotEmpty(t, parentUID)
|
||||
|
||||
childPayload := fmt.Sprintf(`{
|
||||
"title": "Test/child",
|
||||
"uid": "",
|
||||
"parentUid": "%s"
|
||||
}`, parentUID)
|
||||
childCreate := apis.DoRequest(helper, apis.RequestParams{
|
||||
User: client.Args.User,
|
||||
Method: http.MethodPost,
|
||||
Path: "/api/folders",
|
||||
Body: []byte(childPayload),
|
||||
}, &dtos.Folder{})
|
||||
require.NotNil(t, childCreate.Result)
|
||||
childUID := childCreate.Result.UID
|
||||
require.NotEmpty(t, childUID)
|
||||
require.Equal(t, "Test/child", childCreate.Result.Title)
|
||||
require.Equal(t, 1, len(childCreate.Result.Parents))
|
||||
|
||||
parent := childCreate.Result.Parents[0]
|
||||
require.Equal(t, parentUID, parent.UID)
|
||||
require.Equal(t, "Test\\/parent", parent.Title)
|
||||
require.Equal(t, parentCreate.Result.URL, parent.URL)
|
||||
}
|
||||
|
||||
// This does a get with both k8s and legacy API, and verifies the results are the same
|
||||
func getFromBothAPIs(t *testing.T,
|
||||
helper *apis.K8sTestHelper,
|
||||
|
||||
Reference in New Issue
Block a user