Merge pull request #1619 from HusterWan/zr/fix-exec-inspect

bugfix: execConfig remove omitemtpy
AliyunContainerService · Jul 4, 2018 · 00f6ea5 · 00f6ea5
2 parents 7caca29 + d0c29ba
commit 00f6ea5
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 26 deletions.
diff --git a/apis/swagger.yml b/apis/swagger.yml
@@ -2929,50 +2929,67 @@ definitions:
   ContainerExecInspect:
     type: "object"
     description: holds information about a running process started.
+    required: [ID, Running, ExitCode, ProcessConfig, OpenStdin, OpenStderr, OpenStdout, CanRemove, ContainerID, DetachKeys]
     properties:
       ID:
+        x-nullable: false
         type: "string"
         description: "The ID of this exec"
       Running:
+        x-nullable: false
         type: "boolean"
       ExitCode:
+        x-nullable: false
         type: "integer"
         description: "The last exit code of this container"
       ProcessConfig:
+        x-nullable: false
         $ref: "#/definitions/ProcessConfig"
       OpenStdin:
+        x-nullable: false
         type: "boolean"
       OpenStderr:
+        x-nullable: false
         type: "boolean"
       OpenStdout:
+        x-nullable: false
         type: "boolean"
       CanRemove:
+        x-nullable: false
         type: "boolean"
       ContainerID:
+        x-nullable: false
         type: "string"
         description: "The ID of this container"
       DetachKeys:
+        x-nullable: false
         type: "string"
 
   ProcessConfig:
     type: "object"
     description: ExecProcessConfig holds information about the exec process.
+    required: [privileged, user, tty, entrypoint, arguments]
     properties:
       privileged:
+        x-nullable: false
         type: "boolean"
       user:
+        x-nullable: false
         type: "string"
       tty:
+        x-nullable: false
         type: "boolean"
       entrypoint:
+        x-nullable: false
         type: "string"
       arguments:
+        x-nullable: false
         type: "array"
         items:
           type: "string"
 
   ContainerJSON:
-    description: | 
+    description: |
       ContainerJSON contains response of Engine API:
       GET "/containers/{id}/json"
     type: "object"

diff --git a/apis/types/container_exec_inspect.go b/apis/types/container_exec_inspect.go
diff --git a/apis/types/process_config.go b/apis/types/process_config.go