From 739b9db8f11eb68d54a78ebfba872f58a1dfcf0e Mon Sep 17 00:00:00 2001 From: Dave Arnold Date: Tue, 18 Feb 2025 21:28:00 -0800 Subject: [PATCH] Refactor branch protection configuration for improved readability and consistency --- branch_protection.tf | 28 ++++++++++++++-------------- data.tf | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/branch_protection.tf b/branch_protection.tf index 722ff8c..c946750 100644 --- a/branch_protection.tf +++ b/branch_protection.tf @@ -1,12 +1,12 @@ locals { branch_protection_rules = { main = { - pattern = var.github_default_branch - enforce_admins = var.github_enforce_admins_branch_protection - allows_deletions = false - require_signed_commits = true - required_linear_history = true - required_status_checks = var.required_status_checks + pattern = var.github_default_branch + enforce_admins = var.github_enforce_admins_branch_protection + allows_deletions = false + require_signed_commits = true + required_linear_history = true + required_status_checks = var.required_status_checks required_pull_request_reviews = { dismiss_stale_reviews = var.github_dismiss_stale_reviews require_code_owner_reviews = var.github_require_code_owner_reviews @@ -21,11 +21,11 @@ resource "github_branch_protection" "protection" { for_each = local.branch_protection_rules repository_id = local.repo_exists.node_id - pattern = each.value.pattern - enforce_admins = each.value.enforce_admins - allows_deletions = try(each.value.allows_deletions, false) - allows_force_pushes = try(each.value.allows_force_pushes, false) - require_signed_commits = try(each.value.require_signed_commits, false) + pattern = each.value.pattern + enforce_admins = each.value.enforce_admins + allows_deletions = try(each.value.allows_deletions, false) + allows_force_pushes = try(each.value.allows_force_pushes, false) + require_signed_commits = try(each.value.require_signed_commits, false) required_linear_history = try(each.value.required_linear_history, false) dynamic "required_status_checks" { @@ -40,10 +40,10 @@ resource "github_branch_protection" "protection" { for_each = each.value.required_pull_request_reviews != null ? [each.value.required_pull_request_reviews] : [] content { dismiss_stale_reviews = try(required_pull_request_reviews.value.dismiss_stale_reviews, true) - restrict_dismissals = try(required_pull_request_reviews.value.restrict_dismissals, false) - require_code_owner_reviews = try(required_pull_request_reviews.value.require_code_owner_reviews, true) + restrict_dismissals = try(required_pull_request_reviews.value.restrict_dismissals, false) + require_code_owner_reviews = try(required_pull_request_reviews.value.require_code_owner_reviews, true) required_approving_review_count = try(required_pull_request_reviews.value.required_approving_review_count, 1) - pull_request_bypassers = try(required_pull_request_reviews.value.pull_request_bypassers, []) + pull_request_bypassers = try(required_pull_request_reviews.value.pull_request_bypassers, []) } } diff --git a/data.tf b/data.tf index 50c7664..cbabe60 100644 --- a/data.tf +++ b/data.tf @@ -3,7 +3,7 @@ locals { } data "github_repository" "existing" { - count = var.create_repo ? 0 : 1 - name = var.name - full_name = var.repo_org != null ? "${var.repo_org}/${var.name}" : var.name + count = var.create_repo ? 0 : 1 + name = var.name + full_name = var.repo_org != null ? "${var.repo_org}/${var.name}" : var.name }