Merge pull request #85 from aaron-prindle/fix-validation

aaron-prindle · web-flow · commit f12a4d5cf7e8 · 2017-09-12T15:39:32.000-07:00
fix validation error for empty analyzer
diff --git a/cmd/root.go b/cmd/root.go
@@ -121,10 +121,13 @@ func checkArgType(args []string) error {
 }
 
 func checkIfValidAnalyzer(flagtypes string) error {
+	if flagtypes == "" {
+		return nil
+	}
 	analyzers := strings.Split(flagtypes, ",")
 	for _, name := range analyzers {
 		if _, exists := differs.Analyzers[name]; !exists {
-			errMessage := fmt.Sprintf("Argument %s is not an image ID, URL, or tar\n", name)
+			errMessage := fmt.Sprintf("Argument %s is not a valid analyzer\n", name)
 			glog.Errorf(errMessage)
 			return errors.New(errMessage)
 		}

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,13 @@ func checkArgType(args []string) error {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`func checkIfValidAnalyzer(flagtypes string) error {`
	`124`	`+ if flagtypes == "" {`
	`125`	`+ return nil`
	`126`	`+ }`
`124`	`127`	`analyzers := strings.Split(flagtypes, ",")`
`125`	`128`	`for _, name := range analyzers {`
`126`	`129`	`if _, exists := differs.Analyzers[name]; !exists {`
`127`		`- errMessage := fmt.Sprintf("Argument %s is not an image ID, URL, or tar\n", name)`
	`130`	`+ errMessage := fmt.Sprintf("Argument %s is not a valid analyzer\n", name)`
`128`	`131`	`glog.Errorf(errMessage)`
`129`	`132`	`return errors.New(errMessage)`
`130`	`133`	`}`