fix(query): scope config insight selectors via view

Use config_analysis_items for resource selector searches so config insight queries can filter on parent config fields such as agent_id, deleted_at, tags, labels, and type.

Extend the view with the parent config fields and cover config type filtering in resource selector tests.

Author: adityathebe

query/config_analysis.go

@@ -17,7 +17,7 @@ func FindConfigAnalysisByResourceSelector(ctx context.Context, limit int, resour
 }
 
 func FindConfigAnalysisIDsByResourceSelector(ctx context.Context, limit int, resourceSelectors ...types.ResourceSelector) ([]uuid.UUID, error) {
-	return queryTableWithResourceSelectors(ctx, models.ConfigAnalysis{}.TableName(), limit, resourceSelectors...)
+	return queryTableWithResourceSelectors(ctx, configAnalysisItemsView, limit, resourceSelectors...)
 }
 
 func GetConfigAnalysisByIDs(ctx context.Context, ids []uuid.UUID) ([]models.ConfigAnalysis, error) {

query/models.go

@@ -412,25 +412,35 @@ var CanaryQueryModel = QueryModel{
 	},
 }
 
-// ConfigAnalysisQueryModel powers resource selector search for config insights
-// (the config_analysis table). The table has neither name/namespace nor
-// deleted_at/agent_id/tags/labels columns, so those features stay disabled.
+const configAnalysisItemsView = "config_analysis_items"
+
+// ConfigAnalysisQueryModel powers resource selector search for config insights.
+// It queries config_analysis_items so config parent fields (agent, deleted_at,
+// type, tags, labels) are available like they are for catalog_changes.
 var ConfigAnalysisQueryModel = QueryModel{
-	Table: models.ConfigAnalysis{}.TableName(),
+	Table: configAnalysisItemsView,
 	Columns: []string{
 		"id", "config_id", "scraper_id", "source", "analyzer", "analysis_type",
 		"severity", "status", "summary", "message", "first_observed", "last_observed",
+		"name", "type", "config_type", "config_class", "agent_id", "deleted_at", "path",
 	},
-	JSONMapColumns: []string{"analysis"},
+	JSONMapColumns: []string{"analysis", "tags", "labels", "config"},
 	HasProperties:  true,
+	HasTags:        true,
+	HasLabels:      true,
+	HasAgents:      true,
+	HasDeletedAt:   true,
 	Aliases: map[string]string{
-		"type":          "analysis_type",
 		"analyzer_type": "analysis_type",
 		"config":        "config_id",
+		"config_type":   "type",
+		"namespace":     "tags.namespace",
 	},
 	FieldMapper: map[string]func(ctx context.Context, id string) (any, error){
+		"agent_id":       AgentMapper,
 		"first_observed": DateMapper,
 		"last_observed":  DateMapper,
+		"deleted_at":     DateMapper,
 	},
 }
 
@@ -454,7 +464,7 @@ func GetModelFromTable(table string) (QueryModel, error) {
 		return ConfigItemSummaryQueryModel, nil
 	case models.View{}.TableName():
 		return ViewQueryModel, nil
-	case models.ConfigAnalysis{}.TableName():
+	case models.ConfigAnalysis{}.TableName(), configAnalysisItemsView:
 		return ConfigAnalysisQueryModel, nil
 	default:
 		return QueryModel{}, fmt.Errorf("invalid table")

tests/query_resource_selector_test.go

@@ -752,10 +752,15 @@ var _ = ginkgo.Describe("Config Analysis Resource Selector", func() {
 			expectedIDs:      []uuid.UUID{dummy.LogisticsDBRDSAnalysis.ID},
 		},
 		{
-			description:      "by analysis_type alias (type)",
-			resourceSelector: types.ResourceSelector{Search: "type=security config_id=" + ec2ConfigID},
+			description:      "by analysis_type",
+			resourceSelector: types.ResourceSelector{Search: "analysis_type=security config_id=" + ec2ConfigID},
 			expectedIDs:      []uuid.UUID{dummy.EC2InstanceBAnalysis.ID},
 		},
+		{
+			description:      "by config type",
+			resourceSelector: types.ResourceSelector{Search: "type=" + *dummy.LogisticsDBRDS.Type + " config_id=" + logisticsConfigID},
+			expectedIDs:      []uuid.UUID{dummy.LogisticsDBRDSAnalysis.ID},
+		},
 		{
 			description:      "by severity",
 			resourceSelector: types.ResourceSelector{Search: "severity=critical config_id=" + logisticsConfigID},

views/006_config_views.sql

@@ -595,9 +595,18 @@ FOR EACH ROW
 
 DROP VIEW IF EXISTS config_analysis_items;
 
+-- Used by resource selector search for config analysis / insights.
 CREATE OR REPLACE VIEW config_analysis_items AS
   SELECT
     ca.*,
+    ci.name,
+    ci.deleted_at,
+    ci.type,
+    ci.tags,
+    ci.labels,
+    ci.config,
+    ci.agent_id,
+    ci.path,
     ci.name as config_name,
     ci.type as config_type,
     ci.config_class