Populate entityInfo for all entity types in ListEvaluationResults#6361
Conversation
This addresses issue mindersec#3116 by reusing the getRuleEvalEntityInfo helper across ListEvaluationResults so that entityInfo (like artifact_name, artifact_type, etc.) is correctly populated for non-repository entities such as Artifacts and Pull Requests. Signed-off-by: krrish175-byte <krrishbiswas175@gmail.com>
krrish175-byte
force-pushed
the
fix/issue-3116-list-evaluation-results-entity-info
branch
from
5bd69ad to
b81f8b7
Compare
|
coverage: 59.464% (+0.07%) from 59.39% — krrish175-byte:fix/issue-3116-list-evaluation-results-entity-info into mindersec:main |
|
@evankanderson PTAL |
evankanderson
left a comment
evankanderson
left a comment
There was a problem hiding this comment.
This needs to appease the linter; otherwise, it looks good.
| return era | ||
| } | ||
|
|
||
| func getRuleEvalEntityInfo( |
There was a problem hiding this comment.
This looks like a straight move from handlers_profile.go (fine, but this adds a "type 2 - refactoring" change to a "type 3 - behavior" change, which makes it a little bit harder to review).
| minderEntityType := minderv1.Entity_ENTITY_REPOSITORIES | ||
| if tt.entityType == db.EntitiesArtifact { | ||
| minderEntityType = minderv1.Entity_ENTITY_ARTIFACTS | ||
| } else if tt.entityType == db.EntitiesPullRequest { | ||
| minderEntityType = minderv1.Entity_ENTITY_PULL_REQUESTS | ||
| } |
There was a problem hiding this comment.
Lint wants you to use a tagged switch here. If you disagree, you'll need to add an appropriately scoped nolint directive, e.g. //nolint:staticcheck // tagged switch is ...
| minderEntityType := minderv1.Entity_ENTITY_REPOSITORIES | |
| if tt.entityType == db.EntitiesArtifact { | |
| minderEntityType = minderv1.Entity_ENTITY_ARTIFACTS | |
| } else if tt.entityType == db.EntitiesPullRequest { | |
| minderEntityType = minderv1.Entity_ENTITY_PULL_REQUESTS | |
| } | |
| minderEntityType := minderv1.Entity_ENTITY_REPOSITORIES | |
| switch tt.EntityType { | |
| case db.EntitiesArtifact: | |
| minderEntityType = minderv1.Entity_ENTITY_ARTIFACTS | |
| case db.EntitiesPullRequest: | |
| minderEntityType = minderv1.Entity_ENTITY_PULL_REQUESTS | |
| } |
|
This PR needs additional information before we can continue. It is now marked as stale because it has been open for 30 days with no activity. Please provide the necessary details to continue or it will be closed in 30 days. |
|
(This is failing lint, but would otherwise be nice to have merged) |
3 participants
Summary
This PR addresses an issue where the
ListEvaluationResultsRPC only populatedentityInfofor repository entities, leaving it empty for other entity types such as Pull Requests and Artifacts.To fix this, the
getRuleEvalEntityInfohelper function (previously scoped tohandlers_profile.go) was moved tohandlers_evalstatus.go. The mapping logic inbuildRuleEvaluationStatusFromDBEvaluationwas then updated to utilize this shared helper, ensuring consistent population ofentityInfoattributes (e.g.,artifact_name,artifact_type, etc.) across all supported entity types without duplicating code. Unused imports inhandlers_profile.gowere also cleaned up.Fixes #3116
Testing
TestListEvaluationResultsEntityInfoto specifically verify thatentityInfofields are correctly populated when formatting the evaluation results for bothArtifactandPullRequestentities.internal/controlplanepackage (go test -v ./internal/controlplane/...) to ensure no regressions were introduced. All tests passed successfully.