feat: add custom key for cel expression support #961
Conversation
TzlilSwimmer123
commented
Jul 18, 2023
•
TzlilSwimmer123
commented
| return ctx.Error(CustomKeyValidationErrorKeyPath, err.Error()) | ||
| } | ||
| // wrap dataValue (the resource that should be validated) inside a struct with parent object key | ||
| dataValueObjectWrapper := make(map[string]interface{}) |
There was a problem hiding this comment.
naming maybe resourceWithParentKey ?
| } | ||
|
|
||
| func getCELEnvInputs(dataValue map[string]interface{}) ([]cel.EnvOption, error) { | ||
| var inputs map[string]any |
There was a problem hiding this comment.
var inputs map[string]interface{}
There was a problem hiding this comment.
I think that it suppose to be any because it can be any type
There was a problem hiding this comment.
any is an alias for interface{} :)
There was a problem hiding this comment.
Good to know:)
| @@ -0,0 +1,140 @@ | |||
| // This file defines a custom key to implement the logic for rego rule: | |||
There was a problem hiding this comment.
| // This file defines a custom key to implement the logic for rego rule: | |
| // This file defines a custom key to implement the logic for a CEL rule: |
| if customKeyCELRule, ok := m[CELDefinitionCustomKey]; ok { | ||
| customKeyCELRuleObj, validObject := customKeyCELRule.([]interface{}) | ||
| if !validObject { | ||
| return nil, fmt.Errorf("CELDefinition must be an object") |
There was a problem hiding this comment.
| return nil, fmt.Errorf("CELDefinition must be an object") | |
| return nil, fmt.Errorf("CELDefinition must be an array") |
| return ctx.Error(CustomKeyValidationErrorKeyPath, "cel expression needs to return a boolean") | ||
| } | ||
| if !celReturnValue { | ||
| return ctx.Error(CustomKeyValidationErrorKeyPath, "cel expression failure message: %s", celExpression.Message) |
There was a problem hiding this comment.
"cel expression failure message:"
does @adifayer want this prefix for every CEL failure? how do users experience it?
maybe include a screenshot
There was a problem hiding this comment.
I will show it to Adi
| var CELDefinition CELDefinition | ||
| for _, CELExpressionFromSchema := range CELDefinitionSchema { | ||
| var CELExpression CELExpression | ||
| b, err := json.Marshal(CELExpressionFromSchema) |
There was a problem hiding this comment.
why Marshal and then Unmarshal? if you just need a type conversion then use Go's type conversion. Am I missing something?
There was a problem hiding this comment.
Ok let's see, what is your suggestion?
| func getCELEnvInputs(dataValue map[string]interface{}) ([]cel.EnvOption, error) { | ||
| var inputs map[string]any | ||
| dataValueBytes, _ := json.Marshal(dataValue) | ||
| if err := yaml.Unmarshal(dataValueBytes, &inputs); err != nil { |
There was a problem hiding this comment.
Let's see if I understand this properly.
- CEL expects the input to be a yaml
- you get it as a Go object
- therefore, you need to convert the object to a yaml
is that correct?
There was a problem hiding this comment.
Your comment made me understand it was redundant! thanks
