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

Make sure annotations are kept when updating a folder (#98321)

Browse Source 
* Make sure annotations are kept when updating a folder

* Remove pointer

* Mock get on update tests
This commit is contained in:
Leonor Oliveira
2024-12-27 13:51:10 +01:00
committed by GitHub
parent d05ef49016
commit fec5c0ec19
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/folders/conversions.go
+12 -19
View File
@@ -19,8 +19,8 @@ import (
"github.com/grafana/grafana/pkg/util"
)
func LegacyCreateCommandToUnstructured(cmd folder.CreateFolderCommand) (unstructured.Unstructured, error) {
obj := unstructured.Unstructured{
func LegacyCreateCommandToUnstructured(cmd *folder.CreateFolderCommand) (*unstructured.Unstructured, error) {
obj := &unstructured.Unstructured{
Object: map[string]interface{}{
"spec": map[string]interface{}{
"title": cmd.Title,
@@ -34,30 +34,23 @@ func LegacyCreateCommandToUnstructured(cmd folder.CreateFolderCommand) (unstruct
}
obj.SetName(cmd.UID)
if err := setParentUID(&obj, cmd.ParentUID); err != nil {
return unstructured.Unstructured{}, err
if err := setParentUID(obj, cmd.ParentUID); err != nil {
return &unstructured.Unstructured{}, err
}
return obj, nil
}
func LegacyUpdateCommandToUnstructured(cmd folder.UpdateFolderCommand) (*unstructured.Unstructured, error) {
// #TODO add other fields ; do we support updating the UID/orgID?
obj := &unstructured.Unstructured{
Object: map[string]interface{}{
"spec": map[string]interface{}{
"title": cmd.NewTitle,
"description": cmd.NewDescription,
},
},
func LegacyUpdateCommandToUnstructured(obj *unstructured.Unstructured, cmd *folder.UpdateFolderCommand) (*unstructured.Unstructured, error) {
spec, ok := obj.Object["spec"].(map[string]any)
if !ok {
return &unstructured.Unstructured{}, fmt.Errorf("could not convert object to folder")
}
obj.SetName(cmd.UID)
if cmd.NewParentUID == nil {
return obj, nil
if cmd.NewTitle != nil {
spec["title"] = cmd.NewTitle
}
if err := setParentUID(obj, *cmd.NewParentUID); err != nil {
return &unstructured.Unstructured{}, err
if cmd.NewDescription != nil {
spec["description"] = cmd.NewDescription
}
return obj, nil