Make sure to pass pr merge vars through to repo module (#30)

Effect-TS · Jan 16, 2024 · 889f411 · 889f411
1 parent 055b172
commit 889f411
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/terraform/github/repository.tf b/terraform/github/repository.tf
@@ -1,13 +1,15 @@
 module "github_repository" {
-  source          = "../modules/github_repository"
-  for_each        = var.repositories
-  name            = each.key
-  description     = each.value.description
-  topics          = each.value.topics
-  homepage_url    = each.value.homepage_url
-  visibility      = each.value.visibility
-  collaborators   = each.value.collaborators
-  pages           = each.value.pages
-  has_discussions = each.value.has_discussions
-  is_archived     = each.value.is_archived
+  source             = "../modules/github_repository"
+  for_each           = var.repositories
+  name               = each.key
+  description        = each.value.description
+  topics             = each.value.topics
+  homepage_url       = each.value.homepage_url
+  visibility         = each.value.visibility
+  collaborators      = each.value.collaborators
+  pages              = each.value.pages
+  has_discussions    = each.value.has_discussions
+  is_archived        = each.value.is_archived
+  allow_squash_merge = each.value.allow_squash_merge
+  allow_rebase_merge = each.value.allow_rebase_merge
 }
diff --git a/terraform/github/terraform.tfvars b/terraform/github/terraform.tfvars
@@ -60,17 +60,17 @@ repositories = {
     description = "Effect's custom fork of dtslint used to lint TypeScript declaration (.d.ts) files"
   }
   effect = {
-    description = "A fully-fledged functional effect system for TypeScript with a rich standard library"
+    description        = "A fully-fledged functional effect system for TypeScript with a rich standard library"
+    allow_rebase_merge = true
     collaborators = [
       { username = "DenisFrezzato", permission = "push" },
       { username = "isthatcentered", permission = "push" },
       { username = "remiguittaut", permission = "push" },
       { username = "rzeigler", permission = "push" },
     ]
-    pages              = { build_type = "workflow" }
-    homepage_url       = "https://www.effect.website"
-    topics             = ["effect-system", "fp", "framework", "stack-safe", "typescript", "zio"]
-    allow_rebase_merge = true
+    pages        = { build_type = "workflow" }
+    homepage_url = "https://www.effect.website"
+    topics       = ["effect-system", "fp", "framework", "stack-safe", "typescript", "zio"]
   }
   eslint-plugin = {
     description = "A set of ESlint and TypeScript rules to work with Effect"

diff --git a/terraform/github/variables.tf b/terraform/github/variables.tf
@@ -11,13 +11,15 @@ variable "default_branch" {
 variable "repositories" {
   description = "The Effect-TS organization repositories whose configuration should be managed"
   type = map(object({
-    description       = optional(string, "")
-    topics            = optional(set(string), [])
-    homepage_url      = optional(string, "")
-    visibility        = optional(string, "public")
-    is_archived       = optional(bool, false)
-    has_discussions   = optional(bool, false)
-    enable_changesets = optional(bool, true)
+    description        = optional(string, "")
+    topics             = optional(set(string), [])
+    homepage_url       = optional(string, "")
+    visibility         = optional(string, "public")
+    is_archived        = optional(bool, false)
+    has_discussions    = optional(bool, false)
+    enable_changesets  = optional(bool, true)
+    allow_squash_merge = optional(bool, true)
+    allow_rebase_merge = optional(bool, false)
     collaborators = optional(list(object({
       username   = string,
       permission = string