apache
diff --git a/Collapse file
‎cmd/set.go‎
Copy file name to clipboardExpand all lines: cmd/set.go
+11-1Lines changed: 11 additions & 1 deletion b/Collapse file
‎cmd/set.go‎
Copy file name to clipboardExpand all lines: cmd/set.go
+11-1Lines changed: 11 additions & 1 deletion
diff --git a/Collapse file
‎cmk.go‎
Copy file name to clipboardExpand all lines: cmk.go
+6-1Lines changed: 6 additions & 1 deletion b/Collapse file
‎cmk.go‎
Copy file name to clipboardExpand all lines: cmk.go
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/Collapse file
‎config/config.go‎
Copy file name to clipboardExpand all lines: config/config.go
+12Lines changed: 12 additions & 0 deletions b/Collapse file
‎config/config.go‎
Copy file name to clipboardExpand all lines: config/config.go
+12Lines changed: 12 additions & 0 deletions
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
+	"errors"
 
 	"github.com/apache/cloudstack-cloudmonkey/config"
 )
@@ -33,7 +34,7 @@ func init() {
 			"prompt":     {"🐵", "🐱", "random"},
 			"asyncblock": {"true", "false"},
 			"timeout":    {"600", "1800", "3600"},
-			"output":     {"json", "text", "table", "column", "csv"},
+			"output":     config.GetOutputFormats(),
 			"profile":    {},
 			"url":        {},
 			"username":   {},
@@ -56,6 +57,15 @@ func init() {
 				fmt.Println("Usage: set <subcommand> <option>. Press tab-tab to see available subcommands and options.")
 				return nil
 			}
+			if subCommand == "display" {
+				subCommand = "output"
+			}
+			validArgs := r.Command.SubCommands[subCommand]
+			if len(validArgs) != 0 && subCommand != "timeout" {
+				if !config.CheckIfValuePresent(validArgs, value) {
+					return errors.New("Invalid value set for " + subCommand +". Supported values: " + strings.Join(validArgs, ", ") )
+				}
+			}
 			r.Config.UpdateConfig(subCommand, value, true)
 
 			if subCommand == "profile" && r.Config.HasShell {
 
@@ -41,7 +41,8 @@ func init() {
 }
 
 func main() {
-	outputFormat := flag.String("o", "", "output format: json, text, table, column, csv")
+	validFormats := strings.Join(config.GetOutputFormats(), ",")
+	outputFormat := flag.String("o", "", "output format: " + validFormats)
 	showVersion := flag.Bool("v", false, "show version")
 	debug := flag.Bool("d", false, "enable debug mode")
 	profile := flag.String("p", "", "server profile")
@@ -61,6 +62,10 @@ func main() {
 	}
 
 	if *outputFormat != "" {
+		if !config.CheckIfValuePresent(config.GetOutputFormats(), *outputFormat) {
+			fmt.Println("Invalid value set for output format. Supported values: " + validFormats)
+			os.Exit(1)
+		}
 		cfg.UpdateConfig("output", *outputFormat, false)
 	}
 
 
@@ -74,6 +74,18 @@ type Config struct {
 	ActiveProfile *ServerProfile
 }
 
+func GetOutputFormats() []string {
+ return []string {"column", "csv", "json", "table", "text"}
+}
+
+func CheckIfValuePresent(dataset []string, element string) bool {
+	for _, arg := range dataset {
+		if arg == element {
+			return true
+		}
+	}
+	return false
+}
 // CacheFile returns the path to the cache file for a server profile
 func (c Config) CacheFile() string {
 	cacheDir := path.Join(c.Dir, "profiles")
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ func init() {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func main() {`
`44`		`- outputFormat := flag.String("o", "", "output format: json, text, table, column, csv")`
	`44`	`+ validFormats := strings.Join(config.GetOutputFormats(), ",")`
	`45`	`+ outputFormat := flag.String("o", "", "output format: " + validFormats)`
`45`	`46`	`showVersion := flag.Bool("v", false, "show version")`
`46`	`47`	`debug := flag.Bool("d", false, "enable debug mode")`
`47`	`48`	`profile := flag.String("p", "", "server profile")`
`@@ -61,6 +62,10 @@ func main() {`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`if *outputFormat != "" {`
	`65`	`+ if !config.CheckIfValuePresent(config.GetOutputFormats(), *outputFormat) {`
	`66`	`+ fmt.Println("Invalid value set for output format. Supported values: " + validFormats)`
	`67`	`+ os.Exit(1)`
	`68`	`+ }`
`64`	`69`	`cfg.UpdateConfig("output", *outputFormat, false)`
`65`	`70`	`}`
`66`	`71`