mirror of https://github.com/grafana/grafana.git
				
				
				
			fix: ListManagedObjects and CountManagedObjects panic when search is not configured (#110726)
fix ListManagedObjects and CountManagedObjects panicking when search index not configured
This commit is contained in:
		
							parent
							
								
									2750a3516a
								
							
						
					
					
						commit
						005da25698
					
				| 
						 | 
					@ -1301,10 +1301,18 @@ func (s *server) GetStats(ctx context.Context, req *resourcepb.ResourceStatsRequ
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (s *server) ListManagedObjects(ctx context.Context, req *resourcepb.ListManagedObjectsRequest) (*resourcepb.ListManagedObjectsResponse, error) {
 | 
					func (s *server) ListManagedObjects(ctx context.Context, req *resourcepb.ListManagedObjectsRequest) (*resourcepb.ListManagedObjectsResponse, error) {
 | 
				
			||||||
 | 
						if s.search == nil {
 | 
				
			||||||
 | 
							return nil, fmt.Errorf("search index not configured")
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return s.search.ListManagedObjects(ctx, req)
 | 
						return s.search.ListManagedObjects(ctx, req)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (s *server) CountManagedObjects(ctx context.Context, req *resourcepb.CountManagedObjectsRequest) (*resourcepb.CountManagedObjectsResponse, error) {
 | 
					func (s *server) CountManagedObjects(ctx context.Context, req *resourcepb.CountManagedObjectsRequest) (*resourcepb.CountManagedObjectsResponse, error) {
 | 
				
			||||||
 | 
						if s.search == nil {
 | 
				
			||||||
 | 
							return nil, fmt.Errorf("search index not configured")
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return s.search.CountManagedObjects(ctx, req)
 | 
						return s.search.CountManagedObjects(ctx, req)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue