Merge pull request #2086 from opengovern/fix-add-linode

fix: fix delete old resource findings
opengovern · Dec 1, 2024 · ee36b65 · ee36b65
2 parents 0c28ec4 + bab1239
commit ee36b65
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/services/describe/scheduler_describe_result.go b/services/describe/scheduler_describe_result.go
@@ -287,7 +287,6 @@ func (s *Scheduler) cleanupDescribeResourcesNotInIntegrations(ctx context.Contex
 			err = s.es.Delete(key, idx)
 			if err != nil {
 				s.logger.Error("failed to delete resource from open-search", zap.Error(err))
-				return
 			}
 
 			lookupResource := es2.LookupResource{
@@ -304,7 +303,6 @@ func (s *Scheduler) cleanupDescribeResourcesNotInIntegrations(ctx context.Contex
 			err = s.es.Delete(key, idx)
 			if err != nil {
 				s.logger.Error("failed to delete lookup from open-search", zap.Error(err))
-				return
 			}
 
 			resourceFinding := types.ResourceFinding{
@@ -319,7 +317,6 @@ func (s *Scheduler) cleanupDescribeResourcesNotInIntegrations(ctx context.Contex
 			err = s.es.Delete(key, idx)
 			if err != nil {
 				s.logger.Error("failed to delete resource finding from open-search", zap.Error(err))
-				return
 			}
 		}
 	}

diff --git a/services/describe/schedulers/compliance/cleanup.go b/services/describe/schedulers/compliance/cleanup.go
@@ -67,7 +67,7 @@ func getComplianceResultsNotInIntegrationsFromES(ctx context.Context, client ope
 	}
 	root["size"] = size
 	root["sort"] = []map[string]any{
-		{"described_at": "asc"},
+		{"evaluatedAt": "asc"},
 		{"_id": "desc"},
 	}