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

K8s/Folders: Rename api group to singular (#81443)

Browse Source
This commit is contained in:
Ryan McKinley
2024-01-30 08:50:37 -08:00
committed by GitHub
parent d26959aafe
commit e041055012
18 changed files with 169 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/store/entity/sqlstash/folder_support.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
foldersV0 "github.com/grafana/grafana/pkg/apis/folders/v0alpha1"
folder "github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
"github.com/grafana/grafana/pkg/services/sqlstore/session"
)
@@ -44,7 +44,7 @@ func (s *sqlEntityServer) updateFolderTree(ctx context.Context, tx *session.Sess
" FROM entity" +
" WHERE " + s.dialect.Quote("group") + "=? AND resource=? AND namespace=?" +
" ORDER BY slug asc"
args := []interface{}{foldersV0.GROUP, foldersV0.RESOURCE, namespace}
args := []interface{}{folder.GROUP, folder.RESOURCE, namespace}
all := []*folderInfo{}
rows, err := tx.Query(ctx, query, args...)
pkg/services/store/entity/sqlstash/sql_storage_server.go
+7 -7
View File
@@ -13,7 +13,7 @@ import (
"github.com/bwmarrin/snowflake"
"github.com/google/uuid"
foldersV0 "github.com/grafana/grafana/pkg/apis/folders/v0alpha1"
folder "github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
"github.com/grafana/grafana/pkg/infra/appcontext"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
@@ -446,9 +446,9 @@ func (s *sqlEntityServer) Create(ctx context.Context, r *entity.CreateEntityRequ
}
switch current.Group {
case foldersV0.GROUP:
case folder.GROUP:
switch current.Resource {
case foldersV0.RESOURCE:
case folder.RESOURCE:
err = s.updateFolderTree(ctx, tx, current.Namespace)
if err != nil {
s.log.Error("error updating folder tree", "msg", err.Error())
@@ -671,9 +671,9 @@ func (s *sqlEntityServer) Update(ctx context.Context, r *entity.UpdateEntityRequ
}
switch current.Group {
case foldersV0.GROUP:
case folder.GROUP:
switch current.Resource {
case foldersV0.RESOURCE:
case folder.RESOURCE:
err = s.updateFolderTree(ctx, tx, current.Namespace)
if err != nil {
s.log.Error("error updating folder tree", "msg", err.Error())
@@ -789,9 +789,9 @@ func (s *sqlEntityServer) doDelete(ctx context.Context, tx *session.SessionTx, e
}
switch ent.Group {
case foldersV0.GROUP:
case folder.GROUP:
switch ent.Resource {
case foldersV0.RESOURCE:
case folder.RESOURCE:
err = s.updateFolderTree(ctx, tx, ent.Namespace)
if err != nil {
s.log.Error("error updating folder tree", "msg", err.Error())