🐛 deep merge of cloud config broken for maps in slices #1343
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Deploy Preview for kairos-io canceled.
|
Itxaka
previously approved these changes
Apr 24, 2023
fixes #1341 Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
mauromorales
force-pushed
the
1341-merge-maps-in-arrays
branch
from
09947b1
to
2aaa12a
Compare
Itxaka
previously approved these changes
Apr 24, 2023
Codecov Report
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more @@ Coverage Diff @@
## master #1343 +/- ##
==========================================
+ Coverage 22.79% 25.92% +3.13%
==========================================
Files 22 17 -5
Lines 1610 1427 -183
==========================================
+ Hits 367 370 +3
+ Misses 1179 997 -182
+ Partials 64 60 -4
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
jimmykarily
reviewed
Apr 24, 2023
| @@ -63,9 +63,141 @@ func (c *Config) MergeConfigURL() error { | |||
| return c.MergeConfig(remoteConfig) | |||
| } | |||
|
|
|||
| func (c *Config) toMap() (map[string]interface{}, error) { | |||
| var result map[string]interface{} | |||
There was a problem hiding this comment.
Config is a map[string]interface{}. Can't we use it as it is? (maybe with type casting or directly)
There was a problem hiding this comment.
Yeah I guess it should be possible but I didn't go with that for two reasons:
- For iterations of the items, I still had to convert to
map[string]interface{} - It feels weird to put everything on a
Configfor example, when I'm deep merging the map inside an array, that is not a full config but just a map in an array, so to keepDeepMergeas generic as possible I decided to only use maps and not having the need to know anything aboutConfig
Itxaka
previously approved these changes
Apr 25, 2023
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Itxaka
approved these changes
Apr 25, 2023
|
@mauromorales all green! |
Itxaka
pushed a commit
to Itxaka/kairos
that referenced
this pull request
Apr 25, 2023
(cherry picked from commit eff6f1d)
Itxaka
added a commit
that referenced
this pull request
Apr 25, 2023
* 🐛 Add missing lvm packages in fedora+rockylinux Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com> (cherry picked from commit 72ba26c) * 🤖 Fix releases test Leftover broken tests for releases functions Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com> (cherry picked from commit 1261d4b) * 🤖 Download only the x86 iso for testing As we now have also arm generic images, the download-latest job is now downsloading both isos as they match in name. Adds a tighter regex to download the proper images Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com> (cherry picked from commit f7cbb63) * 🐛 deep merge of cloud config broken for maps in slices (#1343) (cherry picked from commit eff6f1d) --------- Co-authored-by: Mauro Morales <mauro.morales@spectrocloud.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Removes use of mergo to deep merge cloud configs, because it cannot merge maps in slices, see darccio/mergo#204
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):fixes #1341