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

Folders/apiserver: Fix mutate method for folders (#107819)

Browse Source 
Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
This commit is contained in:
maicon
2025-07-09 15:57:04 -03:00
committed by GitHub
parent a63a9357bb
commit 0012345a7e
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/folders/register.go
+1 -1
View File
@@ -236,7 +236,7 @@ func (b *FolderAPIBuilder) Mutate(ctx context.Context, a admission.Attributes, _
if !ok {
return fmt.Errorf("obj is not folders.Folder")
}
f.Spec.Title = strings.Trim(f.Spec.Title, "")
f.Spec.Title = strings.Trim(f.Spec.Title, " ")
return nil
}
return nil
pkg/registry/apis/folders/register_test.go
+14 -4
View File
@@ -479,7 +479,7 @@ func TestFolderAPIBuilder_Mutate_Create(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := b.Validate(context.Background(), admission.NewAttributesRecord(
admAttr := admission.NewAttributesRecord(
tt.input,
nil,
folders.SchemeGroupVersion.WithKind("folder"),
@@ -491,13 +491,18 @@ func TestFolderAPIBuilder_Mutate_Create(t *testing.T) {
nil,
true,
&user.SignedInUser{},
), nil)
)
err := b.Validate(context.Background(), admAttr, nil)
if tt.wantErr {
require.Error(t, err)
return
}
require.NoError(t, err)
err = b.Mutate(context.Background(), admAttr, nil)
require.NoError(t, err)
require.Equal(t, tt.input, tt.expected)
})
}
}
@@ -585,7 +590,7 @@ func TestFolderAPIBuilder_Mutate_Update(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := b.Validate(context.Background(), admission.NewAttributesRecord(
admAttr := admission.NewAttributesRecord(
tt.input,
existingObj,
folders.SchemeGroupVersion.WithKind("folder"),
@@ -597,13 +602,18 @@ func TestFolderAPIBuilder_Mutate_Update(t *testing.T) {
nil,
true,
&user.SignedInUser{},
), nil)
)
err := b.Validate(context.Background(), admAttr, nil)
if tt.wantErr {
require.Error(t, err)
return
}
require.NoError(t, err)
err = b.Mutate(context.Background(), admAttr, nil)
require.NoError(t, err)
require.Equal(t, tt.input, tt.expected)
})
}
}