fix: update tests and always include bool

Bearer · Aug 17, 2023 · c8d6d8c · c8d6d8c
1 parent c492606
commit c8d6d8c
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 10 deletions.
diff --git a/e2e/rules/.snapshots/TestReferenceFilters-testdata-data-reference_filters b/e2e/rules/.snapshots/TestReferenceFilters-testdata-data-reference_filters
@@ -34,6 +34,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
 
 

diff --git a/e2e/rules/.snapshots/TestSecrets-secrets b/e2e/rules/.snapshots/TestSecrets-secrets
@@ -45,6 +45,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
 
 

diff --git a/e2e/rules/.snapshots/TestSimpleRuby-testdata-data-simple_ruby b/e2e/rules/.snapshots/TestSimpleRuby-testdata-data-simple_ruby
@@ -54,6 +54,7 @@ medium:
         display_severity: medium
         sensitive_data_category_weighting: 2
         rule_severity_weighting: 2
+        trigger_weighting: false
         final_weighting: 4
 
 

diff --git a/new/detector/composition/java/.snapshots/TestScope--scope.yml b/new/detector/composition/java/.snapshots/TestScope--scope.yml
@@ -33,6 +33,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -68,6 +69,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -103,6 +105,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -138,6 +141,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -173,6 +177,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -208,5 +213,6 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
 
diff --git a/new/detector/composition/javascript/.snapshots/TestPatternVariables--main.yml b/new/detector/composition/javascript/.snapshots/TestPatternVariables--main.yml
@@ -33,6 +33,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -68,5 +69,6 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
 
diff --git a/new/detector/composition/javascript/.snapshots/TestScope--scope.yml b/new/detector/composition/javascript/.snapshots/TestScope--scope.yml
@@ -33,6 +33,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -68,6 +69,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -103,6 +105,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -138,6 +141,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -173,6 +177,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -208,5 +213,6 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
 
diff --git a/new/detector/composition/javascript/.snapshots/import/TestImport--import.yml b/new/detector/composition/javascript/.snapshots/import/TestImport--import.yml
@@ -33,6 +33,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -68,6 +69,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -103,6 +105,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -138,6 +141,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -173,5 +177,6 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
 
diff --git a/.../javascript/.snapshots/object-deconstructing/TestObjectDeconstructing--deconstructing.yml b/.../javascript/.snapshots/object-deconstructing/TestObjectDeconstructing--deconstructing.yml
@@ -32,5 +32,6 @@ low:
         rule_severity: ""
         display_severity: low
         rule_severity_weighting: 2
+        trigger_weighting: false
         final_weighting: 2
 
diff --git a/...avascript/.snapshots/object-deconstructing/TestObjectDeconstructing--multiple_objects.yml b/...avascript/.snapshots/object-deconstructing/TestObjectDeconstructing--multiple_objects.yml
@@ -32,5 +32,6 @@ low:
         rule_severity: ""
         display_severity: low
         rule_severity_weighting: 2
+        trigger_weighting: false
         final_weighting: 2
 
diff --git a/new/detector/composition/ruby/.snapshots/TestPatternVariables--main.yml b/new/detector/composition/ruby/.snapshots/TestPatternVariables--main.yml
@@ -33,6 +33,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -72,6 +73,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -113,5 +115,6 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
 
diff --git a/new/detector/composition/ruby/.snapshots/TestScope--scope.yml b/new/detector/composition/ruby/.snapshots/TestScope--scope.yml
@@ -33,6 +33,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -68,6 +69,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -103,6 +105,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -138,6 +141,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -173,6 +177,7 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
     - rule:
         cwe_ids:
@@ -208,5 +213,6 @@ high:
         rule_severity: high
         display_severity: high
         rule_severity_weighting: 5
+        trigger_weighting: false
         final_weighting: 5
 
diff --git a/pkg/report/output/security/.snapshots/TestCalculateSeverity b/pkg/report/output/security/.snapshots/TestCalculateSeverity
@@ -4,39 +4,39 @@
     DisplaySeverity: (string) (len=8) "critical",
     SensitiveDataCategoryWeighting: (int) 3,
     RuleSeverityWeighting: (int) 2,
