Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions app/Jobs/ProcessMediaWikiJobsJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Jobs;

use App\Services\MediaWikiHostResolver;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldQueue;
Expand All @@ -27,14 +28,28 @@ public function uniqueId(): string {
return $this->wikiDomain;
}

public function handle(Client $kubernetesClient): void {
public function handle(Client $kubernetesClient, MediaWikiHostResolver $resolver): void {
$FQDNOfService = $resolver->getBackendHostForDomain($this->wikiDomain);
$serviceName = explode('.', $FQDNOfService)[0];
$kubernetesClient->setNamespace('default');
$backendService = $kubernetesClient->services()->setFieldSelector([
'metadata.name' => $serviceName,
])->first();

if ($backendService === null) {
$this->fail(
new \RuntimeException(
'Unable to find a matching MediaWiki backend service in the cluster'
)
);

return;
}

$MWPodSelector = $backendService->toArray()['spec']['selector'];
$mediawikiPod = $kubernetesClient->pods()->setFieldSelector([
'status.phase' => 'Running',
])->setLabelSelector([
'app.kubernetes.io/name' => 'mediawiki',
'app.kubernetes.io/component' => 'app-backend',
])->first();
])->setLabelSelector($MWPodSelector)->first();

if ($mediawikiPod === null) {
$this->fail(
Expand Down
31 changes: 26 additions & 5 deletions tests/Jobs/ProcessMediaWikiJobsJobTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Tests\Jobs;

use App\Jobs\ProcessMediaWikiJobsJob;
use App\Services\MediaWikiHostResolver;
use GuzzleHttp\Handler\MockHandler;
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Psr7\Response;
Expand All @@ -16,6 +17,9 @@ class ProcessMediaWikiJobsJobTest extends TestCase {
use RefreshDatabase;

public function testJobFailOnNoMediaWikiPod() {

$mockResolver = $this->createMock(MediaWikiHostResolver::class);

$mockJob = $this->createMock(Job::class);
$mockJob->expects($this->once())->method('fail');

Expand All @@ -24,6 +28,7 @@ public function testJobFailOnNoMediaWikiPod() {

$mock = new MockHandler([
new Response(200, [], json_encode(['items' => []])),
new Response(200, [], json_encode(['items' => []])),
]);

$handlerStack = HandlerStack::create($mock);
Expand All @@ -35,17 +40,30 @@ public function testJobFailOnNoMediaWikiPod() {
$job->handle(new Client([
'master' => 'https://kubernetes.default.svc',
'token' => '/var/run/secrets/kubernetes.io/serviceaccount/token',
], null, $mockGuzzle));
], null, $mockGuzzle), $mockResolver);
}

public function testJobDoesNotFail() {
$mockResolver = $this->createMock(MediaWikiHostResolver::class);
$mockJob = $this->createMock(Job::class);
$mockJob->expects($this->never())->method('fail');

$job = new ProcessMediaWikiJobsJob('test.wikibase.cloud');
$job->setJob($mockJob);

$mock = new MockHandler([
new Response(200, [], json_encode(['items' => [
[
'kind' => 'Service',
'spec' => [
'selector' => [
'app.kubernetes.io/component' => 'app-backend',
'app.kubernetes.io/instance' => 'mediawiki-143',
'app.kubernetes.io/name' => 'mediawiki',
],
],
],
]])),
new Response(200, [], json_encode(['items' => [
[
'kind' => 'Pod',
Expand Down Expand Up @@ -75,9 +93,12 @@ public function testJobDoesNotFail() {
'verify' => '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt',
]);

$job->handle(new Client([
'master' => 'https://kubernetes.default.svc',
'token' => '/var/run/secrets/kubernetes.io/serviceaccount/token',
], null, $mockGuzzle));
$job->handle(
new Client([
'master' => 'https://kubernetes.default.svc',
'token' => '/var/run/secrets/kubernetes.io/serviceaccount/token',
], null, $mockGuzzle),
$mockResolver
);
}
}
Loading