From 8079f31f7eaea89dad108fd62f24ac958dec7177 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Fri, 17 Apr 2026 07:40:01 -0500 Subject: [PATCH] Use the maintainers membership type for organization teams. This avoids the cycling of membership state between GitHub and Terraform. --- terraform/org.tfvars | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/terraform/org.tfvars b/terraform/org.tfvars index cc70ec9..f2fe0f2 100644 --- a/terraform/org.tfvars +++ b/terraform/org.tfvars @@ -162,8 +162,9 @@ organization_teams = { # https://github.com/organizations/django-commons/settings/moderators "Admins" = { description = "Django Commons administrators. This team is responsible for the overall management of the organization." - # Use maintainers for organizational teams - members = [ + # Use maintainers for organizational teams. + # This isn't required for admins, but is consistent. + maintainers = [ "bckohan", "cunla", "Daksh777", @@ -176,8 +177,10 @@ organization_teams = { } "super-admins" = { description = "Django Commons super administrators. This team is responsible for performing privileged operations." - # Use maintainers for organizational teams - members = [ + # Use maintainers for organizational teams. + # This is required for super-admins as Terraform/GitHub will flip-flop + # the membership between what's in GitHub and what the state thinks is set. + maintainers = [ "cunla", "ryancheley", "Stormheg",