Skip to content

Conversation

@tim-schilling
Copy link
Member

@tim-schilling tim-schilling commented Dec 9, 2025

This reverts commit 76671c0.

This is a follow-up to #336

This was necessary because the state change from #335 used the wrong ID for the Admins team in the JSON file and I needed to change a tf file to get the plan to be created and applied.

@tim-schilling tim-schilling requested a review from a team as a code owner December 9, 2025 03:12
@github-actions
Copy link

github-actions bot commented Dec 9, 2025

Terraform plan in terraform
With var files: terraform/production/org.tfvars terraform/production/repositories.tfvars
With variables: github_token = (sensitive value)

Plan: 0 to add, 1 to change, 0 to destroy.
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
!~  update in-place

Terraform will perform the following actions:

  # github_team_members.repo_team_members["django-tasks-scheduler"] will be updated in-place
!~  resource "github_team_members" "repo_team_members" {
        id      = "django-tasks-scheduler"
#        (1 unchanged attribute hidden)

-       members {
-           role     = "maintainer" -> null
-           username = "tim-schilling" -> null
        }

#        (3 unchanged blocks hidden)
    }

Plan: 0 to add, 1 to change, 0 to destroy.

📝 Plan generated in Plan org changes and list them in a PR #219

@tim-schilling
Copy link
Member Author

@cunla I'm starting to wonder if we should just remove the security manager definition from our terraform set up. I wonder if it's having problems due to it being an admin team?

I suspect what's about to happen is that the next change will cause this to re-add the permission.

@cunla
Copy link
Member

cunla commented Dec 10, 2025

I don't think this has something to do with github_organization_security_manager.
github_organization_security_manager is shown here: https://github.com/organizations/django-commons/settings/org_role_assignments?query=Admins+is%3Ateam

While every repository has the admins team access, eg, https://github.com/django-commons/django-tasks-scheduler/settings/access

Also, I think we need to revisit the admins => superadmins rename.. That might cause issues with TF.

@tim-schilling
Copy link
Member Author

I don't think this has something to do with github_organization_security_manager.

Do you think it's the terraform github plugin that's causing the problem then?

Regarding superadmin, let's have that discussion on the other issue.

@tim-schilling
Copy link
Member Author

@cunla I'm in favor of merging this and seeing what happens next. It doesn't appear that it would dramatically impact things.

@cunla
Copy link
Member

cunla commented Dec 10, 2025

can be merged after #340 is merged and applied.

@tim-schilling
Copy link
Member Author

I rebased to try to trigger the plan step again. It was showing the 15 changes and I was worried that would cause a problem when we merged to main.

@cunla
Copy link
Member

cunla commented Dec 10, 2025

I think we need to upgrade the terraform we are using as well

@tim-schilling
Copy link
Member Author

@cunla I may have misunderstood what you mean by upgrading the terraform we're using. I assumed you mean updating our actions, hence #343

@tim-schilling tim-schilling merged commit c92713e into main Dec 10, 2025
4 checks passed
@tim-schilling tim-schilling deleted the remove-tim branch December 10, 2025 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants