From 1735944ba63a155fcefed2bd8369c08e9b320eaf Mon Sep 17 00:00:00 2001 From: mulmuri Date: Wed, 5 Mar 2025 01:14:27 +0900 Subject: [PATCH 1/3] feat: create airflow-dags repository --- modules/github/repository/main.tf | 6 ++++-- modules/github/team/main.tf | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/modules/github/repository/main.tf b/modules/github/repository/main.tf index 3be0c3f..cc4fc22 100644 --- a/modules/github/repository/main.tf +++ b/modules/github/repository/main.tf @@ -9,7 +9,8 @@ locals { {name = "hts-connector", tags = ["backend"]}, {name = ".github", tags = []}, {name = "GoCppLinkingLibrary", tags = ["ml"]}, - {name = "common", tags = []} + {name = "common", tags = []}, + {name = "airflow-dags", tags = ["de"]} ] archived_repositories = [ @@ -36,6 +37,7 @@ resource "github_repository" "repository" { visibility = "public" has_issues = true + auto_init = true delete_branch_on_merge = true allow_merge_commit = true @@ -62,7 +64,7 @@ resource "github_branch_protection_v3" "main_branch_protection" { dismiss_stale_reviews = false require_code_owner_reviews = false bypass_pull_request_allowances { - teams = ["goboolean/DevOps"] + teams = ["goboolean/admin"] } } diff --git a/modules/github/team/main.tf b/modules/github/team/main.tf index 9515b25..be8470e 100644 --- a/modules/github/team/main.tf +++ b/modules/github/team/main.tf @@ -28,6 +28,27 @@ resource "github_team_members" "active_users" { } } +#Admin +resource "github_team" "admin" { + name = "admin" + description = "Admin team" +} + +resource "github_team_members" "admin_members" { + team_id = github_team.admin.id + + members { + username = "mulmuri" + role = "member" + } + + members { + username = "ikjeong" + role = "maintainer" + } +} + + #DevOps resource "github_team" "devops" { @@ -70,7 +91,7 @@ resource "github_team_repository" "devops_access" { #DE resource "github_team" "de" { name = "DE" - description = "DevOps" + description = "Data Engineering" } resource "github_team_members" "de_members" { From 12ccae95141c7c1e61b5c46a4fdef1d280ebc206 Mon Sep 17 00:00:00 2001 From: mulmuri Date: Wed, 5 Mar 2025 01:28:13 +0900 Subject: [PATCH 2/3] feat: wip --- modules/github/repository/main.tf | 6 +++++- modules/github/team/main.tf | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/modules/github/repository/main.tf b/modules/github/repository/main.tf index cc4fc22..694910d 100644 --- a/modules/github/repository/main.tf +++ b/modules/github/repository/main.tf @@ -52,6 +52,10 @@ resource "github_repository_topics" "repository_topic" { depends_on = [github_repository.repository] } +data "github_team" "admin_team" { + slug = "admin" +} + resource "github_branch_protection_v3" "main_branch_protection" { for_each = { for repo in local.repositories : repo.name => repo } @@ -64,7 +68,7 @@ resource "github_branch_protection_v3" "main_branch_protection" { dismiss_stale_reviews = false require_code_owner_reviews = false bypass_pull_request_allowances { - teams = ["goboolean/admin"] + teams = [data.github_team.admin_team.id] } } diff --git a/modules/github/team/main.tf b/modules/github/team/main.tf index be8470e..5f9f1c2 100644 --- a/modules/github/team/main.tf +++ b/modules/github/team/main.tf @@ -26,6 +26,11 @@ resource "github_team_members" "active_users" { username = "dawit0905" role = "member" } + + members { + username = "lsjtop10" + role = "member" + } } #Admin @@ -39,13 +44,18 @@ resource "github_team_members" "admin_members" { members { username = "mulmuri" - role = "member" + role = "maintainer" } members { username = "ikjeong" role = "maintainer" } + + members { + username = "goboolean-io" + role = "maintainer" + } } @@ -68,11 +78,6 @@ resource "github_team_members" "devops_members" { username = "ikjeong" role = "maintainer" } - - members { - username = "goboolean-io" - role = "maintainer" - } } data "github_repositories" "infra_repos" { @@ -134,6 +139,11 @@ resource "github_team_members" "backend_members" { username = "mulmuri" role = "maintainer" } + + members { + username = "lsjtop10" + role = "maintainer" + } } data "github_repositories" "backend_repos" { From 33b23ada2121e7544d90f0e98423f5675e5cfb62 Mon Sep 17 00:00:00 2001 From: mulmuri Date: Wed, 5 Mar 2025 01:38:06 +0900 Subject: [PATCH 3/3] feat: wip --- modules/github/repository/main.tf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/github/repository/main.tf b/modules/github/repository/main.tf index 694910d..d0d2703 100644 --- a/modules/github/repository/main.tf +++ b/modules/github/repository/main.tf @@ -52,10 +52,6 @@ resource "github_repository_topics" "repository_topic" { depends_on = [github_repository.repository] } -data "github_team" "admin_team" { - slug = "admin" -} - resource "github_branch_protection_v3" "main_branch_protection" { for_each = { for repo in local.repositories : repo.name => repo } @@ -68,7 +64,8 @@ resource "github_branch_protection_v3" "main_branch_protection" { dismiss_stale_reviews = false require_code_owner_reviews = false bypass_pull_request_allowances { - teams = [data.github_team.admin_team.id] + users = ["goboolean-io", "mulmuri", "ikjeong"] + teams = ["goboolean/admin"] } }