public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "UniStore: Add folder to the SQL backend" (#95966)

Browse Source 
Revert "UniStore: Add folder to the SQL backend (#95671)"

This reverts commit f075662696.
This commit is contained in:
Leonor Oliveira
2024-11-06 17:04:57 +02:00
committed by GitHub
parent 26b0e8f105
commit aaa4f4a23e
43 changed files with 72 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/sql/backend_test.go
+6 -24
View File
@@ -8,9 +8,7 @@ import (
sqlmock "github.com/DATA-DOG/go-sqlmock"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/grafana/grafana/pkg/apimachinery/utils"
"github.com/grafana/grafana/pkg/storage/unified/resource"
"github.com/grafana/grafana/pkg/storage/unified/sql/db/dbimpl"
"github.com/grafana/grafana/pkg/storage/unified/sql/test"
@@ -283,14 +281,9 @@ func TestResourceVersionAtomicInc(t *testing.T) {
func TestBackend_create(t *testing.T) {
t.Parallel()
meta, err := utils.MetaAccessor(&unstructured.Unstructured{
Object: map[string]any{},
})
require.NoError(t, err)
event := resource.WriteEvent{
Type: resource.WatchEvent_ADDED,
Key: resKey,
Object: meta,
Type: resource.WatchEvent_ADDED,
Key: resKey,
}
t.Run("happy path", func(t *testing.T) {
@@ -393,15 +386,9 @@ func TestBackend_create(t *testing.T) {
func TestBackend_update(t *testing.T) {
t.Parallel()
meta, err := utils.MetaAccessor(&unstructured.Unstructured{
Object: map[string]any{},
})
require.NoError(t, err)
meta.SetFolder("folderuid")
event := resource.WriteEvent{
Type: resource.WatchEvent_MODIFIED,
Key: resKey,
Object: meta,
Type: resource.WatchEvent_MODIFIED,
Key: resKey,
}
t.Run("happy path", func(t *testing.T) {
@@ -504,14 +491,9 @@ func TestBackend_update(t *testing.T) {
func TestBackend_delete(t *testing.T) {
t.Parallel()
meta, err := utils.MetaAccessor(&unstructured.Unstructured{
Object: map[string]any{},
})
require.NoError(t, err)
event := resource.WriteEvent{
Type: resource.WatchEvent_DELETED,
Key: resKey,
Object: meta,
Type: resource.WatchEvent_DELETED,
Key: resKey,
}
t.Run("happy path", func(t *testing.T) {