Merge pull request #3 from OriHoch/master

download schema from cloudcli-server, add support for more commands (via schema)

Author: OriHoch

CONTRIBUTING.md

@@ -20,7 +20,9 @@ Build and run the Docker image which contains the build environment:
 ```
 ( docker rm -f cloudwm-cli-build || true ) &&\
 docker build --build-arg GOOS=$GOOS --build-arg GOARCH=$GOARCH -t cloudwm-cli-build -f Dockerfile.build . &&\
-docker run -d --rm --name cloudwm-cli-build -v `pwd`:/go/src/github.com/cloudwm/cli cloudwm-cli-build tail -f /dev/null
+docker run -d --rm --name cloudwm-cli-build -v `pwd`:/go/src/github.com/cloudwm/cli \
+           -v /etc/cloudcli:/etc/cloudcli \
+           cloudwm-cli-build tail -f /dev/null
 ```
 
 Compile and run the CLI:
@@ -29,23 +31,30 @@ Compile and run the CLI:
 docker exec -it cloudwm-cli-build go run main.go
 ```
 
-Build a binary and set executable:
+(Optional) Enable alpha commands and set a configuration file:
 
 ```
-docker exec -it cloudwm-cli-build go build -o cloudcli main.go && sudo chown $USER ./cloudcli && sudo chmod +x ./cloudcli
+docker exec -e CLOUDCLI_CONFIG=/etc/cloudcli/.my-config.yaml -e CLOUDCLI_ENABLE_ALPHA=1 -it cloudwm-cli-build go run main.go
 ```
 
-Run the executable (From Linux):
+(Optional) For fast development iterations, define bash aliases:
 
 ```
-./cloudcli
+alias cloudcli="docker exec -it cloudwm-cli-build go run main.go"
+alias cloudcli-build="docker exec -it cloudwm-cli-build go build -o cloudcli main.go && sudo chown $USER ./cloudcli && sudo chmod +x ./cloudcli"
 ```
 
-(Optional) For fast development iterations, define bash aliases:
+
+Build a binary and set executable:
 
 ```
-alias cloudcli="docker exec -it cloudwm-cli-build go run main.go"
-alias cloudcli-build="docker exec -it cloudwm-cli-build go build -o cloudcli main.go && sudo chown $USER ./cloudcli && sudo chmod +x ./cloudcli"
+docker exec -it cloudwm-cli-build go build -o cloudcli main.go && sudo chown $USER ./cloudcli && sudo chmod +x ./cloudcli
+```
+
+Run the executable (From Linux):
+
+```
+./cloudcli
 ```
 
 ## Troubleshooting

README.md

@@ -11,7 +11,7 @@ sudo wget -O /usr/local/bin/cloudcli https://github.com/cloudwm/cloudcli/release
 sudo chmod +x /usr/local/bin/cloudcli
 ```
 
-## Usage
+## Configure
 
 Set server API host and credentials using one of the following options:
 
@@ -32,6 +32,15 @@ Set server API host and credentials using one of the following options:
 **Important** Please keep your server and API credentials secure, 
 it's recommended to use a configuration file with appropriate permissions and location.
 
+## Initialize / Update
+
+Update the CLI and authenticate with the API server
+
+```
+cloudcli init
+```
+
+Re-run the init command to get new features or bug fixes from the server.
 
 ## Commands
 
