fixed issue with elastic

Author: dmitriy

.circleci/config.yml

@@ -10,8 +10,9 @@ jobs:
       - checkout
 
       - run:
-          name: Start container and verify it's working
+          name: Prepare and start containers and verify it's working
           command: |
+            chmod 777 var/elasticsearch-data
             make start-test
 
       - run:

.github/workflows/ci.yml

@@ -20,6 +20,8 @@ jobs:
 
         steps:
             - uses: actions/checkout@v1
+            - name: Set Elastic data folder rights
+              run: chmod 777 var/elasticsearch-data
             - name: Build the docker images
               run: make build-test
             - name: Start the docker images

.gitignore

@@ -9,7 +9,7 @@ reports/*
 /config/secrets/prod/prod.decrypt.private.php
 /public/bundles/
 /var/*
-!/var/elasticsearch-data/nodes/0/.gitkeep
+!/var/elasticsearch-data/.gitkeep
 /vendor/
 /tools/**/vendor
 ###< symfony/framework-bundle ###

.gitlab-ci.yml

@@ -23,6 +23,7 @@ stages:
 build:
   stage: build
   script:
+    - chmod 777 var/elasticsearch-data
     - make build-test
     - make start-test
     - docker ps -a

bitbucket-pipelines.yml

@@ -9,6 +9,7 @@ pipelines:
         script:
           - chmod +x .bitbucket/dependencies.sh
           - .bitbucket/dependencies.sh
+          - chmod 777 var/elasticsearch-data
           - make build-test
           - make start-test
           - docker ps -a

src/Command/Utils/WaitElasticCommand.php

@@ -63,6 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             } catch (Exception $e) {
                 $output->writeln('<comment>Trying to connect to elastic seconds:' . $i . '</comment>');
                 sleep(self::WAIT_SLEEP_TIME);
+                $this->elasticsearchService->instantiate();
 
                 continue;
             }

src/Service/ElasticsearchService.php

@@ -21,6 +21,10 @@ class ElasticsearchService implements ElasticsearchServiceInterface
     public const INDEX_PREFIX = 'index';
     public const INDEX_DATE_FORMAT = 'Y_m_d';
     public const TEMPLATE_NAME = 'template_1';
+
+    private string $host;
+    private string $username;
+    private string $password;
     private Client $client;
 
     /**
@@ -32,8 +36,19 @@ class ElasticsearchService implements ElasticsearchServiceInterface
      */
     public function __construct(string $host, string $username, string $password)
     {
-        $this->client = ClientBuilder::create()->setHosts([$host])
-            ->setBasicAuthentication($username, $password)
+        $this->host = $host;
+        $this->username = $username;
+        $this->password = $password;
+        $this->instantiate();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function instantiate(): void
+    {
+        $this->client = ClientBuilder::create()->setHosts([$this->host])
+            ->setBasicAuthentication($this->username, $this->password)
             ->build();
     }
 

src/Service/Interfaces/ElasticsearchServiceInterface.php

@@ -13,6 +13,11 @@
  */
 interface ElasticsearchServiceInterface
 {
+    /**
+     * Instantiate client instance
+     */
+    public function instantiate(): void;
+
     /**
      * Index a document
      *