central/reports/scheduler/schedule.go (1)

338-347: ⚠️ Potential issue | 🟠 Major

Entity-scoped reports still hard-depend on a collection here.

Lines 339-345 always fetch rc.GetScopeId() and fail if no collection exists. Because BuildQuery prefers a non-nil collection over entityScope, this means the new entity-scope path is never reached when a collection is still present, and entity-scoped configs without a collection fail before query building.

Suggested fix

 func (s *scheduler) getReportData(ctx context.Context, rc *storage.ReportConfiguration) ([]common.DeployedImagesResult, error) {
-	collection, found, err := s.collectionDatastore.Get(ctx, rc.GetScopeId())
-	if err != nil {
-		return nil, errors.Wrapf(err, "error building report query: unable to get the collection %s", rc.GetScopeId())
-	}
-	if !found {
-		return nil, errors.Errorf("error building report query: collection with id %s not found", rc.GetScopeId())
-	}
+	var (
+		collection *storage.ResourceCollection
+		found      bool
+		err        error
+	)
+	if rc.GetResourceScope().GetEntityScope() == nil {
+		collection, found, err = s.collectionDatastore.Get(ctx, rc.GetScopeId())
+		if err != nil {
+			return nil, errors.Wrapf(err, "error building report query: unable to get the collection %s", rc.GetScopeId())
+		}
+		if !found {
+			return nil, errors.Errorf("error building report query: collection with id %s not found", rc.GetScopeId())
+		}
+	}
 	rQuery, err := s.buildReportQuery(ctx, rc, collection)

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@central/reports/scheduler/schedule.go` around lines 338 - 347, getReportData
currently always fetches a collection via
collectionDatastore.Get(rc.GetScopeId()) and errors if not found, which blocks
the entity-scoped path; change getReportData so that when the
ReportConfiguration rc represents an entity-scoped report (check
rc.IsEntityScoped() or the equivalent flag on rc) you do not hard-fail when
collectionDatastore.Get returns !found but instead call s.buildReportQuery(ctx,
rc, nil) (or pass a nil collection) so buildReportQuery can use the entityScope;
only treat missing collection as an error for non-entity-scoped configs and keep
existing error wrapping for real Get errors from collectionDatastore.Get.