Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update queries to get last scan status and compliance percentage #947

Merged
merged 3 commits into from
Mar 16, 2023
Merged

Update queries to get last scan status and compliance percentage #947

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f48720a
Update queries to get last scan status and compliance percentage
jatin-baweja Mar 16, 2023
462c80d
Change active type to boolean
jatin-baweja Mar 16, 2023
3fc76f7
Replace RETURN clause in middle of query with WITH clause
jatin-baweja Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 38 additions & 13 deletions deepfence_server/model/cloud_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ type CloudNodeAccountsListResp struct {
}

type CloudNodeAccountInfo struct {
NodeId string `json:"node_id"`
NodeName string `json:"node_name"`
CloudProvider string `json:"cloud_provider"`
CompliancePercentage string `json:"compliance_percentage"`
Active string `json:"active"`
NodeId string `json:"node_id"`
NodeName string `json:"node_name"`
CloudProvider string `json:"cloud_provider"`
CompliancePercentage float64 `json:"compliance_percentage"`
Active bool `json:"active"`
LastScanId string `json:"last_scan_id"`
LastScanStatus string `json:"last_scan_status"`
}

type CloudComplianceScanDetails struct {
Expand Down Expand Up @@ -348,9 +350,16 @@ func GetCloudComplianceNodesList(ctx context.Context, cloudProvider string, fw F
WITH x, node_name, updated_at, COUNT(c) AS total_compliance_count
OPTIONAL MATCH (m:%s{cloud_provider:$cloud_provider+'_org', node_id: x}) -[:IS_CHILD]-> (n:%s{cloud_provider: $cloud_provider})<-[:SCANNED]-(s:%s)-[:DETECTED]->(c1:CloudComplianceResult)
WHERE c1.status IN $pass_status
RETURN x, node_name, $cloud_provider+'_org', CASE WHEN total_compliance_count = 0 THEN 0.0 ELSE COUNT(c1.status)*100.0/total_compliance_count END AS compliance_percentage, updated_at
WITH x, node_name, $cloud_provider+'_org' AS cloud_provider, CASE WHEN total_compliance_count = 0 THEN 0.0 ELSE COUNT(c1.status)*100.0/total_compliance_count END AS compliance_percentage, updated_at
CALL {
WITH x
OPTIONAL MATCH (m:%s{cloud_provider:$cloud_provider+'_org', node_id: x}) -[:IS_CHILD]-> (n:%s{cloud_provider: $cloud_provider})<-[:SCANNED]-(s1:%s)
RETURN s1.node_id AS last_scan_id, s1.status AS last_scan_status
ORDER BY s1.updated_at DESC LIMIT 1
}
RETURN x, node_name, cloud_provider, compliance_percentage, updated_at, COALESCE(last_scan_id, ''), COALESCE(last_scan_status, '')
ORDER BY updated_at`, neo4jNodeType, neo4jNodeType, neo4jNodeType, neo4jNodeType, scanType, neo4jNodeType,
neo4jNodeType, scanType)+fw.FetchWindow2CypherQuery(),
neo4jNodeType, scanType, neo4jNodeType, scanType)+fw.FetchWindow2CypherQuery(),
map[string]interface{}{"cloud_provider": cloudProvider, "pass_status": passStatus})
if err != nil {
return CloudNodeAccountsListResp{Total: 0}, err
Expand All @@ -365,8 +374,15 @@ func GetCloudComplianceNodesList(ctx context.Context, cloudProvider string, fw F
WITH x, node_name, updated_at, COUNT(c) AS total_compliance_count
OPTIONAL MATCH (n:%s{node_id: x})<-[:SCANNED]-(s:%s)-[:DETECTED]->(c1:Compliance)
WHERE c1.status IN $pass_status
RETURN x, node_name, $cloud_provider, CASE WHEN total_compliance_count = 0 THEN 0.0 ELSE COUNT(c1.status)*100.0/total_compliance_count END AS compliance_percentage, updated_at
ORDER BY updated_at`, neo4jNodeType, neo4jNodeType, scanType, neo4jNodeType, scanType)+fw.FetchWindow2CypherQuery(),
WITH x, node_name, CASE WHEN total_compliance_count = 0 THEN 0.0 ELSE COUNT(c1.status)*100.0/total_compliance_count END AS compliance_percentage, updated_at
CALL {
WITH x
OPTIONAL MATCH (n:%s{node_id: x})<-[:SCANNED]-(s1:%s)
RETURN s1.node_id AS last_scan_id, s1.status AS last_scan_status
ORDER BY s1.updated_at DESC LIMIT 1
}
RETURN x, node_name, $cloud_provider, compliance_percentage, updated_at, COALESCE(last_scan_id, ''), COALESCE(last_scan_status, '')
ORDER BY updated_at`, neo4jNodeType, neo4jNodeType, scanType, neo4jNodeType, scanType, neo4jNodeType, scanType)+fw.FetchWindow2CypherQuery(),
map[string]interface{}{
"cloud_provider": cloudProvider,
"pass_status": passStatus,
Expand All @@ -383,8 +399,15 @@ func GetCloudComplianceNodesList(ctx context.Context, cloudProvider string, fw F
WITH x, node_name, cloud_provider, updated_at, COUNT(c) AS total_compliance_count
OPTIONAL MATCH (n:%s{cloud_provider: $cloud_provider, node_id: x})<-[:SCANNED]-(s:%s)-[:DETECTED]->(c1:CloudComplianceResult)
WHERE c1.status IN $pass_status
RETURN x, node_name, cloud_provider, CASE WHEN total_compliance_count = 0 THEN 0.0 ELSE COUNT(c1.status)*100.0/total_compliance_count END AS compliance_percentage, updated_at
ORDER BY updated_at`, neo4jNodeType, neo4jNodeType, scanType, neo4jNodeType, scanType)+fw.FetchWindow2CypherQuery(),
WITH x, node_name, cloud_provider, CASE WHEN total_compliance_count = 0 THEN 0.0 ELSE COUNT(c1.status)*100.0/total_compliance_count END AS compliance_percentage, updated_at
CALL {
WITH x
OPTIONAL MATCH (n:%s{cloud_provider: $cloud_provider, node_id: x})<-[:SCANNED]-(s1:%s)
RETURN s1.node_id AS last_scan_id, s1.status AS last_scan_status
ORDER BY s1.updated_at DESC LIMIT 1
}
RETURN x, node_name, cloud_provider, compliance_percentage, updated_at, COALESCE(last_scan_id, ''), COALESCE(last_scan_status, '')
ORDER BY updated_at`, neo4jNodeType, neo4jNodeType, scanType, neo4jNodeType, scanType, neo4jNodeType, scanType)+fw.FetchWindow2CypherQuery(),
map[string]interface{}{
"cloud_provider": cloudProvider,
"pass_status": passStatus,
Expand All @@ -405,8 +428,10 @@ func GetCloudComplianceNodesList(ctx context.Context, cloudProvider string, fw F
NodeId: rec.Values[0].(string),
NodeName: rec.Values[1].(string),
CloudProvider: rec.Values[2].(string),
CompliancePercentage: "0.00",
Active: "true",
CompliancePercentage: rec.Values[3].(float64),
Active: true,
LastScanId: rec.Values[5].(string),
LastScanStatus: rec.Values[6].(string),
}
cloud_node_accounts_info = append(cloud_node_accounts_info, tmp)
}
Expand Down