diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-19 15:03:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 15:03:41 +0000 |
| commit | 139dca038c74256d196375ef509d1460896394ea (patch) | |
| tree | 014de1110b608b59e3442b3c7f1687f8a98cd910 /cmd/podman | |
| parent | e0ffc431fe7f016124fdcb36819698a90fe448a9 (diff) | |
| parent | 34dcbc94913a899f8c3cc48c3abab4e8114f425f (diff) | |
| download | podman-139dca038c74256d196375ef509d1460896394ea.tar.gz podman-139dca038c74256d196375ef509d1460896394ea.tar.bz2 podman-139dca038c74256d196375ef509d1460896394ea.zip | |
Merge pull request #12027 from rhatdan/connect
Change podman connection list to use default field
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/system/connection/list.go | 8 |
1 files changed, 6 insertions, 2 deletions
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, "", " ") |