Skip to content

fix: don't add empty rule IDs #2260

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: don't add empty rule IDs #2260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions storage/ocp_recommendations_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,7 @@ func (storage OCPRecommendationsDBStorage) ReadClusterListRecommendations(

// we have to select from report table primarily because we need to show last_checked_at even if there
// are no rule hits (which means there are no rows in recommendation table for that cluster)
// that's why we need to use COALESCE. Then, if the rule ID is an empty string, we won't add it to the result

// disable "G202 (CWE-89): SQL string concatenation"
// #nosec G202
Expand Down Expand Up @@ -1431,14 +1432,23 @@ func (storage OCPRecommendationsDBStorage) ReadClusterListRecommendations(
}

if cluster, exists := clusterMap[clusterID]; exists {
cluster.Recommendations = append(cluster.Recommendations, ruleID)
// Only add non-empty rule IDs to recommendations
if ruleID != "" {
cluster.Recommendations = append(cluster.Recommendations, ruleID)
}
clusterMap[clusterID] = cluster
} else {
// create entry in map for new cluster ID
clusterMap[clusterID] = ctypes.ClusterRecommendationList{
// created at is the same for all rows for each cluster
CreatedAt: timestamp,
Recommendations: []ctypes.RuleID{ruleID},
CreatedAt: timestamp,
Recommendations: func() []ctypes.RuleID {
// Only add non-empty rule IDs to recommendations
if ruleID != "" {
return []ctypes.RuleID{ruleID}
}
return []ctypes.RuleID{}
}(),
}
}
}
Expand Down
Loading