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.

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

Jump to bottom

Implement rulesets #2795

Merged
merged 39 commits into from Jun 17, 2023
Merged

Implement rulesets #2795

merged 39 commits into from Jun 17, 2023

Conversation

liaodaniel
Copy link
Contributor

This PR includes both the organization and repository rulesets API.

Resolves #2789

Signed-off-by: Daniel Liao 10663736+liaodaniel@users.noreply.github.com

@liaodaniel
Add repository ruleset and related structs
958a8a0 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add GetAllOrganizationRepositoryRulesets
1e2554c 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Extend ruleset struct with conditions
6a93946 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Create all the different rules
5b15d81 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Spilt out ruleset conditions in different types
dc199b5 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add missing requiredStatusChecks struct
90d803f 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add CreateOrganizationRepositoryRuleset
8b3f493 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Fix unhandled rulesetRule type message
f2b462f 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add comments on the rule creations
113d39f 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add GetOrganizationRepositoryRuleset
93e2a90 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add copyright metadata
3208f5c 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add UpdateOrganizationRepositoryRuleset
f58936c 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add DeleteOrganizationRepositoryRuleset
879e3e0 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add comment on ruleset
d89d75a 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Fix linting
51f34d4 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add tests for Rule_UnmarshalJSON
8d47d85 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Fix newline linting
5439e29 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Rename RuleSetRule to RepositoryRule
3f1a6b4 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add GetRulesForBranch
90c2a8d 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add GetAllRulesets
0e828ee 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add CreateRuleset
5589fc1 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add GetRuleset
8c128a6 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add UpdateRuleset
7696f52 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Fix http method for UpdateOrganizationRepositoryRuleset
9db0040 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Always return response when deleting rulesets
fc0b2f1 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Update comments
5a90752 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Small renaming and tidy up for consistency
5492131 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Merge branch 'master' into add_org_ruleset
fdbe041
@liaodaniel
Add includesParent query to GetAllRulesets
b814d7f 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Further tidy up comments
c390b09 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel liaodaniel mentioned this pull request Jun 2, 2023
Closed
@codecov
Copy link

codecov bot commented Jun 2, 2023 •
edited

Codecov Report

Merging #2795 (221c3ee) into master (3efdd2c) will increase coverage by 0.04%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #2795      +/-   ##
==========================================
+ Coverage   98.06%   98.10%   +0.04%     
==========================================
  Files         132      134       +2     
  Lines       11650    11947     +297     
==========================================
+ Hits        11424    11721     +297     
  Misses        154      154              
  Partials       72       72
Impacted Files Coverage Δ
github/messages.go 100.00% <ø> (ø)
github/event.go 100.00% <100.00%> (ø)
github/orgs_rules.go 100.00% <100.00%> (ø)
github/repos_rules.go 100.00% <100.00%> (ø)

@liaodaniel
Fix the test for RepositoryRule UnmarshalJSON
6ab01f8 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Copy link
Contributor Author

Linter appears to be failing due to golangci/golangci-lint#3862. Guess I'll wait until they make a fix for it

gmlewis
gmlewis requested changes Jun 2, 2023
View reviewed changes
Copy link
Collaborator

@gmlewis gmlewis left a comment

Choose a reason for hiding this comment

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

Thank you, @liaodaniel !
This looks fantastic! I have just a few change requests, and feel free to disagree on any of them. As I commented, it is challenging to tell if we have the right combination of omitempty, but this looks good to me if I haven't made comments otherwise.

github/orgs_rules.go Outdated Show resolved Hide resolved
github/orgs_rules.go Outdated Show resolved Hide resolved
github/repos_rules.go Outdated Show resolved Hide resolved
github/repos_rules.go Outdated Show resolved Hide resolved
github/repos_rules.go Outdated Show resolved Hide resolved
github/repos_rules.go Show resolved Hide resolved
github/repos_rules.go Outdated Show resolved Hide resolved
github/repos_rules.go Outdated Show resolved Hide resolved
github/repos_rules.go Outdated Show resolved Hide resolved
github/repos_rules.go Outdated Show resolved Hide resolved
@liaodaniel
Make fields in RulesetRepositoryConditionParameters optional
a7d82e3 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Fix line break and spelling
fe12731 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Rename some vars
b584269 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Simplify Ruleset struct to use list of pointers
ac74284 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Make BypassActor fields optional
b4eb612 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Add testing for RepositoryRule UnmarshalJSON
ad0beca 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Switch parameters to *json.RawMessage type
5618f6f 
Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com>
@liaodaniel
Merge branch 'master' into add_ruleset
221c3ee
@gmlewis gmlewis added the NeedsReview PR is awaiting a review before merging. label Jun 7, 2023
gmlewis
gmlewis approved these changes Jun 7, 2023
View reviewed changes
Copy link
Collaborator

@gmlewis gmlewis left a comment

Choose a reason for hiding this comment

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

Thank you, @liaodaniel !
LGTM.

Awaiting second LGTM+Approval from any other contributor to this repo before merging.

valbeat
valbeat approved these changes Jun 17, 2023
View reviewed changes
Copy link
Contributor

@valbeat valbeat left a comment

Choose a reason for hiding this comment

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

LGTM!

@gmlewis
Copy link
Collaborator

gmlewis commented Jun 17, 2023

Thank you, @valbeat !
Merging.

@gmlewis gmlewis merged commit 6a57598 into google:master Jun 17, 2023
9 checks passed
@gmlewis gmlewis removed the NeedsReview PR is awaiting a review before merging. label Jun 19, 2023
@liaodaniel liaodaniel deleted the add_ruleset branch October 29, 2023 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@valbeat valbeat valbeat approved these changes

@gmlewis gmlewis gmlewis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support for rulesets API
3 participants
@liaodaniel @gmlewis @valbeat