change param type of AddProcessAdditionalGid

Haiyan Meng · Haiyan Meng · commit a99f698401cb · 2016-07-29T11:39:40.000-04:00
Signed-off-by: Haiyan Meng &lt;hmeng@redhat.com&gt;
diff --git a/cmd/ocitools/generate.go b/cmd/ocitools/generate.go
@@ -174,7 +174,11 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 	if context.IsSet("groups") {
 		groups := context.StringSlice("groups")
 		for _, group := range groups {
-			g.AddProcessAdditionalGid(group)
+			groupID, err := strconv.Atoi(group)
+			if err != nil {
+				return err
+			}
+			g.AddProcessAdditionalGid(uint32(groupID))
 		}
 	}
 
diff --git a/generate/generate.go b/generate/generate.go
@@ -334,20 +334,14 @@ func (g *Generator) ClearProcessAdditionalGids() {
 }
 
 // AddProcessAdditionalGid adds an additional gid into g.spec.Process.AdditionalGids.
-func (g *Generator) AddProcessAdditionalGid(gid string) error {
-	groupID, err := strconv.Atoi(gid)
-	if err != nil {
-		return err
-	}
-
+func (g *Generator) AddProcessAdditionalGid(gid uint32) {
 	g.initSpec()
 	for _, group := range g.spec.Process.User.AdditionalGids {
-		if group == uint32(groupID) {
-			return nil
+		if group == gid {
+			return
 		}
 	}
-	g.spec.Process.User.AdditionalGids = append(g.spec.Process.User.AdditionalGids, uint32(groupID))
-	return nil
+	g.spec.Process.User.AdditionalGids = append(g.spec.Process.User.AdditionalGids, gid)
 }
 
 // SetProcessSelinuxLabel sets g.spec.Process.SelinuxLabel.

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,11 @@ func setupSpec(g generate.Generator, context cli.Context) error {`
`174`	`174`	`if context.IsSet("groups") {`
`175`	`175`	`groups := context.StringSlice("groups")`
`176`	`176`	`for _, group := range groups {`
`177`		`- g.AddProcessAdditionalGid(group)`
	`177`	`+ groupID, err := strconv.Atoi(group)`
	`178`	`+ if err != nil {`
	`179`	`+ return err`
	`180`	`+ }`
	`181`	`+ g.AddProcessAdditionalGid(uint32(groupID))`
`178`	`182`	`}`
`179`	`183`	`}`
`180`	`184`
Original file line number	Diff line number	Diff line change
`@@ -334,20 +334,14 @@ func (g *Generator) ClearProcessAdditionalGids() {`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`// AddProcessAdditionalGid adds an additional gid into g.spec.Process.AdditionalGids.`
`337`		`-func (g *Generator) AddProcessAdditionalGid(gid string) error {`
`338`		`- groupID, err := strconv.Atoi(gid)`
`339`		`- if err != nil {`
`340`		`- return err`
`341`		`- }`
`342`		`-`
	`337`	`+func (g *Generator) AddProcessAdditionalGid(gid uint32) {`
`343`	`338`	`g.initSpec()`
`344`	`339`	`for _, group := range g.spec.Process.User.AdditionalGids {`
`345`		`- if group == uint32(groupID) {`
`346`		`- return nil`
	`340`	`+ if group == gid {`
	`341`	`+ return`
`347`	`342`	`}`
`348`	`343`	`}`
`349`		`- g.spec.Process.User.AdditionalGids = append(g.spec.Process.User.AdditionalGids, uint32(groupID))`
`350`		`- return nil`
	`344`	`+ g.spec.Process.User.AdditionalGids = append(g.spec.Process.User.AdditionalGids, gid)`
`351`	`345`	`}`
`352`	`346`
`353`	`347`	`// SetProcessSelinuxLabel sets g.spec.Process.SelinuxLabel.`