Skip to content

Commit

Permalink
specs-go/config: Make User.UID and User.GID pointers
Browse files Browse the repository at this point in the history
Avoiding:

  $ go test ./specs-go
  --- FAIL: TestConfigRoundTrip (0.00s)
      --- FAIL: TestConfigRoundTrip/config_2 (0.00s)
          round_trip_test.go:35: failed to round-trip:
                  {"ociVersion":"1.0.0","platform":{"os":"windows","arch":"amd64"},"process":{"user":{"uid":0,"gid":0,"username":"containeradministrator"},"args":["sh"],"cwd":"C:\\"},"root":{"path":"rootfs"}}
  FAIL
  FAIL    github.com/opencontainers/runtime-spec/specs-go 0.003s

We can't just add omitempty (without also making them pointers),
because 0 is a meaningful value for both properties.

Signed-off-by: W. Trevor King <wking@tremily.us>
  • Loading branch information
wking committed Apr 6, 2017
1 parent 767e0ce commit 750562b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions specs-go/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ type Box struct {
// User specifies specific user (and group) information for the container process.
type User struct {
// UID is the user id.
UID uint32 `json:"uid" platform:"linux,solaris"`
UID *uint32 `json:"uid,omitempty" platform:"linux,solaris"`
// GID is the group id.
GID uint32 `json:"gid" platform:"linux,solaris"`
GID *uint32 `json:"gid,omitempty" platform:"linux,solaris"`
// AdditionalGids are additional group ids set for the container's process.
AdditionalGids []uint32 `json:"additionalGids,omitempty" platform:"linux,solaris"`
// Username is the user name.
Expand Down

0 comments on commit 750562b

Please sign in to comment.