vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add format functions

Browse source 
Add functions to go templates such as truncating a field.  Also add
the table keyword, which, if placed at the beginning of a format string,
adds headers to the output

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
This commit is contained in:
Ryan Cole 2017-08-15 16:53:17 -04:00
parent 6ca462a3b6
commit 08c3d241a4
10 changed files with 298 additions and 1046 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cmd/kpod/images.go
View file

@ -2,6 +2,9 @@ package main
import (
"fmt"
"reflect"
"strings"
"github.com/containers/storage"
"github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image"
@ -10,14 +13,6 @@ import (
"github.com/urfave/cli"
)
type imageOutputParams struct {
ID string `json:"id"`
Name string `json:"names"`
Digest digest.Digest `json:"digest"`
CreatedAt string `json:"created"`
Size string `json:"size"`
}
var (
imagesFlags = []cli.Flag{
cli.BoolFlag{
@ -201,9 +196,7 @@ func outputImages(store storage.Store, images []storage.Image, truncate, digests
case "json":
out = formats.JSONstruct{Output: toGeneric(imageOutput)}
default:
// Assuming Go-template
out = formats.StdoutTemplate{Output: toGeneric(imageOutput), Template: outputFormat}
out = formats.StdoutTemplate{Output: toGeneric(imageOutput), Template: outputFormat, Fields: imageOutput[0].headerMap()}
}
} else {
out = stdoutstruct{output: imageOutput, digests: digests, truncate: truncate, quiet: quiet, noheading: noheading}
@ -213,3 +206,26 @@ func outputImages(store storage.Store, images []storage.Image, truncate, digests
return nil
}
type imageOutputParams struct {
ID string `json:"id"`
Name string `json:"names"`
Digest digest.Digest `json:"digest"`
CreatedAt string `json:"created"`
Size string `json:"size"`
}
func (i *imageOutputParams) headerMap() map[string]string {
v := reflect.Indirect(reflect.ValueOf(i))
values := make(map[string]string)
for i := 0; i < v.NumField(); i++ {
key := v.Type().Field(i).Name
value := key
if value == "ID" || value == "Name" {
value = "Image" + value
}
values[key] = fmt.Sprintf("%s ", strings.ToUpper(splitCamelCase(value)))
}
return values
}