Don't set attributes that aren't in the input #101
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
When an attribute wasn't in the input data, we weren't handling that correctly and would set the value of the attribute in the catalog to the Go empty value (for example, we'd set a number attribute to 0 if that attribute wasn't set in the input for an entry). This has been fixed by distinguishing when the value we get back from Otto is null or undefined, and not including that attribute.
macebake
reviewed
Mar 14, 2024
expr/js_eval_test.go
Outdated
| @@ -80,29 +80,29 @@ var _ = Describe("Javascript evaluation", func() { | |||
| topLevelSrc := "$.metadata" | |||
| evaluatedResult, err := EvaluateSingleValue[string](ctx, topLevelSrc, sourceEntry, logger) | |||
| Expect(err).NotTo(HaveOccurred()) | |||
| Expect(evaluatedResult).To(Equal("")) | |||
| Expect(*evaluatedResult).To(Equal("")) | |||
There was a problem hiding this comment.
should this BeNil instead?
macebake
reviewed
Mar 14, 2024
output/marshal.go
Outdated
| @@ -136,14 +136,14 @@ func MarshalEntries(ctx context.Context, output *Output, entries []source.Entry, | |||
| if err != nil { | |||
| return nil, errors.Wrap(err, fmt.Sprintf("aliases.%d: evaluating entry alias", idx)) | |||
| } | |||
| if alias == "" { | |||
| if alias == nil || *alias == "" { | |||
There was a problem hiding this comment.
I feel like it's worth explaining in a brief comment why we have to do this, but I'm not sure exactly where.
You could call it out in a couple of places separately, like here in MarshalEntries and somewhere in js_eval.go - just because this may feel like a redundant check if you don't know what's going on
There was a problem hiding this comment.
Fixing the comment about BeNil means that this extra check isn't needed now, because EvaluateResultType now returns a pointer, not "" when you ask for a string but we can't evaluate to a string.
macebake
approved these changes
Mar 14, 2024
So that we can return nil when we need
Because we correctly return nil now.
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.
When an attribute wasn't in the input data, we weren't handling that correctly and would set the value of the attribute in the catalog to the Go empty value (for example, we'd set a number attribute to 0 if that attribute wasn't set in the input for an entry).
This has been fixed by distinguishing when the value we get back from Otto is null or undefined, and not including that attribute.