Change how LogObject treats format argument

eksctl-io · Mar 5, 2019 · cf4e9ef · cf4e9ef
1 parent f2dfe94
commit cf4e9ef
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/pkg/ctl/create/cluster.go b/pkg/ctl/create/cluster.go
@@ -457,7 +457,7 @@ func doCreateCluster(p *api.ProviderConfig, cfg *api.ClusterConfig, nameArg stri
 	// we should also make a call to resolve the AMI and write the result, similaraly
 	// the body of the SSH key can be read
 
-	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n", cfg); err != nil {
+	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n%s\n", cfg); err != nil {
 		return err
 	}
 
@@ -565,7 +565,7 @@ func doCreateCluster(p *api.ProviderConfig, cfg *api.ClusterConfig, nameArg stri
 
 	logger.Success("%s is ready", meta.LogString())
 
-	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n", cfg); err != nil {
+	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n%s\n", cfg); err != nil {
 		return err
 	}
 

diff --git a/pkg/ctl/create/nodegroup.go b/pkg/ctl/create/nodegroup.go
@@ -276,7 +276,7 @@ func doCreateNodeGroups(p *api.ProviderConfig, cfg *api.ClusterConfig, nameArg s
 		return err
 	}
 
-	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n", cfg); err != nil {
+	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n%s\n", cfg); err != nil {
 		return err
 	}
 

diff --git a/pkg/ctl/delete/cluster.go b/pkg/ctl/delete/cluster.go
@@ -76,7 +76,7 @@ func doDeleteCluster(p *api.ProviderConfig, cfg *api.ClusterConfig, nameArg stri
 	}
 
 	logger.Info("deleting EKS cluster %q", meta.Name)
-	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n", cfg); err != nil {
+	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n%s\n", cfg); err != nil {
 		return err
 	}
 

diff --git a/pkg/ctl/update/cluster.go b/pkg/ctl/update/cluster.go
@@ -106,7 +106,7 @@ func doUpdateClusterCmd(p *api.ProviderConfig, cfg *api.ClusterConfig, nameArg s
 		return errors.Wrapf(err, "getting VPC configuration for cluster %q", cfg.Metadata.Name)
 	}
 
-	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n", cfg); err != nil {
+	if err := printer.LogObj(logger.Debug, "cfg.json = \\\n%s\n", cfg); err != nil {
 		return err
 	}
 

diff --git a/pkg/printers/json.go b/pkg/printers/json.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
+	"strings"
 
 	"github.com/kris-nova/logger"
 
@@ -52,13 +53,13 @@ func (j *JSONPrinter) PrintObjWithKind(kind string, obj interface{}, writer io.W
 
 // LogObj will print the passed object formatted as JSON to
 // the logger.
-func (j *JSONPrinter) LogObj(log logger.Logger, prefixFmt string, obj interface{}) error {
+func (j *JSONPrinter) LogObj(log logger.Logger, msgFmt string, obj interface{}) error {
 	b := &bytes.Buffer{}
 	if err := j.PrintObj(obj, b); err != nil {
 		return err
 	}
 
-	log(prefixFmt+"%s", b.String())
+	log(msgFmt, strings.ReplaceAll(b.String(), "%", "%%"))
 
 	return nil
 }
diff --git a/pkg/printers/printers.go b/pkg/printers/printers.go
@@ -12,7 +12,7 @@ import (
 type OutputPrinter interface {
 	PrintObjWithKind(kind string, obj interface{}, writer io.Writer) error
 	PrintObj(obj interface{}, writer io.Writer) error
-	LogObj(log logger.Logger, prefixFmt string, obj interface{}) error
+	LogObj(log logger.Logger, msgFmt string, obj interface{}) error
 }
 
 // NewPrinter creates a new printer based in the printer type requested

diff --git a/pkg/printers/table.go b/pkg/printers/table.go
@@ -55,13 +55,13 @@ func (t *TablePrinter) PrintObjWithKind(kind string, obj interface{}, writer io.
 
 // LogObj will print the passed object formatted as a table to
 // the logger.
-func (t *TablePrinter) LogObj(log logger.Logger, prefixFmt string, obj interface{}) error {
+func (t *TablePrinter) LogObj(log logger.Logger, msgFmt string, obj interface{}) error {
 	b := &bytes.Buffer{}
 	if err := t.PrintObj(obj, b); err != nil {
 		return err
 	}
 
-	log(prefixFmt+"%s", b.String())
+	log(msgFmt, strings.ReplaceAll(b.String(), "%", "%%"))
 
 	return nil
 }

diff --git a/pkg/printers/yaml.go b/pkg/printers/yaml.go
@@ -3,6 +3,7 @@ package printers
 import (
 	"bytes"
 	"io"
+	"strings"
 
 	"github.com/kris-nova/logger"
 
@@ -51,13 +52,13 @@ func (y *YAMLPrinter) PrintObjWithKind(kind string, obj interface{}, writer io.W
 
 // LogObj will print the passed object formatted as YAML to
 // the logger.
-func (y *YAMLPrinter) LogObj(log logger.Logger, prefixFmt string, obj interface{}) error {
+func (y *YAMLPrinter) LogObj(log logger.Logger, msgFmt string, obj interface{}) error {
 	b := &bytes.Buffer{}
 	if err := y.PrintObj(obj, b); err != nil {
 		return err
 	}
 
-	log(prefixFmt+"%s", b.String())
+	log(msgFmt, strings.ReplaceAll(b.String(), "%", "%%"))
 
 	return nil
 }