Skip to content

Commit f093aaa

Browse files
authored
chore!: Remove PullRequestRuleParameters.AutomaticCopilotCodeReviewEnabled field (google#3866)
BREAKING CHANGE: `PullRequestRuleParameters.AutomaticCopilotCodeReviewEnabled` is now removed.
1 parent c7473ca commit f093aaa

File tree

5 files changed

+42
-68
lines changed

5 files changed

+42
-68
lines changed

github/event_types_test.go

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9789,7 +9789,7 @@ func TestRepositoryRulesetEvent_Unmarshal(t *testing.T) {
97899789
{
97909790
"created",
97919791
fmt.Sprintf(
9792-
`{"action":"created","repository_ruleset":{"id":1,"name":"r","target":"branch","source_type":"Repository","source":"o/r","enforcement":"active","conditions":{"ref_name":{"exclude":[],"include":["~ALL"]}},"rules":[{"type":"deletion"},{"type":"creation"},{"type":"update"},{"type":"required_linear_history"},{"type":"pull_request","parameters":{"required_approving_review_count":2,"dismiss_stale_reviews_on_push":false,"require_code_owner_review":false,"require_last_push_approval":false,"required_review_thread_resolution":false,"automatic_copilot_code_review_enabled":false,"allowed_merge_methods":["squash","rebase","merge"]}},{"type":"code_scanning","parameters":{"code_scanning_tools":[{"tool":"CodeQL","security_alerts_threshold":"high_or_higher","alerts_threshold":"errors"}]}}],"node_id":"n","created_at":%[1]s,"updated_at":%[1]s,"_links":{"self":{"href":"a"},"html":{"href":"a"}}},"repository":{"id":1,"node_id":"n","name":"r","full_name":"o/r"},"organization":{"id":1,"node_id":"n","name":"o"},"enterprise":{"id":1,"node_id":"n","slug":"e","name":"e"},"installation":{"id":1,"node_id":"n","app_id":1,"app_slug":"a"},"sender":{"id":1,"node_id":"n","login":"l"}}`,
9792+
`{"action":"created","repository_ruleset":{"id":1,"name":"r","target":"branch","source_type":"Repository","source":"o/r","enforcement":"active","conditions":{"ref_name":{"exclude":[],"include":["~ALL"]}},"rules":[{"type":"deletion"},{"type":"creation"},{"type":"update"},{"type":"required_linear_history"},{"type":"pull_request","parameters":{"required_approving_review_count":2,"dismiss_stale_reviews_on_push":false,"require_code_owner_review":false,"require_last_push_approval":false,"required_review_thread_resolution":false,"allowed_merge_methods":["squash","rebase","merge"]}},{"type":"code_scanning","parameters":{"code_scanning_tools":[{"tool":"CodeQL","security_alerts_threshold":"high_or_higher","alerts_threshold":"errors"}]}}],"node_id":"n","created_at":%[1]s,"updated_at":%[1]s,"_links":{"self":{"href":"a"},"html":{"href":"a"}}},"repository":{"id":1,"node_id":"n","name":"r","full_name":"o/r"},"organization":{"id":1,"node_id":"n","name":"o"},"enterprise":{"id":1,"node_id":"n","slug":"e","name":"e"},"installation":{"id":1,"node_id":"n","app_id":1,"app_slug":"a"},"sender":{"id":1,"node_id":"n","login":"l"}}`,
97939793
referenceTimeStr,
97949794
),
97959795
&RepositoryRulesetEvent{
@@ -9818,12 +9818,11 @@ func TestRepositoryRulesetEvent_Unmarshal(t *testing.T) {
98189818
PullRequestMergeMethodRebase,
98199819
PullRequestMergeMethodMerge,
98209820
},
9821-
AutomaticCopilotCodeReviewEnabled: Ptr(false),
9822-
DismissStaleReviewsOnPush: false,
9823-
RequireCodeOwnerReview: false,
9824-
RequireLastPushApproval: false,
9825-
RequiredApprovingReviewCount: 2,
9826-
RequiredReviewThreadResolution: false,
9821+
DismissStaleReviewsOnPush: false,
9822+
RequireCodeOwnerReview: false,
9823+
RequireLastPushApproval: false,
9824+
RequiredApprovingReviewCount: 2,
9825+
RequiredReviewThreadResolution: false,
98279826
},
98289827
CodeScanning: &CodeScanningRuleParameters{
98299828
CodeScanningTools: []*RuleCodeScanningTool{
@@ -9853,7 +9852,7 @@ func TestRepositoryRulesetEvent_Unmarshal(t *testing.T) {
98539852
{
98549853
"edited",
98559854
fmt.Sprintf(
9856-
`{"action":"edited","repository_ruleset":{"id":1,"name":"r","target":"branch","source_type":"Repository","source":"o/r","enforcement":"active","conditions":{"ref_name":{"exclude":[],"include":["~DEFAULT_BRANCH","refs/heads/dev-*"]}},"rules":[{"type":"deletion"},{"type":"creation"},{"type":"update"},{"type": "required_signatures"},{"type":"pull_request","parameters":{"required_approving_review_count":2,"dismiss_stale_reviews_on_push":false,"require_code_owner_review":false,"require_last_push_approval":false,"required_review_thread_resolution":false,"automatic_copilot_code_review_enabled":false,"allowed_merge_methods":["squash","rebase"]}},{"type":"code_scanning","parameters":{"code_scanning_tools":[{"tool":"CodeQL","security_alerts_threshold":"medium_or_higher","alerts_threshold":"errors"}]}}],"node_id":"n","created_at":%[1]s,"updated_at":%[1]s,"_links":{"self":{"href":"a"},"html":{"href":"a"}}},"changes":{"rules":{"added":[{"type": "required_signatures"}],"updated":[{"rule":{"type":"pull_request","parameters":{"required_approving_review_count":2,"dismiss_stale_reviews_on_push":false,"require_code_owner_review":false,"require_last_push_approval":false,"required_review_thread_resolution":false,"automatic_copilot_code_review_enabled":false,"allowed_merge_methods":["squash","rebase"]}},"changes":{"configuration":{"from":"{\\\"required_reviewers\\\":[],\\\"allowed_merge_methods\\\":[\\\"squash\\\",\\\"rebase\\\",\\\"merge\\\"],\\\"require_code_owner_review\\\":false,\\\"require_last_push_approval\\\":false,\\\"dismiss_stale_reviews_on_push\\\":false,\\\"required_approving_review_count\\\":2,\\\"authorized_dismissal_actors_only\\\":false,\\\"required_review_thread_resolution\\\":false,\\\"ignore_approvals_from_contributors\\\":false,\\\"automatic_copilot_code_review_enabled\\\":false}"}}},{"rule":{"type":"code_scanning","parameters":{"code_scanning_tools":[{"tool":"CodeQL","security_alerts_threshold":"medium_or_higher","alerts_threshold":"errors"}]}},"changes":{"configuration":{"from":"{\\\"code_scanning_tools\\\":[{\\\"tool\\\":\\\"CodeQL\\\",\\\"alerts_threshold\\\":\\\"errors\\\",\\\"security_alerts_threshold\\\":\\\"high_or_higher\\\"}]}"}}}],"deleted":[{"type":"required_linear_history"}]},"conditions":{"updated":[{"condition":{"ref_name":{"exclude":[],"include":["~DEFAULT_BRANCH","refs/heads/dev-*"]}},"changes":{"include":{"from":["~ALL"]}}}],"deleted":[]}},"repository":{"id":1,"node_id":"n","name":"r","full_name":"o/r"},"organization":{"id":1,"node_id":"n","name":"o"},"enterprise":{"id":1,"node_id":"n","slug":"e","name":"e"},"installation":{"id":1,"node_id":"n","app_id":1,"app_slug":"a"},"sender":{"id":1,"node_id":"n","login":"l"}}`,
9855+
`{"action":"edited","repository_ruleset":{"id":1,"name":"r","target":"branch","source_type":"Repository","source":"o/r","enforcement":"active","conditions":{"ref_name":{"exclude":[],"include":["~DEFAULT_BRANCH","refs/heads/dev-*"]}},"rules":[{"type":"deletion"},{"type":"creation"},{"type":"update"},{"type": "required_signatures"},{"type":"pull_request","parameters":{"required_approving_review_count":2,"dismiss_stale_reviews_on_push":false,"require_code_owner_review":false,"require_last_push_approval":false,"required_review_thread_resolution":false,"allowed_merge_methods":["squash","rebase"]}},{"type":"code_scanning","parameters":{"code_scanning_tools":[{"tool":"CodeQL","security_alerts_threshold":"medium_or_higher","alerts_threshold":"errors"}]}}],"node_id":"n","created_at":%[1]s,"updated_at":%[1]s,"_links":{"self":{"href":"a"},"html":{"href":"a"}}},"changes":{"rules":{"added":[{"type": "required_signatures"}],"updated":[{"rule":{"type":"pull_request","parameters":{"required_approving_review_count":2,"dismiss_stale_reviews_on_push":false,"require_code_owner_review":false,"require_last_push_approval":false,"required_review_thread_resolution":false,"allowed_merge_methods":["squash","rebase"]}},"changes":{"configuration":{"from":"{\\\"required_reviewers\\\":[],\\\"allowed_merge_methods\\\":[\\\"squash\\\",\\\"rebase\\\",\\\"merge\\\"],\\\"require_code_owner_review\\\":false,\\\"require_last_push_approval\\\":false,\\\"dismiss_stale_reviews_on_push\\\":false,\\\"required_approving_review_count\\\":2,\\\"authorized_dismissal_actors_only\\\":false,\\\"required_review_thread_resolution\\\":false,\\\"ignore_approvals_from_contributors\\\":false}"}}},{"rule":{"type":"code_scanning","parameters":{"code_scanning_tools":[{"tool":"CodeQL","security_alerts_threshold":"medium_or_higher","alerts_threshold":"errors"}]}},"changes":{"configuration":{"from":"{\\\"code_scanning_tools\\\":[{\\\"tool\\\":\\\"CodeQL\\\",\\\"alerts_threshold\\\":\\\"errors\\\",\\\"security_alerts_threshold\\\":\\\"high_or_higher\\\"}]}"}}}],"deleted":[{"type":"required_linear_history"}]},"conditions":{"updated":[{"condition":{"ref_name":{"exclude":[],"include":["~DEFAULT_BRANCH","refs/heads/dev-*"]}},"changes":{"include":{"from":["~ALL"]}}}],"deleted":[]}},"repository":{"id":1,"node_id":"n","name":"r","full_name":"o/r"},"organization":{"id":1,"node_id":"n","name":"o"},"enterprise":{"id":1,"node_id":"n","slug":"e","name":"e"},"installation":{"id":1,"node_id":"n","app_id":1,"app_slug":"a"},"sender":{"id":1,"node_id":"n","login":"l"}}`,
98579856
referenceTimeStr,
98589857
),
98599858
&RepositoryRulesetEvent{
@@ -9881,12 +9880,11 @@ func TestRepositoryRulesetEvent_Unmarshal(t *testing.T) {
98819880
PullRequestMergeMethodSquash,
98829881
PullRequestMergeMethodRebase,
98839882
},
9884-
AutomaticCopilotCodeReviewEnabled: Ptr(false),
9885-
DismissStaleReviewsOnPush: false,
9886-
RequireCodeOwnerReview: false,
9887-
RequireLastPushApproval: false,
9888-
RequiredApprovingReviewCount: 2,
9889-
RequiredReviewThreadResolution: false,
9883+
DismissStaleReviewsOnPush: false,
9884+
RequireCodeOwnerReview: false,
9885+
RequireLastPushApproval: false,
9886+
RequiredApprovingReviewCount: 2,
9887+
RequiredReviewThreadResolution: false,
98909888
},
98919889
CodeScanning: &CodeScanningRuleParameters{
98929890
CodeScanningTools: []*RuleCodeScanningTool{
@@ -9936,18 +9934,17 @@ func TestRepositoryRulesetEvent_Unmarshal(t *testing.T) {
99369934
PullRequestMergeMethodSquash,
99379935
PullRequestMergeMethodRebase,
99389936
},
9939-
AutomaticCopilotCodeReviewEnabled: Ptr(false),
9940-
DismissStaleReviewsOnPush: false,
9941-
RequireCodeOwnerReview: false,
9942-
RequireLastPushApproval: false,
9943-
RequiredApprovingReviewCount: 2,
9944-
RequiredReviewThreadResolution: false,
9937+
DismissStaleReviewsOnPush: false,
9938+
RequireCodeOwnerReview: false,
9939+
RequireLastPushApproval: false,
9940+
RequiredApprovingReviewCount: 2,
9941+
RequiredReviewThreadResolution: false,
99459942
},
99469943
},
99479944
Changes: &RepositoryRulesetChangedRule{
99489945
Configuration: &RepositoryRulesetChangeSource{
99499946
From: Ptr(
9950-
`{\"required_reviewers\":[],\"allowed_merge_methods\":[\"squash\",\"rebase\",\"merge\"],\"require_code_owner_review\":false,\"require_last_push_approval\":false,\"dismiss_stale_reviews_on_push\":false,\"required_approving_review_count\":2,\"authorized_dismissal_actors_only\":false,\"required_review_thread_resolution\":false,\"ignore_approvals_from_contributors\":false,\"automatic_copilot_code_review_enabled\":false}`,
9947+
`{\"required_reviewers\":[],\"allowed_merge_methods\":[\"squash\",\"rebase\",\"merge\"],\"require_code_owner_review\":false,\"require_last_push_approval\":false,\"dismiss_stale_reviews_on_push\":false,\"required_approving_review_count\":2,\"authorized_dismissal_actors_only\":false,\"required_review_thread_resolution\":false,\"ignore_approvals_from_contributors\":false}`,
99519948
),
99529949
},
99539950
},

github/github-accessors.go

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

github/github-accessors_test.go

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

github/rules.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -457,14 +457,13 @@ type RequiredDeploymentsRuleParameters struct {
457457

458458
// PullRequestRuleParameters represents the pull_request rule parameters.
459459
type PullRequestRuleParameters struct {
460-
AllowedMergeMethods []PullRequestMergeMethod `json:"allowed_merge_methods"`
461-
AutomaticCopilotCodeReviewEnabled *bool `json:"automatic_copilot_code_review_enabled,omitempty"`
462-
DismissStaleReviewsOnPush bool `json:"dismiss_stale_reviews_on_push"`
463-
RequireCodeOwnerReview bool `json:"require_code_owner_review"`
464-
RequireLastPushApproval bool `json:"require_last_push_approval"`
465-
RequiredApprovingReviewCount int `json:"required_approving_review_count"`
466-
RequiredReviewers []*RulesetRequiredReviewer `json:"required_reviewers,omitempty"`
467-
RequiredReviewThreadResolution bool `json:"required_review_thread_resolution"`
460+
AllowedMergeMethods []PullRequestMergeMethod `json:"allowed_merge_methods"`
461+
DismissStaleReviewsOnPush bool `json:"dismiss_stale_reviews_on_push"`
462+
RequireCodeOwnerReview bool `json:"require_code_owner_review"`
463+
RequireLastPushApproval bool `json:"require_last_push_approval"`
464+
RequiredApprovingReviewCount int `json:"required_approving_review_count"`
465+
RequiredReviewers []*RulesetRequiredReviewer `json:"required_reviewers,omitempty"`
466+
RequiredReviewThreadResolution bool `json:"required_review_thread_resolution"`
468467
}
469468

470469
// RulesetRequiredReviewer represents required reviewer parameters for pull requests in rulesets.

0 commit comments

Comments
 (0)