Add django-tasks-scheduler project

.github/workflows/plan.yml

@@ -7,10 +7,36 @@ on:
       - 'terraform/production/*.tfvars'
 
 jobs:
+  format-terraform-code:
+    name: "Format Terraform code"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: "${{ github.event.pull_request.head.ref }}"
+
+
+      - name: terraform fmt
+        uses: dflook/terraform-fmt@2ec321e746af7edf90e43513dda2086a92a07b4c
+        with:
+          path: "terraform"
+
+      - name: Commit changes
+        uses: devops-infra/[email protected]
+        with:
+          github_token: "${{ secrets.GITHUB_TOKEN }}"
+          commit_prefix: "[AUTO]"
+          commit_message: "Format code"
+          force: false
+#          target_branch: "${{ github.event.pull_request.head.ref }}"
+
   plan-changes:
     name: "Org changes plan"
     runs-on: ubuntu-latest
-
+    needs: [ "format-terraform-code" ]
     permissions:
       pull-requests: write
       contents: write

README.md

@@ -112,39 +112,68 @@ Django Commons packages.
 
 ### Terraform changes to add a new project
 
+#### Using the GitHub UI
+
+1. Transfer the existing repository to the Django Commons organization using the GitHub UI, so old information is
+   preserved.
+2. Make sure the there are no teams `repo-name`, `repo-name-admins` and `repo-name-committers` in the Django Commons
+   organization. Teams can be viewed [here](https://github.com/orgs/django-commons/teams). The teams will be created by
+   the terraform apply process.
+
+#### Locally
+
 Assuming repository name is `repo-name`:
 
-1. In [`terraform/production/respositories.tfvars`](https://github.com/django-commons/controls/blob/main/terraform/production/respositories.tfvars),
-   add the new repository to the `repositories` section:
+1.
+In [`terraform/production/respositories.tfvars`](https://github.com/django-commons/controls/blob/main/terraform/production/respositories.tfvars),
+add the new repository to the `repositories` section:
 
 ```terraform
 repositories = {
-   # ...
-   "repo-name" = {
-      description = "repo description"
-      allow_auto_merge = false # optional, default is false
-      allow_merge_commit = false # optional, default is false
-      allow_rebase_merge = false # optional, default is false
-      allow_squash_merge = false # optional, default is false
-      allow_update_branch = false # optional, default is false
-      enable_branch_protection = true # optional, default is true
-      has_discussions = true # optional, default is true
-      has_downloads = true # optional, default is true
-      has_wiki = false # optional, default is false
-      is_template = false # optional, default is false
-      push_allowances = []
-      required_status_checks_contexts = [] # optional, default is []
-      template = "" # optional, default is ""
-      topics = []
-      visibility = "public" # optional, default is "public"
-      skip_team_creation = false # Optional, default is false => create 3 teams for the repository
-      admins = [] # Members of the repository's admin and repository teams. Have admin permissions
-      committers = [] # Members of the repository's committers and repository teams. Have write permissions
-      members = [] # Members of the repository team. Have triage permissions
-   }
+  # ...
+  "repo-name" = {
+    description = "repo description"
+    homepage_url = "" # optional, default is ""
+    allow_auto_merge = false # optional, default is false
+    allow_merge_commit = false # optional, default is false
+    allow_rebase_merge = false # optional, default is false
+    allow_squash_merge = true # optional, default is true
+    allow_update_branch = true # optional, default is true
+    delete_branch_on_merge = true # optional, default is true
+    has_discussions = true # optional, default is true
+    has_downloads = true # optional, default is true
+    has_wiki = false # optional, default is false
+    is_template = false # optional, default is false
+    push_allowances = []
+    template = "" # optional, default is ""
+    topics = []
+    visibility = "public" # optional, default is "public"
+    skip_team_creation = optional(bool, false) # Do not create teams for repository
+    enable_branch_protection = true # optional, default is true
+    required_status_checks_contexts = [] # optional, default is []
+    admins = [] # Members of the repository's admin and repository teams. Have admin permissions
+    committers = [] # Members of the repository's committers and repository teams. Have write permissions
+    members = [] # Members of the repository team. Have triage permissions
+  }
 }
 ```
 
+2. Import the repository into the terraform state by
+   running `terraform import -var-file=production/org.tfvars -var-file=production/repositories.tfvars -var github_token=... 'github_repository.this["repo-name"]' repo-name`
+3. Run `terraform plan -var-file=production/org.tfvars -var-file=production/repositories.tfvars -var github_token=...`
+   to see the changes that will be made.
+
+4. Create a pull-request to `main` branch. This will trigger terraform to plan the changes in the organization to be
+   executed.
+   Review the changes and make sure they align with the request.
+5. Merge the pull request. This will trigger terraform to apply the changes in the organization.
+
+The expected changes:
+
+- New teams `repo-name`, `repo-name-admins`, `repo-name-committers` with the relevant members based on the
+  repository's description.
+- The repository changes are accepted by the project maintainers.
+
 ## Remove Project Playbook
 
 1. Confirm there's agreement amongst current project maintainers to move project out of Django Commons
@@ -158,10 +187,12 @@ repositories = {
 
 1. Remove the repository from the `repositories` section
    in [`terraform/production/respositories.tfvars`](https://github.com/django-commons/controls/blob/main/terraform/production/respositories.tfvars)
-2. Remove the parent team and child teams for the repository from the `teams_repositories`
-   and `teams_repositories_privileged` sections in
-   [`terraform/production/teams.tfvars`](https://github.com/django-commons/controls/blob/main/terraform/production/teams.tfvars)
-3. Create a pull-request to `main` branch. This will trigger terraform to plan the changes in the organization to be
+2. Create a pull-request to `main` branch. This will trigger terraform to plan the changes in the organization to be
    executed.
    Review the changes and make sure they align with the request.
-4. Merge the pull request. This will trigger terraform to apply the changes in the organization.
+3. Merge the pull request. This will trigger terraform to apply the changes in the organization.
+
+The expected changes:
+
+- The repository will be removed from the organization.
+- The repository's teams will be removed from the organization.

terraform/README.md

@@ -10,6 +10,7 @@ GitHub Organization as Terraform
 - `production/*.tfvars` - instances, should strictly follow the types in `variables.tf`.
 - `main.tf` - build configuration based on instances values from `production.tfvars` (or, if not defined explicitly,
   then default value from `variables.tf`)
+- `resources-*.tf` - define resources, like `github_repository`, `github_team`, etc.
 - `tfstate.json` - Current state file, pulled using `terraform import ..`
 
 # Why Terraform?
@@ -34,24 +35,27 @@ All changes should be made in `production/*.tfvars`:
     repositories = {
       "repo-name" = {
         description = "repo description"
+        homepage_url = "" # optional, default is ""
         allow_auto_merge = false # optional, default is false
         allow_merge_commit = false # optional, default is false
         allow_rebase_merge = false # optional, default is false
-        allow_squash_merge = false # optional, default is false
-        allow_update_branch = false # optional, default is false
-        enable_branch_protection = true # optional, default is true
+        allow_squash_merge = true # optional, default is true
+        allow_update_branch = true # optional, default is true
+        delete_branch_on_merge = true # optional, default is true
         has_discussions = true # optional, default is true
         has_downloads = true # optional, default is true
         has_wiki = false # optional, default is false
         is_template = false # optional, default is false
         push_allowances = []
-        required_status_checks_contexts = [] # optional, default is []
         template = "" # optional, default is ""
         topics = []
-        visibility  = "public" # optional, default is "public"
+        visibility = "public" # optional, default is "public"
         skip_team_creation = optional(bool, false) # Do not create teams for repository
-        admins = optional(set(string), []) # Members of the repository admin team
-        committers = optional(set(string), []) # Members of the repository committers team
+        enable_branch_protection = true # optional, default is true
+        required_status_checks_contexts = [] # optional, default is []
+        admins = [] # Members of the repository's admin and repository teams. Have admin permissions
+        committers = [] # Members of the repository's committers and repository teams. Have write permissions
+        members = [] # Members of the repository team. Have triage permissions
       }
      # ...
     }
@@ -72,6 +76,7 @@ To do so, you can use the following steps:
 4. Make changes to `production/*.tfvars` to reflect the desired state (add/update users, repositories, teams, etc.)
 5. To see what changes between the current state of the GitHub organization and the plan
    run:  `terraform plan -var-file=production/org.tfvars -var-file=production/repositories.tfvars -var github_token=...`
-6. To apply the changes, run: `terraform apply -var-file=production/org.tfvars -var-file=production/repositories.tfvars -var github_token=...`
+6. To apply the changes,
+   run: `terraform apply -var-file=production/org.tfvars -var-file=production/repositories.tfvars -var github_token=...`
 
 [1]: https://developer.hashicorp.com/terraform/tutorials/it-saas/github-user-teams#configure-your-credentials

terraform/production/repositories.tfvars

@@ -6,20 +6,20 @@ repositories = {
     description              = "A Special Repository."
     enable_branch_protection = false
 
-    topics = []
-    push_allowances = []
+    topics             = []
+    push_allowances    = []
     skip_team_creation = true
   }
 
   "controls" = {
     description              = "The controls for managing Django Commons projects"
     enable_branch_protection = false
-    allow_merge_commit = true
-    allow_rebase_merge = true
-    allow_squash_merge = true
-    topics = []
-    push_allowances = []
-    skip_team_creation = true
+    allow_merge_commit       = true
+    allow_rebase_merge       = true
+    allow_squash_merge       = true
+    topics                   = []
+    push_allowances          = []
+    skip_team_creation       = true
   }
 
   "membership" = {
@@ -28,14 +28,14 @@ repositories = {
     allow_merge_commit = true
     allow_rebase_merge = true
     allow_squash_merge = true
-    topics = []
-    push_allowances = []
+    topics             = []
+    push_allowances    = []
     skip_team_creation = true
   }
 
   "django-commons-playground" = {
     description = "A sample project to test things out"
-    topics = []
+    topics      = []
     # People with GitHub admin repo permissions
     admins = [
       "tim-schilling",
@@ -52,4 +52,15 @@ repositories = {
     members = [
     ]
   }
+
+  "django-tasks-scheduler" = {
+    description  = "Schedule async tasks using redis pub/sub."
+    homepage_url = "https://django-tasks-scheduler.readthedocs.io/"
+
+    admins = [
+      "cunla",
+    ]
+    committers = []
+    members    = []
+  }
 }

terraform/resources-repo-admin-teams.tf

@@ -1,6 +1,6 @@
 # Define the admin team for each repository
 resource "github_team" "repo_admin_team" {
-  for_each = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each = { for k, v in var.repositories : k => v if v.skip_team_creation == false }
 
   parent_team_id = github_team.repo_team[each.key].id
   name           = "${each.key}-admins"
@@ -10,7 +10,7 @@ resource "github_team" "repo_admin_team" {
 
 # Add the people to the team
 resource "github_team_members" "repo_admin_members" {
-  for_each = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each = { for k, v in var.repositories : k => v if v.skip_team_creation == false }
 
   team_id = github_team.repo_admin_team[each.key].id
 
@@ -26,7 +26,7 @@ resource "github_team_members" "repo_admin_members" {
 
 # Define the team's permissions for the repositories
 resource "github_team_repository" "repo_admin_team_access" {
-  for_each   = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each   = { for k, v in var.repositories : k => v if v.skip_team_creation == false }
   repository = each.key
   team_id    = github_team.repo_admin_team[each.key].id
   permission = "admin"

terraform/resources-repo-committer-teams.tf

@@ -1,6 +1,6 @@
 # Define the committers team for each repository
 resource "github_team" "repo_committer_team" {
-  for_each = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each = { for k, v in var.repositories : k => v if v.skip_team_creation == false }
 
   parent_team_id = github_team.repo_team[each.key].id
   name           = "${each.key}-committers"
@@ -10,7 +10,10 @@ resource "github_team" "repo_committer_team" {
 
 # Add the people to the team
 resource "github_team_members" "repo_committer_team_members" {
-  for_each = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each = {
+    for k, v in var.repositories : k => v
+    if v.skip_team_creation == false && length(v.committers) > 0
+  }
 
   team_id = github_team.repo_committer_team[each.key].id
 
@@ -19,13 +22,17 @@ resource "github_team_members" "repo_committer_team_members" {
 
     content {
       username = members.value
-      role     = contains(var.admins, members.value) ? "maintainer" : "member"
+      role     = contains(each.value.admins, members.value) ? "maintainer" : "member"
     }
   }
 }
+
 # Define the team's permissions for the repositories
 resource "github_team_repository" "repo_committer_team_access" {
-  for_each   = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each = {
+    for k, v in var.repositories : k => v
+    if v.skip_team_creation == false
+  }
   repository = each.key
   team_id    = github_team.repo_committer_team[each.key].id
   permission = "maintain"

terraform/resources-repo-teams.tf

@@ -1,14 +1,14 @@
 # Create the main repository team for Django Commons.
 resource "github_team" "repo_team" {
-  for_each = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each = { for k, v in var.repositories : k => v if v.skip_team_creation == false }
 
   name        = each.key
   description = "Main team for the ${each.key} repository"
   privacy     = "closed"
 }
 # Add the people to the team
 resource "github_team_members" "repo_team_members" {
-  for_each = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each = { for k, v in var.repositories : k => v if v.skip_team_creation == false }
 
   team_id = github_team.repo_team[each.key].id
 
@@ -27,7 +27,7 @@ resource "github_team_members" "repo_team_members" {
 }
 # Define the team's permissions for the repositories
 resource "github_team_repository" "repo_team_access" {
-  for_each   = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each   = { for k, v in var.repositories : k => v if v.skip_team_creation == false }
   repository = each.key
   team_id    = github_team.repo_team[each.key].id
   permission = "triage"
@@ -37,7 +37,7 @@ resource "github_team_repository" "repo_team_access" {
 
 # This is used to enable automatic PR review requests
 resource "github_team_settings" "this" {
-  for_each = {for k, v in var.repositories : k => v if v.skip_team_creation == false}
+  for_each = { for k, v in var.repositories : k => v if v.skip_team_creation == false }
 
   review_request_delegation {
     algorithm    = "LOAD_BALANCE"

terraform/resources-repos.tf

@@ -4,6 +4,7 @@
 resource "github_repository" "this" {
   for_each = var.repositories
 
+  homepage_url                = each.value.homepage_url
   allow_auto_merge            = each.value.allow_auto_merge
   allow_merge_commit          = each.value.allow_merge_commit
   merge_commit_title          = each.value.merge_commit_title