feature: adds trivy new patterns, high and critical, config mappings CF-1860

Author: pedrobpereira

.gitignore

@@ -28,6 +28,7 @@ go.work.sum
 cli-v2
 codacy-cli
 **/.codacy/logs/
+.codacy/
 
 
 #Ignore cursor AI rules

tools/trivyConfigCreator.go

@@ -32,11 +32,18 @@ func CreateTrivyConfig(config []domain.PatternConfiguration) string {
 		if pattern.PatternDefinition.Id == "Trivy_vulnerability_medium" {
 			includeMedium = patternEnabled
 		}
-		if pattern.PatternDefinition.Id == "Trivy_vulnerability" {
-			// This covers HIGH and CRITICAL
+		if pattern.PatternDefinition.Id == "Trivy_vulnerability_high" {
 			includeHigh = patternEnabled
+		}
+		if pattern.PatternDefinition.Id == "Trivy_vulnerability_critical" {
 			includeCritical = patternEnabled
 		}
+		if pattern.PatternDefinition.Id == "Trivy_vulnerability" {
+			// This covers HIGH and CRITICAL
+			// Now there are other patterns that turn these severities on
+			includeHigh = patternEnabled || includeHigh
+			includeCritical = patternEnabled || includeCritical
+		}
 		if pattern.PatternDefinition.Id == "Trivy_secret" {
 			includeSecret = patternEnabled
 		}

tools/trivyConfigCreator_test.go

@@ -116,7 +116,7 @@ scan:
 `)
 }
 
-func TestCreateTrivyConfigOnlyHigh(t *testing.T) {
+func TestCreateTrivyConfigOnlyHighAndCritical(t *testing.T) {
 	testTrivyConfig(t,
 		[]domain.PatternConfiguration{
 			{
@@ -255,3 +255,211 @@ scan:
     - secret
 `)
 }
+
+func TestCreateTrivyConfigOnlyHigh(t *testing.T) {
+	testTrivyConfig(t,
+		[]domain.PatternConfiguration{
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_minor",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_medium",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_high",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "true",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_critical",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+		},
+		`severity:
+  - HIGH
+
+scan:
+  scanners:
+    - vuln
+    - secret
+`)
+}
+
+func TestCreateTrivyConfigOnlyCritical(t *testing.T) {
+	testTrivyConfig(t,
+		[]domain.PatternConfiguration{
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_minor",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_medium",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_high",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_critical",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "true",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+		},
+		`severity:
+  - CRITICAL
+
+scan:
+  scanners:
+    - vuln
+    - secret
+`)
+}
+
+func TestCreateTrivyConfigOnlyHighAndCriticalEventIfPatternsOverlap(t *testing.T) {
+	testTrivyConfig(t,
+		[]domain.PatternConfiguration{
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_minor",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_medium",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_high",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability_critical",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "false",
+					},
+				},
+			},
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "Trivy_vulnerability",
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "enabled",
+						Value: "true",
+					},
+				},
+			},
+		},
+		`severity:
+  - HIGH
+  - CRITICAL
+
+scan:
+  scanners:
+    - vuln
+    - secret
+`)
+}