Skip to content

Commit f6721e4

Browse files
committed
fix missing node_name crash
1 parent 0353ab2 commit f6721e4

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

deepfence_server/reporters/scan/scan_reporters.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ func GetCloudAccountIDs(ctx context.Context, cloudProviderIds []model.NodeIdenti
454454
if len(orgNodeIds) > 0 {
455455
nres, err = tx.Run(ctx, `
456456
MATCH (n:CloudNode) -[:IS_CHILD] -> (m)
457-
WHERE n.node_id IN $node_ids
457+
WHERE n.node_id IN $node_ids
458458
AND NOT m.node_id IN $child_node_ids
459459
`+reporters.ParseFieldFilters2CypherWhereConditions(`m`, filterClauses, false)+`
460460
RETURN m.node_id`,
@@ -542,14 +542,14 @@ func GetScansList(ctx context.Context, scanType utils.Neo4jScanType, nodeIDs []m
542542
AND (` + strings.Join(nodeTypesStr, " OR ") + `)
543543
` + reporters.ParseFieldFilters2CypherWhereConditions("m", mo.Some(ff), false) + `
544544
` + orderFilter + `
545-
RETURN m.node_id, m.status, m.status_message, m.created_at, m.updated_at, n.node_id, n.node_name, labels(n) as node_type
545+
RETURN m.node_id, m.status, m.status_message, m.created_at, m.updated_at, n.node_id, COALESCE(n.node_name, ""), labels(n) as node_type
546546
` + fw.FetchWindow2CypherQuery()
547547
} else {
548548
query = `
549549
MATCH (m:` + string(scanType) + `) -[:SCANNED]-> (n)
550550
` + reporters.ParseFieldFilters2CypherWhereConditions("m", mo.Some(ff), true) + `
551551
` + orderFilter + `
552-
RETURN m.node_id, m.status, m.status_message, m.created_at, m.updated_at, n.node_id, n.node_name, labels(n) as node_type
552+
RETURN m.node_id, m.status, m.status_message, m.created_at, m.updated_at, n.node_id, COALESCE(n.node_name, ""), labels(n) as node_type
553553
` + fw.FetchWindow2CypherQuery()
554554
}
555555
scansInfo, err = processScansListQuery(ctx, query, nodeIDsStr, tx)
@@ -656,8 +656,8 @@ func GetScanResultDiff[T any](ctx context.Context, scanType utils.Neo4jScanType,
656656
OPTIONAL MATCH (c:ContainerImage{node_id: f.docker_image_id}) -[:ALIAS] ->(t) -[ma:MASKED]-> (d)
657657
OPTIONAL MATCH (cb:ContainerImage{node_id: n.docker_image_id}) -[:IS] ->(is) -[mis:MASKED]-> (d)
658658
WITH e, d, r, collect(ma) as ma_list, collect(mis) as mis_list
659-
WITH apoc.map.merge( e{.*},
660-
d{.*, masked: coalesce(d.masked or r.masked or e.masked or head(ma_list).masked or head(mis_list).masked, false),
659+
WITH apoc.map.merge( e{.*},
660+
d{.*, masked: coalesce(d.masked or r.masked or e.masked or head(ma_list).masked or head(mis_list).masked, false),
661661
name: coalesce(e.name, d.name, '')}) AS merged_data` +
662662
reporters.ParseFieldFilters2CypherWhereConditions("d", mo.Some(ff), true) +
663663
ffCondition + ` RETURN merged_data ` +
@@ -749,7 +749,7 @@ func GetScanResults[T any](ctx context.Context, scanType utils.Neo4jScanType, sc
749749
WITH d, n, e, r, m
750750
OPTIONAL MATCH (cb:ContainerImage{node_id: n.docker_image_id}) -[:IS] ->(is) -[mis:MASKED]-> (d)
751751
WITH apoc.map.merge( e{.*},
752-
d{.*, masked: coalesce(d.masked or r.masked or e.masked
752+
d{.*, masked: coalesce(d.masked or r.masked or e.masked
753753
or m.masked or mis.masked, false),
754754
name: coalesce(e.name, d.name, '')}) as d` +
755755
reporters.ParseFieldFilters2CypherWhereConditions("d", mo.Some(ff), true) +

deepfence_server/reporters/search/search.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ func searchGenericScanInfoReport(ctx context.Context, scanType utils.Neo4jScanTy
612612
ORDER BY n.updated_at DESC` +
613613
scanFilter.Window.FetchWindow2CypherQuery() +
614614
`}` +
615-
` RETURN n.node_id as scan_id, n.status as status, n.status_message as status_message, n.created_at as created_at, n.updated_at as updated_at, m.node_id as node_id, COALESCE(m.node_type, m.cloud_provider) as node_type, m.node_name as node_name` +
615+
` RETURN n.node_id as scan_id, n.status as status, n.status_message as status_message, n.created_at as created_at, n.updated_at as updated_at, m.node_id as node_id, COALESCE(m.node_type, m.cloud_provider) as node_type, COALESCE(m.node_name,"") as node_name` +
616616
reporters.OrderFilter2CypherCondition("", scanFilter.Filters.OrderFilter, nil) +
617617
fw.FetchWindow2CypherQuery()
618618
log.Debug().Msgf("search query: %v", query)

0 commit comments

Comments
 (0)