Fix to the branch protection setup (#16)

* known issue (integrations/terraform-provider-github#1147), trying this workaround before changing the provider version * change to v4 graphql branch protection
ministryofjustice · Feb 16, 2023 · 4c32a81 · 4c32a81
1 parent 7d87f25
commit 4c32a81
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 0.14.7
+          terraform_version: 1.3.7
       - name: terraform fmt
         run: |
           terraform fmt -check -recursive

diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/github_repository.tf b/github_repository.tf
@@ -59,11 +59,12 @@ resource "github_branch_default" "default" {
   branch     = var.default_branch_name
 }
 
-resource "github_branch_protection_v3" "repository_main" {
+
+resource "github_branch_protection" "repository_main" {
   count = var.branch_protection_enabled == true ? 1 : 0
 
-  repository     = github_repository.repository.name
-  branch         = var.default_branch_name
+  repository_id  = github_repository.repository.name
+  pattern        = var.default_branch_name
   enforce_admins = var.enforce_admins
 
   required_status_checks {
@@ -86,5 +87,7 @@ resource "github_actions_secret" "repository_secret" {
   repository      = github_repository.repository.name
   secret_name     = each.key
   plaintext_value = each.value
+
+
 }
 
diff --git a/terraform.tf b/terraform.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     github = {
       source  = "integrations/github"
-      version = "4.26.1"
+      version = "4.31.0"
     }
   }
   required_version = ">= 1.0.0"