Proposed microversion implementation

Author: Ernesto J. Pama Jr

src/Common/Service/Builder.php

@@ -83,6 +83,9 @@ 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());
     }
 
@@ -97,9 +100,15 @@ private function stockHttpClient(array &$options, string $serviceName)
                 $stack = $this->getStack($options['authHandler'], $token);
             }
 
+            $microversion = null;
+            if (isset($options['microversion'])) {
+                $microversion = $options['microversion'];
+            }
+            dump($microversion);
+
             $this->addDebugMiddleware($options, $stack);
 
-            $options['httpClient'] = $this->httpClient($baseUrl, $stack);
+            $options['httpClient'] = $this->httpClient($baseUrl, $stack, $microversion);
         }
     }
 
@@ -137,17 +146,20 @@ private function getStack(callable $authHandler, Token $token = null): HandlerSt
         return $stack;
     }
 
-    private function httpClient(string $baseUrl, HandlerStack $stack): ClientInterface
+    private function httpClient(string $baseUrl, HandlerStack $stack, string $microversion = null): ClientInterface
     {
         $clientOptions = [
             'base_uri' => Utils::normalizeUrl($baseUrl),
             'handler'  => $stack,
         ];
 
+        if ($microversion) {
+            $clientOptions['headers']['X-OpenStack-Nova-API-Version'] = $microversion;
+        }
+
         if (isset($this->globalOptions['requestOptions'])) {
             $clientOptions = array_merge($this->globalOptions['requestOptions'], $clientOptions);
         }
-
         return new Client($clientOptions);
     }
 

src/Compute/v2/Api.php

@@ -600,7 +600,8 @@ public function getKeypair(): array
             'method' => 'GET',
             'path'   => 'os-keypairs/{name}',
             'params' => [
-                'name' => $this->isRequired($this->params->keypairName())
+                'name' => $this->isRequired($this->params->keypairName()),
+                'userId' => $this->isRequired($this->params->userId())
             ],
         ];
     }
@@ -610,7 +611,9 @@ public function getKeypairs(): array
         return [
             'method' => 'GET',
             'path'   => 'os-keypairs',
-            'params' => [],
+            'params' => [
+                'userId' => $this->params->userId()
+            ],
         ];
     }
 

src/Compute/v2/Params.php

@@ -451,6 +451,15 @@ public function keypairName(): array
         ];
     }
 
+    public function userId(): array
+    {
+        return [
+            'type'     => self::STRING_TYPE,
+            'sentAs'   => 'user_id',
+            'location' => self::URL
+        ];
+    }
+
     public function flavorRam(): array
     {
         return [