Merge pull request docker-php#163 from rhl-jfm/fix-exec-json-method

joelwurtz · joelwurtz · commit e5c696e5071d · 2016-02-18T16:57:58.000+01:00
Fix method of /exec/(id)/json call
diff --git a/docker-swagger.json b/docker-swagger.json
@@ -3299,7 +3299,7 @@
       }
     },
     "/exec/{id}/json": {
-      "post": {
+      "get": {
         "summary": "Exec Inspect",
         "description": "Return low-level information about the exec command id.",
         "operationId": "find",
diff --git a/generated/Resource/ExecResource.php b/generated/Resource/ExecResource.php
@@ -119,7 +119,7 @@ public function find($id, $parameters = [], $fetch = self::FETCH_OBJECT)
         $url        = $url . ('?' . $queryParam->buildQueryString($parameters));
         $headers    = array_merge(['Host' => 'localhost'], $queryParam->buildHeaders($parameters));
         $body       = $queryParam->buildFormDataString($parameters);
-        $request    = $this->messageFactory->createRequest('POST', $url, $headers, $body);
+        $request    = $this->messageFactory->createRequest('GET', $url, $headers, $body);
         $response   = $this->httpClient->sendRequest($request);
         if (self::FETCH_OBJECT == $fetch) {
             if ('200' == $response->getStatusCode()) {
diff --git a/tests/Manager/ExecManagerTest.php b/tests/Manager/ExecManagerTest.php
@@ -53,6 +53,30 @@ public function testStartStream()
         ]);
     }
 
+    public function testExecFind()
+    {
+        $createContainerResult = $this->createContainer();
+
+        $execConfig = new ExecConfig();
+        $execConfig->setCmd(["/bin/true"]);
+
+        $execCreateResult = $this->getManager()->create($createContainerResult->getId(), $execConfig);
+
+        $execStartConfig = new ExecStartConfig();
+        $execStartConfig->setDetach(false);
+        $execStartConfig->setTty(false);
+
+        $this->getManager()->start($execCreateResult->getId(), $execStartConfig);
+
+        $execFindResult = $this->getManager()->find($execCreateResult->getId());
+
+        $this->assertInstanceOf('Docker\API\Model\ExecCommand', $execFindResult);
+
+        self::getDocker()->getContainerManager()->kill($createContainerResult->getId(), [
+            'signal' => 'SIGKILL'
+        ]);
+    }
+
     private function createContainer()
     {
         $containerConfig = new ContainerConfig();

Original file line number	Diff line number	Diff line change
`@@ -3299,7 +3299,7 @@`
`3299`	`3299`	`}`
`3300`	`3300`	`},`
`3301`	`3301`	`"/exec/{id}/json": {`
`3302`		`- "post": {`
	`3302`	`+ "get": {`
`3303`	`3303`	`"summary": "Exec Inspect",`
`3304`	`3304`	`"description": "Return low-level information about the exec command id.",`
`3305`	`3305`	`"operationId": "find",`