MCLOUD-7572: Service version validation error (#41)

Author: NadiyaS

src/Service/ElasticSearch.php

@@ -94,13 +94,17 @@ public function getVersion(): string
 
         if ($this->version === null) {
             try {
-                $esConfiguration = $this->call(sprintf(
-                    '%s:%s',
-                    $this->getHost(),
-                    $this->getPort()
-                ));
-
-                $this->version = $esConfiguration['version']['number'];
+                $config = $this->getConfiguration();
+                if (isset($config['type']) && strpos($config['type'], ':') !== false) {
+                    $this->version = explode(':', $config['type'])[1];
+                } else {
+                    $esConfiguration = $this->call(sprintf(
+                        '%s:%s',
+                        $this->getHost(),
+                        $this->getPort()
+                    ));
+                    $this->version = $esConfiguration['version']['number'];
+                }
             } catch (Throwable $exception) {
                 throw new ServiceException(
                     'Can\'t get version of elasticsearch: ' . $exception->getMessage(),

src/Test/Unit/Service/ElasticSearchTest.php

@@ -88,8 +88,12 @@ public function testGetVersion(array $esRelationship, string $esConfiguration, s
         $responseMock = $this->createMock(Response::class);
         $streamMock = $this->getMockForAbstractClass(StreamInterface::class);
 
-        $this->environmentMock->method('getRelationship')
+        $this->environmentMock->expects($this->any())
+            ->method('getRelationship')
             ->willReturn($esRelationship);
+        $this->clientFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($clientMock);
         $clientMock->expects($this->once())
             ->method('get')
             ->with($esConfig['host'] . ':' . $esConfig['port'])
@@ -100,9 +104,6 @@ public function testGetVersion(array $esRelationship, string $esConfiguration, s
         $streamMock->expects($this->once())
             ->method('getContents')
             ->willReturn($esConfiguration);
-        $this->clientFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($clientMock);
         $this->loggerMock->expects($this->never())
             ->method('warning');
 
@@ -155,6 +156,48 @@ public function getVersionDataProvider(): array
         ];
     }
 
+    /**
+     * @param array $esRelationship
+     * @param string $expectedVersion
+     * @throws ServiceException
+     *
+     * @dataProvider getVersionFromTypeDataProvider
+     */
+    public function testGetVersionFromType($esRelationship, $expectedVersion)
+    {
+        $this->environmentMock->expects($this->any())
+            ->method('getRelationship')
+            ->willReturn($esRelationship);
+
+        $this->clientFactoryMock->expects($this->never())
+            ->method('create');
+
+        $this->assertSame($expectedVersion, $this->elasticSearch->getVersion());
+    }
+
+    public function getVersionFromTypeDataProvider()
+    {
+        return [
+            [
+                [],
+                '0'
+            ],
+            [
+                [
+                    ['host' => '127.0.0.1', 'port' => '1234', 'type' => 'elasticsearch:7.7']
+                ],
+                '7.7'
+            ],
+            [
+                [
+                    ['host' => '127.0.0.1', 'port' => '1234', 'type' => 'elasticsearch:5.2']
+                ],
+                '5.2'
+            ],
+
+        ];
+    }
+
     /**
      * @param string $version
      * @param string $expected
@@ -216,6 +259,10 @@ public function getFullVersionDataProvider(): array
             [
                 '2.4',
                 'elasticsearch'
+            ],
+            [
+                '7.7',
+                'elasticsearch7'
             ]
         ];
     }