Fix cli arg position issues

Author: Lee Briggs

commands.go

@@ -3,7 +3,6 @@ package flexvolume
 import (
 	"encoding/json"
 	"fmt"
-
 	"github.com/urfave/cli"
 )
 
@@ -21,8 +20,7 @@ func Commands(fv FlexVolume) []cli.Command {
 			Usage: "Attach the volume",
 			Action: func(c *cli.Context) error {
 				var opts map[string]string
-
-				if err := json.Unmarshal([]byte(c.Args().Get(1)), &opts); err != nil {
+				if err := json.Unmarshal([]byte(c.Args().Get(0)), &opts); err != nil {
 					return err
 				}
 
@@ -33,7 +31,7 @@ func Commands(fv FlexVolume) []cli.Command {
 			Name:  "detach",
 			Usage: "Detach the volume",
 			Action: func(c *cli.Context) error {
-				return handle(fv.Detach(c.Args().Get(1)))
+				return handle(fv.Detach(c.Args().Get(0)))
 			},
 		},
 		{
@@ -42,18 +40,18 @@ func Commands(fv FlexVolume) []cli.Command {
 			Action: func(c *cli.Context) error {
 				var opts map[string]string
 
-				if err := json.Unmarshal([]byte(c.Args().Get(1)), &opts); err != nil {
+				if err := json.Unmarshal([]byte(c.Args().Get(2)), &opts); err != nil {
 					return err
 				}
 
-				return handle(fv.Mount(c.Args().Get(1), c.Args().Get(2), opts))
+				return handle(fv.Mount(c.Args().Get(0), c.Args().Get(1), opts))
 			},
 		},
 		{
 			Name:  "umount",
 			Usage: "Mount the volume",
 			Action: func(c *cli.Context) error {
-				return handle(fv.Unmount(c.Args().Get(1)))
+				return handle(fv.Unmount(c.Args().Get(0)))
 			},
 		},
 	}

types.go

@@ -3,9 +3,9 @@ package flexvolume
 type Status string
 
 const (
-	StatusSuccess Status       = "Success"
-	StatusFailure Status       = "Failure"
-	StatusNotSupported Status  = "Not Supported"
+	StatusSuccess      Status = "Success"
+	StatusFailure      Status = "Failure"
+	StatusNotSupported Status = "Not Supported"
 )
 
 type FlexVolume interface {
@@ -19,5 +19,5 @@ type FlexVolume interface {
 type Response struct {
 	Status  Status `json:"status"`
 	Message string `json:"message"`
-	Device  string `json:"device"`
+	Device  string `json:"device,omitempty"`
 }