Preserve source information during CEL policy composition. #1253
Conversation
This file contains hidden or 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
Collaborator
|
/gcbrun |
cel/optimizer.go
Outdated
| func updateOffsetRanges(idGen ast.IDGenerator, info *ast.SourceInfo) { | ||
| newRanges := make(map[int64]ast.OffsetRange) | ||
| sortedOldIDs := []int64{} | ||
| for oldID := range info.OffsetRanges() { |
Collaborator
There was a problem hiding this comment.
Prefer copy(dst, src) to the for-loop
Author
There was a problem hiding this comment.
According to https://pkg.go.dev/builtin#copy it only works with slices, but in this case I am trying to copy the keys from a map.
policy/compiler.go
Outdated
| keepIDs = make(map[int64]bool) | ||
| } else { | ||
| // Remove offset ranges for ids without a corresponding AST node. This can happen because the | ||
| // checker deletes some nodes while rewriting the AST. For example the Select operand is deleted |
Collaborator
There was a problem hiding this comment.
It seems like we should be able to do this cleanup within the parser and the checker rather than here. Could we explore that approach instead? Maybe as a separate PR so we can remove the cleanup here after that one is submitted?
The old implementation outputs the wrong source information for policy files derived from the dummy AST created by RuleComposer.Compose. This change fixes that by preserving the correct source and merging the offset ranges of the rule match expressions inserted by the composer optimizer into the final AST.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The old implementation outputs the wrong source information for policy files derived from the dummy AST created by RuleComposer.Compose. This change fixes that by preserving the correct source and merging the offset ranges of the rule match expressions inserted by the composer optimizer into the final AST.