Skip to content

fix: prevent inconsistent final plan for prevent_self_review in github_repository_environment #3583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kishaningithub wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: prevent inconsistent final plan for prevent_self_review in github_repository_environment #3583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abaaef0
fix: prevent inconsistent final plan for prevent_self_review in githu…
kishaningithub Jul 28, 2026
89e05f2
test: add regression test for prevent_self_review null-state normaliz…
kishaningithub Jul 29, 2026
0c63db8
refactor(repository_environment): simplify prevent_self_review read a…
kishaningithub Aug 3, 2026
a398de1
test(repository_environment): cover prevent_self_review read state
kishaningithub Aug 4, 2026
8ec4533
test(repository_environment): verify prevent_self_review on import wi…
kishaningithub Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion github/resource_github_repository_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ func resourceGithubRepositoryEnvironmentRead(ctx context.Context, d *schema.Reso
return diag.FromErr(err)
}

// Default prevent_self_review to false; it will be overwritten if the
// required_reviewers protection rule is present in the API response.
if err := d.Set("prevent_self_review", false); err != nil {
Comment thread
kishaningithub marked this conversation as resolved.
return diag.FromErr(err)
}

Comment thread
kishaningithub marked this conversation as resolved.
for _, pr := range env.ProtectionRules {
switch pr.GetType() {
case "wait_timer":
Expand Down Expand Up @@ -264,7 +270,7 @@ func resourceGithubRepositoryEnvironmentRead(ctx context.Context, d *schema.Reso
return diag.FromErr(err)
}

if err = d.Set("prevent_self_review", pr.PreventSelfReview); err != nil {
if err = d.Set("prevent_self_review", pr.GetPreventSelfReview()); err != nil {
return diag.FromErr(err)
}
}
Expand Down
6 changes: 4 additions & 2 deletions github/resource_github_repository_environment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ resource "github_repository_environment" "test" {
})
})

t.Run("import", func(t *testing.T) {
t.Run("import_without_reviewers", func(t *testing.T) {
t.Parallel()

randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
Expand Down Expand Up @@ -272,10 +272,12 @@ resource "github_repository_environment" "test" {
},
},
{
// The API omits required_reviewers when none are configured, but
// prevent_self_review must still be populated during import.
ResourceName: "github_repository_environment.test",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"can_admins_bypass", "prevent_self_review", "reviewers", "wait_timer", "deployment_branch_policy"},
ImportStateVerifyIgnore: []string{"can_admins_bypass", "reviewers", "wait_timer", "deployment_branch_policy"},
},
},
})
Expand Down
Loading