Connect set command. TODOs in route command
This commit is contained in:
+10
-5
@@ -5,6 +5,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/BBVA/kapow/internal/client"
|
"github.com/BBVA/kapow/internal/client"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -28,26 +29,30 @@ func init() {
|
|||||||
}
|
}
|
||||||
routeListCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL")
|
routeListCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL")
|
||||||
|
|
||||||
|
// TODO: Manage args for url_pattern and command_file (2 exact args)
|
||||||
var routeAddCmd = &cobra.Command{
|
var routeAddCmd = &cobra.Command{
|
||||||
Use: "add [flags] url_pattern [command_file]",
|
Use: "add [flags] url_pattern [command_file]",
|
||||||
Short: "Add a route",
|
Short: "Add a route",
|
||||||
|
Args: cobra.RangeArgs(1, 2),
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
url, _ := cmd.Flags().GetString("url")
|
url, _ := cmd.Flags().GetString("url")
|
||||||
path, _ := cmd.Flags().GetString("path")
|
|
||||||
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]
|
||||||
|
|
||||||
if err := client.AddRoute(url, path, method, entrypoint, command, os.Stdout); err != nil {
|
// TODO: Read command from parameter, file or stdin
|
||||||
|
|
||||||
|
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
|
||||||
routeAddCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL")
|
routeAddCmd.Flags().String("url", getEnv("KAPOW_URL", "http://localhost:8082"), "Kapow! data interface URL")
|
||||||
routeAddCmd.Flags().StringP("path", "p", "", "Path to register")
|
routeAddCmd.Flags().StringP("method", "X", "get", "HTTP method to accept")
|
||||||
routeAddCmd.Flags().StringP("method", "X", "", "HTTP method to accept")
|
routeAddCmd.Flags().StringP("entrypoint", "e", "/bin/sh -c", "Command to execute")
|
||||||
routeAddCmd.Flags().StringP("entrypoint", "e", "", "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")
|
||||||
|
|
||||||
var routeRemoveCmd = &cobra.Command{
|
var routeRemoveCmd = &cobra.Command{
|
||||||
|
|||||||
+19
-1
@@ -2,6 +2,11 @@ package cmd
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/BBVA/kapow/internal/client"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
@@ -14,9 +19,22 @@ var SetCmd = &cobra.Command{
|
|||||||
Args: cobra.RangeArgs(1, 2),
|
Args: cobra.RangeArgs(1, 2),
|
||||||
PreRunE: handlerIDRequired,
|
PreRunE: handlerIDRequired,
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
|
var r io.Reader
|
||||||
url, _ := cmd.Flags().GetString("url")
|
url, _ := cmd.Flags().GetString("url")
|
||||||
handler, _ := cmd.Flags().GetString("handler")
|
handler, _ := cmd.Flags().GetString("handler")
|
||||||
fmt.Println("niano: ", url, handler)
|
|
||||||
|
if len(args) >= 2 {
|
||||||
|
// We have a command line value create a stringReader
|
||||||
|
r = strings.NewReader(strings.Join(args, " "))
|
||||||
|
} else {
|
||||||
|
// Use stdin
|
||||||
|
r = os.Stdin
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := client.SetData(url, handler, args[0], r); err != nil {
|
||||||
|
os.Stderr.WriteString(fmt.Sprintf("%v\n", err))
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user