From f99a681eb2e4bf9648d16cf6ad0f9886f7dcd5f6 Mon Sep 17 00:00:00 2001 From: Dion Gionet Mallet Date: Thu, 14 Sep 2023 16:45:27 -0400 Subject: [PATCH] fix(branch_protection): added missing App DismissalActorTypes --- github/util_v4_branch_protection.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/github/util_v4_branch_protection.go b/github/util_v4_branch_protection.go index d3ca38de54..f5a5705df4 100644 --- a/github/util_v4_branch_protection.go +++ b/github/util_v4_branch_protection.go @@ -24,6 +24,7 @@ type ActorUser struct { type DismissalActorTypes struct { Actor struct { + App Actor `graphql:"... on App"` Team Actor `graphql:"... on Team"` User ActorUser `graphql:"... on User"` } @@ -340,7 +341,7 @@ func setDismissalActorIDs(actors []DismissalActorTypes, data BranchProtectionRes for _, a := range actors { IsID := false for _, v := range data.ReviewDismissalActorIDs { - if (a.Actor.Team.ID != nil && a.Actor.Team.ID.(string) == v) || (a.Actor.User.ID != nil && a.Actor.User.ID.(string) == v) { + if (a.Actor.Team.ID != nil && a.Actor.Team.ID.(string) == v) || (a.Actor.User.ID != nil && a.Actor.User.ID.(string) == v) || (a.Actor.App.ID != nil && a.Actor.App.ID.(string) == v) { dismissalActors = append(dismissalActors, v) IsID = true break @@ -353,6 +354,10 @@ func setDismissalActorIDs(actors []DismissalActorTypes, data BranchProtectionRes } if a.Actor.User.Login != "" { dismissalActors = append(dismissalActors, "/"+string(a.Actor.User.Login)) + continue + } + if a.Actor.App != (Actor{}) { + dismissalActors = append(dismissalActors, a.Actor.App.ID.(string)) } } } @@ -561,7 +566,7 @@ func getBranchProtectionID(repoID githubv4.ID, pattern string, meta interface{}) } } - return nil, fmt.Errorf("could not find a branch protection rule with the pattern '%s'.", pattern) + return nil, fmt.Errorf("could not find a branch protection rule with the pattern '%s'", pattern) } func getActorIds(data []string, meta interface{}) ([]string, error) {