From b6f0afb919ea7de5b11dccc7c3d0323f95f25b57 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Tue, 5 Oct 2021 12:41:00 +0530
Subject: [PATCH] Remove searchEngine from App (#18540)

https://community-daily.mattermost.com/boards/workspace/zyoahc9uapdn3xdptac6jb69ic/285b80a3-257d-41f6-8cf4-ed80ca9d92e5/495cdb4d-c13a-4992-8eb9-80cfee2819a4?c=c6753a1c-dbbf-4316-8e4e-c58ebb65d6e0

```release-note
NONE
```
---
 app/app.go          | 7 +------
 app/options.go      | 1 -
 app/searchengine.go | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/app.go b/app/app.go
index f1fb5d9929..88e5336e48 100644
--- a/app/app.go
+++ b/app/app.go
@@ -26,11 +26,6 @@ import (
 
 type App struct {
 	srv *Server
-
-	// XXX: This is required because removing this needs BleveEngine
-	// to be registered in (h *MainHelper) setupStore, but that creates
-	// a cyclic dependency as bleve tests themselves import testlib.
-	searchEngine *searchengine.Broker
 }
 
 func New(options ...AppOption) *App {
@@ -508,7 +503,7 @@ func (a *App) DataRetention() einterfaces.DataRetentionInterface {
 	return a.srv.DataRetention
 }
 func (a *App) SearchEngine() *searchengine.Broker {
-	return a.searchEngine
+	return a.srv.SearchEngine
 }
 func (a *App) Ldap() einterfaces.LdapInterface {
 	return a.srv.Ldap
diff --git a/app/options.go b/app/options.go
index d8b1ce9891..462b2d9ba8 100644
--- a/app/options.go
+++ b/app/options.go
@@ -109,6 +109,5 @@ type AppOptionCreator func() []AppOption
 func ServerConnector(s *Server) AppOption {
 	return func(a *App) {
 		a.srv = s
-		a.searchEngine = s.SearchEngine
 	}
 }
diff --git a/app/searchengine.go b/app/searchengine.go
index eba9878814..b58c3c9bc2 100644
--- a/app/searchengine.go
+++ b/app/searchengine.go
@@ -32,7 +32,7 @@ func (a *App) TestElasticsearch(cfg *model.Config) *model.AppError {
 }
 
 func (a *App) SetSearchEngine(se *searchengine.Broker) {
-	a.searchEngine = se
+	a.srv.SearchEngine = se
 }
 
 func (a *App) PurgeElasticsearchIndexes() *model.AppError {