delete omitempty from Privileged in api

Signed-off-by: ziren.wzr <ziren.wzr@alibaba-inc.com>
AliyunContainerService · Jan 14, 2019 · e378474 · e378474
1 parent 01bc2a0
commit e378474
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/apis/swagger.yml b/apis/swagger.yml
@@ -2273,9 +2273,9 @@ definitions:
 
   HostConfig:
     description: "Container configuration that depends on the host we are running on"
-    type: "object"
     allOf:
-      - properties:
+      - type: "object"
+        properties:
           # Applicable to all platforms
           Binds:
             type: "array"
@@ -2389,6 +2389,7 @@ definitions:
               - `"host"`: use the host's PID namespace inside the container
           Privileged:
             type: "boolean"
+            x-omitempty: false
             description: "Gives the container full access to the host."
           PublishAllPorts:
             type: "boolean"

diff --git a/apis/types/host_config.go b/apis/types/host_config.go
diff --git a/test/cli_inspect_test.go b/test/cli_inspect_test.go
@@ -70,7 +70,7 @@ func (suite *PouchInspectSuite) TestInspectCreateAndStartedFormat(c *check.C) {
 	res = command.PouchRun("start", name)
 	res.Assert(c, icmd.Success)
 
-	// Inspect LogPath, HostnamePath, HostsPath, ResolvConfPath
+	// Inspect LogPath, HostnamePath, HostsPath, ResolvConfPath, Privileged
 	output = command.PouchRun("inspect", "-f", "{{.LogPath}}", name).Stdout()
 	expectedLogPath := fmt.Sprintf(rootDir+"/containers/%s/json.log", containerID)
 	c.Assert(strings.TrimSpace(output), check.Equals, expectedLogPath)
@@ -86,6 +86,9 @@ func (suite *PouchInspectSuite) TestInspectCreateAndStartedFormat(c *check.C) {
 	output = command.PouchRun("inspect", "-f", "{{.HostsPath}}", name).Stdout()
 	expectedLogPath = fmt.Sprintf(rootDir+"/containers/%s/hosts", containerID)
 	c.Assert(strings.TrimSpace(output), check.Equals, expectedLogPath)
+
+	output = command.PouchRun("inspect", "-f", "{{.HostConfig.Privileged}}", name).Stdout()
+	c.Assert(strings.TrimSpace(output), check.Equals, "false")
 }
 
 // TestInspectWrongFormat is to verify using wrong format flag of inspect command.