feat: Add support for 'exempt' github_repository_ruleset bypass_mode #2764
+6
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Maybe don't replace the |
|
Ahh, thanks for catching that @krische. My IDE auto-formatted the markdown upon save and I didn't catch it 😅 |
v1v
reviewed
Oct 8, 2025
| Required: true, | ||
| ValidateFunc: validation.StringInSlice([]string{"always", "pull_request"}, false), | ||
| ValidateFunc: validation.StringInSlice([]string{"always", "pull_request", "exempt"}, false), | ||
| Description: "When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`.", |
There was a problem hiding this comment.
I think the description needs to be updated too:
Suggested change
| Description: "When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`.", | |
| Description: "When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`, `exempt`.", |
|
@joshhunt are you working on requested changes? Would need this to go forward and happy to help. |
|
Thanks for the reminder @oikarinen. I fixed it! |
nickfloyd
approved these changes
Oct 21, 2025
nickfloyd
changed the title
oikarinen
added a commit
to oikarinen/terraform-provider-github
that referenced
this pull request
Oct 22, 2025
Add test coverage for all three bypass_modes (always, pull_request,
exempt) for both repository and organization rulesets.
Repository Ruleset Tests (resource_github_repository_ruleset_test.go):
- Add test for all three bypass_modes with Team actors
- Add test for updating bypass_mode (always → exempt)
- Add test for different actor types with different bypass_modes
(Team/always, RepositoryRole/pull_request, OrganizationAdmin/exempt)
Organization Ruleset Tests (resource_github_organization_ruleset_test.go):
- Fix existing "Creates and updates organization using bypasses" test:
* Move bypass_actors from incorrect location (inside rules) to correct
location (at ruleset level)
* Add missing bypass_mode assertions
* Fix incorrect actor_type assertions (was checking for "0", "5" instead
of actual actor type strings)
* Correct OrganizationAdmin actor_id from 0 to 1
- Add test for all three bypass_modes
- Add test for updating bypass_mode
All tests now verify:
- actor_id (both dynamic Team IDs and static role IDs)
- actor_type (Team, RepositoryRole, OrganizationAdmin, DeployKey)
- bypass_mode (always, pull_request, exempt)
This addresses the review comment from PR integrations#2764 requesting test coverage
for bypass_modes, including the newly added "exempt" mode.
Fixes: integrations#2764 (review)
4 tasks
Hope this helps #2802 |
nickfloyd
added a commit
that referenced
this pull request
Oct 22, 2025
Add test coverage for all three bypass_modes (always, pull_request,
exempt) for both repository and organization rulesets.
Repository Ruleset Tests (resource_github_repository_ruleset_test.go):
- Add test for all three bypass_modes with Team actors
- Add test for updating bypass_mode (always → exempt)
- Add test for different actor types with different bypass_modes
(Team/always, RepositoryRole/pull_request, OrganizationAdmin/exempt)
Organization Ruleset Tests (resource_github_organization_ruleset_test.go):
- Fix existing "Creates and updates organization using bypasses" test:
* Move bypass_actors from incorrect location (inside rules) to correct
location (at ruleset level)
* Add missing bypass_mode assertions
* Fix incorrect actor_type assertions (was checking for "0", "5" instead
of actual actor type strings)
* Correct OrganizationAdmin actor_id from 0 to 1
- Add test for all three bypass_modes
- Add test for updating bypass_mode
All tests now verify:
- actor_id (both dynamic Team IDs and static role IDs)
- actor_type (Team, RepositoryRole, OrganizationAdmin, DeployKey)
- bypass_mode (always, pull_request, exempt)
This addresses the review comment from PR #2764 requesting test coverage
for bypass_modes, including the newly added "exempt" mode.
Fixes: #2764 (review)
Co-authored-by: Nick Floyd <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #2755
I'm not familiar with terraform provider development, so I'm not sure if there's anything else I'm missing, but this looked right to me.
Before the change?
After the change?
Pull request checklist
Does this introduce a breaking change?