Merge pull request #12213 from flouthoc/system-connection-rm-all

system: Adds support for removing all named destination via `--all`

4 files changed, 57 insertions, 8 deletions

diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go
index 73bae4994..ffbea76c5 100644
--- a/cmd/podman/system/connection/remove.go
+++ b/cmd/podman/system/connection/remove.go
@@ -5,14 +5,14 @@ import (
 	"github.com/containers/podman/v3/cmd/podman/common"
 	"github.com/containers/podman/v3/cmd/podman/registry"
 	"github.com/containers/podman/v3/cmd/podman/system"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
 var (
 	// Skip creating engines since this command will obtain connection information to said engines
 	rmCmd = &cobra.Command{
-		Use:               "remove NAME",
-		Args:              cobra.ExactArgs(1),
+		Use:               "remove [options] NAME",
 		Aliases:           []string{"rm"},
 		Long:              `Delete named destination from podman configuration`,
 		Short:             "Delete named destination",
@@ -21,6 +21,10 @@ var (
 		Example: `podman system connection remove devl
   podman system connection rm devl`,
 	}
+
+	rmOpts = struct {
+		All bool
+	}{}
 )
 
 func init() {
@@ -28,14 +32,31 @@ func init() {
 		Command: rmCmd,
 		Parent:  system.ConnectionCmd,
 	})
+
+	flags := rmCmd.Flags()
+	flags.BoolVarP(&rmOpts.All, "all", "a", false, "Remove all connections")
 }
 
-func rm(_ *cobra.Command, args []string) error {
+func rm(cmd *cobra.Command, args []string) error {
 	cfg, err := config.ReadCustomConfig()
 	if err != nil {
 		return err
 	}
 
+	if rmOpts.All {
+		if cfg.Engine.ServiceDestinations != nil {
+			for k := range cfg.Engine.ServiceDestinations {
+				delete(cfg.Engine.ServiceDestinations, k)
+			}
+		}
+		cfg.Engine.ActiveService = ""
+		return cfg.Write()
+	}
+
+	if len(args) != 1 {
+		return errors.New("accepts 1 arg(s), received 0")
+	}
+
 	if cfg.Engine.ServiceDestinations != nil {
 		delete(cfg.Engine.ServiceDestinations, args[0])
 	}
diff --git a/docs/source/markdown/podman-system-connection-remove.1.md b/docs/source/markdown/podman-system-connection-remove.1.md
index faa767176..0af05649c 100644
--- a/docs/source/markdown/podman-system-connection-remove.1.md
+++ b/docs/source/markdown/podman-system-connection-remove.1.md
@@ -4,11 +4,17 @@
 podman\-system\-connection\-remove - Delete named destination
 
 ## SYNOPSIS
-**podman system connection remove** *name*
+**podman system connection remove** [*options*] *name*
 
 ## DESCRIPTION
 Delete named ssh destination.
 
+## OPTIONS
+
+#### **--all**=*false*, **-a**
+
+Remove all connections.
+
 ## EXAMPLE
 ```
 $ podman system connection remove production
diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go
index 842ae8df6..d80e6d5a0 100644
--- a/test/e2e/system_connection_test.go
+++ b/test/e2e/system_connection_test.go
@@ -181,6 +181,31 @@ var _ = Describe("podman system connection", func() {
 		}
 	})
 
+	It("remove --all", func() {
+		cmd := []string{"system", "connection", "add",
+			"--default",
+			"--identity", "~/.ssh/id_rsa",
+			"QA",
+			"ssh://root@server.fubar.com:2222/run/podman/podman.sock",
+		}
+		session := podmanTest.Podman(cmd)
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+
+		cmd = []string{"system", "connection", "remove", "--all"}
+		session = podmanTest.Podman(cmd)
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+		Expect(session.Out).Should(Say(""))
+
+		cmd = []string{"system", "connection", "list"}
+		session = podmanTest.Podman(cmd)
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+		Expect(session.Out).Should(Say(""))
+		Expect(session.Err).Should(Say(""))
+	})
+
 	It("default", func() {
 		for _, name := range []string{"devl", "qe"} {
 			cmd := []string{"system", "connection", "add",
diff --git a/test/system/272-system-connection.bats b/test/system/272-system-connection.bats
index 5a90d9398..14c4f6664 100644
--- a/test/system/272-system-connection.bats
+++ b/test/system/272-system-connection.bats
@@ -34,10 +34,7 @@ function teardown() {
         | xargs -l1 --no-run-if-empty umount
 
     # Remove all system connections
-    run_podman system connection ls --format json
-    while read name; do
-        run_podman system connection rm "$name"
-    done < <(jq -r '.[].Name' <<<"$output")
+    run_podman system connection rm --all
 
     basic_teardown
 }