Merge pull request #210 from hkulekci/password-credential-support-for…

…-provider

basicAuthentication support for ElasticsearchServiceProvider

config/elasticsearch.php

@@ -2,6 +2,10 @@
 
 return [
     'host' => env('ELASTICSEARCH_HOST'),
+    'user' => env('ELASTICSEARCH_USER'),
+    'password' => env('ELASTICSEARCH_PASSWORD'),
+    'cloud_id' => env('ELASTICSEARCH_CLOUD_ID'),
+    'api_key' => env('ELASTICSEARCH_API_KEY'),
     'indices' => [
         'mappings' => [
             'default' => [

src/ElasticSearch/Config/Config.php

@@ -4,6 +4,10 @@
 
 /**
  * @method static array hosts()
+ * @method static user()
+ * @method static password()
+ * @method static elasticCloudId()
+ * @method static apiKey()
  */
 class Config
 {

src/ElasticSearch/Config/Storage.php

@@ -31,6 +31,38 @@ public function hosts(): array
         return explode(',', $this->loadConfig('host'));
     }
 
+    /**
+     * @return ?string
+     */
+    public function user(): ?string
+    {
+        return $this->loadConfig('user');
+    }
+
+    /**
+     * @return ?string
+     */
+    public function password(): ?string
+    {
+        return $this->loadConfig('password');
+    }
+
+    /**
+     * @return ?string
+     */
+    public function elasticCloudId(): ?string
+    {
+        return $this->loadConfig('cloud_id');
+    }
+
+    /**
+     * @return ?string
+     */
+    public function apiKey(): ?string
+    {
+        return $this->loadConfig('api_key');
+    }
+
     /**
      * @param  string  $path
      * @return mixed

src/ElasticSearchServiceProvider.php

@@ -8,6 +8,8 @@
 use Elastic\Elasticsearch\ClientBuilder;
 use Illuminate\Support\ServiceProvider;
 use Matchish\ScoutElasticSearch\ElasticSearch\Config\Config;
+use Matchish\ScoutElasticSearch\ElasticSearch\EloquentHitsIteratorAggregate;
+use Matchish\ScoutElasticSearch\ElasticSearch\HitsIteratorAggregate;
 
 final class ElasticSearchServiceProvider extends ServiceProvider
 {
@@ -19,12 +21,22 @@ public function register(): void
         $this->mergeConfigFrom(__DIR__.'/../config/elasticsearch.php', 'elasticsearch');
 
         $this->app->bind(Client::class, function () {
-            return ClientBuilder::create()->setHosts(Config::hosts())->build();
+            $clientBuilder = ClientBuilder::create()->setHosts(Config::hosts());
+            if ($user = Config::user()) {
+                $clientBuilder->setBasicAuthentication($user, Config::password());
+            }
+
+            if ($cloudId = Config::elasticCloudId()) {
+                $clientBuilder->setElasticCloudId($cloudId)
+                    ->setApiKey(Config::apiKey());
+            }
+
+            return $clientBuilder->build();
         });
 
         $this->app->bind(
-            'Matchish\ScoutElasticSearch\ElasticSearch\HitsIteratorAggregate',
-            'Matchish\ScoutElasticSearch\ElasticSearch\EloquentHitsIteratorAggregate'
+            HitsIteratorAggregate::class,
+            EloquentHitsIteratorAggregate::class
         );
     }
 

tests/Unit/ElasticSearch/Config/ConfigTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Tests\Unit\ElasticSearch\Config;
+
+use Illuminate\Support\Facades\Config;
+use Matchish\ScoutElasticSearch\ElasticSearch\Config\Config as ScoutConfig;
+use Tests\TestCase;
+
+class ConfigTest extends TestCase
+{
+    public function test_parse_host(): void
+    {
+        Config::set('elasticsearch.host', 'http://localhost:9200');
+
+        $config = new ScoutConfig();
+        $this->assertEquals(['http://localhost:9200'], $config::hosts());
+    }
+
+    public function test_parse_multihost(): void
+    {
+        Config::set('elasticsearch.host', 'http://localhost:9200,http://localhost:9201');
+
+        $config = new ScoutConfig();
+        $this->assertEquals(['http://localhost:9200', 'http://localhost:9201'], $config::hosts());
+    }
+
+    public function test_parse_username_password(): void
+    {
+        Config::set('elasticsearch.host', 'http://localhost:9200,http://localhost:9201');
+        Config::set('elasticsearch.user', 'elastic');
+        Config::set('elasticsearch.password', 'pass');
+
+        $config = new ScoutConfig();
+        $this->assertEquals('elastic', $config::user());
+        $this->assertEquals('pass', $config::password());
+    }
+
+    public function test_parse_elastic_cloud_id(): void
+    {
+        Config::set('elasticsearch.host', 'http://localhost:9200,http://localhost:9201');
+        Config::set('elasticsearch.cloud_id', 'cloud-id');
+        Config::set('elasticsearch.api_key', '123456');
+
+        $config = new ScoutConfig();
+        $this->assertEquals('cloud-id', $config::elasticCloudId());
+        $this->assertEquals('123456', $config::apiKey());
+    }
+}