From ee00a7bccc38923bbb99189bda874bd1bdcf0819 Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Thu, 17 Oct 2019 17:04:59 +0200 Subject: [PATCH] Fix param names to use the right URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: César Gallego --- internal/cmd/get.go | 6 +++--- internal/cmd/route.go | 21 ++++++++++----------- internal/cmd/set.go | 6 +++--- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/internal/cmd/get.go b/internal/cmd/get.go index f684f3a..0c2f96e 100644 --- a/internal/cmd/get.go +++ b/internal/cmd/get.go @@ -17,10 +17,10 @@ var GetCmd = &cobra.Command{ Args: cobra.ExactArgs(1), PreRunE: handlerIDRequired, Run: func(cmd *cobra.Command, args []string) { - url, _ := cmd.Flags().GetString("url") + dataURL, _ := cmd.Flags().GetString("data-url") handler, _ := cmd.Flags().GetString("handler") - err := client.GetData(url, handler, args[0], os.Stdout) + err := client.GetData(dataURL, handler, args[0], os.Stdout) if err != nil { os.Stderr.WriteString(fmt.Sprintf("%v\n", err)) os.Exit(1) @@ -29,6 +29,6 @@ var GetCmd = &cobra.Command{ } func init() { - GetCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL") + GetCmd.Flags().String("data-url", getEnv("KAPOW_DATA_URL", "http://localhost:8082"), "Kapow! data interface URL") GetCmd.Flags().String("handler", getEnv("KAPOW_HANDLER_ID", ""), "Kapow! handler id") } diff --git a/internal/cmd/route.go b/internal/cmd/route.go index af7f174..4e2b21d 100644 --- a/internal/cmd/route.go +++ b/internal/cmd/route.go @@ -19,15 +19,15 @@ func init() { Use: "list [flags]", Short: "List the current Kapow! routes", Run: func(cmd *cobra.Command, args []string) { - url, _ := cmd.Flags().GetString("url") + controlURL, _ := cmd.Flags().GetString("control-url") - if err := client.ListRoutes(url, os.Stdout); err != nil { + if err := client.ListRoutes(controlURL, os.Stdout); err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } }, } - routeListCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL") + routeListCmd.Flags().String("control-url", getEnv("KAPOW_CONTROL_URL", "http://localhost:8081"), "Kapow! control interface URL") // TODO: Manage args for url_pattern and command_file (2 exact args) var routeAddCmd = &cobra.Command{ @@ -35,23 +35,22 @@ func init() { Short: "Add a route", Args: cobra.RangeArgs(1, 2), Run: func(cmd *cobra.Command, args []string) { - url, _ := cmd.Flags().GetString("url") + controlURL, _ := cmd.Flags().GetString("control-url") method, _ := cmd.Flags().GetString("method") command, _ := cmd.Flags().GetString("command") entrypoint, _ := cmd.Flags().GetString("entrypoint") urlPattern := args[0] // TODO: Read command from parameter, file or stdin - - if err := client.AddRoute(url, urlPattern, method, entrypoint, command, os.Stdout); err != nil { + if err := client.AddRoute(controlURL, urlPattern, method, entrypoint, command, os.Stdout); err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } }, } // TODO: Add default values for flags and remove path flag - routeAddCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL") - routeAddCmd.Flags().StringP("method", "X", "get", "HTTP method to accept") + routeAddCmd.Flags().String("control-url", getEnv("KAPOW_CONTROL_URL", "http://localhost:8081"), "Kapow! control interface URL") + routeAddCmd.Flags().StringP("method", "X", "GET", "HTTP method to accept") routeAddCmd.Flags().StringP("entrypoint", "e", "/bin/sh -c", "Command to execute") routeAddCmd.Flags().StringP("command", "c", "", "Command to pass to the shell") @@ -60,15 +59,15 @@ func init() { Short: "Remove the given route", Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { - url, _ := cmd.Flags().GetString("url") + controlURL, _ := cmd.Flags().GetString("control-url") - if err := client.RemoveRoute(url, args[0]); err != nil { + if err := client.RemoveRoute(controlURL, args[0]); err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } }, } - routeRemoveCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL") + routeRemoveCmd.Flags().String("control-url", getEnv("KAPOW_CONTROL_URL", "http://localhost:8081"), "Kapow! control interface URL") RouteCmd.AddCommand(routeListCmd) RouteCmd.AddCommand(routeAddCmd) diff --git a/internal/cmd/set.go b/internal/cmd/set.go index 1ed9285..423169c 100644 --- a/internal/cmd/set.go +++ b/internal/cmd/set.go @@ -20,7 +20,7 @@ var SetCmd = &cobra.Command{ PreRunE: handlerIDRequired, Run: func(cmd *cobra.Command, args []string) { var r io.Reader - url, _ := cmd.Flags().GetString("url") + dataURL, _ := cmd.Flags().GetString("data-url") handler, _ := cmd.Flags().GetString("handler") if len(args) >= 2 { @@ -31,7 +31,7 @@ var SetCmd = &cobra.Command{ r = os.Stdin } - if err := client.SetData(url, handler, args[0], r); err != nil { + if err := client.SetData(dataURL, handler, args[0], r); err != nil { os.Stderr.WriteString(fmt.Sprintf("%v\n", err)) os.Exit(1) } @@ -39,6 +39,6 @@ var SetCmd = &cobra.Command{ } func init() { - SetCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL") + SetCmd.Flags().String("data-url", getEnv("KAPOW_DATA_URL", "http://localhost:8082"), "Kapow! data interface URL") SetCmd.Flags().String("handler", getEnv("KAPOW_HANDLER_ID", ""), "Kapow! handler id") }