[MAINT] Fix github_organization_ruleset and github_repository_ruleset with push target#2958
Merged
stevehipwell merged 56 commits intointegrations:mainfrom Feb 3, 2026
Merged
Conversation
nickfloyd
reviewed
Dec 2, 2025
stevehipwell
reviewed
Dec 3, 2025
Collaborator
stevehipwell
left a comment
stevehipwell
left a comment
There was a problem hiding this comment.
I think this change likely wants to wait for the SDK upgrade as a lot of this area is modified in future versions.
FYI the error behaviours previously seen should have been mitigated by #2705 so if there is an error the provider should handle it gracefully.
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
0531db8 to
9dd2965
Compare
1 task
stevehipwell
reviewed
Dec 5, 2025
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
1bdfa45 to
efd67ae
Compare
deiga
changed the title
github_organization_ruleset with push targetgithub_organization_ruleset with push target
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
52d95d4 to
6782aab
Compare
stevehipwell
requested changes
Dec 10, 2025
Collaborator
stevehipwell
left a comment
stevehipwell
left a comment
There was a problem hiding this comment.
Would it be possible to either de-scope this PR or open a new PR with the smallest number of changes possible to fix the outstanding bugs?
Collaborator
Author
|
@stevehipwell Yes, I agree. I've done that already in this PR: #2976 But I can't switch the base of this PR to point to that :) |
deiga
changed the title
github_organization_ruleset with push targetgithub_organization_ruleset and github_repository_ruleset with push target
deiga
force-pushed
the
org-ruleset-fix-push
branch
2 times, most recently
from
1fe74fc to
2a2277a
Compare
5 tasks
stevehipwell
requested changes
Jan 13, 2026
Collaborator
stevehipwell
left a comment
stevehipwell
left a comment
There was a problem hiding this comment.
I've added some review comments, mainly about the code structure.
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
c1019c3 to
d51fea0
Compare
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
5c0112b to
c8d93e0
Compare
4 tasks
stevehipwell
requested changes
Jan 20, 2026
Collaborator
stevehipwell
left a comment
stevehipwell
left a comment
There was a problem hiding this comment.
@deiga I've added some comments but the main concern here is that we keep only the relevant changes in the PR. If you could tidy the PR up, rebase, and then I'll give this a full PR with the aim of getting it merged ASAP.
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
…anything Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
…thing Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
…o ruleset Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
6da201a to
00afcdb
Compare
nickfloyd
approved these changes
Feb 3, 2026
JiayangZhou
pushed a commit
to JiayangZhou/terraform-provider-github
that referenced
this pull request
Apr 16, 2026
…set` with `push` target (integrations#2958) * Update descriptions and validations Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add `CustomizeDiff` logic to validate on `plan` Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add first validation test Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add validation error when `conditions` is missing Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add further validation tests Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Remove unnecessary skip blocks as `individual` and `anonymous` access to org rulesets will never be a thing Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Switch `ref_name` to `Optional` as `push` doesn't need a `ref_name` Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add Debug logging with `tflog` to validation Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix validation as `ref_name`, `repository_name` and `repository_id` are empty lists by default Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Remove unnecessary panic test Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Improve validation output messages Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix condition to require only one of `repository_name` or `repository_id` Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add validation to `required_workflow.path` Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Rename test resources for easier debugging Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix linter issues Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add validation to ensure `rules.required_status_checks.required_checks.context` is not empty Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add test to ensure that `required_checks` is always required Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix tests after rebase Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Improve legibility of `conditions` description Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Update descriptions Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add Acc test for push ruleset. This turns out to be failing as there is a bug in our implementation! Unit tests and fix coming up Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add failing test for `flattenConditions` with no `ref_name` condition Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix `flattenConditions` to work with `push` rulesets Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add more tests for `flattenConditions` Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Enable debug logging in `flattenConditions` Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Ensures that `flattenConditions` returns an empty list on empty API response Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add validation for `push` `rules` As they differ from `branch` and `tag` rules Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Get `TestAccGithubRepositoryRulesets` to work Signed-off-by: Timo Sand <timo.sand@f-secure.com> * `repository_ruleset`: Add tests for validations Signed-off-by: Timo Sand <timo.sand@f-secure.com> * `repository_ruleset`: Implement validations for `target`, `conditions` and `rules` Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Updated ruleset docs Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Extract validation functions to separate utils file with unit tests Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix push ruleset test config Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Remove `repository` target after thorough testing that it doesn't do anything Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Use idiomatic test naming convention Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Address code structure comment in tests Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix inconsistent logging Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Refactor to use typed constant string for ruleset `Target` Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix indentation issue with `github_repository_file` and heredocs Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Rename files to be more sensible Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Refactor validation functions so that Repo and Org share almost everything Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Address review comments Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Use `github.RepositoryRuleType` instead of strings Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Refactor `flattenRules` and `expandRules` to use context Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Fix failing validation Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Refactor to use `ValidateDiagFunc` and `validation.ToDiagFunc` in repo ruleset Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Use `strings.Join` to make `Description` of `target` dynamic Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add validation to `operator` attributes Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Add missing validations to repo ruleset attributes Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Refactor to use `ValidateDiagFunc` and `validation.ToDiagFunc` in org ruleset * Use `strings.Join` to make `Description` of `target` dynamic * Add validation to `operator` attributes * Add missing validations to org ruleset attributes * Ensure attribute names map correctly to rule names Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Don't ignore errors Signed-off-by: Timo Sand <timo.sand@f-secure.com> * Address review comments Signed-off-by: Timo Sand <timo.sand@f-secure.com> --------- Signed-off-by: Timo Sand <timo.sand@f-secure.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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 #2929, #2467
Before the change?
ref_namewould cause the provider to Panic asref_nameis a required fieldruleswhich weren't valid forpushrulesetsAfter the change?
pushrulesets to an organizationref_nameshould no longer be needed to be set forpushtargetconditions&targetvalidation logic should ensure correct fields are populatedPull request checklist
Schema migrations have been created if needed (example)Does this introduce a breaking change?
Please see our docs on breaking changes to help!