remove protected values from probes

Signed-off-by: Adam Korczynski <adam@adalogics.com>
ossf · Feb 24, 2024 · 5c98388 · 5c98388
1 parent d34ae27
commit 5c98388
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 70 deletions.
diff --git a/probes/blocksDeleteOnBranches/impl.go b/probes/blocksDeleteOnBranches/impl.go
@@ -52,14 +52,6 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 	for i := range r.Branches {
 		branch := &r.Branches[i]
 
-		protected := !(branch.Protected != nil && !*branch.Protected)
-		var protectedValue int
-		if protected {
-			protectedValue = 1
-		} else {
-			protectedValue = 0
-		}
-
 		var text string
 		var outcome finding.Outcome
 		switch {

diff --git a/probes/blocksForcePushOnBranches/impl.go b/probes/blocksForcePushOnBranches/impl.go
@@ -52,14 +52,6 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 	for i := range r.Branches {
 		branch := &r.Branches[i]
 
-		protected := !(branch.Protected != nil && !*branch.Protected)
-		var protectedValue int
-		if protected {
-			protectedValue = 1
-		} else {
-			protectedValue = 0
-		}
-
 		var text string
 		var outcome finding.Outcome
 		switch {

diff --git a/probes/branchProtectionAppliesToAdmins/impl.go b/probes/branchProtectionAppliesToAdmins/impl.go
@@ -53,14 +53,6 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 	for i := range r.Branches {
 		branch := &r.Branches[i]
 
-		protected := !(branch.Protected != nil && !*branch.Protected)
-		var protectedValue int
-		if protected {
-			protectedValue = 1
-		} else {
-			protectedValue = 0
-		}
-
 		p := branch.BranchProtectionRule.EnforceAdmins
 		text, outcome, err := branchprotection.GetTextOutcomeFromBool(p,
 			"branch protection settings apply to administrators",

diff --git a/probes/requiresApproversForPullRequests/impl.go b/probes/requiresApproversForPullRequests/impl.go
@@ -57,14 +57,6 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 	for i := range r.Branches {
 		branch := &r.Branches[i]
 
-		protected := !(branch.Protected != nil && !*branch.Protected)
-		var protectedValue int
-		if protected {
-			protectedValue = 1
-		} else {
-			protectedValue = 0
-		}
-
 		nilMsg := fmt.Sprintf("could not determine whether branch '%s' has required approving review count", *branch.Name)
 		trueMsg := fmt.Sprintf("required approving review count on branch '%s'", *branch.Name)
 		falseMsg := fmt.Sprintf("branch '%s' does not require approvers", *branch.Name)

diff --git a/probes/requiresLastPushApproval/impl.go b/probes/requiresLastPushApproval/impl.go
@@ -53,14 +53,6 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 	for i := range r.Branches {
 		branch := &r.Branches[i]
 
-		protected := !(branch.Protected != nil && !*branch.Protected)
-		var protectedValue int
-		if protected {
-			protectedValue = 1
-		} else {
-			protectedValue = 0
-		}
-
 		p := branch.BranchProtectionRule.RequireLastPushApproval
 		text, outcome, err := branchprotection.GetTextOutcomeFromBool(p, "last push approval", *branch.Name)
 		if err != nil {

diff --git a/probes/requiresPRsToChangeCode/impl.go b/probes/requiresPRsToChangeCode/impl.go
@@ -52,14 +52,6 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 	for i := range r.Branches {
 		branch := &r.Branches[i]
 
-		protected := !(branch.Protected != nil && !*branch.Protected)
-		var protectedValue int
-		if protected {
-			protectedValue = 1
-		} else {
-			protectedValue = 0
-		}
-
 		nilMsg := fmt.Sprintf("could not determine whether branch '%s' requires PRs to change code", *branch.Name)
 		trueMsg := fmt.Sprintf("PRs are required in order to make changes on branch '%s'", *branch.Name)
 		falseMsg := fmt.Sprintf("PRs are not required to make changes on branch '%s'; ", *branch.Name) +
@@ -78,20 +70,17 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 		case p == nil:
 			f = f.WithMessage(nilMsg).WithOutcome(finding.OutcomeNotAvailable)
 			f = f.WithValues(map[string]int{
-				*branch.Name:      1,
-				"branchProtected": protectedValue,
+				*branch.Name: 1,
 			})
 		case *p:
 			f = f.WithMessage(trueMsg).WithOutcome(finding.OutcomePositive)
 			f = f.WithValues(map[string]int{
-				*branch.Name:      1,
-				"branchProtected": protectedValue,
+				*branch.Name: 1,
 			})
 		case !*p:
 			f = f.WithMessage(falseMsg).WithOutcome(finding.OutcomeNegative)
 			f = f.WithValues(map[string]int{
-				*branch.Name:      1,
-				"branchProtected": protectedValue,
+				*branch.Name: 1,
 			})
 		default:
 			return nil, Probe, fmt.Errorf("create finding: %w", errWrongValue)

diff --git a/probes/requiresUpToDateBranches/impl.go b/probes/requiresUpToDateBranches/impl.go
@@ -53,14 +53,6 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 	for i := range r.Branches {
 		branch := &r.Branches[i]
 
-		protected := !(branch.Protected != nil && !*branch.Protected)
-		var protectedValue int
-		if protected {
-			protectedValue = 1
-		} else {
-			protectedValue = 0
-		}
-
 		p := branch.BranchProtectionRule.CheckRules.UpToDateBeforeMerge
 		text, outcome, err := branchprotection.GetTextOutcomeFromBool(p,
 			"up-to-date branches",

diff --git a/probes/runsStatusChecksBeforeMerging/impl.go b/probes/runsStatusChecksBeforeMerging/impl.go
@@ -52,14 +52,6 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 	for i := range r.Branches {
 		branch := &r.Branches[i]
 
-		protected := !(branch.Protected != nil && !*branch.Protected)
-		var protectedValue int
-		if protected {
-			protectedValue = 1
-		} else {
-			protectedValue = 0
-		}
-
 		switch {
 		case len(branch.BranchProtectionRule.CheckRules.Contexts) > 0:
 			f, err := finding.NewWith(fs, Probe,