-
Notifications
You must be signed in to change notification settings - Fork 19
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
Resolve correct CEL types consistently for all field types #80
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| // Copyright 2023 Buf Technologies, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package expression | ||
|
|
||
| import ( | ||
| "github.com/google/cel-go/cel" | ||
| "google.golang.org/protobuf/reflect/protoreflect" | ||
| "google.golang.org/protobuf/types/dynamicpb" | ||
| ) | ||
|
|
||
| // ProtoKindToCELType maps a protoreflect.Kind to a compatible cel.Type. | ||
| func ProtoKindToCELType(kind protoreflect.Kind) *cel.Type { | ||
| switch kind { | ||
| case | ||
| protoreflect.FloatKind, | ||
| protoreflect.DoubleKind: | ||
| return cel.DoubleType | ||
| case | ||
| protoreflect.Int32Kind, | ||
| protoreflect.Int64Kind, | ||
| protoreflect.Sint32Kind, | ||
| protoreflect.Sint64Kind, | ||
| protoreflect.Sfixed32Kind, | ||
| protoreflect.Sfixed64Kind, | ||
| protoreflect.EnumKind: | ||
| return cel.IntType | ||
| case | ||
| protoreflect.Uint32Kind, | ||
| protoreflect.Uint64Kind, | ||
| protoreflect.Fixed32Kind, | ||
| protoreflect.Fixed64Kind: | ||
| return cel.UintType | ||
| case protoreflect.BoolKind: | ||
| return cel.BoolType | ||
| case protoreflect.StringKind: | ||
| return cel.StringType | ||
| case protoreflect.BytesKind: | ||
| return cel.BytesType | ||
| case | ||
| protoreflect.MessageKind, | ||
| protoreflect.GroupKind: | ||
| return cel.DynType | ||
| default: | ||
| return cel.DynType | ||
| } | ||
| } | ||
|
|
||
| // ProtoFieldToCELType resolves the CEL value type for the provided | ||
| // FieldDescriptor. If generic is true, the specific subtypes of map and | ||
| // repeated fields will be replaced with cel.DynType. If forItems is true, the | ||
| // type for the repeated list items is returned instead of the list type itself. | ||
| func ProtoFieldToCELType(fieldDesc protoreflect.FieldDescriptor, generic, forItems bool) *cel.Type { | ||
| if !forItems { | ||
| switch { | ||
| case fieldDesc.IsMap(): | ||
| if generic { | ||
| return cel.MapType(cel.DynType, cel.DynType) | ||
| } | ||
| keyType := ProtoFieldToCELType(fieldDesc.MapKey(), false, true) | ||
| valType := ProtoFieldToCELType(fieldDesc.MapValue(), false, true) | ||
| return cel.MapType(keyType, valType) | ||
| case fieldDesc.IsList(): | ||
| if generic { | ||
| return cel.ListType(cel.DynType) | ||
| } | ||
| itemType := ProtoFieldToCELType(fieldDesc, false, true) | ||
| return cel.ListType(itemType) | ||
| } | ||
| } | ||
|
|
||
| if fieldDesc.Kind() == protoreflect.MessageKind { | ||
| switch fqn := fieldDesc.Message().FullName(); fqn { | ||
| case "google.protobuf.Any": | ||
| return cel.AnyType | ||
| case "google.protobuf.Duration": | ||
| return cel.DurationType | ||
| case "google.protobuf.Timestamp": | ||
| return cel.TimestampType | ||
| default: | ||
| return cel.ObjectType(string(fqn)) | ||
| } | ||
| } | ||
| return ProtoKindToCELType(fieldDesc.Kind()) | ||
| } | ||
|
|
||
| // RequiredCELEnvOptions returns the options required to have expressions which | ||
| // rely on the provided descriptor. | ||
| func RequiredCELEnvOptions(fieldDesc protoreflect.FieldDescriptor) []cel.EnvOption { | ||
| if fieldDesc.IsMap() { | ||
| return append( | ||
| RequiredCELEnvOptions(fieldDesc.MapKey()), | ||
| RequiredCELEnvOptions(fieldDesc.MapValue())..., | ||
| ) | ||
| } | ||
| if fieldDesc.Kind() == protoreflect.MessageKind { | ||
| return []cel.EnvOption{ | ||
| cel.Types(dynamicpb.NewMessage(fieldDesc.Message())), | ||
| } | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For my own knowledge, why is generic set to true here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here we are compiling the standard constraint expressions the first time we see them, and we use a concrete field it's attached to as the basis for type information.
repeatedandmapfields are generic over their elements, so when we build (say) theuniqueexpression forRepeatedRules, we cannot assume that the element type of the list is always going to be that of the field we're using since another repeated field of a different type might also specify unique.