refactor(unified-storage): move generated protos to own pkg (#105356)

pkg/storage/unified/sql/queries.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
+	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
 	"github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate"
 )
 
@@ -88,7 +89,7 @@ func (r sqlResourceRequest) Validate() error {
 
 type sqlResourceInsertFromHistoryRequest struct {
 	sqltemplate.SQLTemplate
-	Key *resource.ResourceKey
+	Key *resourcepb.ResourceKey
 }
 
 func (r sqlResourceInsertFromHistoryRequest) Validate() error {
@@ -115,7 +116,7 @@ func (r sqlStatsRequest) Validate() error {
 }
 
 type historyPollResponse struct {
-	Key             resource.ResourceKey
+	Key             resourcepb.ResourceKey
 	GUID            string
 	ResourceVersion int64
 	PreviousRV      *int64
@@ -148,7 +149,7 @@ func (r *sqlResourceHistoryPollRequest) Results() (*historyPollResponse, error)
 		prevRV = new(int64)
 	}
 	return &historyPollResponse{
-		Key: resource.ResourceKey{
+		Key: resourcepb.ResourceKey{
 			Namespace: r.Response.Key.Namespace,
 			Group:     r.Response.Key.Group,
 			Resource:  r.Response.Key.Resource,
@@ -165,13 +166,13 @@ func (r *sqlResourceHistoryPollRequest) Results() (*historyPollResponse, error)
 // sqlResourceReadRequest can be used to retrieve a row fromthe "resource" tables.
 func NewReadResponse() *resource.BackendReadResponse {
 	return &resource.BackendReadResponse{
-		Key: &resource.ResourceKey{},
+		Key: &resourcepb.ResourceKey{},
 	}
 }
 
 type sqlResourceReadRequest struct {
 	sqltemplate.SQLTemplate
-	Request  *resource.ReadRequest
+	Request  *resourcepb.ReadRequest
 	Response *resource.BackendReadResponse
 }
 
@@ -186,7 +187,7 @@ func (r *sqlResourceReadRequest) Results() (*resource.BackendReadResponse, error
 // List
 type sqlResourceListRequest struct {
 	sqltemplate.SQLTemplate
-	Request *resource.ListRequest
+	Request *resourcepb.ListRequest
 }
 
 func (r sqlResourceListRequest) Validate() error {
@@ -194,7 +195,7 @@ func (r sqlResourceListRequest) Validate() error {
 }
 
 type historyReadRequest struct {
-	Key             *resource.ResourceKey
+	Key             *resourcepb.ResourceKey
 	ResourceVersion int64
 }
 
@@ -213,8 +214,8 @@ func (r sqlResourceHistoryReadRequest) Results() (*resource.BackendReadResponse,
 }
 
 type historyReadLatestRVRequest struct {
-	Key       *resource.ResourceKey
-	EventType resource.WatchEvent_Type
+	Key       *resourcepb.ResourceKey
+	EventType resourcepb.WatchEvent_Type
 }
 
 type sqlResourceHistoryReadLatestRVRequest struct {
@@ -242,25 +243,25 @@ func (r *resourceHistoryReadLatestRVResponse) Results() (*resourceHistoryReadLat
 type historyListRequest struct {
 	ResourceVersion, Limit, Offset int64
 	Folder                         string
-	Options                        *resource.ListOptions
+	Options                        *resourcepb.ListOptions
 }
 type sqlResourceHistoryListRequest struct {
 	sqltemplate.SQLTemplate
 	Request  *historyListRequest
-	Response *resource.ResourceWrapper
+	Response *resourcepb.ResourceWrapper
 }
 
 func (r sqlResourceHistoryListRequest) Validate() error {
 	return nil // TODO
 }
 
-func (r sqlResourceHistoryListRequest) Results() (*resource.ResourceWrapper, error) {
+func (r sqlResourceHistoryListRequest) Results() (*resourcepb.ResourceWrapper, error) {
 	// sqlResourceHistoryListRequest is a set-returning query. As such, it
 	// should not return its *Response, since that will be overwritten in the
 	// next call to `Scan`, so it needs to return a copy of it. Note, though,
 	// that it is safe to return the same `Response.Value` since `Scan`
 	// allocates a new slice of bytes each time.
-	return &resource.ResourceWrapper{
+	return &resourcepb.ResourceWrapper{
 		ResourceVersion: r.Response.ResourceVersion,
 		Value:           r.Response.Value,
 	}, nil
@@ -292,7 +293,7 @@ func (r *sqlResourceHistoryDeleteRequest) Validate() error {
 
 type sqlGetHistoryRequest struct {
 	sqltemplate.SQLTemplate
-	Key           *resource.ResourceKey
+	Key           *resourcepb.ResourceKey
 	Trash         bool  // only deleted items
 	StartRV       int64 // from NextPageToken
 	MinRV         int64 // minimum resource version for NotOlderThan
@@ -307,7 +308,7 @@ func (r sqlGetHistoryRequest) Validate() error {
 // prune resource history
 type sqlPruneHistoryRequest struct {
 	sqltemplate.SQLTemplate
-	Key                   *resource.ResourceKey
+	Key                   *resourcepb.ResourceKey
 	PartitionByGeneration bool // include generation in the partition
 	HistoryLimit          int64
 }
@@ -335,7 +336,7 @@ type sqlResourceBlobInsertRequest struct {
 	sqltemplate.SQLTemplate
 	Now         time.Time
 	Info        *utils.BlobInfo
-	Key         *resource.ResourceKey
+	Key         *resourcepb.ResourceKey
 	Value       []byte
 	ContentType string
 }
@@ -349,7 +350,7 @@ func (r sqlResourceBlobInsertRequest) Validate() error {
 
 type sqlResourceBlobQueryRequest struct {
 	sqltemplate.SQLTemplate
-	Key *resource.ResourceKey
+	Key *resourcepb.ResourceKey
 	UID string
 }