diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6561e23..d9e4dd2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/mineiros-io/pre-commit-hooks - rev: v0.4.1 + rev: v0.5.1 hooks: - id: terraform-fmt - id: terraform-validate diff --git a/main.tf b/main.tf index 60e5a38..a041084 100644 --- a/main.tf +++ b/main.tf @@ -16,6 +16,7 @@ locals { allow_rebase_merge = var.allow_rebase_merge == null ? lookup(var.defaults, "allow_rebase_merge", false) : var.allow_rebase_merge allow_squash_merge = var.allow_squash_merge == null ? lookup(var.defaults, "allow_squash_merge", false) : var.allow_squash_merge allow_auto_merge = var.allow_auto_merge == null ? lookup(var.defaults, "allow_auto_merge", false) : var.allow_auto_merge + allow_update_branch = var.allow_update_branch == null ? lookup(var.defaults, "allow_update_branch", false) : var.allow_update_branch delete_branch_on_merge = var.delete_branch_on_merge == null ? lookup(var.defaults, "delete_branch_on_merge", true) : var.delete_branch_on_merge is_template = var.is_template == null ? lookup(var.defaults, "is_template", false) : var.is_template has_downloads = var.has_downloads == null ? lookup(var.defaults, "has_downloads", false) : var.has_downloads @@ -100,6 +101,7 @@ resource "github_repository" "repository" { allow_rebase_merge = local.allow_rebase_merge allow_squash_merge = local.allow_squash_merge allow_auto_merge = local.allow_auto_merge + allow_update_branch = local.allow_update_branch delete_branch_on_merge = local.delete_branch_on_merge is_template = local.is_template has_downloads = local.has_downloads diff --git a/variables.tf b/variables.tf index 810069f..58d6cf3 100644 --- a/variables.tf +++ b/variables.tf @@ -96,6 +96,12 @@ variable "allow_auto_merge" { default = null } +variable "allow_update_branch" { + description = "(Optional) - Set to true to always suggest updating pull request branches." + type = bool + default = null +} + variable "delete_branch_on_merge" { description = "(Optional) Whether or not to delete the merged branch after merging a pull request. (Default: false)" type = bool