adding logic to account for when no bypass actors are set

Author: kuhlman-labs

Diff for: reporulesetbot/handler.go

@@ -162,6 +162,13 @@ func (h *RulesetHandler) handleRulesetEdited(ctx context.Context, event *Ruleset
 			continue
 		}
 
+		if len(ruleset.BypassActors) == 0 {
+			logger.Info().Msgf("Ruleset %s in the organization %s does not have any bypass actors.", ruleset.Name, orgName)
+			if err := removeBypassActors(client, orgName, rulesetID); err != nil {
+				return errors.Wrapf(err, "Failed to remove bypass actors from ruleset %s in organization %s", eventRulesetName, orgName)
+			}
+		}
+
 		if err := editRuleset(ctx, client, orgName, rulesetID, ruleset, logger); err != nil {
 			return errors.Wrapf(err, "Failed to edit ruleset %s in organization %s", eventRulesetName, orgName)
 		}

Diff for: reporulesetbot/ruleset.go

@@ -237,16 +237,16 @@ func shouldProcessBypassActor(bypassActor *github.BypassActor) bool {
 
 // isManagedRuleset returns true if the ruleset is managed by this App.
 func isManagedRuleset(event *RulesetEvent, ruleset *github.Ruleset, logger zerolog.Logger) bool {
-
 	if event.Changes.Name.From != "" && ruleset.Name == event.Changes.Name.From {
 		logger.Info().Msgf("Ruleset name was changed from %s to %s in the organization %s.", event.Changes.Name.From, event.Ruleset.Name, event.Organization.GetLogin())
-		return ruleset.Name == event.Changes.Name.From
+		return true
 	}
 
 	if ruleset.Name != event.Ruleset.Name {
-		logger.Info().Msgf("Ruleset %s in the organization %s is not managed by this App.", event.Ruleset.Name, event.Organization.GetLogin())
+		logger.Info().Msgf("Ruleset %s does not match the event ruleset %s in the organization %s.", ruleset.Name, event.Ruleset.Name, event.Organization.GetLogin())
 		return false
 	}
+
 	logger.Info().Msgf("Ruleset %s in the organization %s is managed by this App.", event.Ruleset.Name, event.Organization.GetLogin())
 	return true
 }

Diff for: reporulesetbot/utils.go

@@ -1,7 +1,10 @@
 package reporulesetbot
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
+	"fmt"
 	"net/http"
 	"net/url"
 	"os"
@@ -206,3 +209,29 @@ func getRulesetFiles(dir string) ([]string, error) {
 
 	return ruleSetFiles, nil
 }
+
+// removeBypassActors edits the ruleset to remove the bypass actors.
+func removeBypassActors(client *github.Client, orgName string, rulesetID int64) error {
+
+	payload := map[string]interface{}{
+		"bypass_actors": []interface{}{},
+	}
+
+	data, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "Failed to marshal JSON payload")
+	}
+
+	body := bytes.NewReader(data)
+
+	req, err := http.NewRequest("PUT", fmt.Sprintf("https://api.github.com/orgs/%s/rulesets/%d", orgName, rulesetID), body)
+	if err != nil {
+		return errors.Wrap(err, "Failed to create new request")
+	}
+	_, err = client.BareDo(context.Background(), req)
+	if err != nil {
+		return errors.Wrap(err, "Failed to remove bypass actors")
+	}
+
+	return nil
+}