Fixup create command flag application.

jsirois · jsirois · commit 705865fa70a7 · 2016-03-29T11:53:22.000-06:00
Previously StringSlice flag defaults were not respected.  These use
special handling and that handling did not take account of default
values, always over-writing them.  Expand the CommandLine interface to
take advantage of the underlying codegansta/cli.Context IsSet method and
guard default string slice overwrites with an IsSet test.

Signed-off-by: John Sirois &lt;john.sirois@gmail.com&gt;
diff --git a/commands/commands.go b/commands/commands.go
@@ -42,6 +42,8 @@ type CommandLine interface {
 
 	Args() cli.Args
 
+	IsSet(name string) bool
+
 	Bool(name string) bool
 
 	Int(name string) int
diff --git a/commands/commandstest/fake_command_line.go b/commands/commandstest/fake_command_line.go
@@ -42,6 +42,11 @@ func (ff FakeFlagger) Bool(key string) bool {
 	return false
 }
 
+func (fcli *FakeCommandLine) IsSet(key string) bool {
+	_, ok := fcli.LocalFlags.Data[key]
+	return ok
+}
+
 func (fcli *FakeCommandLine) String(key string) string {
 	return fcli.LocalFlags.String(key)
 }
diff --git a/commands/create.go b/commands/create.go
@@ -364,7 +364,9 @@ func getDriverOpts(c CommandLine, mcnflags []mcnflag.Flag) drivers.DriverOptions
 			// TODO: This is pretty hacky.  StringSlice is the only
 			// type so far we have to worry about which is not a
 			// Getter, though.
-			driverOpts.Values[name] = c.StringSlice(name)
+			if c.IsSet(name) {
+				driverOpts.Values[name] = c.StringSlice(name)
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,11 @@ func (ff FakeFlagger) Bool(key string) bool {`
`42`	`42`	`return false`
`43`	`43`	`}`
`44`	`44`
	`45`	`+func (fcli *FakeCommandLine) IsSet(key string) bool {`
	`46`	`+ _, ok := fcli.LocalFlags.Data[key]`
	`47`	`+ return ok`
	`48`	`+}`
	`49`	`+`
`45`	`50`	`func (fcli *FakeCommandLine) String(key string) string {`
`46`	`51`	`return fcli.LocalFlags.String(key)`
`47`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,9 @@ func getDriverOpts(c CommandLine, mcnflags []mcnflag.Flag) drivers.DriverOptions`
`364`	`364`	`// TODO: This is pretty hacky. StringSlice is the only`
`365`	`365`	`// type so far we have to worry about which is not a`
`366`	`366`	`// Getter, though.`
`367`		`- driverOpts.Values[name] = c.StringSlice(name)`
	`367`	`+ if c.IsSet(name) {`
	`368`	`+ driverOpts.Values[name] = c.StringSlice(name)`
	`369`	`+ }`
`368`	`370`	`}`
`369`	`371`	`}`
`370`	`372`