mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
ea61dac9e6
This fix is an attempt to address https://github.com/docker/docker/pull/28213#issuecomment-273840405 Currently when specify table format with table `--format "table {{.ID}}..."`, the delimiter in the header section of the table is always `"\t"`. That is actually different from the content of the table as the delimiter could be anything (or even contatenated with `.`, for example): ``` $ docker service ps web --format 'table {{.Name}}.{{.ID}}' --no-trunc NAME ID web.1.inyhxhvjcijl0hdbu8lgrwwh7 \_ web.1.p9m4kx2srjqmfms4igam0uqlb ``` This fix is an attampt to address the skewness of the table when delimiter is not `"\t"`. The basic idea is that, when header consists of `table` key, the header section will be redendered the same way as content section. A map mapping each placeholder name to the HEADER entry name is used for the context of the header. Unit tests have been updated and added to cover the changes. This fix is related to #28313. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
131 lines
2.7 KiB
Go
131 lines
2.7 KiB
Go
package formatter
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
units "github.com/docker/go-units"
|
|
)
|
|
|
|
const (
|
|
defaultVolumeQuietFormat = "{{.Name}}"
|
|
defaultVolumeTableFormat = "table {{.Driver}}\t{{.Name}}"
|
|
|
|
volumeNameHeader = "VOLUME NAME"
|
|
mountpointHeader = "MOUNTPOINT"
|
|
linksHeader = "LINKS"
|
|
// Status header ?
|
|
)
|
|
|
|
// NewVolumeFormat returns a format for use with a volume Context
|
|
func NewVolumeFormat(source string, quiet bool) Format {
|
|
switch source {
|
|
case TableFormatKey:
|
|
if quiet {
|
|
return defaultVolumeQuietFormat
|
|
}
|
|
return defaultVolumeTableFormat
|
|
case RawFormatKey:
|
|
if quiet {
|
|
return `name: {{.Name}}`
|
|
}
|
|
return `name: {{.Name}}\ndriver: {{.Driver}}\n`
|
|
}
|
|
return Format(source)
|
|
}
|
|
|
|
// VolumeWrite writes formatted volumes using the Context
|
|
func VolumeWrite(ctx Context, volumes []*types.Volume) error {
|
|
render := func(format func(subContext subContext) error) error {
|
|
for _, volume := range volumes {
|
|
if err := format(&volumeContext{v: *volume}); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
return ctx.Write(newVolumeContext(), render)
|
|
}
|
|
|
|
type volumeHeaderContext map[string]string
|
|
|
|
func (c volumeHeaderContext) Label(name string) string {
|
|
n := strings.Split(name, ".")
|
|
r := strings.NewReplacer("-", " ", "_", " ")
|
|
h := r.Replace(n[len(n)-1])
|
|
|
|
return h
|
|
}
|
|
|
|
type volumeContext struct {
|
|
HeaderContext
|
|
v types.Volume
|
|
}
|
|
|
|
func newVolumeContext() *volumeContext {
|
|
volumeCtx := volumeContext{}
|
|
volumeCtx.header = volumeHeaderContext{
|
|
"Name": volumeNameHeader,
|
|
"Driver": driverHeader,
|
|
"Scope": scopeHeader,
|
|
"Mountpoint": mountpointHeader,
|
|
"Labels": labelsHeader,
|
|
"Links": linksHeader,
|
|
"Size": sizeHeader,
|
|
}
|
|
return &volumeCtx
|
|
}
|
|
|
|
func (c *volumeContext) MarshalJSON() ([]byte, error) {
|
|
return marshalJSON(c)
|
|
}
|
|
|
|
func (c *volumeContext) Name() string {
|
|
return c.v.Name
|
|
}
|
|
|
|
func (c *volumeContext) Driver() string {
|
|
return c.v.Driver
|
|
}
|
|
|
|
func (c *volumeContext) Scope() string {
|
|
return c.v.Scope
|
|
}
|
|
|
|
func (c *volumeContext) Mountpoint() string {
|
|
return c.v.Mountpoint
|
|
}
|
|
|
|
func (c *volumeContext) Labels() string {
|
|
if c.v.Labels == nil {
|
|
return ""
|
|
}
|
|
|
|
var joinLabels []string
|
|
for k, v := range c.v.Labels {
|
|
joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
|
|
}
|
|
return strings.Join(joinLabels, ",")
|
|
}
|
|
|
|
func (c *volumeContext) Label(name string) string {
|
|
if c.v.Labels == nil {
|
|
return ""
|
|
}
|
|
return c.v.Labels[name]
|
|
}
|
|
|
|
func (c *volumeContext) Links() string {
|
|
if c.v.UsageData == nil {
|
|
return "N/A"
|
|
}
|
|
return fmt.Sprintf("%d", c.v.UsageData.RefCount)
|
|
}
|
|
|
|
func (c *volumeContext) Size() string {
|
|
if c.v.UsageData == nil {
|
|
return "N/A"
|
|
}
|
|
return units.HumanSize(float64(c.v.UsageData.Size))
|
|
}
|