search

vmware-tanzu / velero

Backup and migrate Kubernetes applications and their persistent volumes
https://velero.io
Apache License 2.0
8.42k stars 1.37k forks source link

Fix condition matching in resource modifier when there are multiple rules #7715

Closed 27149chen closed 1 month ago

27149chen commented 2 months ago

Please add a summary of your change

Fix condition matching in resource modifier when there are multiple rules

Does your change fix a particular issue?

Fixes #7714

Please indicate you've done the following:

codecov[bot] commented 2 months ago

Codecov Report

Attention: Patch coverage is 77.27273% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 58.67%. Comparing base (3c37c84) to head (b0f96cd). Report is 4 commits behind head on main.

Files Patch % Lines
internal/resourcemodifiers/resource_modifiers.go 77.27% 5 Missing :warning:
Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #7715 +/- ## ======================================= Coverage 58.66% 58.67% ======================================= Files 344 344 Lines 28731 28737 +6 ======================================= + Hits 16854 16860 +6 Misses 10448 10448 Partials 1429 1429 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

reasonerjt commented 2 months ago

@27149chen Could you rebase to fix the linter errors?

anshulahuja98 commented 2 months ago

PR LGTM - @27149chen can you please consider adding a unit test for the scenario you described in the issue to ensure we do not regress this in future and the behaviour is captured in the UTs atleast.

anshulahuja98 commented 2 months ago

gentle ping @27149chen

27149chen commented 1 month ago

gentle ping @27149chen

ut added, apologies for the delay

27149chen commented 1 month ago

@27149chen Could you rebase to fix the linter errors?

done

blackpiglet commented 1 month ago

@27149chen Sorry for interruption again, the CI action failed due to go.mod file is out-of-date.

27149chen commented 1 month ago

@27149chen Sorry for interruption again, the CI action failed due to go.mod file is out-of-date.

@blackpiglet , I have run go mod tidy, but with no help

blackpiglet commented 1 month ago

@27149chen I rebase and squash the commits. The go module issue is fixed. Hope that's OK for you.

Please check out and sign off again to make the DCO check pass.

27149chen commented 1 month ago

@27149chen I rebase and squash the commits. The go module issue is fixed. Hope that's OK for you.

Please check out and sign off again to make the DCO check pass.

@blackpiglet thanks, DCO looks right