Feature: branch protection conversation resolution

[josh-barker]

This PR addresses #868 and updates the following resources:

• github_branch_protection
• github_branch_protection_v3

You may find it easier to review commit by commit.

[bleggett]

I would like this - how difficult is the conflict resolution? Can I help move this along?

[josh-barker]

Hi @bleggett, thanks for the prompt. I've just rebased the code.

[josh-barker]

Hi @jcudit, just wondering what the process is around getting a PR reviewed?

Thanks

[jcudit]

Looking like a promising contribution so far with the following caveats:

• Can we get some clarity on the v4 dependency update?
• Can we drop the edits to the _v3 resource? It has been in a frozen state since released so that we do not diverge from the recommended resource.

[jcudit]

Can we get some insight into why this dependency is changing? Not a blocker, but hoping to understand what we're currently missing.

[josh-barker]

@jcudit The structs/variables for Conversation Resolution do not exist with the older version of githubv4.

[josh-barker]

@jcudit There are existing issues relating to performance of the branch protection resource using GraphQL.
For example #606.

Therefore, I've implemented the configuration in both resources so that people have the option of choosing the more performant resource.

Personally, I can't use the github_branch_protection as I am managing too many repositories.

How did you want to proceed?

[jcudit]

I think we can ship to both resources in this case, but overall discourage adding more to the github_branch_protection_v3 resource. Aiming to send this out in an upcoming release.

[jcudit]

Tests well, thanks for the contribution!

[mambax]

Sorry but quick question. The docs state that this new require_conversation_resolution is optional.

Yet, after updating the provider our plans break:

github_team_repository.qa-microservice-streaming-api-omega-admin: Refreshing state... [id=9733:qa-microservice-streaming-api]

Error: Field 'requiresConversationResolution' doesn't exist on type 'BranchProtectionRule'

  with github_branch_protection.actions,
  on 30_actions.tf line 19, in resource "github_branch_protection" "actions":
  19: resource "github_branch_protection" "actions" {

Is that an issue or wanted behaviour?