Retain location metadata for values in convert.FromTyped
#1523
+105
−38
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
shreyas-goenka
commented
Jun 25, 2024
| src = 1235 | ||
| nv, err = FromTyped(src, ref) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, dyn.NewValue(int64(1235), dyn.Location{File: "foo"}), nv) |
There was a problem hiding this comment.
FromTyped normalizes all integer values to int64
pietern
changed the title
dyn.FromTypedconvert.FromTyped
pietern
approved these changes
Jun 25, 2024
andrewnester
approved these changes
Jun 25, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jun 27, 2024
…1520) ## Changes This PR makes two changes: 1. In #1510 we'll be adding multiple associated location metadata with a dyn.Value. The Go compiler does not allow comparing structs if they contain slice values (presumably due to multiple possible definitions for equality). In anticipation for adding a `[]dyn.Location` type field to `dyn.Value` this PR removes all direct comparisons of `dyn.Value` and instead relies on the kind. 2. Retain location metadata for values in convert.FromTyped. The change diff is exactly the same as #1523. It's been combined with this PR because they both depend on each other to prevent test failures (forming a test failure deadlock). Go patch used: ``` @@ var x expression @@ -x == dyn.InvalidValue +x.Kind() == dyn.KindInvalid @@ var x expression @@ -x != dyn.InvalidValue +x.Kind() != dyn.KindInvalid @@ var x expression @@ -x == dyn.NilValue +x.Kind() == dyn.KindNil @@ var x expression @@ -x != dyn.NilValue +x.Kind() != dyn.KindNil ``` ## Tests Unit tests and integration tests pass.
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.
Changes
There are four different treatments location metadata can receive in the
convert.FromTypedmethod.This PR ensures that location metadata is not lost in any case; that is, it's always preserved.
For (2), this serves as a bug fix so that location information is not lost on conversion to and from typed for nil values of complex types (struct, slices, and maps).
For (4) this is a change in semantics. For primitive values modified in a
typedmutator, any references to.Location()for computed primitive fields will now return associated YAML location metadata (if any) instead of an empty location.While arguable, these semantics are OK since:
Tests
Unit tests