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: audit merge errors #2478

Merged
merged 2 commits into from
Dec 21, 2022
Merged

Conversation

sozercan
Copy link
Member

@sozercan sozercan commented Dec 21, 2022

Signed-off-by: Sertac Ozercan sozercan@gmail.com

What this PR does / why we need it:

  • fix an issue where mergeErrors skips the first error when merging
  • added tests

Which issue(s) this PR fixes (optional, using fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when the PR gets merged):
Fixes #

Special notes for your reviewer:

@sozercan sozercan requested a review from maxsmythe December 21, 2022 01:05
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Dec 21, 2022

Codecov Report

Base: 53.25% // Head: 53.48% // Increases project coverage by +0.22% 🎉

Coverage data is based on head (9c44979) compared to base (253124e).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2478      +/-   ##
==========================================
+ Coverage   53.25%   53.48%   +0.22%     
==========================================
  Files         115      115              
  Lines       10196    10196              
==========================================
+ Hits         5430     5453      +23     
+ Misses       4346     4327      -19     
+ Partials      420      416       -4     
Flag Coverage Δ
unittests 53.48% <100.00%> (+0.22%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/audit/manager.go 1.07% <100.00%> (+1.07%) ⬆️
...onstrainttemplate/constrainttemplate_controller.go 59.33% <0.00%> (+3.58%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

}
sb.WriteString(err.Error())
Copy link
Member

Choose a reason for hiding this comment

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

Good catch!

Copy link
Member

@ritazh ritazh left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@maxsmythe maxsmythe left a comment

Choose a reason for hiding this comment

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

LGTM

@sozercan sozercan merged commit 50ccb5c into open-policy-agent:master Dec 21, 2022
@sozercan sozercan deleted the fix-audit-mergerrs branch December 21, 2022 04:33
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.

4 participants