Resolve GuzzleHttp\Exception\RequestException error

app/Console/Commands/RebuildQueryserviceData.php

@@ -42,7 +42,7 @@ public function handle(MediaWikiHostResolver $mwHostResolver) {
         $skippedWikis = 0;
         $processedWikis = 0;
         foreach ($wikis as $wiki) {
-            $this->apiUrl = $mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace
+            $this->apiUrl = $mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace
 
             try {
                 $entities = $this->getEntitiesForWiki($wiki);

app/Jobs/CirrusSearch/CirrusSearchJob.php

@@ -70,7 +70,7 @@ public function handle(HttpRequest $request, MediaWikiHostResolver $mwHostResolv
 
         $request->setOptions(
             [
-                CURLOPT_URL => $mwHostResolver->getBackendHostForDomain($this->wiki->domain) . '/w/api.php?action=' . $this->apiModule() . $this->getQueryParams(),
+                CURLOPT_URL => $mwHostResolver->getBackendUrlForDomain($this->wiki->domain) . '/w/api.php?action=' . $this->apiModule() . $this->getQueryParams(),
                 CURLOPT_RETURNTRANSFER => true,
                 CURLOPT_ENCODING => '',
                 CURLOPT_TIMEOUT => $this->getRequestTimeout(),

app/Jobs/MediawikiInit.php

@@ -31,7 +31,7 @@ public function handle(HttpRequest $request, MediaWikiHostResolver $mwHostResolv
         ];
 
         $request->setOptions([
-            CURLOPT_URL => $mwHostResolver->getBackendHostForDomain($this->wikiDomain) . '/w/api.php?action=wbstackInit&format=json',
+            CURLOPT_URL => $mwHostResolver->getBackendUrlForDomain($this->wikiDomain) . '/w/api.php?action=wbstackInit&format=json',
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING => '',
             CURLOPT_TIMEOUT => 60,

app/Jobs/MediawikiSandboxLoadData.php

@@ -27,7 +27,7 @@ public function handle(MediaWikiHostResolver $mwHostResolver) {
 
         $curl = curl_init();
         curl_setopt_array($curl, [
-            CURLOPT_URL => $mwHostResolver->getBackendHostForDomain($this->wikiDomain) . '/w/rest.php/wikibase-exampledata/v0/load',
+            CURLOPT_URL => $mwHostResolver->getBackendUrlForDomain($this->wikiDomain) . '/w/rest.php/wikibase-exampledata/v0/load',
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING => '',
             CURLOPT_TIMEOUT => 10 * 60, // TODO Long 10 mins (probably shouldn't keep the request open...)

app/Jobs/PlatformStatsSummaryJob.php

@@ -80,7 +80,7 @@ public function prepareStats(array $allStats, $wikis): array {
         $currentTime = CarbonImmutable::now();
 
         foreach ($wikis as $wiki) {
-            $this->apiUrl = $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace
+            $this->apiUrl = $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php'; // used in PageFetcher::fetchPagesInNamespace
 
             if (!is_null($wiki->deleted_at)) {
                 $deletedWikis[] = $wiki;

app/Jobs/PollForMediaWikiJobsJob.php

@@ -28,7 +28,7 @@ private function hasPendingJobs(string $wikiDomain): bool {
         $response = Http::withHeaders([
             'host' => $wikiDomain,
         ])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wikiDomain) . '/w/api.php?action=query&meta=siteinfo&siprop=statistics&format=json'
+            $this->mwHostResolver->getBackendUrlForDomain($wikiDomain) . '/w/api.php?action=query&meta=siteinfo&siprop=statistics&format=json'
         );
 
         if ($response->failed()) {

app/Jobs/SiteStatsUpdateJob.php

@@ -34,7 +34,7 @@ public function handle(HttpRequest $request, MediaWikiHostResolver $mwHostResolv
         Log::info(__METHOD__ . ": Updating stats for $wiki->domain");
 
         $request->setOptions([
-            CURLOPT_URL => $mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php?action=wbstackSiteStatsUpdate&format=json',
+            CURLOPT_URL => $mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php?action=wbstackSiteStatsUpdate&format=json',
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING => '',
             CURLOPT_TIMEOUT => 60 * 5,

app/Jobs/UpdateWikiSiteStatsJob.php

@@ -59,7 +59,7 @@ private function updateSiteStats(Wiki $wiki): void {
         $response = Http::withHeaders([
             'host' => $wiki->getAttribute('domain'),
         ])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php?action=query&meta=siteinfo&siprop=statistics&format=json'
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php?action=query&meta=siteinfo&siprop=statistics&format=json'
         );
 
         if ($response->failed()) {
@@ -81,7 +81,7 @@ private function updateSiteStats(Wiki $wiki): void {
 
     private function getFirstEditedDate(Wiki $wiki): ?CarbonInterface {
         $allRevisions = Http::withHeaders(['host' => $wiki->getAttribute('domain')])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php',
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php',
             [
                 'action' => 'query',
                 'format' => 'json',
@@ -99,7 +99,7 @@ private function getFirstEditedDate(Wiki $wiki): ?CarbonInterface {
         }
 
         $revisionInfo = Http::withHeaders(['host' => $wiki->getAttribute('domain')])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php',
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php',
             [
                 'action' => 'query',
                 'format' => 'json',
@@ -119,7 +119,7 @@ private function getFirstEditedDate(Wiki $wiki): ?CarbonInterface {
 
     private function getLastEditedDate(Wiki $wiki): ?CarbonInterface {
         $allRevisions = Http::withHeaders(['host' => $wiki->getAttribute('domain')])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php',
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php',
             [
                 'action' => 'query',
                 'format' => 'json',
@@ -137,7 +137,7 @@ private function getLastEditedDate(Wiki $wiki): ?CarbonInterface {
         }
 
         $revisionInfo = Http::withHeaders(['host' => $wiki->getAttribute('domain')])->get(
-            $this->mwHostResolver->getBackendHostForDomain($wiki->domain) . '/w/api.php',
+            $this->mwHostResolver->getBackendUrlForDomain($wiki->domain) . '/w/api.php',
             [
                 'action' => 'query',
                 'format' => 'json',

app/Jobs/WikiEntityImportJob.php

@@ -77,7 +77,7 @@ private static function domainToOrigin(string $domain): string {
 
     private static function acquireCredentials(string $wikiDomain, MediaWikiHostResolver $mwHostResolver): OAuthCredentials {
         $response = Http::withHeaders(['host' => $wikiDomain])->asForm()->post(
-            $mwHostResolver->getBackendHostForDomain($wikiDomain) . '/w/api.php?action=wbstackPlatformOauthGet&format=json',
+            $mwHostResolver->getBackendUrlForDomain($wikiDomain) . '/w/api.php?action=wbstackPlatformOauthGet&format=json',
             [
                 'consumerName' => 'WikiEntityImportJob',
                 'ownerOnly' => '1',

app/Services/MediaWikiHostResolver.php

@@ -37,6 +37,10 @@ public function getBackendHostForDomain(string $domain): string {
         return sprintf('mediawiki-%s-app-backend.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
     }
 
+    public function getBackendUrlForDomain(string $domain): string {
+        return 'http://' . $this->getBackendHostForDomain($domain);
+    }
+
     private function getMwVersionForDomain(string $domain): string {
         $wiki = Wiki::where('domain', $domain)->first();
 

composer.json

@@ -11,7 +11,7 @@
         "absszero/laravel-stackdriver-error-reporting": "^1.9",
         "firebase/php-jwt": "^7.0",
         "google/recaptcha": "^1.2",
-        "guzzlehttp/guzzle": "^7.8",
+        "guzzlehttp/guzzle": "^7.13",
         "guzzlehttp/psr7": "^2.9",
         "hackzilla/password-generator": "^1.6",
         "intervention/image": "^2.5",

tests/Commands/RebuildQueryserviceDataTest.php

@@ -25,10 +25,10 @@ protected function setUp(): void {
         WikiSetting::query()->delete();
         QueryserviceNamespace::query()->delete();
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
 

tests/Jobs/CirrusSearch/ForceSearchIndexTest.php

@@ -48,10 +48,10 @@ protected function setUp(): void {
             'wiki_id' => $this->wiki->id,
         ]);
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $this->mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $this->mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $this->mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
     }

tests/Jobs/CirrusSearch/QueueSearchIndexBatchesTest.php

@@ -47,10 +47,10 @@ protected function setUp(): void {
             'wiki_id' => $this->wiki->id,
         ]);
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $this->mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $this->mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $this->mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
     }

tests/Jobs/MediawikiInitTest.php

@@ -24,10 +24,10 @@ protected function setUp(): void {
         $this->wikiDomain = 'some.domain.com';
         $this->username = 'username';
         $this->email = 'some@email.com';
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $this->mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $this->mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $this->mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
     }

tests/Jobs/PlatformStatsSummaryJobTest.php

@@ -44,10 +44,10 @@ protected function setUp(): void {
         $this->wikis = [];
         $this->users = [];
 
-        $this->mwBackendHost = 'mediawiki.localhost';
+        $this->mwBackendHost = 'http://mediawiki.localhost';
 
         $this->mockMwHostResolver = $this->createMock(MediaWikiHostResolver::class);
-        $this->mockMwHostResolver->method('getBackendHostForDomain')->willReturn(
+        $this->mockMwHostResolver->method('getBackendUrlForDomain')->willReturn(
             $this->mwBackendHost
         );
     }