Add validation package to allow the use of IntBetween.

Author: Andy Gertjejansen

github/resource_github_branch_protection.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/google/go-github/github"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
 )
 
 func resourceGithubBranchProtection() *schema.Resource {
@@ -97,19 +98,11 @@ func resourceGithubBranchProtection() *schema.Resource {
 							Optional: true,
 						},
 						"required_approving_review_count": {
-							Type:        schema.TypeInt,
-							Optional:    true,
-							Description: "Number of approvals required to merge a pull request",
-							Default:     1,
-							// Old version of terraform, could not utilize validation.IntBetween
-							ValidateFunc: func(i interface{}, k string) (s []string, es []error) {
-								v := i.(int)
-								if v < 1 || v > 6 {
-									es = append(es, errors.New("required_pull_request_reviews.required_approving_review_count must be an integer between 1 - 6"))
-								}
-
-								return
-							},
+							Type:         schema.TypeInt,
+							Optional:     true,
+							Description:  "Number of approvals required to merge a pull request",
+							Default:      1,
+							ValidateFunc: validation.IntBetween(1, 6),
 						},
 					},
 				},

vendor/github.com/hashicorp/terraform/helper/validation/validation.go

@@ -533,6 +533,12 @@
 			"version": "v0.11.7",
 			"versionExact": "v0.11.7"
 		},
+		{
+			"checksumSHA1": "nEC56vB6M60BJtGPe+N9rziHqLg=",
+			"path": "github.com/hashicorp/terraform/helper/validation",
+			"revision": "c64d8bdf354eb27125416de89ee199a740ff8d35",
+			"revisionTime": "2018-09-10T19:16:45Z"
+		},
 		{
 			"checksumSHA1": "kD1ayilNruf2cES1LDfNZjYRscQ=",
 			"path": "github.com/hashicorp/terraform/httpclient",