Deal with cacheKey creation failures

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

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/pkg/evaluators/authorization.go b/pkg/evaluators/authorization.go
@@ -58,10 +58,12 @@ func (config *AuthorizationConfig) Call(pipeline auth.AuthPipeline, ctx context.
 
 		if cache != nil {
 			cacheKey, _ = cache.ResolveKeyFor(pipeline.GetAuthorizationJSON())
-			if cachedObj, err := cache.Get(cacheKey); err != nil {
-				logger.V(1).Error(err, "failed to retrieve data from the cache")
-			} else if cachedObj != nil {
-				return cachedObj, nil
+			if cacheKey != nil {
+				if cachedObj, err := cache.Get(cacheKey); err != nil {
+					logger.V(1).Error(err, "failed to retrieve data from the cache")
+				} else if cachedObj != nil {
+					return cachedObj, nil
+				}
 			}
 		}
 

diff --git a/pkg/evaluators/identity.go b/pkg/evaluators/identity.go
@@ -85,10 +85,12 @@ func (config *IdentityConfig) Call(pipeline auth.AuthPipeline, ctx context.Conte
 
 		if cache != nil {
 			cacheKey, _ = cache.ResolveKeyFor(pipeline.GetAuthorizationJSON())
-			if cachedObj, err := cache.Get(cacheKey); err != nil {
-				logger.V(1).Error(err, "failed to retrieve data from the cache")
-			} else if cachedObj != nil {
-				return cachedObj, nil
+			if cacheKey != nil {
+				if cachedObj, err := cache.Get(cacheKey); err != nil {
+					logger.V(1).Error(err, "failed to retrieve data from the cache")
+				} else if cachedObj != nil {
+					return cachedObj, nil
+				}
 			}
 		}
 

diff --git a/pkg/evaluators/metadata.go b/pkg/evaluators/metadata.go
@@ -54,10 +54,12 @@ func (config *MetadataConfig) Call(pipeline auth.AuthPipeline, ctx context.Conte
 
 		if cache != nil {
 			cacheKey, _ = cache.ResolveKeyFor(pipeline.GetAuthorizationJSON())
-			if cachedObj, err := cache.Get(cacheKey); err != nil {
-				logger.V(1).Error(err, "failed to retrieve data from the cache")
-			} else if cachedObj != nil {
-				return cachedObj, nil
+			if cacheKey != nil {
+				if cachedObj, err := cache.Get(cacheKey); err != nil {
+					logger.V(1).Error(err, "failed to retrieve data from the cache")
+				} else if cachedObj != nil {
+					return cachedObj, nil
+				}
 			}
 		}
 

diff --git a/pkg/evaluators/response.go b/pkg/evaluators/response.go
@@ -83,10 +83,12 @@ func (config *ResponseConfig) Call(pipeline auth.AuthPipeline, ctx context.Conte
 
 		if cache != nil {
 			cacheKey, _ = cache.ResolveKeyFor(pipeline.GetAuthorizationJSON())
-			if cachedObj, err := cache.Get(cacheKey); err != nil {
-				logger.V(1).Error(err, "failed to retrieve data from the cache")
-			} else if cachedObj != nil {
-				return cachedObj, nil
+			if cacheKey != nil {
+				if cachedObj, err := cache.Get(cacheKey); err != nil {
+					logger.V(1).Error(err, "failed to retrieve data from the cache")
+				} else if cachedObj != nil {
+					return cachedObj, nil
+				}
 			}
 		}