IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

K8s: Dashboards: Set message as annotation (#99230)

Browse Source
This commit is contained in:
Stephanie Hingtgen 2025-01-19 22:40:23 -07:00 committed by GitHub
parent b309c5daed
commit 1a2a284972
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/services/dashboards/service/dashboard_service.go
View File

@ -2020,15 +2020,19 @@ func LegacySaveCommandToUnstructured(cmd *dashboards.SaveDashboardCommand, names
finalObj.SetNamespace(namespace) finalObj.SetNamespace(namespace)
finalObj.SetGroupVersionKind(v0alpha1.DashboardResourceInfo.GroupVersionKind()) finalObj.SetGroupVersionKind(v0alpha1.DashboardResourceInfo.GroupVersionKind())
if cmd.FolderUID != "" { meta, err := utils.MetaAccessor(&finalObj)
meta, err := utils.MetaAccessor(&finalObj) if err != nil {
if err != nil { return finalObj, err
return finalObj, err }
}
if cmd.FolderUID != "" {
meta.SetFolder(cmd.FolderUID) meta.SetFolder(cmd.FolderUID)
} }
if cmd.Message != "" {
meta.SetMessage(cmd.Message)
}
return finalObj, nil return finalObj, nil
} }

3
pkg/services/dashboards/service/dashboard_service_test.go
View File

@ -1761,6 +1761,7 @@ func TestLegacySaveCommandToUnstructured(t *testing.T) {
t.Run("successfully converts save command to unstructured", func(t *testing.T) { t.Run("successfully converts save command to unstructured", func(t *testing.T) {
cmd := &dashboards.SaveDashboardCommand{ cmd := &dashboards.SaveDashboardCommand{
FolderUID: "folder-uid", FolderUID: "folder-uid",
Message: "saving this dashboard",
Dashboard: simplejson.NewFromAny(map[string]any{"test": "test", "title": "testing slugify", "uid": "test-uid"}), Dashboard: simplejson.NewFromAny(map[string]any{"test": "test", "title": "testing slugify", "uid": "test-uid"}),
} }
@ -1771,7 +1772,7 @@ func TestLegacySaveCommandToUnstructured(t *testing.T) {
assert.Equal(t, "test-namespace", result.GetNamespace()) assert.Equal(t, "test-namespace", result.GetNamespace())
spec := result.Object["spec"].(map[string]any) spec := result.Object["spec"].(map[string]any)
assert.Equal(t, spec["version"], 1) assert.Equal(t, spec["version"], 1)
assert.Equal(t, result.GetAnnotations(), map[string]string{utils.AnnoKeyFolder: "folder-uid"}) assert.Equal(t, result.GetAnnotations(), map[string]string{utils.AnnoKeyFolder: "folder-uid", utils.AnnoKeyMessage: "saving this dashboard"})
}) })
t.Run("should increase version when called", func(t *testing.T) { t.Run("should increase version when called", func(t *testing.T) {