Skip to content

chore(terraform): develop 보호 정책에 Admin role bypass 추가#85

Merged
chanwoo7 merged 1 commit intomainfrom
chore/terraform-develop-bypass-actor
May 5, 2026
Merged

chore(terraform): develop 보호 정책에 Admin role bypass 추가#85
chanwoo7 merged 1 commit intomainfrom
chore/terraform-develop-bypass-actor

Conversation

@chanwoo7
Copy link
Copy Markdown
Member

@chanwoo7 chanwoo7 commented May 5, 2026

Summary

release 머지 후 develop을 main HEAD로 fast-forward 동기화할 수 있도록
develop_protectionRepositoryRole=Admin bypass_actors 1건 추가.

배경

  • GitHub UI의 PR 머지 모드는 모두 새 커밋(merge commit / squash / rebase)을 생성
  • 진정한 fast-forward (포인터만 이동)는 PR로 불가능
  • release 머지 후 develop은 main의 머지 커밋을 모르는 상태가 누적 → 두 브랜치 SHA drift
  • Admin이 release 머지 직후 git push origin main:develop 으로 ff sync 가능하도록 우회 권한 부여

변경 사항

  • develop_protection ruleset에 bypass_actors 1건 추가
    • actor_type: RepositoryRole
    • actor_id: 5 (Admin)
    • bypass_mode: always

GitHub Ruleset API는 user 직접 지정 불가 (RepositoryRole/Team/Integration/OrganizationAdmin만).
현재 레포 admin 4명에게 bypass 권한 부여됨.

영향 범위

  • main 보호: 그대로 유지 (PR + CI 필수)
  • develop 보호: 일반 작업은 여전히 PR 경유 권장
    • admin이 의도적으로 직접 push (ff sync 등) 시에만 우회

Test plan

  • terraform plan: bypass_actors 1건 추가만 변경 (다른 0)
  • 머지 후 terraform apply
  • git push origin main:develop 동작 확인

Summary by CodeRabbit

변경 사항

  • 설정 업데이트
    • 개발(develop) 브랜치 보호 규칙에 관리자 역할이 항상 규칙을 우회할 수 있는 기능이 추가되었습니다. 기존의 삭제/강제 푸시 제한, PR 요구사항 및 필수 상태 확인은 변경되지 않습니다.

release 머지 후 develop을 main HEAD로 fast-forward 동기화할 수 있도록
develop_protection에 RepositoryRole=Admin bypass_actors 추가.

GitHub UI의 PR 머지 모드들은 모두 새 커밋(머지/squash/rebase)을 생성하므로
release 후 develop SHA가 main과 달라지는 누적 drift가 발생한다.
Admin이 main 머지 직후 git push origin main:develop 으로 ff sync 하기 위함.

main 보호는 그대로 유지 (PR + CI 필수). 일반 작업도 PR 경유 권장 그대로.
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 5, 2026

Caution

Review failed

Pull request was closed or merged during review

📝 Walkthrough

Walkthrough

terraform/main.tf 파일의 github_repository_ruleset.develop_protection 리소스에 bypass_actors 블록이 추가되어, Repository Admin 역할(actor_id 5)이 develop 브랜치 규칙 세트를 항상 우회할 수 있도록 허용합니다.

Changes

저장소 규칙 세트 관리자 우회 권한 추가

Layer / File(s) Summary
규칙 세트 구성
terraform/main.tf
github_repository_ruleset.develop_protectionbypass_actors 블록 추가로 Repository Admin 역할(actor_id = 5)에 bypass_mode = "always" 권한 부여. 기존 삭제/강제 푸시 제한, PR 요구사항, 필수 상태 검사는 변경 없음.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 4
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed PR 제목이 변경 사항을 명확하게 설명하고 있으며, terraform 파일의 develop 보호 정책에 Admin role bypass를 추가한 내용과 정확히 일치합니다.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch chore/terraform-develop-bypass-actor

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@chanwoo7 chanwoo7 enabled auto-merge May 5, 2026 19:05
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

Coverage report

St.
Category Percentage Covered / Total
🟢 Statements 96.69% 2894/2993
🟢 Branches 86.5% 1647/1904
🟢 Functions 93.32% 615/659
🟢 Lines 97.02% 2638/2719

Test suite run success

868 tests passing in 77 suites.

Report generated by 🧪jest coverage report action from 5875d90

@chanwoo7 chanwoo7 merged commit 81fd6c9 into main May 5, 2026
9 of 10 checks passed
@codecov
Copy link
Copy Markdown

codecov Bot commented May 5, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@chanwoo7 chanwoo7 deleted the chore/terraform-develop-bypass-actor branch May 5, 2026 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant