Adding missing RequiresLinearHistory

integrations · Oct 8, 2021 · f0bd733 · f0bd733
1 parent a03b373
commit f0bd733
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/github/resource_github_branch_protection.go b/github/resource_github_branch_protection.go
@@ -153,6 +153,7 @@ func resourceGithubBranchProtectionCreate(d *schema.ResourceData, meta interface
 		RequiresApprovingReviews:     githubv4.NewBoolean(githubv4.Boolean(data.RequiresApprovingReviews)),
 		RequiresCodeOwnerReviews:     githubv4.NewBoolean(githubv4.Boolean(data.RequiresCodeOwnerReviews)),
 		RequiresCommitSignatures:     githubv4.NewBoolean(githubv4.Boolean(data.RequiresCommitSignatures)),
+		RequiresLinearHistory:        githubv4.NewBoolean(githubv4.Boolean(data.RequiresLinearHistory)),
 		RequiresStatusChecks:         githubv4.NewBoolean(githubv4.Boolean(data.RequiresStatusChecks)),
 		RequiresStrictStatusChecks:   githubv4.NewBoolean(githubv4.Boolean(data.RequiresStrictStatusChecks)),
 		RestrictsPushes:              githubv4.NewBoolean(githubv4.Boolean(data.RestrictsPushes)),
@@ -273,6 +274,7 @@ func resourceGithubBranchProtectionUpdate(d *schema.ResourceData, meta interface
 		RequiresApprovingReviews:     githubv4.NewBoolean(githubv4.Boolean(data.RequiresApprovingReviews)),
 		RequiresCodeOwnerReviews:     githubv4.NewBoolean(githubv4.Boolean(data.RequiresCodeOwnerReviews)),
 		RequiresCommitSignatures:     githubv4.NewBoolean(githubv4.Boolean(data.RequiresCommitSignatures)),
+		RequiresLinearHistory:        githubv4.NewBoolean(githubv4.Boolean(data.RequiresLinearHistory)),
 		RequiresStatusChecks:         githubv4.NewBoolean(githubv4.Boolean(data.RequiresStatusChecks)),
 		RequiresStrictStatusChecks:   githubv4.NewBoolean(githubv4.Boolean(data.RequiresStrictStatusChecks)),
 		RestrictsPushes:              githubv4.NewBoolean(githubv4.Boolean(data.RestrictsPushes)),

diff --git a/github/resource_github_branch_protection_test.go b/github/resource_github_branch_protection_test.go
@@ -39,6 +39,9 @@ func TestAccGithubBranchProtection(t *testing.T) {
 			resource.TestCheckResourceAttr(
 				"github_branch_protection.test", "require_signed_commits", "false",
 			),
+			resource.TestCheckResourceAttr(
+				"github_branch_protection.test", "required_linear_history", "false",
+			),
 			resource.TestCheckResourceAttr(
 				"github_branch_protection.test", "required_status_checks.#", "0",
 			),