fix: inherited maintainer & member (#6)

* fix: inherited maintainer & member

* fix: inherited maintainer & member

Author: dmzrio

.gitignore

@@ -35,3 +35,4 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
+.terraform.lock.hcl

README.md

@@ -101,7 +101,7 @@ Map of organization members with their roles
 
 ```hcl
 module "github_teams" {
-  source = "./terraform/github/teams"
+  source = "./terraform-github-teams"
 
   organization = "kitabisa"
 
@@ -130,11 +130,11 @@ module "github_teams" {
 ```hcl
 module "github_teams" {
   source = "./terraform-github-teams"
-
+  
   organization = "kitabisa"
 
   teams = {
-    engineering = {
+    engineer = {
       platform = {
         devops = {
           description = "DevOps Team"
@@ -147,34 +147,26 @@ module "github_teams" {
           maintainers = ["eve"]
         }
       }
+      
       backend = {
         api = {
           members = ["frank", "grace"]
+          inherit_members_from = [
+            "engineer/platform/sre",
+          ]
         }
         data = {
           members = ["henry"]
         }
       }
-      # All team (inherits members from all sub-teams)
-      all = {
-        description = "All Platform Engineers"
-        inherit_members_from = [
-          "engineering/platform/devops",
-          "engineering/platform/sre",
-          "engineering/platform/api",
-          "engineering/platform/data"
-        ]
-      }
-      # Leadership team (inherits only maintainers)
+
       leads = {
-        description = "Platform Leadership"
         inherit_maintainers_from = [
-          "engineering/platform/devops",
-          "engineering/platform/sre"
+          "engineer/platform",
+          "engineer/backend"
         ]
       }
     }
-    non-engineering = {}
   }
 
   org_members = {

main.tf

@@ -23,7 +23,7 @@ locals {
         name       = l2_key
         value      = l2_val
       }
-      if l2_key != "description" && l2_key != "privacy" && l2_key != "members" && l2_key != "maintainers" && try(l2_val != null && length(keys(l2_val)) > 0, false)
+      if l2_key != "description" && l2_key != "privacy" && l2_key != "members" && l2_key != "maintainers" && l2_key != "inherit_members_from" && l2_key != "inherit_maintainers_from" && try(l2_val != null && length(keys(l2_val)) > 0, false)
     ]
   ])
 
@@ -43,7 +43,7 @@ locals {
         name       = l3_key
         value      = l3_val
       }
-      if l3_key != "parent_key" && l3_key != "name" && l3_key != "description" && l3_key != "privacy" && l3_key != "members" && l3_key != "maintainers"
+      if l3_key != "parent_key" && l3_key != "name" && l3_key != "description" && l3_key != "privacy" && l3_key != "members" && l3_key != "maintainers" && l3_key != "inherit_members_from" && l3_key != "inherit_maintainers_from"
     ]
   ])
 
@@ -62,8 +62,8 @@ locals {
         name       = l4_key
         value      = l4_val
       }
-      if l4_key != "parent_key" && l4_key != "name" && l4_key != "description" && l4_key != "privacy" && l4_key != "members" && l4_key != "maintainers"
-        && can(length(keys(l4_val)))
+      if l4_key != "parent_key" && l4_key != "name" && l4_key != "description" && l4_key != "privacy" && l4_key != "members" && l4_key != "maintainers" && l4_key != "inherit_members_from" && l4_key != "inherit_maintainers_from"
+      && can(length(keys(l4_val)))
     ]
   ])
 
@@ -81,16 +81,16 @@ locals {
   level1_members_flat = flatten([
     for l1_key, l1_val in local.level1_teams : concat(
       [for member in try(l1_val.members, []) : {
-        team_key = l1_key
+        team_key    = l1_key
         team_id_ref = "github_team.level1[\"${l1_key}\"].id"
-        username = member
-        role     = "member"
+        username    = member
+        role        = "member"
       }],
       [for maintainer in try(l1_val.maintainers, []) : {
-        team_key = l1_key
+        team_key    = l1_key
         team_id_ref = "github_team.level1[\"${l1_key}\"].id"
-        username = maintainer
-        role     = "maintainer"
+        username    = maintainer
+        role        = "maintainer"
       }]
     )
   ])

terraform.tfvars.example

@@ -0,0 +1,37 @@
+organization = "kitabisa"
+
+teams = {
+  engineer = {
+    platform = {
+      devops = {
+        description = "DevOps Team"
+        privacy     = "closed"
+        members     = ["alice", "bob"]
+        maintainers = ["charlie"]
+      }
+      sre = {
+        members     = ["david"]
+        maintainers = ["eve"]
+      }
+    }
+    
+    backend = {
+      api = {
+        members = ["frank", "grace"]
+        inherit_members_from = [
+          "engineer/platform/sre",
+        ]
+      }
+      data = {
+        members = ["henry"]
+      }
+    }
+
+    leads = {
+      inherit_maintainers_from = [
+        "engineer/platform",
+        "engineer/backend"
+      ]
+    }
+  }
+}