Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pkg/ottl] adapt mapGetter to handle nested map items within slices #37408

Open
wants to merge 12 commits into
base: main
Choose a base branch
from

Conversation

bacherfl
Copy link
Contributor

@bacherfl bacherfl commented Jan 22, 2025

Description

This PR fixes the limitations described in #37405. The recently introduced ValueExpression had to be adapted, and will now only return raw types, instead of their pcommon.Map/pcommon.Slice eqivalents, as suggested in #37280 (comment)

Link to tracking issue

Fixes #37405

Testing

Adapted and extended the unit and e2e tests

@bacherfl bacherfl marked this pull request as ready for review January 22, 2025 09:57
@bacherfl bacherfl requested a review from a team as a code owner January 22, 2025 09:57
@bacherfl
Copy link
Contributor Author

Converting back to draft for now, due to #37280 (comment)

@bacherfl bacherfl marked this pull request as draft January 23, 2025 07:28
@bacherfl bacherfl marked this pull request as ready for review January 23, 2025 10:49
Signed-off-by: Florian Bacher <[email protected]>
@bacherfl bacherfl changed the title [pkg/ottl] adapt mapGetter to return raw maps [pkg/ottl] adapt mapGetter to handle nested map items within slices Jan 23, 2025
@@ -480,6 +481,19 @@ func (p *Parser[K]) ParseValueExpression(raw string) (*ValueExpression[K], error
}

return &ValueExpression[K]{
getter: getter,
getter: &StandardGetSetter[K]{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we end up stick to this approach, considering the mapGetter is now returning pcommon.Map values, I think we could keep it consistent and remove these changes, so all maps would still be parsed aspcommon.Map instead of raw values. I guess it would be a breaking change, though. WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be fine with that, however there are also arguments for returning the raw types here (#37280 (comment)). I think I would also prefer to consistently return pcommon.Map values though. @evan-bradley @TylerHelmuth WDYT?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[pkg/ottl] Map literals within slices can not be parsed
4 participants