rename disallowedSeverity to disallowedSeverities

ratify-project · Nov 30, 2023 · 497c82e · 497c82e
1 parent d88e13e
commit 497c82e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/config/samples/config_v1beta1_verifier_vulnerabilityreport.yaml b/config/samples/config_v1beta1_verifier_vulnerabilityreport.yaml
@@ -7,7 +7,7 @@ spec:
   artifactTypes: application/sarif+json
   parameters:
     maximumAge: 24h
-    disallowedSeverity:
+    disallowedSeverities:
       - high
       - critical
     denylistCVEs:

diff --git a/plugins/verifier/vulnerabilityreport/vulnerability_report.go b/plugins/verifier/vulnerabilityreport/vulnerability_report.go
@@ -53,7 +53,7 @@ type PluginConfig struct {
 	SchemaURL             string   `json:"schemaURL,omitempty"`
 	CreatedAnnotationName string   `json:"createdAnnotationName,omitempty"`
 	MaximumAge            string   `json:"maximumAge,omitempty"`
-	DisallowedSeverity    []string `json:"disallowedSeverity,omitempty"`
+	DisallowedSeverities  []string `json:"disallowedSeverities,omitempty"`
 	Passthrough           bool     `json:"passthrough,omitempty"`
 	DenylistCVEs          []string `json:"denylistCVEs,omitempty"`
 }
@@ -250,8 +250,8 @@ func processSarifReport(input *PluginConfig, verifierName string, blob []byte, c
 			return verifierReport, nil
 		}
 	}
-	if len(input.DisallowedSeverity) > 0 {
-		verifierReport, err := verifyDisallowedSeverities(input.Name, scannerName, sarifReport, input.DisallowedSeverity, createdTime)
+	if len(input.DisallowedSeverities) > 0 {
+		verifierReport, err := verifyDisallowedSeverities(input.Name, scannerName, sarifReport, input.DisallowedSeverities, createdTime)
 		if err != nil {
 			return nil, err
 		}
@@ -332,7 +332,7 @@ func verifyDenyListCVEs(verifierName string, scannerName string, sarifReport *sa
 }
 
 // verifyDisallowedSeverities verifies that the report does not contain any disallowed severity levels
-func verifyDisallowedSeverities(verifierName string, scannerName string, sarifReport *sarif.Report, disallowedSeverity []string, createdTime time.Time) (*verifier.VerifierResult, error) {
+func verifyDisallowedSeverities(verifierName string, scannerName string, sarifReport *sarif.Report, disallowedSeverities []string, createdTime time.Time) (*verifier.VerifierResult, error) {
 	ruleMap := make(map[string]*sarif.ReportingDescriptor)
 	violatingRules := make([]sarif.ReportingDescriptor, 0)
 	// create a map of rule id to rule for easy lookup
@@ -377,7 +377,7 @@ func verifyDisallowedSeverities(verifierName string, scannerName string, sarifRe
 			}, nil
 		}
 		// check if the severity is disallowed and add it to the list of violating rules
-		for _, disallowed := range disallowedSeverity {
+		for _, disallowed := range disallowedSeverities {
 			if strings.EqualFold(severity, disallowed) {
 				violatingRules = append(violatingRules, *rule)
 			}

diff --git a/plugins/verifier/vulnerabilityreport/vulnerability_report_test.go b/plugins/verifier/vulnerabilityreport/vulnerability_report_test.go
@@ -367,7 +367,7 @@ func TestProcessSarifReport(t *testing.T) {
 				input: PluginConfig{
 					Name:         "test_verifier",
 					DenylistCVEs: []string{"CVE-2022-48174"},
-					DisallowedSeverity: []string{
+					DisallowedSeverities: []string{
 						"critical",
 					},
 				},
@@ -384,7 +384,7 @@ func TestProcessSarifReport(t *testing.T) {
 				input: PluginConfig{
 					Name:         "test_verifier",
 					DenylistCVEs: []string{"CVE-2022-48174"},
-					DisallowedSeverity: []string{
+					DisallowedSeverities: []string{
 						"high",
 					},
 				},