Merge pull request #18 from ensi-platform/task-105512-v8

#105512 (v8) Переход на клиента elasticsearch 8

Author: zix2

.github/workflows/run-tests.yml

@@ -2,9 +2,9 @@ name: run-tests
 
 on:
   push:
-    branches: [master]
+    branches: [v7, v8]
   pull_request:
-    branches: [master]
+    branches: [v7, v8]
 
 jobs:
   test:

.huskyrc.json

@@ -266,6 +266,18 @@ $records = ElasticQuery::getQueryLog();
 ElasticQuery::disableQueryLog();
 ```
 
+## Environment Variables
+Below see the environment variables that you can configure with the default values,
+Hosts should be comma seperated string of hosts with protocol prefix and port suffix, e.g. `http://localhost:9200,http://localhost:9201`
+
+```dotenv
+ ELASTICSEARCH_HOSTS=https://localhost:9200'
+ ELASTICSEARCH_RETRIES=2
+ ELASTICSEARCH_USERNAME=admin
+ ELASTICSEARCH_PASSWORD=admin
+ ELASTICSEARCH_SSL_VERIFICATION=true,
+```
+
 ## Contributing
 
 Please see [CONTRIBUTING](.github/CONTRIBUTING.md) for details.

README.md

@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "elasticsearch/elasticsearch": "^7.13",
+        "elasticsearch/elasticsearch": "^8.0",
         "illuminate/support": "^8.0||^9.0",
         "webmozart/assert": "^1.11"
     },
@@ -40,10 +40,12 @@
         "cs": "php-cs-fixer fix --config .php-cs-fixer.php",
         "test": "vendor/bin/phpunit",
         "test-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html coverage"
-
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "extra": {
         "laravel": {

composer.json

@@ -6,5 +6,10 @@
          * Elasticsearch hosts in format http[s]://[user][:pass]@hostname[:9200]
          */
         'hosts' => explode(',', env('ELASTICSEARCH_HOSTS')),
-    ]
+
+        'retries' => env('ELASTICSEARCH_RETRIES', 1),
+        'username' => env('ELASTICSEARCH_USERNAME', ''),
+        'password' => env('ELASTICSEARCH_PASSWORD', ''),
+        'ssl_verification' => env('ELASTICSEARCH_SSL_VERIFICATION', false),
+    ],
 ];