Merge pull request #2 from dhenkel92/update_logging

Update logging

main.go

@@ -46,6 +46,12 @@ func main() {
 				Usage:  "runs smth",
 				Action: commands.Run,
 				Flags: []cli.Flag{
+					&cli.StringFlag{
+						Name:     "entrypoint",
+						Aliases:  []string{"e", "entry"},
+						Required: false,
+						Value:    "/bin/sh -c",
+					},
 					&cli.StringFlag{
 						Name:     "command",
 						Aliases:  []string{"c"},
@@ -63,6 +69,11 @@ func main() {
 						Aliases: []string{"ci"},
 						Value:   -1,
 					},
+					&cli.Int64Flag{
+						Name:    "tail",
+						Aliases: []string{"t"},
+						Value:   -1,
+					},
 				},
 			},
 		},

src/commands/logs.go

@@ -3,25 +3,10 @@ package commands
 import (
 	"github.com/dhenkel92/pod-helper/src/config"
 	"github.com/dhenkel92/pod-helper/src/kube"
-	"github.com/dhenkel92/pod-helper/src/log"
-	. "github.com/logrusorgru/aurora"
+	"github.com/dhenkel92/pod-helper/src/types"
 	"github.com/urfave/cli/v2"
-	v1 "k8s.io/api/core/v1"
 )
 
