Fix service-repo module and exclude GitHub provider 6.7.3

modules/service-repo/main.tf

@@ -28,8 +28,8 @@ resource "github_repository" "this" {
   web_commit_signoff_required = false
 
   template {
-    owner      = var.gh_org_name
-    repository = var.template_repo
+    owner      = "infrahouse"
+    repository = "terraform-root-template"
   }
 }
 

modules/service-repo/terraform.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     github = {
       source  = "integrations/github"
-      version = "~> 6.7, >= 6.7.3"
+      version = "~> 6.7"
     }
     random = {
       source = "hashicorp/random"

modules/service-repo/variables.tf

@@ -101,18 +101,12 @@ variable "state_bucket" {
   type        = string
 }
 
-variable "template_repo" {
+variable "repo_private" {
   description = <<-EOT
-    Name of the template repository to use when creating the service repo.
-    The template provides CI/CD workflows, Makefile, .gitignore, and other
-    boilerplate. Files are copied once at creation time — the service repo
-    owns them after that.
+    If true, the repository is private.
+    Rulesets and environments on private repos require a GitHub Team
+    plan ($4/user/month).
   EOT
-  type        = string
-}
-
-variable "repo_private" {
-  description = "If true, the repository is private."
   type        = bool
   default     = true
 }

repo-aws-service-infrahouse-app.tf

@@ -37,7 +37,6 @@ module "aws_service_infrahouse_app" {
   repo_description = "AWS infrastructure for the InfraHouse product app"
   gh_org_name      = local.gh_org_name
   github_app_slug  = "infrahouse-github-terraform"
-  template_repo    = "terraform-root-template"
   state_bucket     = module.aws_service_infrahouse_app_state.bucket_name
 
   environments = {

terraform.tf

@@ -12,8 +12,11 @@ terraform {
 
   required_providers {
     github = {
-      source  = "integrations/github"
-      version = "6.7.3"
+      source = "integrations/github"
+      # 6.7.3 causes "Root object was present, but now absent"
+      # on github_actions_secret due to destroy_on_drift bug.
+      # https://github.com/integrations/terraform-provider-github/issues/2387
+      version = "~> 6.7, != 6.7.3"
     }
     aws = {
       source  = "hashicorp/aws"