Allow empty maps for yaml (#907) #908
Merged
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
ikedam
commented
Jul 24, 2021
| assert.Nil(t, err) | ||
| assert.Equal(t, "{}\n", string(bytes)) | ||
| } | ||
|
|
There was a problem hiding this comment.
This fails like this:
--- FAIL: TestEmpty3 (0.00s)
store_test.go:206:
Error Trace: store_test.go:206
Error: Expected nil, but got: &errors.errorString{s:"Error marshaling to yaml: yaml: expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS, but got document end"}
Test: TestEmpty3
store_test.go:207:
Error Trace: store_test.go:207
Error: Not equal:
expected: "{}\n"
actual : ""
Diff:
--- Expected
+++ Actual
@@ -1,2 +1 @@
-{}
Test: TestEmpty3
FAIL
coverage: 69.5% of statements
FAIL go.mozilla.org/sops/v3/stores/yaml 0.066s
FAIL
I wanted to demonstrate that in CI, but the test failed fast for #882.
ikedam
commented
Jul 24, 2021
| @@ -361,11 +361,7 @@ func (store *Store) EmitPlainFile(branches sops.TreeBranches) ([]byte, error) { | |||
| mapping.Kind = yaml.MappingNode | |||
| // Marshal branch to global mapping node | |||
| store.appendTreeBranch(branch, &mapping) | |||
| if len(mapping.Content) == 0 { | |||
| doc.HeadComment = mapping.HeadComment | |||
There was a problem hiding this comment.
This branch always cause an error as far as I know, and is useless.
|
|
felixfontein
approved these changes
Aug 7, 2021
|
(You probably have to close+reopen to re-run CI.) |
|
@ajvb could you please re-run CI for this one (probably closing+reopening is required)? I think it's still ready for merging, but it would be good to see a new test run :) |
|
Merged latest develop. |
felixfontein
approved these changes
Mar 7, 2022
ajvb
approved these changes
Mar 22, 2022
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 #907
This allows following usage in sops-3.7.x, just like in sops-3.6.x and earlier.