Commit 7d3cad68 authored by Kenjiro Nakayama's avatar Kenjiro Nakayama

Use MarshalIndent instead of marshal and indent

parent 59628744
...@@ -17,7 +17,6 @@ limitations under the License. ...@@ -17,7 +17,6 @@ limitations under the License.
package dns package dns
import ( import (
"bytes"
"encoding/json" "encoding/json"
"strings" "strings"
...@@ -37,18 +36,11 @@ func NewTreeCache() *TreeCache { ...@@ -37,18 +36,11 @@ func NewTreeCache() *TreeCache {
} }
func (cache *TreeCache) Serialize() (string, error) { func (cache *TreeCache) Serialize() (string, error) {
b, err := json.Marshal(cache) prettyJSON, err := json.MarshalIndent(cache, "", "\t")
if err != nil { if err != nil {
return "", err return "", err
} }
return string(prettyJSON), nil
var prettyJSON bytes.Buffer
err = json.Indent(&prettyJSON, b, "", "\t")
if err != nil {
return "", err
}
return string(prettyJSON.Bytes()), nil
} }
// setEntry creates the entire path if it doesn't already exist in the cache, // setEntry creates the entire path if it doesn't already exist in the cache,
......
...@@ -267,14 +267,12 @@ func (p *JSONPrinter) PrintObj(obj runtime.Object, w io.Writer) error { ...@@ -267,14 +267,12 @@ func (p *JSONPrinter) PrintObj(obj runtime.Object, w io.Writer) error {
return err return err
} }
data, err := json.Marshal(obj) data, err := json.MarshalIndent(obj, "", " ")
if err != nil { if err != nil {
return err return err
} }
dst := bytes.Buffer{} data = append(data, '\n')
err = json.Indent(&dst, data, "", " ") _, err = w.Write(data)
dst.WriteByte('\n')
_, err = w.Write(dst.Bytes())
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment