K8s: Rename origin.key to origin.hash (#89337)

pkg/services/apiserver/storage/entity/selector.go

@@ -21,8 +21,6 @@ type Requirements struct {
 	ListDeleted bool
 	// ListHistory is a resource name to list the history of
 	ListHistory string
-	// ListOriginKeys needs to include the origin key of a given entity in order for it to be selected.
-	ListOriginKeys []string
 }
 
 func ReadLabelSelectors(selector labels.Selector) (Requirements, labels.Selector, error) {
@@ -48,11 +46,6 @@ func ReadLabelSelectors(selector labels.Selector) (Requirements, labels.Selector
 				return requirements, newSelector, apierrors.NewBadRequest(SortByKey + " label selector only supports in")
 			}
 			requirements.SortBy = r.Values().List()
-		case utils.AnnoKeyOriginKey:
-			if r.Operator() != selection.In {
-				return requirements, newSelector, apierrors.NewBadRequest(SortByKey + " label selector only supports in")
-			}
-			requirements.ListOriginKeys = r.Values().List()
 		case ListDeletedKey:
 			if r.Operator() != selection.Equals {
 				return requirements, newSelector, apierrors.NewBadRequest(ListDeletedKey + " label selector only supports equality")

pkg/services/apiserver/storage/entity/storage.go

@@ -442,9 +442,6 @@ func (s *Storage) GetList(ctx context.Context, key string, opts storage.ListOpti
 	if len(requirements.SortBy) > 0 {
 		req.Sort = requirements.SortBy
 	}
-	if len(requirements.ListOriginKeys) > 0 {
-		req.OriginKeys = requirements.ListOriginKeys
-	}
 	if requirements.ListDeleted {
 		req.Deleted = true
 	}

pkg/services/apiserver/storage/entity/utils.go

@@ -73,7 +73,7 @@ func entityToResource(rsp *entityStore.Entity, res runtime.Object, codec runtime
 		originTime := time.UnixMilli(rsp.Origin.Time).UTC()
 		grafanaAccessor.SetOriginInfo(&utils.ResourceOriginInfo{
 			Name: rsp.Origin.Source,
-			Key:  rsp.Origin.Key,
+			Path: rsp.Origin.Key, // Using "key" in the
 			// Path: rsp.Origin.Path,
 			Timestamp: &originTime,
 		})
@@ -136,8 +136,8 @@ func resourceToEntity(res runtime.Object, requestInfo *request.RequestInfo, code
 		Title:           grafanaAccessor.FindTitle(metaAccessor.GetName()),
 		Origin: &entityStore.EntityOriginInfo{
 			Source: grafanaAccessor.GetOriginName(),
-			Key:    grafanaAccessor.GetOriginKey(),
-			// Path: 	grafanaAccessor.GetOriginPath(),
+			// Deprecated: Keeping "key" in the protobuf to avoid migrations while a bigger one is in place
+			Key: grafanaAccessor.GetOriginPath(),
 		},
 		Labels: metaAccessor.GetLabels(),
 	}

pkg/services/store/entity/entity.proto

@@ -311,7 +311,7 @@ message EntityListRequest {
   // list deleted entities instead of active ones
   bool deleted = 12;
 
-  // Limit to a set of origin keys (empty is all)
+  // Deprecated: Limit to a set of origin keys (empty is all)
   repeated string origin_keys = 13;
 }