Initial cleanup

[jennijuju]

Summary

Why do you need this?

What else do we need to know?

DRI: myself

Reviewer's Checklist

• It is clear where the request is coming from (if unsure, ask)
• All the automated checks passed
• The YAML changes reflect the summary of the request
• The Terraform plan posted as a comment reflects the summary of the request

[github-actions]

The following access changes will be introduced as a result of applying the plan:

Access Changes

User biglep:
  - will gain push permission to filecoin-services
  - will gain push permission to synapse-sdk
User jennijuju:
  - will have the permission to filecoin-services change from push to admin
  - will have the permission to synapse-sdk change from push to admin
User rjan90:
  - will have the permission to filecoin-services change from admin to maintain
  - will have the permission to synapse-sdk change from admin to maintain
User shrenujbansal:
  - will lose admin permission to client-contract
  - will lose admin permission to dotstorage-deal-renewal
User zenground0:
  - will gain admin permission to client-contract

[BigLep]

@galargh : I'm sorry to pull you in but I'm unclear how this PR has gotten into a bad state. I did the sync workflow and reran all the steps. Do you have any pointers? I look forward to learning so I can be more self-sufficient in the future.

[github-actions]

Before merge, verify that all the following plans are correct. They will be applied as-is after the merge.

Terraform plans

FilOzone

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  + create
  ~ update in-place
  - destroy
-/+ destroy and then create replacement

Terraform will perform the following actions:

  # github_repository_collaborator.this["client-contract:shrenujbansal"] will be destroyed
  # (because key ["client-contract:shrenujbansal"] is not in for_each map)
  - resource "github_repository_collaborator" "this" {
      - id         = "client-contract:shrenujbansal" -> null
      - permission = "admin" -> null
      - repository = "client-contract" -> null
      - username   = "shrenujbansal" -> null
    }

  # github_repository_collaborator.this["client-contract:zenground0"] will be created
  + resource "github_repository_collaborator" "this" {
      + id                          = (known after apply)
      + invitation_id               = (known after apply)
      + permission                  = "admin"
      + permission_diff_suppression = false
      + repository                  = "client-contract"
      + username                    = "ZenGround0"
    }

  # github_repository_collaborator.this["dotstorage-deal-renewal:shrenujbansal"] will be destroyed
  # (because key ["dotstorage-deal-renewal:shrenujbansal"] is not in for_each map)
  - resource "github_repository_collaborator" "this" {
      - id         = "dotStorage-deal-renewal:shrenujbansal" -> null
      - permission = "admin" -> null
      - repository = "dotStorage-deal-renewal" -> null
      - username   = "shrenujbansal" -> null
    }

  # github_repository_collaborator.this["filecoin-services:jennijuju"] will be created
  + resource "github_repository_collaborator" "this" {
      + id                          = (known after apply)
      + invitation_id               = (known after apply)
      + permission                  = "admin"
      + permission_diff_suppression = false
      + repository                  = "filecoin-services"
      + username                    = "jennijuju"
    }

  # github_repository_collaborator.this["filecoin-services:rjan90"] must be replaced
-/+ resource "github_repository_collaborator" "this" {
      ~ id                          = "filecoin-services:rjan90" -> (known after apply)
      + invitation_id               = (known after apply)
      ~ permission                  = "admin" -> "maintain" # forces replacement
      + permission_diff_suppression = false
        # (2 unchanged attributes hidden)
    }

  # github_repository_collaborator.this["synapse-sdk:jennijuju"] will be created
  + resource "github_repository_collaborator" "this" {
      + id                          = (known after apply)
      + invitation_id               = (known after apply)
      + permission                  = "admin"
      + permission_diff_suppression = false
      + repository                  = "synapse-sdk"
      + username                    = "jennijuju"
    }

  # github_repository_collaborator.this["synapse-sdk:rjan90"] must be replaced
-/+ resource "github_repository_collaborator" "this" {
      ~ id                          = "synapse-sdk:rjan90" -> (known after apply)
      + invitation_id               = (known after apply)
      ~ permission                  = "admin" -> "maintain" # forces replacement
      + permission_diff_suppression = false
        # (2 unchanged attributes hidden)
    }

  # github_team_membership.this["filoz-fs:biglep"] will be created
  + resource "github_team_membership" "this" {
      + etag     = (known after apply)
      + id       = (known after apply)
      + role     = "member"
      + team_id  = "13124042"
      + username = "BigLep"
    }

  # github_team_membership.this["filoz-fs:zenground0"] will be updated in-place
  ~ resource "github_team_membership" "this" {
        id       = "13124042:ZenGround0"
      ~ role     = "maintainer" -> "member"
        # (3 unchanged attributes hidden)
    }

  # github_team_membership.this["spacemeridian:bajtos"] will be updated in-place
  ~ resource "github_team_membership" "this" {
        id       = "13124062:bajtos"
      ~ role     = "member" -> "maintainer"
        # (3 unchanged attributes hidden)
    }

  # github_team_membership.this["spacemeridian:jennijuju"] will be destroyed
  # (because key ["spacemeridian:jennijuju"] is not in for_each map)
  - resource "github_team_membership" "this" {
      - etag     = "W/\"4fc20fbd5c50a5cb8e92f923821bf78facce2837b795c73036cdc3c2d38aa6d0\"" -> null
      - id       = "13124062:jennijuju" -> null
      - role     = "maintainer" -> null
      - team_id  = "13124062" -> null
      - username = "jennijuju" -> null
    }

  # github_team_membership.this["spacemeridian:patrickwoodhead"] will be updated in-place
  ~ resource "github_team_membership" "this" {
        id       = "13124062:patrickwoodhead"
      ~ role     = "member" -> "maintainer"
        # (3 unchanged attributes hidden)
    }

Plan: 6 to add, 3 to change, 5 to destroy.

[galargh]

So, the plan was failing because we were removing a repository in this PR (bfc7383, https://github.com/FilOzone/github-mgmt/actions/runs/15454450995/job/43503796496). Removing a repository is not a permitted operation in GitHub as Code because it is hard/impossible to revert cleanly.

The sync that you run removed that repository from the config on the default branch (1fc8f23) but since we also touched that repository, the PR couldn't be cleanly updated.

The fix was to manually merge the default branch into this PR and resolve the conflicts. In this case, the conflict resolution was to accept the repository removals from the default branch.

Now, all the workflows are passing again and the PR can be cleanly merged 🥳