Simplify Info (as a map)

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

docker/container/container.go

@@ -76,12 +76,12 @@ func (c *Container) Info(ctx context.Context, qFlag bool) (project.Info, error)
 
 	result := project.Info{}
 	if qFlag {
-		result = append(result, project.InfoPart{Key: "Id", Value: c.container.ID})
+		result["Id"] = c.container.ID
 	} else {
-		result = append(result, project.InfoPart{Key: "Name", Value: name(info.Names)})
-		result = append(result, project.InfoPart{Key: "Command", Value: info.Command})
-		result = append(result, project.InfoPart{Key: "State", Value: info.Status})
-		result = append(result, project.InfoPart{Key: "Ports", Value: portString(info.Ports)})
+		result["Name"] = name(info.Names)
+		result["Command"] = info.Command
+		result["State"] = info.Status
+		result["Ports"] = portString(info.Ports)
 	}
 
 	return result, nil

project/info.go

@@ -6,16 +6,11 @@ import (
 	"text/tabwriter"
 )
 
-// InfoPart holds key/value strings.
-type InfoPart struct {
-	Key, Value string
-}
-
 // InfoSet holds a list of Info.
 type InfoSet []Info
 
 // Info holds a list of InfoPart.
-type Info []InfoPart
+type Info map[string]string
 
 func (infos InfoSet) String(titleFlag bool) string {
 	//no error checking, none of this should fail
@@ -37,15 +32,15 @@ func (infos InfoSet) String(titleFlag bool) string {
 
 func writeLine(writer io.Writer, key bool, info Info) {
 	first := true
-	for _, part := range info {
+	for k, v := range info {
 		if !first {
 			writer.Write([]byte{'\t'})
 		}
 		first = false
 		if key {
-			writer.Write([]byte(part.Key))
+			writer.Write([]byte(k))
 		} else {
-			writer.Write([]byte(part.Value))
+			writer.Write([]byte(v))
 		}
 	}