fix current state

Author: cunla

terraform/main.tf

@@ -6,20 +6,6 @@ terraform {
     github = {
       source = "integrations/github"
     }
-
-    # Random Provider
-    # https://registry.terraform.io/providers/hashicorp/random/latest/docs
-
-    random = {
-      source = "hashicorp/random"
-    }
-
-    # Time Provider
-    # https://registry.terraform.io/providers/hashicorp/time/latest/docs
-
-    time = {
-      source = "hashicorp/time"
-    }
   }
 }
 

terraform/resources-repos.tf

@@ -8,24 +8,24 @@ resource "github_repository" "this" {
 
   for_each = var.repositories
 
-  allow_auto_merge            = each.value.allow_auto_merge
-  allow_merge_commit          = each.value.allow_merge_commit
-  allow_rebase_merge          = each.value.allow_rebase_merge
-  allow_squash_merge          = each.value.allow_squash_merge
-  allow_update_branch         = each.value.allow_update_branch
-  archive_on_destroy          = true
-  delete_branch_on_merge      = true
-  description                 = each.value.description
-  has_downloads               = each.value.has_downloads
-  has_discussions             = each.value.has_discussions
-  has_issues                  = true
-  has_projects                = true
-  has_wiki                    = each.value.has_wiki
-  is_template                 = each.value.is_template
-  name                        = each.key
-  topics                      = each.value.topics
-  visibility                  = each.value.visibility
-  vulnerability_alerts        = true
+  allow_auto_merge       = each.value.allow_auto_merge
+  allow_merge_commit     = each.value.allow_merge_commit
+  allow_rebase_merge     = each.value.allow_rebase_merge
+  allow_squash_merge     = each.value.allow_squash_merge
+  allow_update_branch    = each.value.allow_update_branch
+  archive_on_destroy     = true
+  delete_branch_on_merge = each.value.delete_branch_on_merge
+  description            = each.value.description
+  has_downloads          = each.value.has_downloads
+  has_discussions        = each.value.has_discussions
+  has_issues             = true
+  has_projects           = true
+  has_wiki               = each.value.has_wiki
+  is_template            = each.value.is_template
+  name                   = each.key
+  topics                 = each.value.topics
+  visibility             = each.value.visibility
+  vulnerability_alerts   = true
 
   dynamic "template" {
     for_each = each.value.template != null ? [each.value.template] : []

terraform/tfstate.json

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.9.3",
-  "serial": 95,
+  "serial": 98,
   "lineage": "425397de-8394-a003-8a6c-bce854d9cc53",
   "outputs": {},
   "resources": [
@@ -316,7 +316,7 @@
             "default_branch": "main",
             "delete_branch_on_merge": true,
             "description": "The controls for managing Django Commons projects",
-            "etag": "W/\"312b9849a32911763a28d044423d2f70b3a8352f77a1d37492b6c86a0cdceece\"",
+            "etag": "W/\"ea2861ea815a93f58cb6de87bdeadf4180c8867141f15b04bed786ba41e1580b\"",
             "full_name": "django-commons/controls",
             "git_clone_url": "git://github.com/django-commons/controls.git",
             "gitignore_template": null,

terraform/variables.tf

@@ -27,6 +27,7 @@ variable "repositories" {
     allow_rebase_merge = optional(bool, false)
     allow_squash_merge = optional(bool, true)
     allow_update_branch = optional(bool, true)
+    delete_branch_on_merge = optional(bool, true)
     enable_branch_protection = optional(bool, true)
     has_discussions = optional(bool, true)
     has_downloads = optional(bool, true)