feat: match Query cel function #1317
Open
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
adityathebe
force-pushed
the
feat/matchQuery-cel-function
branch
from
133ed5b to
ca3230b
Compare
adityathebe
force-pushed
the
feat/matchQuery-cel-function
branch
from
ca3230b to
4436753
Compare
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
Comment on lines
+51
to
+96
| func matchQuery(resourceSelectableRaw map[string]any, peg string) (bool, error) { | ||
| var resourceSelectable dutyTypes.ResourceSelectable | ||
|
|
||
| // NOTE: We check for fields in the map to determine what resource to unmarshal to. | ||
|
|
||
| if _, ok := resourceSelectableRaw["config_class"]; ok { | ||
| var config models.ConfigItem | ||
| if b, err := json.Marshal(resourceSelectableRaw); err != nil { | ||
| return false, err | ||
| } else if err := json.Unmarshal(b, &config); err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| resourceSelectable = config | ||
| } else if _, ok := resourceSelectableRaw["category"]; ok { | ||
| var playbook models.Playbook | ||
| if b, err := json.Marshal(resourceSelectableRaw); err != nil { | ||
| return false, err | ||
| } else if err := json.Unmarshal(b, &playbook); err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| resourceSelectable = &playbook | ||
| } else if _, ok := resourceSelectableRaw["topology_id"]; ok { | ||
| var component models.Component | ||
| if b, err := json.Marshal(resourceSelectableRaw); err != nil { | ||
| return false, err | ||
| } else if err := json.Unmarshal(b, &component); err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| resourceSelectable = component | ||
| } else if _, ok := resourceSelectableRaw["canary_id"]; ok { | ||
| var check models.Check | ||
| if b, err := json.Marshal(resourceSelectableRaw); err != nil { | ||
| return false, err | ||
| } else if err := json.Unmarshal(b, &check); err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| resourceSelectable = check | ||
| } | ||
|
|
||
| rs := dutyTypes.ResourceSelector{Search: peg} | ||
| return rs.Matches(resourceSelectable), nil | ||
| } |
There was a problem hiding this comment.
The matchQuery function currently returns a nil resourceSelectable to rs.Matches() when no resource type is matched. This could lead to a panic or undefined behavior. Consider adding this check after the if-else chain:
if resourceSelectable == nil {
return false, fmt.Errorf("unknown resource type")
}Spotted by Graphite Reviewer
Is this helpful? React 👍 or 👎 to let us know.
There was a problem hiding this comment.
@adityathebe I think we should default back to map if type detection fails
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.
No description provided.