mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
0e70d96a68
When UpdateStatus was not present, the empty values of the timestamps
would be present:
"UpdateStatus": {
"StartedAt": "0001-01-01T00:00:00Z",
"CompletedAt": "0001-01-01T00:00:00Z"
}
To fix this, make the timestamps pointers, so they can be set to nil
when they should not be shown.
Also make UpdateStatus itself a pointer, so an empty object does not
show up when there is no UpdateStatus.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
129 lines
2.9 KiB
Go
129 lines
2.9 KiB
Go
package service
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/cli/command/formatter"
|
|
"github.com/docker/docker/pkg/testutil/assert"
|
|
)
|
|
|
|
func formatServiceInspect(t *testing.T, format formatter.Format, now time.Time) string {
|
|
b := new(bytes.Buffer)
|
|
|
|
endpointSpec := &swarm.EndpointSpec{
|
|
Mode: "vip",
|
|
Ports: []swarm.PortConfig{
|
|
{
|
|
Protocol: swarm.PortConfigProtocolTCP,
|
|
TargetPort: 5000,
|
|
},
|
|
},
|
|
}
|
|
|
|
two := uint64(2)
|
|
|
|
s := swarm.Service{
|
|
ID: "de179gar9d0o7ltdybungplod",
|
|
Meta: swarm.Meta{
|
|
Version: swarm.Version{Index: 315},
|
|
CreatedAt: now,
|
|
UpdatedAt: now,
|
|
},
|
|
Spec: swarm.ServiceSpec{
|
|
Annotations: swarm.Annotations{
|
|
Name: "my_service",
|
|
Labels: map[string]string{"com.label": "foo"},
|
|
},
|
|
TaskTemplate: swarm.TaskSpec{
|
|
ContainerSpec: swarm.ContainerSpec{
|
|
Image: "foo/bar@sha256:this_is_a_test",
|
|
},
|
|
},
|
|
Mode: swarm.ServiceMode{
|
|
Replicated: &swarm.ReplicatedService{
|
|
Replicas: &two,
|
|
},
|
|
},
|
|
UpdateConfig: nil,
|
|
Networks: []swarm.NetworkAttachmentConfig{
|
|
{
|
|
Target: "5vpyomhb6ievnk0i0o60gcnei",
|
|
Aliases: []string{"web"},
|
|
},
|
|
},
|
|
EndpointSpec: endpointSpec,
|
|
},
|
|
Endpoint: swarm.Endpoint{
|
|
Spec: *endpointSpec,
|
|
Ports: []swarm.PortConfig{
|
|
{
|
|
Protocol: swarm.PortConfigProtocolTCP,
|
|
TargetPort: 5000,
|
|
PublishedPort: 30000,
|
|
},
|
|
},
|
|
VirtualIPs: []swarm.EndpointVirtualIP{
|
|
{
|
|
NetworkID: "6o4107cj2jx9tihgb0jyts6pj",
|
|
Addr: "10.255.0.4/16",
|
|
},
|
|
},
|
|
},
|
|
UpdateStatus: &swarm.UpdateStatus{
|
|
StartedAt: &now,
|
|
CompletedAt: &now,
|
|
},
|
|
}
|
|
|
|
ctx := formatter.Context{
|
|
Output: b,
|
|
Format: format,
|
|
}
|
|
|
|
err := formatter.ServiceInspectWrite(ctx, []string{"de179gar9d0o7ltdybungplod"}, func(ref string) (interface{}, []byte, error) {
|
|
return s, nil, nil
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return b.String()
|
|
}
|
|
|
|
func TestPrettyPrintWithNoUpdateConfig(t *testing.T) {
|
|
s := formatServiceInspect(t, formatter.NewServiceFormat("pretty"), time.Now())
|
|
if strings.Contains(s, "UpdateStatus") {
|
|
t.Fatal("Pretty print failed before parsing UpdateStatus")
|
|
}
|
|
}
|
|
|
|
func TestJSONFormatWithNoUpdateConfig(t *testing.T) {
|
|
now := time.Now()
|
|
// s1: [{"ID":..}]
|
|
// s2: {"ID":..}
|
|
s1 := formatServiceInspect(t, formatter.NewServiceFormat(""), now)
|
|
t.Log("// s1")
|
|
t.Logf("%s", s1)
|
|
s2 := formatServiceInspect(t, formatter.NewServiceFormat("{{json .}}"), now)
|
|
t.Log("// s2")
|
|
t.Logf("%s", s2)
|
|
var m1Wrap []map[string]interface{}
|
|
if err := json.Unmarshal([]byte(s1), &m1Wrap); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(m1Wrap) != 1 {
|
|
t.Fatalf("strange s1=%s", s1)
|
|
}
|
|
m1 := m1Wrap[0]
|
|
t.Logf("m1=%+v", m1)
|
|
var m2 map[string]interface{}
|
|
if err := json.Unmarshal([]byte(s2), &m2); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Logf("m2=%+v", m2)
|
|
assert.DeepEqual(t, m2, m1)
|
|
}
|