@@ -43,7 +52,6 @@ See the cloudcli command help messages for full reference.
 cloudcli --help
 ```
 
-
 ### Server commands
 
 
@@ -83,3 +91,7 @@ To enable them set environment variable `CLOUDCLI_ENABLE_ALPHA=1`
 Create server
 
 **Work In Progress**
+
+
+### Advanced Features
+

cmd/command.go

@@ -7,14 +7,26 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
+	"net/http"
+	"net/url"
 	"os"
 	"strings"
 	"text/tabwriter"
 )
 
 func commandInit(cmd *cobra.Command, command SchemaCommand) {
 	for _, flag := range command.Flags {
-		cmd.Flags().StringP(flag.Name, "", "", flag.Usage)
+		if flag.Array {
+			var defaultValue []string
+			if flag.Default != "" {
+				defaultValue = append(defaultValue, flag.Default)
+			}
+			cmd.Flags().StringArrayP(flag.Name, "", defaultValue, flag.Usage)
+		} else if flag.Bool {
+			cmd.Flags().BoolP(flag.Name, "", flag.Default != "", flag.Usage)
+		} else {
+			cmd.Flags().StringP(flag.Name, "", flag.Default, flag.Usage)
+		}
 		if flag.Required {
 			cmd.MarkFlagRequired(flag.Name)
 		}
@@ -35,10 +47,14 @@ func commandRun(cmd *cobra.Command, command SchemaCommand) {
 }
 
 func commandRunGetList(cmd *cobra.Command, command SchemaCommand) {
-	if resp, err := resty.R().
+	get_url := fmt.Sprintf("%s%s", apiServer, command.Run.Path)
+	if dryrun {
+		fmt.Printf("\nGET %s\n", get_url)
+		os.Exit(exitCodeDryrun)
+	} else if resp, err := resty.R().
 		SetHeader("AuthClientId", apiClientid).
 		SetHeader("AuthSecret", apiSecret).
-		Get(fmt.Sprintf("%s%s", apiServer, command.Run.Path));
+		Get(get_url);
 		err != nil {
 		fmt.Println(err.Error())
 		os.Exit(exitCodeUnexpected)
@@ -90,9 +106,127 @@ func commandRunGetList(cmd *cobra.Command, command SchemaCommand) {
 	}
 }
 
+func commandExitErrorResponse(body []byte) {
+	var errorResponse map[string]interface{}
+	if err := json.Unmarshal(body, &errorResponse); err != nil {
+		fmt.Println(string(body))
+		fmt.Println("Failed to parse server error response")
+		os.Exit(exitCodeInvalidResponse)
+	} else {
+		var message string;
+		for k, v := range errorResponse {
+			if k == "message" {
+				message = v.(string);
+			}
+		}
+		if format == "" && message != "" {
+			fmt.Println(message)
+		} else {
+			var d []byte
+			var err error
+			if format == "yaml" {
+				d, err = yaml.Marshal(&errorResponse)
+			} else {
+				d, err = json.Marshal(&errorResponse)
+			}
+			if err != nil {
+				fmt.Println(string(body))
+				fmt.Println("Invalid response from server")
+				os.Exit(exitCodeInvalidResponse)
+			} else {
+				fmt.Println(string(d))
+			}
+		}
+		os.Exit(exitCodeInvalidStatus)
+	}
+}
+
 func commandRunPost(cmd *cobra.Command, command SchemaCommand) {
-	fmt.Println("post")
-	os.Exit(exitCodeUnexpected)
+	var qs []string
+	for _, field := range command.Run.Fields {
+		var value string;
+		if field.Array {
+			arrayValue, _ := cmd.Flags().GetStringArray(field.Flag)
+			value = strings.Join(arrayValue, " ")
+		} else if field.Bool {
+			if boolValue, _ := cmd.Flags().GetBool(field.Flag); boolValue {
+				value = "true"
+			} else {
+				value = ""
+			}
+		} else {
+			value, _ = cmd.Flags().GetString(field.Flag)
+		}
+		escapedValue := url.PathEscape(value)
+		if (debug) {
+			fmt.Printf("\nfield %s=%s / urlpart %s=%s", field.Flag, value, field.Name, escapedValue)
+		}
+		qs = append(qs, fmt.Sprintf("%s=%s", field.Name, escapedValue))
+	}
+	payload := strings.Join(qs, "&")
+	post_url := fmt.Sprintf("%s%s", apiServer, command.Run.Path)
+	if dryrun {
+		fmt.Printf("\nPOST %s\n", post_url)
+		fmt.Printf("%s\n\n", payload)
+		os.Exit(exitCodeDryrun)
+	} else {
+		if req, err := http.NewRequest("POST", post_url, strings.NewReader(payload)); err != nil {
+			fmt.Println("Failed to create POST request")
+			os.Exit(exitCodeUnexpected)
+		} else {
+			req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+			req.Header.Add("AuthClientId", apiClientid)
+			req.Header.Add("AuthSecret", apiSecret)
+			if r, err := http.DefaultClient.Do(req); err != nil {
+				fmt.Println("Failed to send POST request")
+				os.Exit(exitCodeUnexpected)
+			} else if body, err := ioutil.ReadAll(r.Body); err != nil {
+				fmt.Println("Failed to read POST response body")
+				os.Exit(exitCodeInvalidResponse)
+			} else if r.StatusCode != 200 {
+				commandExitErrorResponse(body)
+			} else {
+				var commandIds []string;
+				if err := json.Unmarshal(body, &commandIds); err != nil {
+					fmt.Println(string(body))
+					fmt.Println("Failed to parse response")
+					os.Exit(exitCodeInvalidResponse)
+				}
+				if len(commandIds) == 0 {
+					fmt.Println("Unexpected command failure")
+					os.Exit(exitCodeUnexpected);
+				}
+				if format == "json" || format == "yaml" {
+					parsedResponse := make(map[string][]string);
+					parsedResponse["command_ids"] = commandIds;
+					var d []byte
+					var err error
+					if format == "yaml" {
+						d, err = yaml.Marshal(&parsedResponse)
+					} else {
+						d, err = json.Marshal(&parsedResponse)
+					}
+					if err != nil {
+						fmt.Println(string(body))
+						fmt.Println("Invalid response from server")
+						os.Exit(exitCodeInvalidResponse)
+					} else {
+						fmt.Println(string(d))
+						os.Exit(0)
+					}
+				} else if len(commandIds) == 1 {
+					fmt.Printf("Command ID: %s\n", commandIds[0])
+					os.Exit(0)
+				} else {
+					fmt.Println("Command IDs:")
+					for _, commandId := range commandIds {
+						fmt.Printf("%s\n", commandId)
+					}
+					os.Exit(0)
+				}
+			}
+		}
+	}
 }
 
 func commandInitGetListOfLists(cmd *cobra.Command, command SchemaCommand) {

cmd/flags.go

@@ -39,6 +39,11 @@ const flagDebugKey = "debug"
 var debug bool
 var flagDebugValue bool
 
+const flagDryrun = "dryrun"
+const flagDryrunKey = "dryrun"
+var dryrun bool
+var flagDryrunValue bool
+
 func loadGlobalFlags() {
 	debug = viper.GetBool(flagDebugKey)
 	if debug {
@@ -74,7 +79,10 @@ func loadGlobalFlags() {
 	} else if debug {
 		fmt.Fprintf(os.Stderr, "%s = %s\n", flagFormatKey, format)
 	}
-
+	dryrun = viper.GetBool(flagDryrunKey)
+	if dryrun {
+		fmt.Fprintf(os.Stderr, "Running in dry run mode, not performing actions\n")
+	}
 	if numFailures > 0 {
 		os.Exit(1)
 	}
@@ -99,4 +107,7 @@ func addGlobalFlags() {
 
 	rootCmd.PersistentFlags().BoolVar(&flagDebugValue, flagDebug, false, "enable debug output to stderr")
 	viper.BindPFlag(flagDebugKey, rootCmd.PersistentFlags().Lookup(flagDebug))
+
+	rootCmd.PersistentFlags().BoolVar(&flagDryrunValue, flagDryrun, false, "enable dry run mode, does not perform actions")
+	viper.BindPFlag(flagDryrunKey, rootCmd.PersistentFlags().Lookup(flagDryrun))
 }

cmd/output.go

@@ -3,3 +3,4 @@ package cmd
 const exitCodeUnexpected = 1
 const exitCodeInvalidStatus = 2
 const exitCodeInvalidResponse = 3
+const exitCodeDryrun = 4

cmd/root.go

@@ -12,11 +12,24 @@ const cloudcliEnvPrefix = "CLOUDCLI"
 const cloudcliConfigFilePrefix = ".cloudcli"
 
 var enableAlpha = false
+var hasSchema = false
+
+func getRootLongDescription() string {
+	if hasSchema {
+		return "Cloudcli server management - create, configure and manage servers"
+	} else {
+		return `Cloudcli server management - create, configure and manage servers
+
+Cloudcli is not initialized, please run "cloudcli init" command to authenticate with an API server.
+
+`
+	}
+}
 
 var rootCmd = &cobra.Command{
 	Use:   "cloudcli",
 	Short: "Cloudcli server management",
-	Long: `Cloudcli server management - create, configure and manage servers`,
+	Long: getRootLongDescription(),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		loadGlobalFlags()
 	},
@@ -35,16 +48,30 @@ func init() {
 	if os.Getenv("CLOUDCLI_ENABLE_ALPHA") != "" {
 		enableAlpha = true
 	}
-	schema := loadSchema()
-	for _, command := range schema.Commands {
-		var cmd = createCommandFromSchema(command)
-		for _, subcommand := range command.Commands {
-			if ! subcommand.Alpha || enableAlpha {
-				var subcmd = createCommandFromSchema(subcommand)
-				cmd.AddCommand(subcmd)
+	rootCmd.AddCommand(&cobra.Command{
+		Use: "init",
+		Short: "Initialize cloudcli",
+		Long: "Authenticates to a cloudcli server and updates CLI to latest version",
+		Run: func(cmd *cobra.Command, args []string) {
+			schema := downloadSchema(schemaFile, fmt.Sprintf("%s%s", apiServer, "/schema"))
+			fmt.Printf(
+				"cloudcli v%d.%d.%d Initialized successfully.\n\nYou can now run cloudcli commands, see:\ncloudcli --help\n\n",
+				schema.SchemaVersion[0], schema.SchemaVersion[1], schema.SchemaVersion[2],
+			)
+		},
+	})
+	var schema Schema
+	if hasSchema, schema = loadSchema(); hasSchema {
+		for _, command := range schema.Commands {
+			var cmd = createCommandFromSchema(command)
+			for _, subcommand := range command.Commands {
+				if ! subcommand.Alpha || enableAlpha {
+					var subcmd = createCommandFromSchema(subcommand)
+					cmd.AddCommand(subcmd)
+				}
 			}
+			rootCmd.AddCommand(cmd)
 		}
-		rootCmd.AddCommand(cmd)
 	}
 }