Adding missing RequiresLinearHistory #935

jtyr · 2021-10-08T13:24:06Z

This PR is adding missing parameter that sets the required_linear_history in the branch protection. Without this patch, I can don't see the requiresLinearHistory in the request data:

2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: 2021/10/08 14:21:23 [DEBUG] Github API Request Details:
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: ---[ REQUEST ]---------------------------------------
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: POST /graphql HTTP/1.1
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: Host: api.github.com
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: User-Agent: Go-http-client/1.1
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: Content-Length: 665
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: Content-Type: application/json
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: Accept-Encoding: gzip
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: 
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: {
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:  "query": "mutation($input:UpdateBranchProtectionRuleInput!){updateBranchProtectionRule(input: $input){branchProtectionRule{id}}}",
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:  "variables": {
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:   "input": {
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "branchProtectionRuleId": "BPR_kwDOGLwnv84BVkxt",
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "pattern": "release",
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresApprovingReviews": true,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiredApprovingReviewCount": 1,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresCommitSignatures": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "allowsForcePushes": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "allowsDeletions": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "isAdminEnforced": true,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresStatusChecks": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresStrictStatusChecks": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresCodeOwnerReviews": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "dismissesStaleReviews": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "restrictsReviewDismissals": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "reviewDismissalActorIds": null,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "restrictsPushes": false,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "pushActorIds": null,
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiredStatusCheckContexts": null
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:   }
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:  }
2021-10-08T14:21:23.703+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: }

With this patch, I can see the requiresLinearHistory in the request data:

2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: 2021/10/08 14:11:47 [DEBUG] Github API Request Details:
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: ---[ REQUEST ]---------------------------------------
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: POST /graphql HTTP/1.1
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: Host: api.github.com
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: User-Agent: Go-http-client/1.1
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: Content-Length: 694
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: Content-Type: application/json
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: Accept-Encoding: gzip
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: 
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: {
2021-10-08T14:11:47.287+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:  "query": "mutation($input:UpdateBranchProtectionRuleInput!){updateBranchProtectionRule(input: $input){branchProtectionRule{id}}}",
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:  "variables": {
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:   "input": {
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "branchProtectionRuleId": "BPR_kwDOGLwnv84BVkxt",
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "pattern": "release",
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresApprovingReviews": true,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiredApprovingReviewCount": 1,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresCommitSignatures": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresLinearHistory": true,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "allowsForcePushes": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "allowsDeletions": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "isAdminEnforced": true,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresStatusChecks": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresStrictStatusChecks": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiresCodeOwnerReviews": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "dismissesStaleReviews": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "restrictsReviewDismissals": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "reviewDismissalActorIds": null,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "restrictsPushes": false,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "pushActorIds": null,
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:    "requiredStatusCheckContexts": null
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:   }
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0:  }
2021-10-08T14:11:47.288+0100 [DEBUG] provider.terraform-provider-github_v4.16.0: }

majormoses

LGTM

jcudit

Thanks for the patience on this one 🙇🏾

Looks good to ship! @jtyr can I get some help with the conflicts?

Signed-off-by: Jiri Tyr <[email protected]>

jtyr · 2021-12-08T15:43:55Z

@jcudit Code rebase.

philippeboyd · 2021-12-10T18:39:51Z

It seems to be missing a final approval from @majormoses

majormoses · 2021-12-11T03:51:21Z

It seems to be missing a final approval from @majormoses

Just a contributor. Will need assistance from @jcudit or another maintainer.

Signed-off-by: Jiri Tyr <[email protected]>

jtyr force-pushed the jtyr-libhist branch from f0bd733 to 3323406 Compare October 14, 2021 01:38

jcudit added this to the v4.19.0 milestone Nov 2, 2021

jtyr force-pushed the jtyr-libhist branch from 3323406 to f242217 Compare November 9, 2021 12:10

majormoses approved these changes Nov 16, 2021

View reviewed changes

jcudit approved these changes Dec 3, 2021

View reviewed changes

jcudit mentioned this pull request Dec 7, 2021

Set linear history flag on create and update #994

Closed

Adding missing RequiresLinearHistory

92adfc0

Signed-off-by: Jiri Tyr <[email protected]>

jtyr force-pushed the jtyr-libhist branch from f242217 to 92adfc0 Compare December 8, 2021 15:43

jcudit approved these changes Dec 13, 2021

View reviewed changes

jcudit merged commit 2c980cf into integrations:main Dec 13, 2021

kfcampbell pushed a commit to kfcampbell/terraform-provider-github that referenced this pull request Jul 26, 2022

Adding missing RequiresLinearHistory (integrations#935)

77409f4

Signed-off-by: Jiri Tyr <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding missing RequiresLinearHistory #935

Adding missing RequiresLinearHistory #935

jtyr commented Oct 8, 2021

majormoses left a comment

jcudit left a comment •

edited

Loading

jtyr commented Dec 8, 2021

philippeboyd commented Dec 10, 2021

majormoses commented Dec 11, 2021

Adding missing RequiresLinearHistory #935

Adding missing RequiresLinearHistory #935

Conversation

jtyr commented Oct 8, 2021

majormoses left a comment

Choose a reason for hiding this comment

jcudit left a comment • edited Loading

Choose a reason for hiding this comment

jtyr commented Dec 8, 2021

philippeboyd commented Dec 10, 2021

majormoses commented Dec 11, 2021

jcudit left a comment •

edited

Loading