Dark-Alex-17/kapow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix param names to use the right URL

Browse Source 
Co-authored-by: César Gallego <gallego.cesar@gmail.com>
This commit is contained in:
pancho horrillo
2019-10-17 17:04:59 +02:00
parent 4638bec5fe
commit ee00a7bccc
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cmd/get.go
+3 -3
View File
@@ -17,10 +17,10 @@ var GetCmd = &cobra.Command{
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
PreRunE: handlerIDRequired, PreRunE: handlerIDRequired,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
url, _ := cmd.Flags().GetString("url") dataURL, _ := cmd.Flags().GetString("data-url")
handler, _ := cmd.Flags().GetString("handler") 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 { if err != nil {
os.Stderr.WriteString(fmt.Sprintf("%v\n", err)) os.Stderr.WriteString(fmt.Sprintf("%v\n", err))
os.Exit(1) os.Exit(1)
@@ -29,6 +29,6 @@ var GetCmd = &cobra.Command{
} }
func init() { 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") GetCmd.Flags().String("handler", getEnv("KAPOW_HANDLER_ID", ""), "Kapow! handler id")
} }
internal/cmd/route.go
+10 -11
View File
@@ -19,15 +19,15 @@ func init() {
Use: "list [flags]", Use: "list [flags]",
Short: "List the current Kapow! routes", Short: "List the current Kapow! routes",
Run: func(cmd *cobra.Command, args []string) { 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) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) 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) // TODO: Manage args for url_pattern and command_file (2 exact args)
var routeAddCmd = &cobra.Command{ var routeAddCmd = &cobra.Command{
@@ -35,23 +35,22 @@ func init() {
Short: "Add a route", Short: "Add a route",
Args: cobra.RangeArgs(1, 2), Args: cobra.RangeArgs(1, 2),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
url, _ := cmd.Flags().GetString("url") controlURL, _ := cmd.Flags().GetString("control-url")
method, _ := cmd.Flags().GetString("method") method, _ := cmd.Flags().GetString("method")
command, _ := cmd.Flags().GetString("command") command, _ := cmd.Flags().GetString("command")
entrypoint, _ := cmd.Flags().GetString("entrypoint") entrypoint, _ := cmd.Flags().GetString("entrypoint")
urlPattern := args[0] urlPattern := args[0]
// TODO: Read command from parameter, file or stdin // TODO: Read command from parameter, file or stdin
if err := client.AddRoute(controlURL, urlPattern, method, entrypoint, command, os.Stdout); err != nil {
if err := client.AddRoute(url, urlPattern, method, entrypoint, command, os.Stdout); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)
} }
}, },
} }
// TODO: Add default values for flags and remove path flag // 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().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("method", "X", "GET", "HTTP method to accept")
routeAddCmd.Flags().StringP("entrypoint", "e", "/bin/sh -c", "Command to execute") routeAddCmd.Flags().StringP("entrypoint", "e", "/bin/sh -c", "Command to execute")
routeAddCmd.Flags().StringP("command", "c", "", "Command to pass to the shell") routeAddCmd.Flags().StringP("command", "c", "", "Command to pass to the shell")
@@ -60,15 +59,15 @@ func init() {
Short: "Remove the given route", Short: "Remove the given route",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { 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) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) 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(routeListCmd)
RouteCmd.AddCommand(routeAddCmd) RouteCmd.AddCommand(routeAddCmd)
internal/cmd/set.go
+3 -3
View File
@@ -20,7 +20,7 @@ var SetCmd = &cobra.Command{
PreRunE: handlerIDRequired, PreRunE: handlerIDRequired,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
var r io.Reader var r io.Reader
url, _ := cmd.Flags().GetString("url") dataURL, _ := cmd.Flags().GetString("data-url")
handler, _ := cmd.Flags().GetString("handler") handler, _ := cmd.Flags().GetString("handler")
if len(args) >= 2 { if len(args) >= 2 {
@@ -31,7 +31,7 @@ var SetCmd = &cobra.Command{
r = os.Stdin 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.Stderr.WriteString(fmt.Sprintf("%v\n", err))
os.Exit(1) os.Exit(1)
} }
@@ -39,6 +39,6 @@ var SetCmd = &cobra.Command{
} }
func init() { 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") SetCmd.Flags().String("handler", getEnv("KAPOW_HANDLER_ID", ""), "Kapow! handler id")
} }