Merge pull request #2 from hogklint/chore/clean

Some cleaning

Author: hogklint

Dockerfile

@@ -37,7 +37,7 @@ The `container query` is a regular expression of the container name; you could p
  flag                        | default                         | purpose
 -----------------------------|---------------------------------|---------
  `--color`                   | `auto`                          | Force set color output. 'auto':  colorize if tty attached, 'always': always colorize, 'never': never colorize.
- `--completion`              |                                 | Output stern command-line completion code for the specified shell. Can be 'bash', 'zsh' or 'fish'.
+ `--completion`              |                                 | Output tailfin command-line completion code for the specified shell. Can be 'bash', 'zsh' or 'fish'.
  `--compose`                 | `[]`                            | Compose project name to match (regular expression)
  `--compose-colors`          |                                 | Specifies the colors used to highlight container names. Provide colors as a comma-separated list using SGR (Select Graphic Rendition) sequences, e.g., "91,92,93,94,95,96".
  `--config`                  | `~/.config/tailfin/config.yaml` | Path to the tailfin config file

README.md

@@ -334,7 +334,7 @@ func (o *options) overrideFlagSetDefaultFromConfig(fs *pflag.FlagSet) error {
 // AddFlags adds all the flags used by tailfin.
 func (o *options) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&o.color, "color", o.color, "Force set color output. 'auto':  colorize if tty attached, 'always': always colorize, 'never': never colorize.")
-	fs.StringVar(&o.completion, "completion", o.completion, "Output stern command-line completion code for the specified shell. Can be 'bash', 'zsh' or 'fish'.")
+	fs.StringVar(&o.completion, "completion", o.completion, "Output tailfin command-line completion code for the specified shell. Can be 'bash', 'zsh' or 'fish'.")
 	fs.StringArrayVar(&o.compose, "compose", o.compose, "Compose project name to match (regular expression)")
 	fs.StringArrayVarP(&o.exclude, "exclude", "e", o.exclude, "Log lines to exclude. (regular expression)")
 	fs.StringArrayVarP(&o.excludeContainer, "exclude-container", "E", o.excludeContainer, "Container name to exclude. (regular expression)")

cmd/tailfincmd/cmd.go

@@ -234,7 +234,7 @@ func TestOptionsGenerateTemplate(t *testing.T) {
 				return o
 			}(),
 			"json message",
-			`{"message":"json message","nodeName":"","namespace":"","podName":"","containerName":"container1","composeProject":"compose1"}
+			`{"message":"json message","container":"container1","compose":"compose1"}
 `,
 			false,
 			true,

cmd/tailfincmd/cmd_test.go

@@ -183,9 +183,6 @@ func (t *DockerTail) consumeLine(line string) {
 func (t *DockerTail) Print(msg string) {
 	vm := Log{
 		Message:        msg,
-		NodeName:       "",
-		Namespace:      "",
-		PodName:        "",
 		ContainerName:  t.ContainerName,
 		ComposeProject: t.ComposeProject,
 		ComposeColor:   t.composeColor,

stern/docker_tail.go

@@ -61,11 +61,7 @@ func (t *FileTail) ConsumeReader(reader *bufio.Reader) error {
 func (t *FileTail) Print(msg string) {
 	vm := Log{
 		Message:        msg,
-		NodeName:       "",
-		Namespace:      "",
-		PodName:        "",
 		ContainerName:  "",
-		PodColor:       color.New(color.Reset),
 		ContainerColor: color.New(color.Reset),
 	}
 

stern/file_tail.go

@@ -22,23 +22,10 @@ type Log struct {
 	// Message is the log message itself
 	Message string `json:"message"`
 
-	// Node name of the pod
-	NodeName string `json:"nodeName"`
+	ContainerName string `json:"container"`
 
-	// Namespace of the pod
-	Namespace string `json:"namespace"`
+	ComposeProject string `json:"compose"`
 
-	// TODO REMOVE
-	// PodName of the pod
-	PodName string `json:"podName"`
-
-	// TODO change to container
-	ContainerName string `json:"containerName"`
-
-	// TODO hange ot "compose"
-	ComposeProject string `json:"composeProject"`
-
-	PodColor       *color.Color `json:"-"`
 	ComposeColor   *color.Color `json:"-"`
 	ContainerColor *color.Color `json:"-"`
 }