Adding missing RequiresLinearHistory (#935)

Signed-off-by: Jiri Tyr <[email protected]>
integrations · Dec 13, 2021 · 2c980cf · 2c980cf
1 parent 3444b63
commit 2c980cf
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
@@ -158,6 +158,7 @@ func resourceGithubBranchProtectionCreate(d *schema.ResourceData, meta interface
 		RequiresCodeOwnerReviews:       githubv4.NewBoolean(githubv4.Boolean(data.RequiresCodeOwnerReviews)),
 		RequiresCommitSignatures:       githubv4.NewBoolean(githubv4.Boolean(data.RequiresCommitSignatures)),
 		RequiresConversationResolution: githubv4.NewBoolean(githubv4.Boolean(data.RequiresConversationResolution)),
+		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)),
@@ -284,6 +285,7 @@ func resourceGithubBranchProtectionUpdate(d *schema.ResourceData, meta interface
 		RequiresCodeOwnerReviews:       githubv4.NewBoolean(githubv4.Boolean(data.RequiresCodeOwnerReviews)),
 		RequiresCommitSignatures:       githubv4.NewBoolean(githubv4.Boolean(data.RequiresCommitSignatures)),
 		RequiresConversationResolution: githubv4.NewBoolean(githubv4.Boolean(data.RequiresConversationResolution)),
+		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
@@ -127,6 +127,9 @@ func TestAccGithubBranchProtection(t *testing.T) {
 			resource.TestCheckResourceAttr(
 				"github_branch_protection.test", "require_conversation_resolution", "true",
 			),
+			resource.TestCheckResourceAttr(
+				"github_branch_protection.test", "required_linear_history", "false",
+			),
 			resource.TestCheckResourceAttr(
 				"github_branch_protection.test", "required_status_checks.#", "0",
 			),