-    TriggerWeighting: (bool) true,
+    TriggerWeighting: (*bool)(true),
     FinalWeighting: (int) 8
   },
   (security.SeverityWeighting) {
     RuleSeverity: (string) (len=3) "low",
     DisplaySeverity: (string) (len=4) "high",
     SensitiveDataCategoryWeighting: (int) 3,
     RuleSeverityWeighting: (int) 2,
-    TriggerWeighting: (bool) false,
+    TriggerWeighting: (*bool)(false),
     FinalWeighting: (int) 5
   },
   (security.SeverityWeighting) {
     RuleSeverity: (string) (len=3) "low",
     DisplaySeverity: (string) (len=6) "medium",
     SensitiveDataCategoryWeighting: (int) 2,
     RuleSeverityWeighting: (int) 2,
-    TriggerWeighting: (bool) false,
+    TriggerWeighting: (*bool)(false),
     FinalWeighting: (int) 4
   },
   (security.SeverityWeighting) {
     RuleSeverity: (string) (len=7) "warning",
     DisplaySeverity: (string) (len=7) "warning",
     SensitiveDataCategoryWeighting: (int) 0,
     RuleSeverityWeighting: (int) 0,
-    TriggerWeighting: (bool) false,
+    TriggerWeighting: (*bool)(<nil>),
     FinalWeighting: (int) 0
   },
   (security.SeverityWeighting) {
     RuleSeverity: (string) (len=7) "warning",
     DisplaySeverity: (string) (len=7) "warning",
     SensitiveDataCategoryWeighting: (int) 0,
     RuleSeverityWeighting: (int) 0,
-    TriggerWeighting: (bool) false,
+    TriggerWeighting: (*bool)(<nil>),
     FinalWeighting: (int) 0
   }
 }
diff --git a/pkg/report/output/security/.snapshots/TestGetOutput b/pkg/report/output/security/.snapshots/TestGetOutput
@@ -56,7 +56,7 @@
         DisplaySeverity: (string) (len=8) "critical",
         SensitiveDataCategoryWeighting: (int) 3,
         RuleSeverityWeighting: (int) 2,
-        TriggerWeighting: (bool) true,
+        TriggerWeighting: (*bool)(true),
         FinalWeighting: (int) 8
       },
       RawCodeExtract: ([]file.Line) {
@@ -115,7 +115,7 @@
         DisplaySeverity: (string) (len=4) "high",
         SensitiveDataCategoryWeighting: (int) 2,
         RuleSeverityWeighting: (int) 3,
-        TriggerWeighting: (bool) false,
+        TriggerWeighting: (*bool)(false),
         FinalWeighting: (int) 5
       },
       RawCodeExtract: ([]file.Line) {

diff --git a/pkg/report/output/security/.snapshots/TestTestGetOutputWithSeverity b/pkg/report/output/security/.snapshots/TestTestGetOutputWithSeverity
@@ -56,7 +56,7 @@
         DisplaySeverity: (string) (len=8) "critical",
         SensitiveDataCategoryWeighting: (int) 3,
         RuleSeverityWeighting: (int) 2,
-        TriggerWeighting: (bool) true,
+        TriggerWeighting: (*bool)(true),
         FinalWeighting: (int) 8
       },
       RawCodeExtract: ([]file.Line) {

diff --git a/pkg/report/output/security/security.go b/pkg/report/output/security/security.go
@@ -63,7 +63,7 @@ type SeverityWeighting struct {
 	DisplaySeverity                string `json:"display_severity" yaml:"display_severity"`
 	SensitiveDataCategoryWeighting int    `json:"sensitive_data_category_weighting,omitempty" yaml:"sensitive_data_category_weighting,omitempty"`
 	RuleSeverityWeighting          int    `json:"rule_severity_weighting,omitempty" yaml:"rule_severity_weighting,omitempty"`
-	TriggerWeighting               bool   `json:"trigger_weighting,omitempty" yaml:"trigger_weighting,omitempty"`
+	TriggerWeighting               *bool  `json:"trigger_weighting,omitempty" yaml:"trigger_weighting,omitempty"`
 	FinalWeighting                 int    `json:"final_weighting,omitempty" yaml:"final_weighting,omitempty"`
 }
 
@@ -478,7 +478,7 @@ func CalculateSeverity(groups []string, severity string, hasLocalDataTypes bool)
 		RuleSeverity:                   severity,
 		SensitiveDataCategoryWeighting: sensitiveDataCategoryWeighting,
 		RuleSeverityWeighting:          ruleSeverityWeighting,
-		TriggerWeighting:               hasLocalDataTypes,
+		TriggerWeighting:               &hasLocalDataTypes,
 		FinalWeighting:                 finalWeighting,
 		DisplaySeverity:                displaySeverity,
 	}