Skip to content
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.

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

Fix #1555: Avoid duplication of pull request bypasser #1711

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

bpaquet
Copy link
Contributor

@bpaquet bpaquet commented Jun 3, 2023

Fix #1555

This one line patch avoid to duplicate pull request bypasser while reading branch protection.

@bpaquet
Copy link
Contributor Author

bpaquet commented Jun 3, 2023

Hello @kfcampbell. This patch works for me, but I'm not able to have green test with TestAccGithubBranchProtection, with or without the patch. Are these integration test green on master? Is there a place on which we can see integration test result for the master branch? Thx

@bpaquet bpaquet changed the title Fix #1555: Avoid duplication of pull reqyuest bypasser Fix #1555: Avoid duplication of pull request bypasser Jun 3, 2023
@bpaquet
Copy link
Contributor Author

bpaquet commented Jun 3, 2023

I will be happy to add tests if I'm able to have them green before :)

@kfcampbell
Copy link
Member

🙈 🙈 🙈 Our branch protection tests are a bit of a mess, unfortunately. If you can provide a reproduction case I can use to manually test this, I'll consider that acceptable.

@bpaquet
Copy link
Contributor Author

bpaquet commented Jun 21, 2023

🙈 🙈 🙈 Our branch protection tests are a bit of a mess, unfortunately. If you can provide a reproduction case I can use to manually test this, I'll consider that acceptable.

hello @kfcampbell Can you try this? https://github.com/bpaquet/terraform-provider-github/tree/test_bypasser/examples/repo_branch_protection ? I cannot check it on my side, because my test org is not pro, but I'm confident this will highlight the issue. Just run two apply, or one apply and a plan after. Thx :)

Copy link
Member

@kfcampbell kfcampbell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @bpaquet! I've validated that this does fix the issue in which subsequent applies wanted to remove the actor ID. This is good to go.

@kfcampbell kfcampbell merged commit be7cfe8 into integrations:main Jun 22, 2023
3 checks passed
doonga pushed a commit to doonga/greyrock-ops that referenced this pull request Jun 23, 2023
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github](https://registry.terraform.io/providers/integrations/github)
([source](https://togithub.com/integrations/terraform-provider-github))
| required_provider | patch | `5.28.0` -> `5.28.1` |

---

### Release Notes

<details>
<summary>integrations/terraform-provider-github (github)</summary>

###
[`v5.28.1`](https://togithub.com/integrations/terraform-provider-github/releases/tag/v5.28.1)

[Compare
Source](https://togithub.com/integrations/terraform-provider-github/compare/v5.28.0...v5.28.1)

#### What's Changed

- build(deps): bump github.com/google/go-github/v53 from 53.0.0 to
53.1.0 by [@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#1740
- build(deps): bump golang.org/x/oauth2 from 0.8.0 to 0.9.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#1739
- Improve github team resource by
[@&#8203;bpaquet](https://togithub.com/bpaquet) in
[integrations/terraform-provider-github#1722
- Handle deployment branch policies for repositories: resources and
datasource by [@&#8203;bpaquet](https://togithub.com/bpaquet) in
[integrations/terraform-provider-github#1715
- Bump google/go-github to v53.2.0 by
[@&#8203;kfcampbell](https://togithub.com/kfcampbell) in
[integrations/terraform-provider-github#1744
- Fix
[#&#8203;1555](https://togithub.com/integrations/terraform-provider-github/issues/1555):
Avoid duplication of pull request bypasser by
[@&#8203;bpaquet](https://togithub.com/bpaquet) in
[integrations/terraform-provider-github#1711
- fix: Repo Creation fails with enabled Pages by
[@&#8203;0x46616c6b](https://togithub.com/0x46616c6b) in
[integrations/terraform-provider-github#1748

**Full Changelog**:
integrations/terraform-provider-github@v5.28.0...v5.29.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xNDAuMiIsInVwZGF0ZWRJblZlciI6IjM1LjE0MC4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: greyrock-bot <1583719+greyrock-bot[bot]@users.noreply.github.com>
avidspartan1 pushed a commit to avidspartan1/terraform-provider-github that referenced this pull request Feb 5, 2024
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.

[BUG] terraform plan is not empty when using github_branch_protection with actor names
2 participants