Skip to content

Commit

Permalink
fix: use team id instead of slug
Browse files Browse the repository at this point in the history 
For `github_repository_collaborators` `team` blocks, use the team id
instead of the team slug.

[This change][1] in the GitHub integration caused a lot of noise that is
now fixed.

[1]: integrations/terraform-provider-github#2420
  • Loading branch information
@matijs
matijs committed Jan 22, 2025
1 parent 36b7301 commit fc2fd1e
Show file tree
Hide file tree
Showing 28 changed files with 203 additions and 203 deletions.
8 changes: 4 additions & 4 deletions backlog.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,21 @@ resource "github_repository_collaborators" "backlog" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}
}
10 changes: 5 additions & 5 deletions basis.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,26 +89,26 @@ resource "github_repository_collaborators" "basis" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "triage"
team_id = github_team.kernteam-dependabot.slug
team_id = github_team.kernteam-dependabot.id
}
}
10 changes: 5 additions & 5 deletions candidate.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,27 +89,27 @@ resource "github_repository_collaborators" "candidate" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "triage"
team_id = github_team.kernteam-dependabot.slug
team_id = github_team.kernteam-dependabot.id
}
}

Expand Down
20 changes: 10 additions & 10 deletions denhaag.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,51 +129,51 @@ resource "github_repository_collaborators" "denhaag" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "admin"
team_id = github_team.gemeente-denhaag-admin.slug
team_id = github_team.gemeente-denhaag-admin.id
}

team {
permission = "push"
team_id = github_team.gemeente-denhaag-design-system.slug
team_id = github_team.gemeente-denhaag-design-system.id
}

team {
permission = "push"
team_id = github_team.gemeente-denhaag-acato-committer.slug
team_id = github_team.gemeente-denhaag-acato-committer.id
}

team {
permission = "push"
team_id = github_team.denhaag-acato.slug
team_id = github_team.denhaag-acato.id
}

team {
permission = "push"
team_id = github_team.frameless.slug
team_id = github_team.frameless.id
}

team {
permission = "maintain"
team_id = github_team.frameless-maintainer.slug
team_id = github_team.frameless-maintainer.id
}
}
12 changes: 6 additions & 6 deletions documentatie.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,32 +103,32 @@ resource "github_repository_collaborators" "documentatie" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "push"
team_id = github_team.kernteam-a11y.slug
team_id = github_team.kernteam-a11y.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "triage"
team_id = github_team.kernteam-dependabot.slug
team_id = github_team.kernteam-dependabot.id
}

team {
Expand Down
8 changes: 4 additions & 4 deletions dot-github.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ resource "github_repository_collaborators" "dot-github" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}
}
10 changes: 5 additions & 5 deletions example-with-angular.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,26 @@ resource "github_repository_collaborators" "example-with-angular" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "push"
team_id = github_team.frameless.slug
team_id = github_team.frameless.id
}
}
10 changes: 5 additions & 5 deletions example-with-next-js.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,26 @@ resource "github_repository_collaborators" "example-with-next-js" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "push"
team_id = github_team.frameless.slug
team_id = github_team.frameless.id
}
}
10 changes: 5 additions & 5 deletions example.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,26 +73,26 @@ resource "github_repository_collaborators" "example" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "triage"
team_id = github_team.kernteam-dependabot.slug
team_id = github_team.kernteam-dependabot.id
}
}
12 changes: 6 additions & 6 deletions gebruikersonderzoeken.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,31 +78,31 @@ resource "github_repository_collaborators" "gebruikersonderzoeken" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "triage"
team_id = github_team.kernteam-dependabot.slug
team_id = github_team.kernteam-dependabot.id
}

team {
permission = "maintain"
team_id = github_team.gebruikersonderzoeken.slug
team_id = github_team.gebruikersonderzoeken.id
}
}
10 changes: 5 additions & 5 deletions icons.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,27 @@ resource "github_repository_collaborators" "icons" {

team {
permission = "admin"
team_id = github_team.kernteam-admin.slug
team_id = github_team.kernteam-admin.id
}

team {
permission = "maintain"
team_id = github_team.kernteam-maintainer.slug
team_id = github_team.kernteam-maintainer.id
}

team {
permission = "push"
team_id = github_team.kernteam-committer.slug
team_id = github_team.kernteam-committer.id
}

team {
permission = "triage"
team_id = github_team.kernteam-triage.slug
team_id = github_team.kernteam-triage.id
}

team {
permission = "push"
team_id = github_team.icons-committer.slug
team_id = github_team.icons-committer.id
}
}

Expand Down
Loading

0 comments on commit fc2fd1e

Please sign in to comment.