feature/985 branch protection checks

github/resource_github_branch_protection_v3.go

@@ -53,12 +53,30 @@ func resourceGithubBranchProtectionV3() *schema.Resource {
 							Default:  false,
 						},
 						"contexts": {
-							Type:     schema.TypeSet,
-							Optional: true,
+							Type:       schema.TypeSet,
+							Optional:   true,
+							Deprecated: "GitHub is deprecating the use of `contexts`. Use `check` blocks instead.",
 							Elem: &schema.Schema{
 								Type: schema.TypeString,
 							},
 						},
+						"check": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"context": {
+										Type:     schema.TypeString,
+										Required: true,
+									},
+									"app_id": {
+										Type:     schema.TypeInt,
+										Optional: true,
+										Default:  -1,
+									},
+								},
+							},
+						},
 					},
 				},
 			},

github/resource_github_branch_protection_v3_utils.go

@@ -46,10 +46,24 @@ func flattenAndSetRequiredStatusChecks(d *schema.ResourceData, protection *githu
 			contexts = append(contexts, c)
 		}
 
+		var checks []interface{}
+		for _, chk := range rsc.Checks {
+			chkMap := make(map[string]interface{})
+			chkMap["context"] = chk.Context
+			chkMap["app_id"] = func() int {
+				if chk.AppID != nil {
+					return int(*chk.AppID)
+				}
+				return -1
+			}()
+			checks = append(checks, chkMap)
+		}
+
 		return d.Set("required_status_checks", []interface{}{
 			map[string]interface{}{
 				"strict":   rsc.Strict,
 				"contexts": schema.NewSet(schema.HashString, contexts),
+				"check":    checks,
 			},
 		})
 	}
@@ -193,6 +207,29 @@ func expandRequiredStatusChecks(d *schema.ResourceData) (*github.RequiredStatusC
 
 			contexts := expandNestedSet(m, "contexts")
 			rsc.Contexts = contexts
+
+			// Iterate and parse checks
+			checks := m["check"].([]interface{})
+			var rscChecks []*github.RequiredStatusCheck
+			for _, c := range checks {
+				chk := c.(map[string]interface{})
+
+				var cContext string
+				if cContext, ok = chk["context"].(string); !ok {
+					return nil, errors.New("could not parse 'context' for required_status_checks check")
+				}
+				var cAppId int
+				if cAppId, ok = chk["app_id"].(int); !ok {
+					log.Printf("[DEBUG] app_id value: %v", chk["app_id"].(int))
+					return nil, errors.New("could not parse 'app_id' for required_status_checks check")
+				}
+				rscAppId := int64(cAppId)
+				rscChecks = append(rscChecks, &github.RequiredStatusCheck{
+					Context: cContext,
+					AppID:   &rscAppId,
+				})
+			}
+			rsc.Checks = rscChecks
 		}
 		return rsc, nil
 	}