Replace use of yaml.v2 library with yaml.v3 #7091
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
anderseknert
force-pushed
the
bye-bye-yaml.v2
branch
from
dff6637
to
a84d0cf
Compare
anderseknert
changed the title
anderseknert
force-pushed
the
bye-bye-yaml.v2
branch
from
a84d0cf
to
d15cc46
Compare
| @@ -2397,7 +2394,7 @@ func (b *metadataParser) Parse() (*Annotations, error) { | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| case map[interface{}]interface{}: | |||
| case map[string]any: | |||
johanfylling
approved these changes
Oct 4, 2024
| @@ -6058,7 +6058,7 @@ func TestAnnotationsAugmentedError(t *testing.T) { | |||
| "# scope: rule\n" + | |||
| "p := true\n", | |||
| expErrorHint: "Hint: on line 4, symbol(s) ['\\u00a0'] immediately following a key/value separator ':' is not a legal yaml space character", | |||
| expErrorRow: 5, | |||
| expErrorRow: 6, // Should be 5 really, and yaml.v2 reported the error as on line 1, but v3 on line 3.. | |||
There was a problem hiding this comment.
Weird. But these are just hints after all; don't think this is enough to keep us in the lib stone ages.
| t.Fatalf("Expected custom.string to be 'yes' but got %v", value) | ||
| } | ||
| } | ||
|
|
| @@ -575,9 +575,6 @@ gopkg.in/check.v1 | |||
| # gopkg.in/ini.v1 v1.67.0 | |||
| ## explicit | |||
| gopkg.in/ini.v1 | |||
| # gopkg.in/yaml.v2 v2.4.0 | |||
| ## explicit; go 1.15 | |||
| gopkg.in/yaml.v2 | |||
There was a problem hiding this comment.
v3 shouldn't be vendored?
There was a problem hiding this comment.
Oh, we already had it vendored ..
ashutosh-narkar
approved these changes
Oct 4, 2024
Some quirks encountered in the upgrade: - Errors reported by the parser are now zero-indexed - A few errors seemingly reported on the line after the error rather than where it happened - Also a few tests where the line number reported *previously* seemed wrong but now is right - Something different in how the parser unmarshalled to the "raw" schema annotation type we used. Changed to use a a map instead of that type alias.. but I'm not really sure why that had to be done Perhaps worth looking into this further. But pushing this now to start that discussion. Fixes open-policy-agent#7090 Signed-off-by: Anders Eknert <[email protected]>
anderseknert
force-pushed
the
bye-bye-yaml.v2
branch
from
d15cc46
to
7f37d27
Compare
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.
Some quirks encountered in the upgrade:
Perhaps worth looking into this further. But pushing this now to start that discussion.
Fixes #7090