Empty ruleset required_deployment_environments is now valid (#1942)

* Empty ruleset required_deployment_environments is now valid * Update github/respository_rules_utils.go --------- Co-authored-by: Keegan Campbell <[email protected]>
integrations · Oct 25, 2023 · b86c22c · b86c22c
1 parent fbcad03
commit b86c22c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/github/resource_github_repository_ruleset.go b/github/resource_github_repository_ruleset.go
@@ -162,7 +162,6 @@ func resourceGithubRepositoryRuleset() *schema.Resource {
 									"required_deployment_environments": {
 										Type:        schema.TypeList,
 										Required:    true,
-										DefaultFunc: func() (interface{}, error) { return []string{}, nil },
 										Description: "The environments that must be successfully deployed to before branches can be merged.",
 										Elem: &schema.Schema{
 											Type: schema.TypeString,

diff --git a/github/respository_rules_utils.go b/github/respository_rules_utils.go
@@ -239,7 +239,13 @@ func expandRules(input []interface{}, org bool) []*github.RepositoryRule {
 	// Required deployments rule
 	if !org {
 		if v, ok := rulesMap["required_deployments"].([]interface{}); ok && len(v) != 0 {
-			requiredDeploymentsMap := v[0].(map[string]interface{})
+			requiredDeploymentsMap := make(map[string]interface{})
+			// If the rule's block is present but has an empty environments list
+			if v[0] == nil {
+				requiredDeploymentsMap["required_deployment_environments"] = make([]interface{}, 0)
+			} else {
+				requiredDeploymentsMap = v[0].(map[string]interface{})
+			}
 			envs := make([]string, 0)
 			for _, v := range requiredDeploymentsMap["required_deployment_environments"].([]interface{}) {
 				envs = append(envs, v.(string))