refactor write to writeStringln

pkg/cmd/history_writer.go

@@ -16,32 +16,33 @@ package cmd
 
 import (
 	"encoding/json"
+	"errors"
 	"os"
 )
 
-// Write writes history to given path
-func (w *GardenctlHistoryWriter) Write(historyPath string, m map[string]string) error {
-	f, err := os.OpenFile(historyPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
-	if err != nil {
-		return err
-	}
+var tmp string
 
-	j, err := json.Marshal(m)
+// WriteStringln writes history to given path
+func (w *GardenctlHistoryWriter) WriteStringln(historyPath string, i interface{}) error {
+	f, err := os.OpenFile(historyPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
 	if err != nil {
 		return err
 	}
 
-	_, err = f.WriteString(string(j) + "\n")
-	return err
-}
+	switch x := i.(type) {
+	case map[string]string:
+		j, err := json.Marshal(x)
+		if err != nil {
+			return err
+		}
+		tmp = string(j)
 
-// WriteString writes history to given path
-func (w *GardenctlHistoryWriter) WriteString(historyPath string, s string) error {
-	f, err := os.OpenFile(historyPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
-	if err != nil {
-		return err
+	case string:
+		tmp = x
+	default:
+		return errors.New("Invalid type not supported")
 	}
 
-	_, err = f.WriteString(s + "\n")
+	_, err = f.WriteString(tmp + "\n")
 	return err
 }

pkg/cmd/target.go

@@ -104,7 +104,7 @@ func NewTargetCmd(targetReader TargetReader, targetWriter TargetWriter, configRe
 					checkError(err)
 				}
 
-				err := historyWriter.Write(pathHistory, targetInfo)
+				err := historyWriter.WriteStringln(pathHistory, targetInfo)
 				if err != nil {
 					return err
 				}
@@ -275,7 +275,7 @@ func NewTargetCmd(targetReader TargetReader, targetWriter TargetWriter, configRe
 				}
 			}
 
-			err := historyWriter.Write(pathHistory, targetInfo)
+			err := historyWriter.WriteStringln(pathHistory, targetInfo)
 			if err != nil {
 				return err
 			}

pkg/cmd/target_history.go

@@ -86,7 +86,7 @@ func NewHistoryCmd(targetWriter TargetWriter, historyWriter HistoryWriter) *cobr
 
 			kubeconfigPathOutput(&target)
 
-			err = historyWriter.WriteString(pathHistory, items.Item)
+			err = historyWriter.WriteStringln(pathHistory, items.Item)
 			if err != nil {
 				return fmt.Errorf("error write history %s", err)
 			}

pkg/cmd/target_test.go

@@ -116,7 +116,7 @@ var _ = Describe("Target command", func() {
 
 		It("targeting project with correct name", func() {
 			targetReader.EXPECT().ReadTarget(gomock.Any()).Return(target).Times(2)
-			historyWriter.EXPECT().Write(gomock.Any(), gomock.Any()).Return(nil)
+			historyWriter.EXPECT().WriteStringln(gomock.Any(), gomock.Any()).Return(nil)
 			target.EXPECT().Stack().Return([]cmd.TargetMeta{
 				{
 					Kind: cmd.TargetKindGarden,
@@ -172,7 +172,7 @@ var _ = Describe("Target command", func() {
 
 		It("targeting shoot name with multiple matches across projects", func() {
 			targetReader.EXPECT().ReadTarget(gomock.Any()).Return(target)
-			historyWriter.EXPECT().Write(gomock.Any(), gomock.Any()).Return(nil)
+			historyWriter.EXPECT().WriteStringln(gomock.Any(), gomock.Any()).Return(nil)
 			target.EXPECT().Stack().Return([]cmd.TargetMeta{
 				{
 					Kind: cmd.TargetKindGarden,

pkg/cmd/types.go

@@ -41,8 +41,7 @@ type KubeconfigWriter interface {
 
 // HistoryWriter writes history to given path.
 type HistoryWriter interface {
-	Write(path string, history map[string]string) error
-	WriteString(path string, history string) error
+	WriteStringln(path string, history interface{}) error
 }
 
 // GardenctlTargetReader implements TargetReader.