add duplicate section support to ini store #1452
Open
+54
−4
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
reindlt
force-pushed
the
ini-store-duplicate-sections
branch
from
5d855a3
to
b7c5f11
Compare
felixfontein
reviewed
Mar 9, 2024
| @@ -24,7 +24,8 @@ func NewStore(c *config.INIStoreConfig) *Store { | |||
| } | |||
|
|
|||
| func (store Store) encodeTree(branches sops.TreeBranches) ([]byte, error) { | |||
| iniFile := ini.Empty() | |||
| iniFile := ini.Empty(ini.LoadOptions{AllowNonUniqueSections: true}) | |||
| iniFile.DeleteSection(ini.DefaultSection) | |||
There was a problem hiding this comment.
What's the reason to delete the default section?
There was a problem hiding this comment.
ini.Empty() will already create a default section. Due to the AllowNonUniqueSection option set to true iniFile.NewSection() will create another one resulting in 2 empty default sections. Usually, an empty default section will be ignored by iniFile.WriteTo() but only when it is at the first position. Thus, the second empty default section will be included in the output although there is no default section specified in the input file.
As the branches parameter already includes a default section it will be recreated with iniFile.NewSection().
reindlt
force-pushed
the
ini-store-duplicate-sections
branch
from
b7c5f11
to
ee26039
Compare
Signed-off-by: Tobias Reindl <[email protected]>
reindlt
force-pushed
the
ini-store-duplicate-sections
branch
from
ee26039
to
61329cc
Compare
|
@felixfontein anything else needed to get this merged? |
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.
Fixes #1340
Assuming that nobody relies on the behavior described in #1340 I just added support for duplicate sections. In case this is not desired we have to think of a way to make this configurable.