-type LogResult struct {
-	ExecResult kube.ExecResult
-	Pod        v1.Pod
-}
-
-func (result *LogResult) print() {
-	log.Info.Println("----------------------------------------")
-	log.Info.Println(Green(result.Pod.Name))
-	log.Info.Println(Green("Successful"))
-	log.Info.Printf("Result:\n%s", result.ExecResult.StdOut)
-	log.Info.Println("----------------------------------------")
-}
-
 func Logs(c *cli.Context) error {
 	cliConf := config.NewConfigFromCliContext(c)
 
@@ -40,17 +25,13 @@ func Logs(c *cli.Context) error {
 		return err
 	}
 
-	var results []LogResult
 	for _, pod := range pods.Items {
 		c := make(chan kube.ExecResult)
 		go podExec.Logs(c, &cliConf, &pod)
 		res := <-c
 
-		results = append(results, LogResult{ExecResult: res, Pod: pod})
-	}
-
-	for _, res := range results {
-		res.print()
+		result := types.Result{ExecResult: res, Pod: pod}
+		result.Print()
 	}
 
 	return nil

src/commands/run.go

@@ -3,25 +3,10 @@ package commands
 import (
 	"github.com/dhenkel92/pod-helper/src/config"
 	"github.com/dhenkel92/pod-helper/src/kube"
-	"github.com/dhenkel92/pod-helper/src/log"
-	. "github.com/logrusorgru/aurora"
+	"github.com/dhenkel92/pod-helper/src/types"
 	"github.com/urfave/cli/v2"
-	v1 "k8s.io/api/core/v1"
 )
 
-type Result struct {
-	ExecResult kube.ExecResult
-	Pod        v1.Pod
-}
-
-func (result *Result) print() {
-	log.Info.Println("----------------------------------------")
-	log.Info.Println(Green(result.Pod.Name))
-	log.Info.Println(Green("Successful"))
-	log.Info.Printf("Result:\n%s", result.ExecResult.StdOut)
-	log.Info.Println("----------------------------------------")
-}
-
 func Run(c *cli.Context) error {
 	cliConf := config.NewConfigFromCliContext(c)
 
@@ -40,17 +25,13 @@ func Run(c *cli.Context) error {
 		return err
 	}
 
-	var results []Result
 	for _, pod := range pods.Items {
 		c := make(chan kube.ExecResult)
-		go podExec.Exec(c, &cliConf, &pod)
+		go podExec.Run(c, &cliConf, &pod)
 		res := <-c
 
-		results = append(results, Result{ExecResult: res, Pod: pod})
-	}
-
-	for _, res := range results {
-		res.print()
+		result := types.Result{ExecResult: res, Pod: pod}
+		result.Print()
 	}
 
 	return nil

src/config/logs_config.go

@@ -4,6 +4,10 @@ import "github.com/urfave/cli/v2"
 
 func newLogsConfig(c *cli.Context) LogsConfig {
 	containerIndex := c.Int64("container-index")
+	tail := c.Int64("tail")
 
-	return LogsConfig{ContainerIndex: containerIndex}
+	return LogsConfig{
+		ContainerIndex: containerIndex,
+		Tail:           tail,
+	}
 }

src/config/run_config.go

@@ -1,16 +1,16 @@
 package config
 
 import (
-	"fmt"
 	"github.com/urfave/cli/v2"
 	"strings"
 )
 
 func newRunConfig(c *cli.Context) RunConfig {
+	entrypoint := c.String("entrypoint")
 	command := c.String("command")
 
-	commands := strings.Split(command, " ")
-	fmt.Println(commands)
-
-	return RunConfig{Command: commands}
+	return RunConfig{
+		Entrypoint: strings.Split(entrypoint, " "),
+		Command:    command,
+	}
 }

src/config/types.go

@@ -9,9 +9,11 @@ type Config struct {
 }
 
 type RunConfig struct {
-	Command []string
+	Entrypoint []string
+	Command    string
 }
 
 type LogsConfig struct {
 	ContainerIndex int64
+	Tail           int64
 }

src/kube/pod_logs.go

@@ -12,6 +12,9 @@ func (podExec *PodExecutor) Logs(c chan ExecResult, conf *config.Config, pod *v1
 	if conf.LogsConfig.ContainerIndex >= 0 {
 		options.Container = pod.Spec.Containers[conf.LogsConfig.ContainerIndex].Name
 	}
+	if conf.LogsConfig.Tail >= 0 {
+		options.TailLines = &conf.LogsConfig.Tail
+	}
 
 	req := podExec.Clientset.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &options)
 	podLogs, err := req.Stream()

src/kube/exec_pod.go → src/kube/run_pod.go

@@ -3,13 +3,12 @@ package kube
 import (
 	"bytes"
 	"github.com/dhenkel92/pod-helper/src/config"
-
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/remotecommand"
 )
 
-func (podExec *PodExecutor) Exec(c chan ExecResult, conf *config.Config, pod *v1.Pod) {
+func (podExec *PodExecutor) Run(c chan ExecResult, conf *config.Config, pod *v1.Pod) {
 	req := podExec.Clientset.
 		CoreV1().
 		RESTClient().
@@ -20,7 +19,7 @@ func (podExec *PodExecutor) Exec(c chan ExecResult, conf *config.Config, pod *v1
 		SubResource("exec")
 
 	option := &v1.PodExecOptions{
-		Command: conf.RunConfig.Command,
+		Command: append(conf.RunConfig.Entrypoint, conf.RunConfig.Command),
 		Stdin:   false,
 		Stdout:  true,
 		Stderr:  true,
@@ -39,7 +38,7 @@ func (podExec *PodExecutor) Exec(c chan ExecResult, conf *config.Config, pod *v1
 		Stderr: &stderr,
 	})
 	if err != nil {
-		c <- ExecResult{Error: err}
+		c <- ExecResult{Error: err, StdErr: stderr.String(), StdOut: stdout.String()}
 		return
 	}
 

src/types/result.go

@@ -0,0 +1,33 @@
+package types
+
+import (
+	"github.com/dhenkel92/pod-helper/src/kube"
+	"github.com/dhenkel92/pod-helper/src/log"
+	"github.com/logrusorgru/aurora"
+	v1 "k8s.io/api/core/v1"
+	"strings"
+)
+
+type Result struct {
+	ExecResult kube.ExecResult
+	Pod        v1.Pod
+}
+
+func (result *Result) Print() {
+	var text string
+	var resText string
+	if result.ExecResult.Error == nil {
+		text = aurora.Sprintf(aurora.Green("Success on %s"), result.Pod.Name)
+		resText = result.ExecResult.StdOut
+	} else {
+		text = aurora.Sprintf(aurora.Red("Failed on %s"), result.Pod.Name)
+		resText = result.ExecResult.StdOut
+	}
+
+	lineByLine := strings.Split(resText, "\n")
+
+	log.Info.Println("----------------------------------------")
+	log.Info.Println(text)
+	log.Info.Printf("Result:\n\n\t%s", strings.Join(lineByLine, "\n\t"))
+	log.Info.Println("----------------------------------------")
+}