diff --git a/modules/common_repository/main.tf b/modules/common_repository/main.tf index 902e314..630124d 100644 --- a/modules/common_repository/main.tf +++ b/modules/common_repository/main.tf @@ -1,21 +1,21 @@ resource "github_repository" "repo" { - name = var.name - archived = var.archived - visibility = var.visibility - description = var.description - auto_init = true - allow_auto_merge = var.visibility == "private" ? false : true - allow_merge_commit = var.allow_merge_commit - allow_squash_merge = var.allow_squash_merge - allow_rebase_merge = var.allow_rebase_merge + name = var.name + archived = var.archived + visibility = var.visibility + description = var.description + auto_init = true + allow_auto_merge = var.visibility == "private" ? false : true + allow_merge_commit = var.allow_merge_commit + allow_squash_merge = var.allow_squash_merge + allow_rebase_merge = var.allow_rebase_merge squash_merge_commit_title = "PR_TITLE" squash_merge_commit_message = "PR_BODY" - has_issues = true - has_downloads = false - has_projects = false - has_wiki = false - is_template = var.is_template - vulnerability_alerts = var.vulnerability_alerts + has_issues = true + has_downloads = false + has_projects = false + has_wiki = false + is_template = var.is_template + vulnerability_alerts = var.vulnerability_alerts dynamic "template" { # Use the public_template repository as a template unless the repository is diff --git a/repositories.tf b/repositories.tf index 702b23e..cddaa83 100644 --- a/repositories.tf +++ b/repositories.tf @@ -150,6 +150,10 @@ module "repo_osac" { { team_id = "infrastructure" permission = "push" + }, + { + team_id = "wg-osac-storage" + permission = "push" } ] # Prow plugins handle approval via OWNERS (lgtm/approved labels), not native @@ -329,6 +333,12 @@ module "repo_enhancement_proposals" { { context = "pre-commit", integration_id = 15368 }, ] ruleset_bypass_team_ids = [github_team.all["wg-infra"].id] + teams = [ + { + team_id = "wg-osac-storage" + permission = "push" + } + ] } module "repo_osac_test_infra" { @@ -348,6 +358,10 @@ module "repo_osac_test_infra" { { team_id = "infrastructure" permission = "push" + }, + { + team_id = "wg-osac-storage" + permission = "push" } ] required_approvals = null @@ -403,6 +417,10 @@ module "repo_osac_ui" { { team_id = "fulfillment-wg" permission = "push" + }, + { + team_id = "wg-osac-storage" + permission = "push" } ] } diff --git a/team-members/wg-osac-storage.csv b/team-members/wg-osac-storage.csv index e995f41..7d6f47c 100644 --- a/team-members/wg-osac-storage.csv +++ b/team-members/wg-osac-storage.csv @@ -2,6 +2,7 @@ username,role akshaynadkarni,maintainer avishayt,member DanNiESh,member +ElayAharoni,member rgolangh,member ronniel1,member wgordon17,member