Add workaround for GH API bug that OrgAdmin actor_id is returned as null

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/util_rules.go

@@ -133,9 +133,15 @@ func flattenBypassActors(bypassActors []*github.BypassActor) []any {
 	actorsSlice := make([]any, 0)
 	for _, v := range bypassActors {
 		actorMap := make(map[string]any)
-
-		actorMap["actor_id"] = v.GetActorID()
-		actorMap["actor_type"] = v.GetActorType()
+		actorID := v.GetActorID()
+		actorType := v.GetActorType()
+		if *actorType == github.BypassActorTypeOrganizationAdmin && actorID == 0 {
+      // This is a workaround for the GitHub API bug where OrganizationAdmin actor_id is returned as `null` instead of `1`
+      log.Printf("[DEBUG] Setting OrganizationAdmin Actor ID to 1")
+			actorID = 1
+		}
+		actorMap["actor_id"] = actorID
+		actorMap["actor_type"] = actorType
 		actorMap["bypass_mode"] = v.GetBypassMode()
 
 		actorsSlice = append(actorsSlice, actorMap)