Use MediaWikiHOstResolver for mapping

Author: rosalieper

app/Http/Controllers/Backend/MediaWikiHostController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers\Backend;
+
+use App\Http\Controllers\Controller;
+use App\Services\MediaWikiHostResolver;
+use App\Services\UnknownDBVersionException;
+use App\Services\UnknownWikiDomainException;
+use Illuminate\Http\Request;
+
+
+class MediaWikiHostController extends Controller {
+    public function getWikiHostForDomain(Request $request): \Illuminate\Http\JsonResponse
+    {
+        $mediawikiHostResolver = new MediaWikiHostResolver();
+        $domain = $request->query('domain');
+        try {
+            $backendHost=  $mediawikiHostResolver->getBackendHostForDomain($domain);
+            $webHost = $mediawikiHostResolver->getWebHostForDomain($domain);
+            $apiHost = $mediawikiHostResolver->getApiHostForDomain($domain);
+        } catch (UnknownWikiDomainException $e) {
+            return response()->json(['error' => 'Domain not found.'], 404 );
+        } catch (UnknownDBVersionException $e) {
+            return response()->json(['error' => 'Unknown database version.'], 500 );
+        }
+
+
+
+        return response()
+            ->json([
+                'domain'  => $domain,
+                'backend-host' => $backendHost,
+                'web-host' => $webHost ,
+                'api-host' => $apiHost,
+            ])
+            ->header('x-backend-host', $backendHost)
+            ->header('x-web-host', $webHost)
+            ->header('x-api-host', $apiHost);
+    }
+}

app/Http/Controllers/Backend/MediawikiHostMapController.php

@@ -34,6 +34,16 @@ public function getBackendHostForDomain(string $domain): string {
         return sprintf('mediawiki-%s-app-backend.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
     }
 
+    public function getWebHostForDomain(string $domain): string {
+        // TODO: Move 'web.default.svc.cluster.local' to an env variable (e.g. PLATFORM_MW_WEB_HOST_SUFFIX) for flexibility.
+        return sprintf('mediawiki-%s-app-web.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
+    }
+
+    public function getApiHostForDomain(string $domain): string {
+        // TODO: Move 'api.default.svc.cluster.local' to an env variable (e.g. PLATFORM_MW_API_HOST_SUFFIX) for flexibility.
+        return sprintf('mediawiki-%s-app-api.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
+    }
+
     public function getMwVersionForDomain(string $domain): string {
         $wiki = Wiki::where('domain', $domain)->first();
 

app/Services/MediaWikiHostResolver.php

@@ -18,7 +18,7 @@ function () {
 $router->group(['prefix' => 'ingress'], function () use ($router) {
     // GET
     $router->get('getWikiVersionForDomain', ['uses' => 'IngressController@getWikiVersionForDomain']);
-    $router->get('getWikiVersionToHostMapForDomain', ['uses' => 'MediawikiHostMapController@getWikiVersionToHostMapForDomain']);
+    $router->get('getWikiHostForDomain', ['uses' => 'MediaWikiHostController@getWikiHostForDomain']);
 });
 
 $router->group(['prefix' => 'wiki'], function () use ($router) {

config/mediawiki-host.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Tests\Routes\Ingress;
+
+use App\Wiki;
+use App\WikiDb;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class MediaWikiHostControllerTest extends TestCase {
+
+    use RefreshDatabase;
+
+    private function createWiki(string $domain, string $version) {
+        $wiki = Wiki::factory()->create(['domain' => $domain]);
+        WikiDb::create([
+            'name' => $domain,
+            'user' => 'someUser',
+            'password' => 'somePassword',
+            'version' => $version,
+            'prefix' => 'somePrefix',
+            'wiki_id' => $wiki->id,
+        ]);
+    }
+
+    public function testDomainNotfound() {
+        $this->getJson('/backend/ingress/getWikiHostForDomain?domain=notfound.wikibase.cloud')
+            ->assertStatus(404);
+    }
+
+    public function testDbVersionNotfound() {
+        $this->createWiki('noversion.wikibase.cloud', 'unknownVersion');
+        $this->getJson('/backend/ingress/getWikiHostForDomain?domain=noversion.wikibase.cloud')
+            ->assertStatus(500);
+    }
+
+    public function testFoundHost() {
+        $expectedHosts = [
+            'backend' => 'mediawiki-143-app-backend.default.svc.cluster.local',
+            'web' => 'mediawiki-143-app-web.default.svc.cluster.local',
+            'api' => 'mediawiki-143-app-api.default.svc.cluster.local',
+        ];
+        $this->createWiki('found.wikibase.cloud', 'mw1.43-wbs1');
+        $this->createWiki('other.wikibase.cloud', 'otherVersion');
+        $this->getJson( '/backend/ingress/getWikiHostForDomain?domain=found.wikibase.cloud')
+            ->assertStatus(200)
+            ->assertHeader('x-backend-host', $expectedHosts['backend'])
+            ->assertHeader('x-web-host', $expectedHosts['web'])
+            ->assertHeader('x-api-host', $expectedHosts['api'])
+            ->assertJson([
+                'backend-host' => $expectedHosts['backend'],
+                'web-host' => $expectedHosts['web'],
+                'api-host' => $expectedHosts['api'],
+                'domain' => 'found.wikibase.cloud'
+            ]);
+    }
+
+}