switched behaviour of squash messages and titles to true by default

ministryofjustice · Dec 6, 2024 · 17087ee · 17087ee
1 parent edbf539
commit 17087ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/terraform/github/modules/repository/variables.tf b/terraform/github/modules/repository/variables.tf
@@ -41,13 +41,13 @@ variable "secrets" {
 variable "squash_merge_commit_message" {
   type        = bool
   description = "Should squash merge commit message be set to MERGE_MESSAGE?"
-  default     = false
+  default     = true
 }
 
 variable "squash_merge_commit_title" {
   type        = bool
   description = "Should squash merge commit title be set to PR_TITLE?"
-  default     = false
+  default     = true
 }
 
 variable "topics" {

diff --git a/terraform/github/repositories.tf b/terraform/github/repositories.tf
@@ -10,8 +10,6 @@ module "core" {
     "aws",
     "documentation"
   ]
-  squash_merge_commit_message = true
-  squash_merge_commit_title   = true
   secrets = {
     # Terraform GitHub token for the CI/CD user
     TERRAFORM_GITHUB_TOKEN = data.aws_secretsmanager_secret_version.github_ci_user_token.secret_string
@@ -52,10 +50,12 @@ module "terraform-module-cross-account-access" {
 }
 
 module "terraform-module-environments" {
-  source      = "./modules/repository"
-  name        = "modernisation-platform-terraform-environments"
-  type        = "module"
-  description = "Module for creating organizational units and accounts within AWS Organizations from JSON files"
+  source                      = "./modules/repository"
+  name                        = "modernisation-platform-terraform-environments"
+  type                        = "module"
+  description                 = "Module for creating organizational units and accounts within AWS Organizations from JSON files"
+  squash_merge_commit_message = false
+  squash_merge_commit_title   = false
   topics = [
     "organizational-units",
     "aws"