I know it's halloween, but still... we should rewrite this in Ruby

Signed-off-by: Alex Snaps <[email protected]>
Kuadrant · Oct 24, 2024 · cd4156c · cd4156c
1 parent b445436
commit cd4156c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/controllers/auth_config_controller.go b/controllers/auth_config_controller.go
@@ -183,13 +183,13 @@ func (r *AuthConfigReconciler) translateAuthConfig(ctx context.Context, authConf
 	for identityCfgName, identity := range authConfigIdentityConfigs {
 		extendedProperties := make([]evaluators.IdentityExtension, len(identity.Defaults)+len(identity.Overrides))
 		for propertyName, property := range identity.Defaults {
-			extendedProperties = append(extendedProperties, evaluators.NewIdentityExtension(propertyName, &json.JSONValue{
+			extendedProperties = append(extendedProperties, evaluators.NewIdentityExtension(propertyName, json.JSONValue{
 				Static:  property.Value,
 				Pattern: property.Selector,
 			}, false))
 		}
 		for propertyName, property := range identity.Overrides {
-			extendedProperties = append(extendedProperties, evaluators.NewIdentityExtension(propertyName, &json.JSONValue{
+			extendedProperties = append(extendedProperties, evaluators.NewIdentityExtension(propertyName, json.JSONValue{
 				Static:  property.Value,
 				Pattern: property.Selector,
 			}, true))

diff --git a/pkg/evaluators/identity.go b/pkg/evaluators/identity.go
@@ -199,11 +199,13 @@ func (config *IdentityConfig) ResolveExtendedProperties(pipeline auth.AuthPipeli
 	authJSON := pipeline.GetAuthorizationJSON()
 
 	for _, extendedProperty := range config.ExtendedProperties {
-		resolved, err := extendedProperty.ResolveFor(extendedIdentityObject, authJSON)
-		if err != nil {
-			return nil, err
+		if extendedProperty.Value != nil {
+			resolved, err := extendedProperty.ResolveFor(extendedIdentityObject, authJSON)
+			if err != nil {
+				return nil, err
+			}
+			extendedIdentityObject[extendedProperty.Name] = resolved
 		}
-		extendedIdentityObject[extendedProperty.Name] = resolved
 	}
 
 	return extendedIdentityObject, nil

diff --git a/pkg/evaluators/identity_extension.go b/pkg/evaluators/identity_extension.go
@@ -1,15 +1,14 @@
 package evaluators
 
 import (
-	"github.com/kuadrant/authorino/pkg/expressions"
 	"github.com/kuadrant/authorino/pkg/json"
 )
 
-func NewIdentityExtension(name string, value expressions.Value, overwrite bool) IdentityExtension {
+func NewIdentityExtension(name string, value json.JSONValue, overwrite bool) IdentityExtension {
 	return IdentityExtension{
 		JSONProperty: json.JSONProperty{
 			Name:  name,
-			Value: value,
+			Value: &value,
 		},
 		Overwrite: overwrite,
 	}