fix: Require linear history and resolved conversations before merging…

… PRs (#4) Fixes #1
relaycorp · Dec 14, 2021 · 9d3bd5d · 9d3bd5d
1 parent b399c3c
commit 9d3bd5d
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 27 deletions.
diff --git a/examples/self/.terraform.lock.hcl b/examples/self/.terraform.lock.hcl
diff --git a/examples/self/main.tf b/examples/self/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     github = {
       source  = "integrations/github"
-      version = "~> 4.18.2"
+      version = "~> 4.19.0"
     }
   }
 }
@@ -18,4 +18,5 @@ module "self" {
   description  = "Terraform module for open source projects by Relaycorp"
   homepage_url = "https://registry.terraform.io/modules/relaycorp/oss-project/github/latest"
   licence      = "mit"
+  ci_contexts  = ["ci"]
 }
diff --git a/locals.tf b/locals.tf
@@ -0,0 +1,5 @@
+locals {
+  // Work around https://github.com/integrations/terraform-provider-github/issues/1009
+  github_actions_app_node_id = "MDM6QXBwMTUzNjg=" // https://api.github.com/apps/github-actions
+  kodiakhq_app_node_id       = "MDM6QXBwMjkxOTY=" // https://api.github.com/apps/kodiakhq
+}
diff --git a/main.tf b/main.tf
@@ -34,9 +34,12 @@ resource "github_repository" "main" {
   }
 }
 
-resource "github_branch_protection_v3" "main" {
-  repository = github_repository.main.name
-  branch     = var.main_branch
+resource "github_branch_protection" "main" {
+  repository_id = github_repository.main.node_id
+  pattern       = "^${var.main_branch}$"
+
+  required_linear_history         = true
+  require_conversation_resolution = true
 
   required_status_checks {
     strict = true
@@ -52,12 +55,10 @@ resource "github_branch_protection_v3" "main" {
     required_approving_review_count = 1
   }
 
-  restrictions {
-    apps = [
-      "github-actions", # Allow @semantic-release/github to create GH releases
-      "kodiakhq",       # Allow Kodiak to merge PRs
-    ]
-  }
+  push_restrictions = [
+    local.github_actions_app_node_id, # Allow @semantic-release/github to create GH releases
+    local.kodiakhq_app_node_id,       # Allow Kodiak to merge PRs
+  ]
 }
 
 resource "github_issue_label" "kodiak_automerge" {

diff --git a/providers.tf b/providers.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     github = {
       source  = "integrations/github"
-      version = "~> 4.18.2"
+      version = "~> 4.19.0"
     }
   }