Folders/K8s: Fix createdBy and updatedBy fields in response (#99569)

2025-01-28 10:46:07 -06:00
parent d81b1bf803
commit 94a844977e
6 changed files with 143 additions and 72 deletions
@@ -0,0 +1,72 @@
+package folderimpl
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/services/user/usertest"
+)
+
+func TestFolderConversions(t *testing.T) {
+	input := &unstructured.Unstructured{}
+	err := input.UnmarshalJSON([]byte(`{
+      "kind": "Folder",
+      "apiVersion": "folder.grafana.app/v0alpha1",
+      "metadata": {
+        "name": "be79sztagf20wd",
+        "namespace": "default",
+        "uid": "wfi3RARqQREzEKtUJCWurWevwbQ7i9ii0cA7JUIbMtEX",
+        "resourceVersion": "1734509107000",
+        "creationTimestamp": "2022-12-02T02:02:02Z",
+				"generation": 4,
+        "labels": {
+          "grafana.app/deprecatedInternalID": "234"
+        },
+        "annotations": {
+          "grafana.app/folder": "parent-folder-name",
+          "grafana.app/updatedTimestamp": "2022-12-02T07:02:02Z",
+          "grafana.app/repoName": "example-repo",
+          "grafana.app/createdBy": "user:useruid",
+          "grafana.app/updatedBy": "user:useruid"
+        }
+      },
+      "spec": {
+        "title": "test folder",
+        "description": "Something set in the file"
+      }
+    }`))
+	require.NoError(t, err)
+
+	created, err := time.Parse(time.RFC3339, "2022-12-02T02:02:02Z")
+	created = created.UTC()
+	require.NoError(t, err)
+
+	fake := usertest.NewUserServiceFake()
+	fake.ExpectedUser = &user.User{ID: 10, UID: "useruid"}
+
+	fs := ProvideUnifiedStore(nil, fake)
+
+	converted, err := fs.UnstructuredToLegacyFolder(context.Background(), input)
+	require.NoError(t, err)
+	require.Equal(t, folder.Folder{
+		ID:          234,
+		OrgID:       1,
+		Version:     4,
+		UID:         "be79sztagf20wd",
+		ParentUID:   "parent-folder-name",
+		Title:       "test folder",
+		Description: "Something set in the file",
+		URL:         "/dashboards/f/be79sztagf20wd/test-folder",
+		Repository:  "example-repo",
+		Created:     created,
+		Updated:     created.Add(time.Hour * 5),
+		CreatedBy:   10,
+		UpdatedBy:   10,
+	}, *converted)
+}