Drop support for using Elasticsearch without a shared index

Author: AndrewKostka

app/Http/Controllers/WikiController.php

@@ -5,7 +5,6 @@
 use App\Helper\DomainHelper;
 use App\Helper\DomainValidator;
 use App\Helper\ProfileValidator;
-use App\Jobs\CirrusSearch\ElasticSearchIndexInit;
 use App\Jobs\ElasticSearchAliasInit;
 use App\Jobs\KubernetesIngressCreate;
 use App\Jobs\MediawikiInit;
@@ -34,12 +33,11 @@ public function __construct(DomainValidator $domainValidator, ProfileValidator $
     }
 
     public function create(Request $request): \Illuminate\Http\Response {
-        $clusterWithoutSharedIndex = Config::get('wbstack.elasticsearch_cluster_without_shared_index');
         $sharedIndexHost = Config::get('wbstack.elasticsearch_shared_index_host');
         $sharedIndexPrefix = Config::get('wbstack.elasticsearch_shared_index_prefix');
 
         if (Config::get('wbstack.elasticsearch_enabled_by_default')) {
-            if (!$clusterWithoutSharedIndex && !($sharedIndexHost && $sharedIndexPrefix)) {
+            if (!($sharedIndexHost && $sharedIndexPrefix)) {
                 abort(503, 'Search enabled, but its configuration is invalid');
             }
         }
@@ -172,9 +170,6 @@ public function create(Request $request): \Illuminate\Http\Response {
 
         // dispatch elasticsearch init job to enable the feature
         if (Config::get('wbstack.elasticsearch_enabled_by_default')) {
-            if ($clusterWithoutSharedIndex) {
-                dispatch(new ElasticSearchIndexInit($wiki->id, $clusterWithoutSharedIndex));
-            }
             if ($sharedIndexHost && $sharedIndexPrefix) {
                 dispatch(new ElasticSearchAliasInit($wiki->id));
             }

app/Jobs/CirrusSearch/ElasticSearchIndexInit.php

@@ -21,7 +21,6 @@
 
     'elasticsearch_hosts' => array_filter(explode(',', env('ELASTICSEARCH_HOST', ''))),
     'elasticsearch_enabled_by_default' => env('WBSTACK_ELASTICSEARCH_ENABLED_BY_DEFAULT', false),
-    'elasticsearch_cluster_without_shared_index' => env('ELASTICSEARCH_CLUSTER_WITHOUT_SHARED_INDEX', null),
     'elasticsearch_shared_index_host' => env('ELASTICSEARCH_SHARED_INDEX_HOST', null),
     'elasticsearch_shared_index_prefix' => env('ELASTICSEARCH_SHARED_INDEX_PREFIX', null),
 

config/wbstack.php

@@ -2,7 +2,6 @@
 
 namespace Tests\Routes\Wiki\Managers;
 
-use App\Jobs\CirrusSearch\ElasticSearchIndexInit;
 use App\Jobs\ElasticSearchAliasInit;
 use App\Jobs\MediawikiInit;
 use App\Jobs\ProvisionWikiDbJob;
@@ -41,12 +40,10 @@ class CreateTest extends TestCase {
      */
     public function testWikiCreateDispatchesSomeJobs($elasticSearchConfig) {
         $enabledForNewWikis = $elasticSearchConfig['enabledForNewWikis'];
-        $clusterWithoutSharedIndex = $elasticSearchConfig['clusterWithoutSharedIndex'] ?? null;
         $sharedIndexHost = $elasticSearchConfig['sharedIndexHost'] ?? null;
         $sharedIndexPrefix = $elasticSearchConfig['sharedIndexPrefix'] ?? null;
 
         Config::set('wbstack.elasticsearch_enabled_by_default', $enabledForNewWikis);
-        Config::set('wbstack.elasticsearch_cluster_without_shared_index', $clusterWithoutSharedIndex);
         Config::set('wbstack.elasticsearch_shared_index_host', $sharedIndexHost);
         Config::set('wbstack.elasticsearch_shared_index_prefix', $sharedIndexPrefix);
 
@@ -73,21 +70,13 @@ public function testWikiCreateDispatchesSomeJobs($elasticSearchConfig) {
                 ]
             );
 
-        if ($enabledForNewWikis && $clusterWithoutSharedIndex) {
-            Queue::assertPushed(function (ElasticSearchIndexInit $job) use ($clusterWithoutSharedIndex) {
-                return $job->cluster() === $clusterWithoutSharedIndex;
-            });
-        } else {
-            Queue::assertNotPushed(ElasticSearchIndexInit::class);
-        }
-
         if ($enabledForNewWikis && $sharedIndexHost && $sharedIndexPrefix) {
             Queue::assertPushed(ElasticSearchAliasInit::class, 1);
         } else {
             Queue::assertNotPushed(ElasticSearchAliasInit::class);
         }
 
-        if ($enabledForNewWikis && !$clusterWithoutSharedIndex && !($sharedIndexHost && $sharedIndexPrefix)) {
+        if ($enabledForNewWikis && !($sharedIndexHost && $sharedIndexPrefix)) {
             $response->assertStatus(503)
                 ->assertJsonPath('message', 'Search enabled, but its configuration is invalid');
 
@@ -117,18 +106,6 @@ public function testWikiCreateDispatchesSomeJobs($elasticSearchConfig) {
     }
 
     public static function createDispatchesSomeJobsProvider() {
-        yield [[
-            'enabledForNewWikis' => true,
-            'clusterWithoutSharedIndex' => 'all',
-            'sharedIndexHost' => 'somehost',
-            'sharedIndexPrefix' => 'testing_1',
-        ]];
-
-        yield [[
-            'enabledForNewWikis' => true,
-            'clusterWithoutSharedIndex' => 'default',
-        ]];
-
         yield [[
             'enabledForNewWikis' => true,
             'sharedIndexHost' => 'somehost',