[ELASTICSEARCH-FIRST] Enable Elasticsearch for new wikis

app/Http/Controllers/WikiController.php

@@ -76,17 +76,17 @@ public function create(Request $request): \Illuminate\Http\Response
             // Docs: https://www.mediawiki.org/wiki/Manual:$wgSecretKey
             WikiSetting::create([
                 'wiki_id' => $wiki->id,
-                'name' => 'wgSecretKey',
+                'name' => WikiSetting::wgSecretKey,
                 'value' => Str::random(64),
             ]);
 
-            // Enable elasticsearch for new wikis by default
+            // Create the enabled elasticsearch setting
             // T285541
-//             WikiSetting::create([
-//                 'wiki_id' => $wiki->id,
-//                 'name' => 'wwExtEnableElasticSearch',
-//                 'value' => true,
-//             ]);
+            WikiSetting::create([
+                'wiki_id' => $wiki->id,
+                'name' => WikiSetting::wwExtEnableElasticSearch,
+                'value' => true,
+            ]);
 
             // Also track the domain forever in your domains table
             $wikiDomain = WikiDomain::create([
@@ -117,7 +117,8 @@ public function create(Request $request): \Illuminate\Http\Response
         $this->dispatch(new ProvisionWikiDbJob(null, null, 10));
         $this->dispatch(new ProvisionQueryserviceNamespaceJob(null, 10));
 
-//        $this->dispatch(new ElasticSearchIndexInit($wiki->domain));
+        // dispatch elasticsearch init job to enable the feature
+        $this->dispatch(new ElasticSearchIndexInit($wiki->id));
 
         $res['success'] = true;
         $res['message'] = 'Success!';

app/Jobs/ElasticSearchIndexInit.php

@@ -1,66 +1,127 @@
 <?php
 
 namespace App\Jobs;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use App\WikiSetting;
+use App\Http\Curl\CurlRequest;
+use App\Http\Curl\HttpRequest;
+use Illuminate\Support\Facades\Log;
+use App\Wiki;
 
-class ElasticSearchIndexInit extends Job
+class ElasticSearchIndexInit extends Job implements ShouldBeUnique
 {
-    private $wikiDomain;
+    private $wikiId;
+    private $request;
 
     /**
      * @return void
      */
-    public function __construct($wikiDomain)
+    public function __construct( int $wikiId, HttpRequest $request = null )
     {
-        $this->wikiDomain = $wikiDomain;
+        $this->wikiId = $wikiId;
+        $this->request = $request ?? new CurlRequest();
+    }
+
+    /**
+     * The unique ID of the job.
+     *
+     * @return string
+     */
+    public function uniqueId()
+    {
+        return strval($this->wikiId);
     }
 
     /**
      * @return void
      */
     public function handle()
     {
-        $curl = curl_init();
-        curl_setopt_array($curl, [
-            CURLOPT_URL => getenv('PLATFORM_MW_BACKEND_HOST').'/w/api.php?action=wbstackElasticSearchInit&format=json',
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_ENCODING => '',
-            CURLOPT_TIMEOUT => 10,
-            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-            CURLOPT_CUSTOMREQUEST => 'POST',
-            CURLOPT_HTTPHEADER => [
-                'content-type: application/x-www-form-urlencoded',
-                'host: '.$this->wikiDomain,
-            ],
-        ]);
-
-        $rawResponse = curl_exec($curl);
-        $err = curl_error($curl);
-        if ($err) {
-            $this->fail(
-                new \RuntimeException('curl error for '.$this->wikiDomain.': '.$err)
-            );
+        $wiki = Wiki::whereId( $this->wikiId )->with('settings')->with('wikiDb')->first();
+
+        // job got triggered but no wiki
+        if ( !$wiki ) {
+            $this->fail( new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiId.' was triggered but not wiki available.') );
+            return;
+        }
+
+        $setting = $wiki->settings()->where([ 'name' => WikiSetting::wwExtEnableElasticSearch, ])->first();
+        // job got triggered but no setting
+        if ( !$setting ) {
+            $this->fail( new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiId.' was triggered but not setting available') );
+            return;
+        }
+
+        $wikiDB = $wiki->wikiDb()->first();
+        // no wikiDB around
+        if ( !$wikiDB ) {
+            $this->fail( new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiId.' was triggered but not WikiDb available') );
+            $setting->update( [  'value' => false  ] );
+            return;
+        }
+
+        $this->request->setOptions( 
+            [
+                CURLOPT_URL => getenv('PLATFORM_MW_BACKEND_HOST').'/w/api.php?action=wbstackElasticSearchInit&format=json',
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_ENCODING => '',
+                CURLOPT_TIMEOUT => 60, // This could potentially take a bit longer
+                CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+                CURLOPT_CUSTOMREQUEST => 'POST',
+                CURLOPT_HTTPHEADER => [
+                    'content-type: application/x-www-form-urlencoded',
+                    'host: '.$wiki->domain,
+                ]
+            ]
+        );
 
-            return; //safegaurd
+        $rawResponse = $this->request->execute();
+        $err = $this->request->error();
+
+        if ($err) {
+            $this->fail( new \RuntimeException('curl error for '.$this->wikiId.': '.$err) );
+            $setting->update( [  'value' => false  ] );
+            return;
         }
 
-        curl_close($curl);
+        $this->request->close();
 
         $response = json_decode($rawResponse, true);
 
         if (!array_key_exists('wbstackElasticSearchInit', $response)) {
-            $this->fail(
-                new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiDomain.'. No wbstackElasticSearchInit key in response: '.$rawResponse)
-            );
-
-            return; //safegaurd
+            $this->fail( new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiId.'. No wbstackElasticSearchInit key in response: '.$rawResponse) );
+            $setting->update( [  'value' => false  ] );
+            return;
         }
 
         if ($response['wbstackElasticSearchInit']['success'] == 0) {
-            $this->fail(
-                new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiDomain.' was not successful:'.$rawResponse)
-            );
+            $this->fail( new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiId.' was not successful:'.$rawResponse) );
+            $setting->update( [  'value' => false  ] );
+            return;
+        }
+
+        $output = $response['wbstackElasticSearchInit']['output'];
+
+        $enableElasticSearchFeature = false;
 
