Storage: Avoid relying on RequestInfo (#89635)

2024-06-25 10:06:03 -04:00
parent 4cf3ebbb3d
commit 71270f3203
20 changed files with 227 additions and 358 deletions
@@ -7,6 +7,7 @@ import (
 	"time"

 	folder "github.com/grafana/grafana/pkg/apis/folder/v0alpha1"
+	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
 	"github.com/grafana/grafana/pkg/services/store/entity"
 	"github.com/grafana/grafana/pkg/services/store/entity/db"
 	"github.com/grafana/grafana/pkg/services/store/entity/sqlstash/sqltemplate"
@@ -20,7 +21,7 @@ func (s *sqlEntityServer) Delete(ctx context.Context, r *entity.DeleteEntityRequ
 		return nil, err
 	}

-	key, err := entity.ParseKey(r.Key)
+	key, err := grafanaregistry.ParseKey(r.Key)
 	if err != nil {
 		return nil, fmt.Errorf("delete entity: parse entity key: %w", err)
 	}