[BUG] fix rulesets `update_allows_fetch_and_merge` validation by deiga · Pull Request #3547 · integrations/terraform-provider-github

deiga · 2026-07-16T21:02:43Z

Resolves #3543

Before the change?

rules.0.update_allows_fetch_and_merge is being marked as invalid config for repository ruleset

After the change?

rules.0.update_allows_fetch_and_merge will be allowed as config for repository rulesets
Adds Create and Update validation to ensure only Forked repos can set rules.0.update_allows_fetch_and_merge
Adds test helper for archiving a repository and for configuring repository visibility
Refactors github_repository_ruleset tests to follow modern practices

Pull request checklist

Schema migrations have been created if needed (example)
Tests for the changes have been added (for bug fixes / features)
Docs have been reviewed and added / updated if needed (for bug fixes / features)

Does this introduce a breaking change?

Please see our docs on breaking changes to help!

Yes
No

github-actions · 2026-07-16T21:02:53Z

👋 Hi, and thank you for this contribution!

This repo is maintained by GitHub and community members on a best-effort basis. We'll get to this as soon as we can.

You can help us prioritize by joining the discussion on open issues and PRs, sharing details on the changes you need, and reviewing other contributions.

_{🤖 This is an automated message.}

Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

…t validation The validation added in 6.11.0 walks the keys of the rules block and rejects any name absent from the allow-list of rule types. update_allows_fetch_and_merge is a parameter of the update rule rather than a rule of its own, so it is rejected before the expansion that folds it into UpdateRuleParameters ever runs. Any ruleset setting it therefore fails to plan, on both branch and tag targets. The provider contradicts itself within one version, since util_rules.go sends the value as a parameter and never as a rule. Cherry-picked from integrations#3547, which fixes this upstream but is still awaiting review. Only the two lines that matter are taken; the rest of that pull request is regenerated documentation and rewritten tests. A later sync of this fork absorbs the change and this patch disappears with it.

…t validation (#19) The validation added in 6.11.0 walks the keys of the rules block and rejects any name absent from the allow-list of rule types. update_allows_fetch_and_merge is a parameter of the update rule rather than a rule of its own, so it is rejected before the expansion that folds it into UpdateRuleParameters ever runs. Any ruleset setting it therefore fails to plan, on both branch and tag targets. The provider contradicts itself within one version, since util_rules.go sends the value as a parameter and never as a rule. Cherry-picked from integrations#3547, which fixes this upstream but is still awaiting review. Only the two lines that matter are taken; the rest of that pull request is regenerated documentation and rewritten tests. A later sync of this fork absorbs the change and this patch disappears with it.

stevehipwell

Please add a import-by-string-id.tf file to the examples.

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

…n non-forked repos Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Co-authored-by: Steve Hipwell <steve.hipwell@gmail.com>

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

rilical

The validation fix itself looks focused, but the surrounding cleanup dropped two useful pieces. create_branch_ruleset used to verify the resulting bypass actors and nested rules; it now only checks that Terraform plans a Create. The generated docs also lost the note explaining which rules apply to branch and tag targets versus push targets when the custom template was removed. Could we restore the state assertions alongside the new plan check and move that guidance into a schema description or small template section so it survives regeneration?

github-actions Bot added the Type: Bug Something isn't working as documented label Jul 16, 2026

deiga force-pushed the fix-update_allows_fetch_and_merge-validation branch from e68c40e to ce2ffca Compare July 19, 2026 06:20

deiga requested a review from Copilot July 19, 2026 06:32

Copilot started reviewing on behalf of deiga July 19, 2026 06:33 View session

Copilot AI reviewed Jul 19, 2026

deiga marked this pull request as ready for review July 19, 2026 06:49

deiga requested review from Copilot and stevehipwell July 19, 2026 06:49

Copilot started reviewing on behalf of deiga July 21, 2026 00:25 View session

Copilot AI reviewed Jul 21, 2026

View reviewed changes

Comment thread github/resource_github_repository_ruleset_test.go

stevehipwell reviewed Jul 21, 2026

View reviewed changes

Comment thread github/acc_helpers_test.go Outdated

Comment thread github/acc_helpers_test.go Outdated

Comment thread github/resource_github_repository_ruleset_test.go Outdated

Comment thread github/resource_github_repository_ruleset_test.go Outdated

deiga added r/repository_ruleset vNextPatch These issues and PRs should be included in the next patch release labels Jul 28, 2026

deiga added this to the v6.13.1 milestone Jul 28, 2026

deiga force-pushed the fix-update_allows_fetch_and_merge-validation branch from 2c4dedb to 5bdcf8c Compare July 28, 2026 19:08

deiga requested a review from stevehipwell July 28, 2026 19:08

deiga force-pushed the fix-update_allows_fetch_and_merge-validation branch from 5bdcf8c to 2a5953e Compare August 10, 2026 16:46

dev-milos mentioned this pull request Aug 17, 2026

Apply patch to v6.11.1: allow update_allows_fetch_and_merge in ruleset validation G-Research-Forks/terraform-provider-github#19

Merged

dev-milos mentioned this pull request Aug 17, 2026

provider: bump to 6.11.1-gr.2 for the ruleset validation fix G-Research/github-terraformer#76

Merged

stevehipwell requested changes Aug 18, 2026

View reviewed changes

Comment thread github/resource_github_repository_ruleset.go Outdated

Comment thread github/resource_github_repository_ruleset.go Outdated

Comment thread github/resource_github_repository_ruleset.go Outdated

deiga added 7 commits August 22, 2026 13:54

Add test and fix for configuring update_allows_fetch_and_merge

d0ba04a

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Add validation to block configuring update_allows_fetch_and_merge o…

d0b1e72

…n non-forked repos Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Refactor create_branch_ruleset test to use ConfigStateChecks

7119789

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Refactor tests to use proper test setup

aeef481

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Refactor usages of legacy Check patterns

26b3d1b

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Update RESOURCES listing

3d1c8f7

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Address review comments

d9e9847

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

deiga and others added 3 commits August 22, 2026 13:54

Migrate repo ruleset docs to generated

be23058

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Apply suggestions from code review

cd54b27

Co-authored-by: Steve Hipwell <steve.hipwell@gmail.com>

Address review comments

afef5c0

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

deiga force-pushed the fix-update_allows_fetch_and_merge-validation branch from e5bf717 to afef5c0 Compare August 22, 2026 10:56

deiga requested a review from stevehipwell August 22, 2026 10:56

rilical reviewed Aug 24, 2026

View reviewed changes

Navigation Menu

Uh oh!

[BUG] fix rulesets `update_allows_fetch_and_merge` validation - #3547

[BUG] fix rulesets `update_allows_fetch_and_merge` validation#3547
deiga wants to merge 10 commits into
integrations:mainfrom
F-Secure-web:fix-update_allows_fetch_and_merge-validation

deiga commented Jul 16, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 16, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stevehipwell left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rilical left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

deiga commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Before the change?

After the change?

Pull request checklist

Does this introduce a breaking change?

Uh oh!

github-actions Bot commented Jul 16, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stevehipwell left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rilical left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

deiga commented Jul 16, 2026 •

edited

Loading