-            return; //safegaurd
+        // occurs a couple of times when newly created
+        if ( in_array( "\tCreating index...ok",  $output ) ) {
+
+            // newly created index succeeded, turn on the wiki setting
+            $enableElasticSearchFeature = true;
+
+        // occurs on a successful update run
+        } else if ( in_array( "\t\tValidating {$wikiDB->name}_general alias...ok", $output ) ) {
+
+            // script ran and update was successful, make sure feature is enabled
+            $enableElasticSearchFeature = true;
+        } else {
+
+            Log::error(__METHOD__ . ": Job finished but didn't create or update, something is weird");
+            $this->fail( new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiId.' was not successful:' . $rawResponse ) );
         }
+
+        $setting->update( [  'value' => $enableElasticSearchFeature  ] );
+
     }
 }

app/WikiDb.php

@@ -3,6 +3,7 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * App\WikiDb.
@@ -33,6 +34,8 @@
  */
 class WikiDb extends Model
 {
+    use HasFactory;
+
     /**
      * The attributes that are mass assignable.
      *

app/WikiSetting.php

@@ -3,6 +3,7 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * App\WikiSetting.
@@ -27,6 +28,12 @@
  */
 class WikiSetting extends Model
 {
+    use HasFactory;
+
+    public const wwExtEnableElasticSearch = 'wwExtEnableElasticSearch';
+    public const wwExtEnableWikibaseLexeme = 'wwExtEnableWikibaseLexeme';
+    public const wgSecretKey = 'wgSecretKey';
+
     /**
      * The attributes that are mass assignable.
      *

database/factories/WikiDbFactory.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use App\WikiDb;
+
+class WikiDbFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = WikiDb::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'name' => $this->faker->text(5),
+            'prefix' => $this->faker->text(5),
+            'user' => 'root',
+            'password' => 'toor',
+            'version' => 'seeded'
+        ];
+    }
+}

database/factories/WikiFactory.php

@@ -23,8 +23,7 @@ public function definition()
     {
         return [
             'sitename' => $this->faker->text(5),
-            'domain' => $this->faker->domainName,
-            'deleted_at' => $this->faker->dateTime
+            'domain' => $this->faker->domainName
         ];
     }
 }

database/factories/WikiSettingFactory.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Database\Factories;
+
+use App\WikiSetting;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class WikiSettingFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = WikiSetting::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [];
+    }
+}