Skip to content
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

Adding null checks for metadata #2868

Merged
merged 1 commit into from
Feb 22, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions gateway/enforcer/internal/extproc/ext_proc.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,10 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
// return status.Errorf(codes.Unknown, "cannot extract metadata: %v", err)
break
}
if metadata == nil {
s.log.Error(err, "metadata is nil")
break
}
requestConfigHolder.ExternalProcessingEnvoyMetadata = metadata

// s.log.Info(fmt.Sprintf("Matched api bjc: %v", requestConfigHolder.MatchedAPI.BackendJwtConfiguration))
Expand Down Expand Up @@ -438,6 +442,10 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
s.log.Error(err, "failed to extract context metadata")
break
}
if metadata == nil {
s.log.Error(err, "metadata is nil")
break
}
s.cfg.Logger.Sugar().Debug(fmt.Sprintf("metadata: %v", metadata))
matchedAPI := s.apiStore.GetMatchedAPI(metadata.MatchedAPIIdentifier)
if matchedAPI == nil {
Expand Down Expand Up @@ -683,6 +691,10 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
s.log.Error(err, "failed to extract context metadata")
break
}
if metadata == nil {
s.log.Error(err, "metadata is nil")
break
}
s.cfg.Logger.Sugar().Debug(fmt.Sprintf("metadata: %+v", metadata))
matchedAPI := s.apiStore.GetMatchedAPI(metadata.MatchedAPIIdentifier)
if matchedAPI == nil {
Expand Down Expand Up @@ -839,6 +851,10 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
s.log.Error(err, "failed to extract context metadata")
break
}
if metadata == nil {
s.log.Error(err, "metadata is nil")
break
}
s.cfg.Logger.Sugar().Debug(fmt.Sprintf("metadata: %v", metadata))
matchedAPI := s.apiStore.GetMatchedAPI(metadata.MatchedAPIIdentifier)
if matchedAPI == nil {
Expand Down Expand Up @@ -887,6 +903,7 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
matchedAPI.AiProvider.SupportedModels != nil &&
matchedAPI.AIModelBasedRoundRobin != nil &&
matchedAPI.AIModelBasedRoundRobin.Enabled &&
matchedResource.RouteMetadataAttributes != nil &&
matchedResource.RouteMetadataAttributes.SuspendAIModel == "true" {
s.cfg.Logger.Sugar().Debug("API Level Model Based Round Robin enabled")
httpBody := req.GetResponseBody().Body
Expand Down Expand Up @@ -914,6 +931,7 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
matchedAPI.AIModelBasedRoundRobin == nil &&
matchedResource.AIModelBasedRoundRobin != nil &&
matchedResource.AIModelBasedRoundRobin.Enabled &&
matchedResource.RouteMetadataAttributes != nil &&
matchedResource.RouteMetadataAttributes.SuspendAIModel == "true" {
s.cfg.Logger.Sugar().Debug("Resource Level Model Based Round Robin enabled")
httpBody := req.GetResponseBody().Body
Expand Down
Loading