luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Get JSON formatting working

This commit is contained in:
Joel Watson 2020-11-04 14:04:17 -06:00
parent fd5b94443e
commit 0918d8dbc0
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
command/snapshot/inspect/formatter.go
View File

@ -15,7 +15,7 @@ const (
)
type Formatter interface {
Format(*OutputFormat, *OutputFormat, bool) (string, error)
Format(*OutputFormat, bool) (string, error)
}
func GetSupportedFormats() []string {
@ -38,7 +38,7 @@ func NewFormatter(format string) (Formatter, error) {
}
}
func (_ *prettyFormatter) Format(info *OutputFormat, kvInfo *OutputFormat, detailed bool) (string, error) {
func (_ *prettyFormatter) Format(info *OutputFormat, detailed bool) (string, error) {
var b bytes.Buffer
tw := tabwriter.NewWriter(&b, 8, 8, 6, ' ', 0)
@ -68,11 +68,11 @@ func (_ *prettyFormatter) Format(info *OutputFormat, kvInfo *OutputFormat, detai
fmt.Fprintln(kvtw, "\n Key Name\tCount\tSize\t")
fmt.Fprintf(kvtw, " %s\t%s\t%s\t", "----", "----", "----")
// For each different type generate new output
for _, s := range kvInfo.Stats {
for _, s := range info.KStats {
fmt.Fprintf(kvtw, "\n %s\t%d\t%s\t", s.Name, s.Count, ByteSize(uint64(s.Sum)))
}
fmt.Fprintf(kvtw, "\n %s\t%s\t%s\t", "----", "----", "----")
fmt.Fprintf(kvtw, "\n Total\t\t%s\t", ByteSize(uint64(kvInfo.TotalSize)))
fmt.Fprintf(kvtw, "\n Total\t\t%s\t", ByteSize(uint64(info.TotalSize)))
if err := kvtw.Flush(); err != nil {
return b.String(), err
@ -88,7 +88,7 @@ func newJSONFormatter() Formatter {
return &jsonFormatter{}
}
func (_ *jsonFormatter) Format(info *OutputFormat, infoKV *OutputFormat, detailed bool) (string, error) {
func (_ *jsonFormatter) Format(info *OutputFormat, detailed bool) (string, error) {
b, err := json.MarshalIndent(info, "", " ")
if err != nil {
return "", fmt.Errorf("Failed to marshal original snapshot stats: %v", err)

9
command/snapshot/inspect/snapshot_inspect.go
View File

@ -68,6 +68,7 @@ type MetadataInfo struct {
type OutputFormat struct {
Meta *MetadataInfo
Stats []typeStats
KStats []typeStats
TotalSize int
}
@ -138,15 +139,11 @@ func (c *cmd) Run(args []string) int {
in := &OutputFormat{
Meta: metaformat,
Stats: formattedStats,
TotalSize: totalSize,
}
inKV := &OutputFormat{
Meta: metaformat,
Stats: formattedKStats,
KStats: formattedKStats,
TotalSize: totalSize,
}
out, err := formatter.Format(in, inKV, c.detailed)
out, err := formatter.Format(in, c.detailed)
if err != nil {
c.UI.Error(err.Error())
return 1