fix container list with json format

Signed-off-by: Kay Yan <[email protected]>

Author: yankay

cmd/nerdctl/container_list_test.go

@@ -41,3 +41,21 @@ func TestContainerListWithFormatLabel(t *testing.T) {
 		"--filter", "label="+labelK,
 		"--format", fmt.Sprintf("{{.Label %q}}", labelK)).AssertOutExactly(labelV + "\n")
 }
+
+func TestContainerListWithJsonFormatLabel(t *testing.T) {
+	t.Parallel()
+	base := testutil.NewBase(t)
+	tID := testutil.Identifier(t)
+	cID := tID
+	labelK := "label-key-" + tID
+	labelV := "label-value-" + tID
+
+	base.Cmd("run", "-d",
+		"--name", cID,
+		"--label", labelK+"="+labelV,
+		testutil.CommonImage, "sleep", "infinity").AssertOK()
+	defer base.Cmd("rm", "-f", cID).AssertOK()
+	base.Cmd("ps", "-a",
+		"--filter", "label="+labelK,
+		"--format", "json").AssertOutContains(fmt.Sprintf("%s=%s", labelK, labelV))
+}

pkg/cmd/container/list.go

@@ -97,12 +97,14 @@ type ListItem struct {
 	Status    string
 	Runtime   string // nerdctl extension
 	Size      string
-	Labels    map[string]string
+	Labels    string
+	LabelsMap map[string]string `json:"-"`
+
 	// TODO: "LocalVolumes", "Mounts", "Networks", "RunningFor", "State"
 }
 
 func (x *ListItem) Label(s string) string {
-	return x.Labels[s]
+	return x.LabelsMap[s]
 }
 
 func prepareContainers(ctx context.Context, client *containerd.Client, containers []containerd.Container, options types.ContainerListOptions) ([]ListItem, error) {
@@ -138,7 +140,8 @@ func prepareContainers(ctx context.Context, client *containerd.Client, container
 			Ports:     formatter.FormatPorts(info.Labels),
 			Status:    formatter.ContainerStatus(ctx, c),
 			Runtime:   info.Runtime.Name,
-			Labels:    info.Labels,
+			Labels:    formatter.FormatLabels(info.Labels),
+			LabelsMap: info.Labels,
 		}
 		if options.Size {
 			containerSize, err := getContainerSize(ctx, client, c, info)