Merge pull request integrations#385 from svanharmelen/svh/b-branch-pr…

…otection Prevent a panic when trying to use DismissalRestrictions
kfcampbell · Mar 25, 2020 · 0bb8e92 · 0bb8e92
2 parents c33ab7b + 0d722ee
commit 0bb8e92
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/github/resource_github_branch_protection.go b/github/resource_github_branch_protection.go
@@ -433,17 +433,18 @@ func requireSignedCommitsUpdate(d *schema.ResourceData, meta interface{}) (err e
 func flattenAndSetRequiredPullRequestReviews(d *schema.ResourceData, protection *github.Protection) error {
 	rprr := protection.RequiredPullRequestReviews
 	if rprr != nil {
-		users := make([]interface{}, 0, len(rprr.DismissalRestrictions.Users))
-		for _, u := range rprr.DismissalRestrictions.Users {
-			if u.Login != nil {
-				users = append(users, *u.Login)
+		var users, teams []interface{}
+		if rprr.DismissalRestrictions != nil {
+			for _, u := range rprr.DismissalRestrictions.Users {
+				if u.Login != nil {
+					users = append(users, *u.Login)
+				}
 			}
-		}
 
-		teams := make([]interface{}, 0, len(rprr.DismissalRestrictions.Teams))
-		for _, t := range rprr.DismissalRestrictions.Teams {
-			if t.Slug != nil {
-				teams = append(teams, *t.Slug)
+			for _, t := range rprr.DismissalRestrictions.Teams {
+				if t.Slug != nil {
+					teams = append(teams, *t.Slug)
+				}
 			}
 		}
 

diff --git a/github/resource_github_branch_protection_test.go b/github/resource_github_branch_protection_test.go
@@ -305,18 +305,21 @@ func testAccCheckGithubBranchProtectionPullRequestReviews(protection *github.Pro
 			return fmt.Errorf("Expected `dismiss_state_reviews` to be %t, got %t", expectedStale, reviews.DismissStaleReviews)
 		}
 
-		users := []string{}
-		for _, u := range reviews.DismissalRestrictions.Users {
-			users = append(users, *u.Login)
+		var users, teams []string
+		if reviews.DismissalRestrictions != nil {
+			for _, u := range reviews.DismissalRestrictions.Users {
+				users = append(users, *u.Login)
+			}
+
+			for _, t := range reviews.DismissalRestrictions.Teams {
+				teams = append(teams, *t.Slug)
+			}
 		}
+
 		if diff := pretty.Compare(users, expectedUsers); diff != "" {
 			return fmt.Errorf("diff %q: (-got +want)\n%s", "required_pull_request_reviews.dismissal_users", diff)
 		}
 
-		teams := []string{}
-		for _, t := range reviews.DismissalRestrictions.Teams {
-			teams = append(teams, *t.Slug)
-		}
 		sort.Strings(teams)
 		sort.Strings(expectedTeams)
 		if diff := pretty.Compare(teams, expectedTeams); diff != "" {