feat: remove merge queue and required deployments from GitHub enterprise ruleset schema

Author: Ravio1i

github/data_source_github_enterprise_ruleset.go

@@ -209,67 +209,6 @@ func dataSourceGithubEnterpriseRuleset() *schema.Resource {
 							Computed:    true,
 							Description: "Commits pushed to matching branches must have verified signatures.",
 						},
-						"merge_queue": {
-							Type:        schema.TypeList,
-							Computed:    true,
-							Description: "Merges must be performed via a merge queue.",
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"check_response_timeout_minutes": {
-										Type:        schema.TypeInt,
-										Computed:    true,
-										Description: "Maximum time for a required status check to report a conclusion.",
-									},
-									"grouping_strategy": {
-										Type:        schema.TypeString,
-										Computed:    true,
-										Description: "When set to ALLGREEN, the merge commit created by merge queue for each PR in the group must pass all required checks to merge. When set to HEADGREEN, only the commit at the head of the merge group must pass its required checks to merge.",
-									},
-									"max_entries_to_build": {
-										Type:        schema.TypeInt,
-										Computed:    true,
-										Description: "Limit the number of queued pull requests requesting checks and workflow runs at the same time.",
-									},
-									"max_entries_to_merge": {
-										Type:        schema.TypeInt,
-										Computed:    true,
-										Description: "The maximum number of PRs that will be merged together in a group.",
-									},
-									"merge_method": {
-										Type:        schema.TypeString,
-										Computed:    true,
-										Description: "Method to use when merging changes from queued pull requests.",
-									},
-									"min_entries_to_merge": {
-										Type:        schema.TypeInt,
-										Computed:    true,
-										Description: "The minimum number of PRs that will be merged together in a group.",
-									},
-									"min_entries_to_merge_wait_minutes": {
-										Type:        schema.TypeInt,
-										Computed:    true,
-										Description: "The time merge queue should wait after the first PR is added to the queue for the minimum group size to be met.",
-									},
-								},
-							},
-						},
-						"required_deployments": {
-							Type:        schema.TypeList,
-							Computed:    true,
-							Description: "Choose which environments must be successfully deployed to before branches can be merged into a branch that matches this rule.",
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"required_deployment_environments": {
-										Type:        schema.TypeList,
-										Computed:    true,
-										Description: "The environments that must be successfully deployed to before branches can be merged.",
-										Elem: &schema.Schema{
-											Type: schema.TypeString,
-										},
-									},
-								},
-							},
-						},
 						"non_fast_forward": {
 							Type:        schema.TypeBool,
 							Computed:    true,

github/resource_github_enterprise_ruleset.go

@@ -231,72 +231,6 @@ func resourceGithubEnterpriseRuleset() *schema.Resource {
 							Optional:    true,
 							Description: "Commits pushed to matching branches must have verified signatures.",
 						},
-						"merge_queue": {
-							Type:        schema.TypeList,
-							Optional:    true,
-							MaxItems:    1,
-							Description: "Merges must be performed via a merge queue.",
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"check_response_timeout_minutes": {
-										Type:        schema.TypeInt,
-										Required:    true,
-										Description: "Maximum time for a required status check to report a conclusion. After this much time has elapsed, checks that have not reported a conclusion will be assumed to have failed.",
-									},
-									"grouping_strategy": {
-										Type:             schema.TypeString,
-										Required:         true,
-										Description:      "When set to ALLGREEN, the merge commit created by merge queue for each PR in the group must pass all required checks to merge. When set to HEADGREEN, only the commit at the head of the merge group, i.e. the commit containing changes from all of the PRs in the group, must pass its required checks to merge.",
-										ValidateDiagFunc: toDiagFunc(validation.StringInSlice([]string{"ALLGREEN", "HEADGREEN"}, false), "grouping_strategy"),
-									},
-									"max_entries_to_build": {
-										Type:        schema.TypeInt,
-										Required:    true,
-										Description: "Limit the number of queued pull requests requesting checks and workflow runs at the same time.",
-									},
-									"max_entries_to_merge": {
-										Type:        schema.TypeInt,
-										Required:    true,
-										Description: "The maximum number of PRs that will be merged together in a group.",
-									},
-									"merge_method": {
-										Type:             schema.TypeString,
-										Required:         true,
-										Description:      "Method to use when merging changes from queued pull requests. Can be one of `MERGE`, `SQUASH`, or `REBASE`.",
-										ValidateDiagFunc: toDiagFunc(validation.StringInSlice([]string{"MERGE", "SQUASH", "REBASE"}, false), "merge_method"),
-									},
-									"min_entries_to_merge": {
-										Type:        schema.TypeInt,
-										Required:    true,
-										Description: "The minimum number of PRs that will be merged together in a group.",
-									},
-									"min_entries_to_merge_wait_minutes": {
-										Type:        schema.TypeInt,
-										Required:    true,
-										Description: "The time merge queue should wait after the first PR is added to the queue for the minimum group size to be met. After this time has elapsed, the minimum group size will be ignored and a smaller group will be merged.",
-									},
-								},
-							},
-						},
-						"required_deployments": {
-							Type:        schema.TypeList,
-							Optional:    true,
-							MaxItems:    1,
-							Description: "Choose which environments must be successfully deployed to before branches can be merged into a branch that matches this rule.",
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"required_deployment_environments": {
-										Type:        schema.TypeList,
-										Required:    true,
-										MinItems:    1,
-										Description: "The environments that must be successfully deployed to before branches can be merged.",
-										Elem: &schema.Schema{
-											Type: schema.TypeString,
-										},
-									},
-								},
-							},
-						},
 						"pull_request": {
 							Type:        schema.TypeList,
 							MaxItems:    1,

github/resource_github_enterprise_ruleset_test.go

@@ -170,42 +170,10 @@ resource "github_enterprise_ruleset" "test" {
 
 func TestAccGithubEnterpriseRuleset_required_workflows(t *testing.T) {
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
-	repoName := fmt.Sprintf("%srepo-enterprise-wf-%s", testResourcePrefix, randomID)
 	rulesetName := fmt.Sprintf("%s-enterprise-wf-ruleset-%s", testResourcePrefix, randomID)
 	workflowFilePath := ".github/workflows/echo.yaml"
 
 	config := fmt.Sprintf(`
-resource "github_repository" "test" {
-	name       = "%s"
-	visibility = "private"
-	auto_init  = true
-}
-
-resource "github_repository_file" "workflow_file" {
-	repository     = github_repository.test.name
-	branch         = "main"
-	file           = "%s"
-	content        = <<EOT
-name: Echo Workflow
-
-on: [pull_request]
-
-jobs:
-  echo:
-    runs-on: linux
-    steps:
-      - run: echo "Hello, world!"
-EOT
-	commit_message = "Managed by Terraform"
-	commit_author  = "Terraform User"
-	commit_email   = "[email protected]"
-}
-
-resource "github_actions_repository_access_level" "test" {
-	repository   = github_repository.test.name
-	access_level = "organization"
-}
-
 resource "github_enterprise_ruleset" "test" {
 	enterprise_slug = "%s"
 	name            = "%s"
@@ -233,14 +201,14 @@ resource "github_enterprise_ruleset" "test" {
 		required_workflows {
 			do_not_enforce_on_create = true
 			required_workflow {
-				path          = github_repository_file.workflow_file.file
-				repository_id = github_repository.test.repo_id
+				path          = "%s"
+				repository_id = 1234567
 				ref           = "main"
 			}
 		}
 	}
 }
-`, repoName, workflowFilePath, testAccConf.enterpriseSlug, rulesetName)
+`, testAccConf.enterpriseSlug, rulesetName, workflowFilePath)
 
 	check := resource.ComposeTestCheckFunc(
 		resource.TestCheckResourceAttr("github_enterprise_ruleset.test", "name", rulesetName),