Add severity to rule in ListEvaluationHistory RPC.

database/query/eval_history.sql

@@ -119,6 +119,7 @@ SELECT s.id::uuid AS evaluation_id,
        -- rule type, name, and profile
        rt.name AS rule_type,
        ri.name AS rule_name,
+       rt.severity_value as rule_severity,
        p.name AS profile_name,
        -- evaluation status and details
        s.status AS evaluation_status,

internal/controlplane/handlers_evalstatus.go

@@ -148,6 +148,11 @@ func fromEvaluationHistoryRows(
 			return nil, err
 		}
 
+		ruleSeverity, err := dbSeverityToSeverity(row.RuleSeverity)
+		if err != nil {
+			return nil, err
+		}
+
 		var alert *minderv1.EvaluationHistoryAlert
 		if row.AlertStatus.Valid {
 			alert = &minderv1.EvaluationHistoryAlert{
@@ -174,6 +179,7 @@ func fromEvaluationHistoryRows(
 			Rule: &minderv1.EvaluationHistoryRule{
 				Name:     row.RuleName,
 				RuleType: row.RuleType,
+				Severity: ruleSeverity,
 				Profile:  row.ProfileName,
 			},
 			Status: &minderv1.EvaluationHistoryStatus{
@@ -466,9 +472,11 @@ func buildRuleEvaluationStatusFromDBEvaluation(
 		guidance = eval.RuleTypeGuidance
 	}
 
-	sev := &minderv1.Severity{}
-	sev.EnsureDefault()
-	if err := sev.Value.FromString(string(eval.RuleTypeSeverityValue)); err != nil {
+	var sev *minderv1.Severity
+	var err error
+
+	sev, err = dbSeverityToSeverity(eval.RuleTypeSeverityValue)
+	if err != nil {
 		zerolog.Ctx(ctx).
 			Err(err).
 			Str("value", string(eval.RuleTypeSeverityValue)).
@@ -477,7 +485,6 @@ func buildRuleEvaluationStatusFromDBEvaluation(
 
 	entityInfo := map[string]string{}
 	remediationURL := ""
-	var err error
 	if eval.Entity == db.EntitiesRepository {
 		entityInfo["provider"] = eval.Provider
 		entityInfo["repo_owner"] = eval.RepoOwner
@@ -603,6 +610,19 @@ func dbEntityToEntity(dbEnt db.Entities) minderv1.Entity {
 	}
 }
 
+func dbSeverityToSeverity(dbSev db.Severity) (*minderv1.Severity, error) {
+	severity := &minderv1.Severity{}
+	severity.EnsureDefault()
+	if err := severity.Value.FromString(string(dbSev)); err != nil {
+		// This is not an elegant pattern, but we have places
+		// in the code where the error was simply logged and
+		// default value for severity was used.
+		return severity, err
+	}
+
+	return severity, nil
+}
+
 func getEntityName(
 	dbEnt db.Entities,
 	row db.ListEvaluationHistoryRow,

internal/controlplane/handlers_evalstatus_test.go

@@ -371,6 +371,7 @@ func TestFromEvaluationHistoryRows(t *testing.T) {
 					ProjectID:    uuid.NullUUID{},
 					RuleType:     "rule_type",
 					RuleName:     "rule_name",
+					RuleSeverity: "unknown",
 					ProfileName:  "profile_name",
 				},
 			},
@@ -388,6 +389,7 @@ func TestFromEvaluationHistoryRows(t *testing.T) {
 					ProjectID:    uuid.NullUUID{},
 					RuleType:     "rule_type",
 					RuleName:     "rule_name",
+					RuleSeverity: "unknown",
 					ProfileName:  "profile_name",
 				},
 				{
@@ -400,6 +402,7 @@ func TestFromEvaluationHistoryRows(t *testing.T) {
 					ProjectID:    uuid.NullUUID{},
 					RuleType:     "rule_type",
 					RuleName:     "rule_name",
+					RuleSeverity: "unknown",
 					ProfileName:  "profile_name",
 				},
 			},
@@ -417,6 +420,7 @@ func TestFromEvaluationHistoryRows(t *testing.T) {
 					ProjectID:    uuid.NullUUID{},
 					RuleType:     "rule_type",
 					RuleName:     "rule_name",
+					RuleSeverity: "unknown",
 					ProfileName:  "profile_name",
 					AlertStatus:  nullAlertStatusOK(),
 					AlertDetails: nullStr("alert details"),
@@ -436,6 +440,7 @@ func TestFromEvaluationHistoryRows(t *testing.T) {
 					ProjectID:          uuid.NullUUID{},
 					RuleType:           "rule_type",
 					RuleName:           "rule_name",
+					RuleSeverity:       "unknown",
 					ProfileName:        "profile_name",
 					RemediationStatus:  nullRemediationStatusTypesSuccess(),
 					RemediationDetails: nullStr("remediation details"),
@@ -466,6 +471,9 @@ func TestFromEvaluationHistoryRows(t *testing.T) {
 				require.Equal(t, dbEntityToEntity(row.EntityType), item.Entity.Type)
 				require.Equal(t, row.RuleType, item.Rule.RuleType)
 				require.Equal(t, row.RuleName, item.Rule.Name)
+				sev, err := dbSeverityToSeverity(row.RuleSeverity)
+				require.NoError(t, err)
+				require.Equal(t, sev, item.Rule.Severity)
 				require.Equal(t, row.ProfileName, item.Rule.Profile)
 
 				require.Equal(t, row.AlertStatus.Valid, item.Alert != nil)