Merge branch 'main' into add-user/116

Author: cunla

terraform/main.tf

@@ -5,6 +5,7 @@ terraform {
   required_providers {
     github = {
       source = "integrations/github"
+      version = "6.3.1"
     }
   }
 }

terraform/resources-repo-admin-teams.tf

@@ -2,7 +2,7 @@
 resource "github_team" "repo_admin_team" {
   for_each = local.project_repositories
 
-  parent_team_id = github_team.repo_team[each.key].id
+  parent_team_id = github_team.repo_team[each.key].slug
   name           = "${each.key}-admins"
   description    = "Admin team for the ${each.key} repository"
   privacy        = "closed"
@@ -12,7 +12,7 @@ resource "github_team" "repo_admin_team" {
 resource "github_team_members" "repo_admin_members" {
   for_each = local.project_repositories
 
-  team_id = github_team.repo_admin_team[each.key].id
+  team_id = github_team.repo_admin_team[each.key].slug
 
   dynamic "members" {
     for_each = each.value.admins
@@ -28,6 +28,6 @@ resource "github_team_members" "repo_admin_members" {
 resource "github_team_repository" "repo_admin_team_access" {
   for_each   = local.project_repositories
   repository = each.key
-  team_id    = github_team.repo_admin_team[each.key].id
+  team_id    = github_team.repo_admin_team[each.key].slug
   permission = "admin"
 }

terraform/resources-repo-committer-teams.tf

@@ -2,7 +2,7 @@
 resource "github_team" "repo_committer_team" {
   for_each = local.project_repositories
 
-  parent_team_id = github_team.repo_team[each.key].id
+  parent_team_id = github_team.repo_team[each.key].slug
   name           = "${each.key}-committers"
   description    = "Committers team for the ${each.key} repository"
   privacy        = "closed"
@@ -15,7 +15,7 @@ resource "github_team_members" "repo_committer_team_members" {
     if v.is_django_commons_repo == false && length(v.committers) > 0
   }
 
-  team_id = github_team.repo_committer_team[each.key].id
+  team_id = github_team.repo_committer_team[each.key].slug
 
   dynamic "members" {
     for_each = each.value.committers
@@ -34,7 +34,7 @@ resource "github_team_repository" "repo_committer_team_access" {
     if v.is_django_commons_repo == false
   }
   repository = each.key
-  team_id    = github_team.repo_committer_team[each.key].id
+  team_id    = github_team.repo_committer_team[each.key].slug
   permission = "maintain"
 }
 

terraform/resources-repo-teams.tf

@@ -10,7 +10,7 @@ resource "github_team" "repo_team" {
 resource "github_team_members" "repo_team_members" {
   for_each = local.project_repositories
 
-  team_id = github_team.repo_team[each.key].id
+  team_id = github_team.repo_team[each.key].slug
 
   dynamic "members" {
     # Add the admins and committers as members because this is the parent
@@ -29,7 +29,7 @@ resource "github_team_members" "repo_team_members" {
 resource "github_team_repository" "repo_team_access" {
   for_each   = local.project_repositories
   repository = each.key
-  team_id    = github_team.repo_team[each.key].id
+  team_id    = github_team.repo_team[each.key].slug
   permission = "triage"
 }
 # GitHub Team Settings Resource
@@ -45,5 +45,5 @@ resource "github_team_settings" "this" {
     notify       = false
   }
 
-  team_id = github_team.repo_team[each.key].id
+  team_id = github_team.repo_team[each.key].slug
 }