Set allowed_merge_methods to Optional

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/resource_github_organization_ruleset.go

@@ -200,7 +200,7 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 								Schema: map[string]*schema.Schema{
 									"allowed_merge_methods": {
 										Type:        schema.TypeList,
-										Required:    true,
+										Optional:    true,
 										MinItems:    1,
 										Description: "Array of allowed merge methods. Allowed values include `merge`, `squash`, and `rebase`. At least one option must be enabled.",
 										Elem: &schema.Schema{

github/resource_github_organization_ruleset_test.go

@@ -95,7 +95,6 @@ resource "github_organization_ruleset" "test" {
 		required_signatures = false
 
 		pull_request {
-			allowed_merge_methods = ["merge", "rebase", "squash"]
 			required_approving_review_count   = 2
 			required_review_thread_resolution = true
 			require_code_owner_review         = true

github/resource_github_repository_ruleset.go

@@ -191,7 +191,7 @@ func resourceGithubRepositoryRuleset() *schema.Resource {
 								Schema: map[string]*schema.Schema{
 									"allowed_merge_methods": {
 										Type:        schema.TypeList,
-										Required:    true,
+										Optional:    true,
 										MinItems:    1,
 										Description: "Array of allowed merge methods. Allowed values include `merge`, `squash`, and `rebase`. At least one option must be enabled.",
 										Elem: &schema.Schema{

github/resource_github_repository_ruleset_test.go

@@ -13,6 +13,10 @@ import (
 )
 
 func TestAccGithubRepositoryRuleset(t *testing.T) {
+	baseVisibility := "public"
+	if testAccConf.authMode == enterprise {
+		baseVisibility = "private" // Enable tests to run on GHEC EMU
+	}
 	t.Run("create_branch_ruleset", func(t *testing.T) {
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 		repoName := fmt.Sprintf("%srepo-ruleset-%s", testResourcePrefix, randomID)
@@ -23,6 +27,7 @@ resource "github_repository" "test" {
 	auto_init = true
 	default_branch = "main"
 	vulnerability_alerts = true
+	visibility = "%s"
 }
 
 resource "github_repository_environment" "example" {
@@ -112,7 +117,7 @@ resource "github_repository_ruleset" "test" {
 		}
 	}
 }
-`, repoName)
+`, repoName, baseVisibility)
 
 		resource.Test(t, resource.TestCase{
 			PreCheck:          func() { skipUnauthenticated(t) },