Description

Looks like the logic got flipped during the changes to https://github.com/FlowFuse/flowfuse/pull/4016

Related Issue(s)

4058

Checklist

[x] I have read the contribution guidelines
[ ] Suitable unit/system level tests have been added and they pass
[ ] Documentation has been updated
- [ ] Upgrade instructions
- [ ] Configuration details
- [ ] Concepts
[ ] Changes flowforge.yml?
- [ ] Issue/PR raised on FlowFuse/helm to update ConfigMap Template
- [ ] Issue/PR raised on FlowFuse/CloudProject to update values for Staging/Production

Labels

[ ] Includes a DB migration? -> add the area:migration label

knolleary commented 3 months ago

I disagree. The logic should be: if !merge then overwrite everything. If merge, we skip if on the skip list.

Is the problem a layer up where this function is being called by the pipeline with a false rather than a true` for the merge flag?

We need a unit test to verify the behaviour.

hardillb commented 3 months ago

OK, I've moved it up and it does what's expected and doesn't fail any of the existing tests.

I'll try and write a suitable testcase

codecov[bot] commented 3 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 78.72%. Comparing base (edf11c8) to head (1b2228d). Report is 2 commits behind head on main.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## main #4059 +/- ## ======================================= Coverage 78.71% 78.72% ======================================= Files 284 284 Lines 13008 13008 Branches 2897 2897 ======================================= + Hits 10239 10240 +1 + Misses 2769 2768 -1 ``` | [Flag](https://app.codecov.io/gh/FlowFuse/flowfuse/pull/4059/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=FlowFuse) | Coverage Δ | | |---|---|---| | [backend](https://app.codecov.io/gh/FlowFuse/flowfuse/pull/4059/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=FlowFuse) | `78.72% <ø> (+<0.01%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=FlowFuse#carryforward-flags-in-the-pull-request-comment) to find out more.

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