Simplify printer

glassechidna · May 29, 2019 · 323f258 · 323f258
1 parent 054b725
commit 323f258
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 38 deletions.
diff --git a/cmd/down.go b/cmd/down.go
@@ -30,9 +30,7 @@ var downCmd = &cobra.Command{
 		region := viper.GetString("region")
 		profile := viper.GetString("profile")
 		stackName := viper.GetString("stack-name")
-		showTimestamps := !viper.GetBool("no-timestamps")
-		showColor := !viper.GetBool("no-color")
-		printer := stackit.NewTailPrinterWithOptions(showTimestamps, showColor, cmd.OutOrStderr())
+		printer := stackit.NewTailPrinter(cmd.OutOrStderr())
 
 		events := make(chan stackit.TailStackEvent)
 
@@ -63,9 +61,4 @@ var downCmd = &cobra.Command{
 
 func init() {
 	RootCmd.AddCommand(downCmd)
-
-	downCmd.PersistentFlags().Bool("no-timestamps", false, "")
-	downCmd.PersistentFlags().Bool("no-color", false, "")
-	viper.BindPFlags(downCmd.PersistentFlags())
-
 }
diff --git a/cmd/execute.go b/cmd/execute.go
@@ -29,7 +29,7 @@ func executeChangeSet(ctx context.Context, region, profile, stackName, changeSet
 	sess := awsSession(profile, region)
 	sit := stackit.NewStackit(cloudformation.New(sess), sts.New(sess))
 	events := make(chan stackit.TailStackEvent)
-	printer := stackit.NewTailPrinterWithOptions(true, true, writer)
+	printer := stackit.NewTailPrinter(writer)
 
 	printerCtx, printerCancel := context.WithCancel(ctx)
 	defer printerCancel()

diff --git a/cmd/package.go b/cmd/package.go
@@ -52,7 +52,7 @@ func packageTemplate(ctx context.Context, region, profile, stackName, templatePa
 	packager := stackit.NewPackager(s3api, sts.New(sess), region)
 
 	events := make(chan stackit.TailStackEvent)
-	printer := stackit.NewTailPrinterWithOptions(true, true, writer)
+	printer := stackit.NewTailPrinter(writer)
 
 	printerCtx, printerCancel := context.WithCancel(ctx)
 	defer printerCancel()

diff --git a/cmd/tail.go b/cmd/tail.go
@@ -30,9 +30,7 @@ var tailCmd = &cobra.Command{
 		region := viper.GetString("region")
 		profile := viper.GetString("profile")
 		stackName := viper.GetString("stack-name")
-		showTimestamps := !viper.GetBool("no-timestamps")
-		showColor := !viper.GetBool("no-color")
-		printer := stackit.NewTailPrinterWithOptions(showTimestamps, showColor, cmd.OutOrStderr())
+		printer := stackit.NewTailPrinter(cmd.OutOrStderr())
 
 		sess := awsSession(profile, region)
 		sit := stackit.NewStackit(cloudformation.New(sess), sts.New(sess))

diff --git a/cmd/up.go b/cmd/up.go
@@ -49,10 +49,6 @@ var upCmd = &cobra.Command{
 		previousTemplate := viper.GetBool("previous-template")
 		alwaysSucceed := viper.GetBool("always-succeed")
 
-		showTimestamps := !viper.GetBool("no-timestamps")
-		showColor := !viper.GetBool("no-color")
-		printer := stackit.NewTailPrinterWithOptions(showTimestamps, showColor, cmd.OutOrStderr())
-
 		parsed := parseCLIInput(
 			serviceRole,
 			stackPolicy,
@@ -72,6 +68,7 @@ var upCmd = &cobra.Command{
 
 		ctx := context.Background()
 
+		printer := stackit.NewTailPrinter(cmd.OutOrStderr())
 		printerCtx, printerCancel := context.WithCancel(ctx)
 		defer printerCancel()
 
@@ -203,8 +200,6 @@ func init() {
 	upCmd.PersistentFlags().StringArrayVar(&tags, "tag", []string{}, "")
 	upCmd.PersistentFlags().StringArrayVar(&notificationArns, "notification-arn", []string{}, "")
 	upCmd.PersistentFlags().Bool("previous-template", false, "")
-	upCmd.PersistentFlags().Bool("no-timestamps", false, "")
-	upCmd.PersistentFlags().Bool("no-color", false, "")
 	upCmd.PersistentFlags().Bool("always-succeed", false, "Typically stackit will return a nonzero exit code on failure. This disables that.")
 
 	viper.BindPFlags(upCmd.PersistentFlags())

diff --git a/pkg/stackit/tail_printer.go b/pkg/stackit/tail_printer.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/fatih/color"
 	"io"
-	"os"
 	"strings"
 )
 
@@ -14,25 +13,10 @@ type TailPrinter struct {
 	writer          io.Writer
 }
 
-func NewTailPrinter() TailPrinter {
-	return NewTailPrinterWithOptions(true, true, os.Stderr)
-}
-
-func NewTailPrinterWithOptions(showTimestamp, showColors bool, writer io.Writer) TailPrinter {
-	format := ""
-	if showTimestamp {
-		format = "[03:04:05]"
-	}
-
-	failureColor := color.New(color.FgRed)
-
-	if !showColors {
-		failureColor = nil
-	}
-
+func NewTailPrinter(writer io.Writer) TailPrinter {
 	return TailPrinter{
-		timestampFormat: format,
-		failureColor:    failureColor,
+		timestampFormat: "[03:04:05]",
+		failureColor:    color.New(color.FgRed),
 		writer:          writer,
 	}
 }