Allows building service with specified micro version

Author: haphan

src/Common/Service/Builder.php

@@ -83,9 +83,6 @@ public function createService(string $namespace, array $serviceOptions = []): Se
 
         list($apiClass, $serviceClass) = $this->getClasses($namespace);
 
-        /** @var Client $client */
-        $client = $options['httpClient'];
-
         return new $serviceClass($options['httpClient'], new $apiClass());
     }
 
@@ -100,15 +97,11 @@ private function stockHttpClient(array &$options, string $serviceName)
                 $stack = $this->getStack($options['authHandler'], $token);
             }
 
-            $microversion = null;
-            if (isset($options['microversion'])) {
-                $microversion = $options['microversion'];
-            }
-            dump($microversion);
+            $microVersion = $options['microVersion'] ?? null;
 
             $this->addDebugMiddleware($options, $stack);
 
-            $options['httpClient'] = $this->httpClient($baseUrl, $stack, $microversion);
+            $options['httpClient'] = $this->httpClient($baseUrl, $stack, $options['catalogType'], $microVersion);
         }
     }
 
@@ -146,15 +139,15 @@ private function getStack(callable $authHandler, Token $token = null): HandlerSt
         return $stack;
     }
 
-    private function httpClient(string $baseUrl, HandlerStack $stack, string $microversion = null): ClientInterface
+    private function httpClient(string $baseUrl, HandlerStack $stack, string $serviceType, string $microVersion = null): ClientInterface
     {
         $clientOptions = [
             'base_uri' => Utils::normalizeUrl($baseUrl),
             'handler'  => $stack,
         ];
 
-        if ($microversion) {
-            $clientOptions['headers']['X-OpenStack-Nova-API-Version'] = $microversion;
+        if ($microVersion) {
+            $clientOptions['headers']['OpenStack-API-Version'] = sprintf('%s %s', $serviceType, $microVersion);
         }
 
         if (isset($this->globalOptions['requestOptions'])) {

tests/unit/Common/Service/BuilderTest.php

@@ -2,6 +2,7 @@
 
 namespace OpenStack\Test\Common\Service;
 
+use GuzzleHttp\Client;
 use OpenStack\Common\Auth\IdentityService;
 use OpenStack\Common\Auth\Token;
 use OpenStack\Common\Service\Builder;
@@ -116,6 +117,30 @@ public function test_it_does_not_authenticate_for_identity_services()
 
         $this->assertInstanceOf(Fixtures\Identity\Service::class, $s);
     }
+
+    public function test_it_create_service_with_micro_version()
+    {
+        $is = $this->prophesize(TestIdentity::class);
+        $is->authenticate(Argument::any())->willReturn([new FakeToken(), '']);
+
+        $s = $this->builder->createService('Test\\Common\\Service\\Fixtures', $this->opts + [
+                'identityService' => $is->reveal(),
+                'microVersion' => '1.2.3'
+            ]);
+
+        $this->assertInstanceOf(Fixtures\Service::class, $s);
+
+        $refClass = new \ReflectionClass($s);
+        $refProperty = $refClass->getProperty('client');
+        $refProperty->setAccessible(true);
+
+        /** @var Client $client */
+        $client = $refProperty->getValue($s);
+
+        $headers = $client->getConfig()['headers'];
+        $this->assertArrayHasKey('OpenStack-API-Version', $headers);
+        $this->assertEquals('7 1.2.3', $headers['OpenStack-API-Version']);
+    }
 }
 
 class FakeToken implements Token