Fix connection builder

Jeroen-G · Dec 20, 2024 · b1819b6 · b1819b6
1 parent 1892e14
commit b1819b6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/Infrastructure/Elastic/ElasticClientBuilder.php b/src/Infrastructure/Elastic/ElasticClientBuilder.php
@@ -27,7 +27,14 @@ public static function fromConfig(Repository $config): ClientBuilder
         );
 
         if (!empty($hostConnectionProperties)) {
-            $builder->setHosts([$hostConnectionProperties]);
+            $builder->setHosts([
+                sprintf(
+                    "%s://%s:%s",
+                    $hostConnectionProperties['scheme'],
+                    $hostConnectionProperties['host'],
+                    $hostConnectionProperties['port']
+                ),
+            ]);
         }
 
         if ($config->has('explorer.additionalConnections')) {

diff --git a/tests/Unit/ElasticClientBuilderTest.php b/tests/Unit/ElasticClientBuilderTest.php
@@ -19,6 +19,7 @@ final class ElasticClientBuilderTest extends MockeryTestCase
     private const CLOUD_ID = 'staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRjZWM2ZjI2MWE3NGJmMjRjZTMzYmI4ODExYjg0Mjk0ZiRjNmMyY2E2ZDA0MjI0OWFmMGNjN2Q3YTllOTYyNTc0Mw';
 
     private const CONNECTION = [ 'host' => 'example.com', 'port' => '9222', 'scheme' => 'https' ];
+    private const CONNECTION_STRING = 'https://example.com:9222';
 
     /** @dataProvider provideClientConfigs */
     public function test_it_creates_client_with_config(array $config, ClientBuilder $expectedBuilder): void
@@ -39,7 +40,7 @@ public function provideClientConfigs(): ?\Generator
                 'connection' => self::CONNECTION
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
         ];
 
          yield 'elastic cloud id' => [
@@ -62,7 +63,7 @@ public function provideClientConfigs(): ?\Generator
                 ], self::CONNECTION)
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
                 ->setBasicAuthentication('myName', 'myPassword'),
         ];
 
@@ -76,7 +77,7 @@ public function provideClientConfigs(): ?\Generator
                 ], self::CONNECTION)
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
                 ->setApiKey('myId', 'myKey'),
         ];
 
@@ -87,7 +88,7 @@ public function provideClientConfigs(): ?\Generator
                 ], self::CONNECTION)
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
                 ->setNodePool(new SimpleNodePool(new RoundRobin(), new ElasticsearchResurrect())),
         ];
 
@@ -110,7 +111,7 @@ public function provideClientConfigs(): ?\Generator
                 ], self::CONNECTION)
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
                 ->setSSLVerification(false),
         ];
 
@@ -121,7 +122,7 @@ public function provideClientConfigs(): ?\Generator
                 ], self::CONNECTION)
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
                 ->setSSLVerification(),
         ];
 
@@ -135,7 +136,7 @@ public function provideClientConfigs(): ?\Generator
                 ], self::CONNECTION)
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
                 ->setSSLCert('path/to/cert.pem', 'passphrase')
                 ->setSSLKey('path/to/key.pem', 'passphrase'),
         ];
@@ -150,7 +151,7 @@ public function provideClientConfigs(): ?\Generator
                 ], self::CONNECTION)
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
                 ->setSSLCert('path/to/cert.pem')
                 ->setSSLKey('path/to/key.pem'),
         ];
@@ -162,7 +163,7 @@ public function provideClientConfigs(): ?\Generator
                 'connection' => self::CONNECTION,
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION])
+                ->setHosts([self::CONNECTION_STRING])
                 ->setLogger(new NullLogger()),
         ];
 
@@ -173,7 +174,7 @@ public function provideClientConfigs(): ?\Generator
                 'connection' => self::CONNECTION,
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION]),
+                ->setHosts([self::CONNECTION_STRING]),
         ];
 
         yield 'without logger' => [
@@ -182,7 +183,7 @@ public function provideClientConfigs(): ?\Generator
                 'connection' => self::CONNECTION,
             ],
             ClientBuilder::create()
-                ->setHosts([self::CONNECTION]),
+                ->setHosts([self::CONNECTION_STRING]),
         ];
     }