From 34dcbc94913a899f8c3cc48c3abab4e8114f425f Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 18 Oct 2021 16:45:23 -0400
Subject: Change podman connection list to use default field

Stop using "*" to indicate default.  Add default field to make
it more obvios and the json field more machine usable.

Fixes: https://github.com/containers/podman/issues/12019

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/podman/system/connection/list.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'cmd/podman')

diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go
index de85ce3fa..a3290e3d6 100644
--- a/cmd/podman/system/connection/list.go
+++ b/cmd/podman/system/connection/list.go
@@ -44,6 +44,7 @@ func init() {
 type namedDestination struct {
 	Name string
 	config.Destination
+	Default bool
 }
 
 func list(cmd *cobra.Command, _ []string) error {
@@ -60,12 +61,14 @@ func list(cmd *cobra.Command, _ []string) error {
 		"Identity": "Identity",
 		"Name":     "Name",
 		"URI":      "URI",
+		"Default":  "Default",
 	}}
 
 	rows := make([]namedDestination, 0)
 	for k, v := range cfg.Engine.ServiceDestinations {
+		def := false
 		if k == cfg.Engine.ActiveService {
-			k += "*"
+			def = true
 		}
 
 		r := namedDestination{
@@ -74,6 +77,7 @@ func list(cmd *cobra.Command, _ []string) error {
 				Identity: v.Identity,
 				URI:      v.URI,
 			},
+			Default: def,
 		}
 		rows = append(rows, r)
 	}
@@ -82,7 +86,7 @@ func list(cmd *cobra.Command, _ []string) error {
 		return rows[i].Name < rows[j].Name
 	})
 
-	format := "{{.Name}}\t{{.Identity}}\t{{.URI}}\n"
+	format := "{{.Name}}\t{{.URI}}\t{{.Identity}}\t{{.Default}}\n"
 	switch {
 	case report.IsJSON(cmd.Flag("format").Value.String()):
 		buf, err := registry.JSONLibrary().MarshalIndent(rows, "", "    ")
-- 
cgit v1.2.3-54-g00ecf