fix(api): return missing finding data (#1929)

* fix(orchestrator): return finding id from createOrUpdateDBFinding Signed-off-by: András Jáky <ajaky@cisco.com> * fix(api): add missing odatasql Secret schema metas Signed-off-by: András Jáky <ajaky@cisco.com> --------- Signed-off-by: András Jáky <ajaky@cisco.com>
openclarity · Jul 17, 2024 · b913ab1 · b913ab1
1 parent a61acee
commit b913ab1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/api/server/database/gorm/odata.go b/api/server/database/gorm/odata.go
@@ -999,6 +999,8 @@ var schemaMetas = map[string]odatasql.SchemaMeta{
 			"filePath":    odatasql.FieldMeta{FieldType: odatasql.StringFieldType},
 			"startLine":   odatasql.FieldMeta{FieldType: odatasql.StringFieldType},
 			"endLine":     odatasql.FieldMeta{FieldType: odatasql.StringFieldType},
+			"startColumn": odatasql.FieldMeta{FieldType: odatasql.StringFieldType},
+			"endColumn":   odatasql.FieldMeta{FieldType: odatasql.StringFieldType},
 			"fingerprint": odatasql.FieldMeta{FieldType: odatasql.StringFieldType},
 		},
 	},
@@ -1256,7 +1258,7 @@ var schemaMetas = map[string]odatasql.SchemaMeta{
 			},
 			"finding": odatasql.FieldMeta{
 				FieldType:            odatasql.RelationshipFieldType,
-				RelationshipSchema:   "Finding",
+				RelationshipSchema:   findingSchemaName,
 				RelationshipProperty: "id",
 			},
 			"firstSeen":     odatasql.FieldMeta{FieldType: odatasql.DateTimeFieldType},

diff --git a/orchestrator/processor/assetscan/common.go b/orchestrator/processor/assetscan/common.go
@@ -47,10 +47,9 @@ func (asp *AssetScanProcessor) createOrUpdateDBFinding(ctx context.Context, info
 		return "", fmt.Errorf("failed to create finding: %w", err)
 	}
 
-	var id string
+	id := *conflictError.ConflictingFinding.Id
 	// Update existing finding if newer
 	if conflictError.ConflictingFinding.LastSeen.Before(completedTime) {
-		id = *conflictError.ConflictingFinding.Id
 		finding := apitypes.Finding{
 			LastSeen: &completedTime,
 			LastSeenBy: &apitypes.AssetScanRelationship{