[Techinal Debt] Cleanup ABI vs. Tunnel CLI commands

[NO TESTS NEEDED]

This commit cleans up two issues:
* Most commands support all EngineModes so default to that. Let
  outlayers declare their intent.
* Use cobra.Annotations to set supported EngineMode. This simplies
  instantiating commands as there is now one method to communicate a
  commands requirements rather than two.
* Combined aliased commands into one file
* Fixed aliased commands where Args field did not match
* Updated examples in README.md for writing commands
* Remove redundant flag DisableFlagsInUseLine in cobra.Command
  initialization.

Signed-off-by: Jhon Honce <jhonce@redhat.com>

2 files changed, 9 insertions, 15 deletions

diff --git a/cmd/podman/healthcheck/healthcheck.go b/cmd/podman/healthcheck/healthcheck.go
index 4a986e171..b42ae2182 100644
--- a/cmd/podman/healthcheck/healthcheck.go
+++ b/cmd/podman/healthcheck/healthcheck.go
@@ -3,12 +3,10 @@ package healthcheck
 import (
 	"github.com/containers/podman/v3/cmd/podman/registry"
 	"github.com/containers/podman/v3/cmd/podman/validate"
-	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
 var (
-	// Command: healthcheck
 	healthCmd = &cobra.Command{
 		Use:   "healthcheck",
 		Short: "Manage health checks on containers",
@@ -19,7 +17,6 @@ var (
 
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: healthCmd,
 	})
 }
diff --git a/cmd/podman/healthcheck/run.go b/cmd/podman/healthcheck/run.go
index 50a51d172..fe8dc2573 100644
--- a/cmd/podman/healthcheck/run.go
+++ b/cmd/podman/healthcheck/run.go
@@ -11,23 +11,20 @@ import (
 )
 
 var (
-	healthcheckRunDescription = "run the health check of a container"
-	healthcheckrunCommand     = &cobra.Command{
-		Use:                   "run CONTAINER",
-		Short:                 "run the health check of a container",
-		Long:                  healthcheckRunDescription,
-		Example:               `podman healthcheck run mywebapp`,
-		RunE:                  run,
-		Args:                  cobra.ExactArgs(1),
-		ValidArgsFunction:     common.AutocompleteContainersRunning,
-		DisableFlagsInUseLine: true,
+	runCmd = &cobra.Command{
+		Use:               "run CONTAINER",
+		Short:             "run the health check of a container",
+		Long:              "run the health check of a container",
+		Example:           `podman healthcheck run mywebapp`,
+		RunE:              run,
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: common.AutocompleteContainersRunning,
 	}
 )
 
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
-		Command: healthcheckrunCommand,
+		Command: runCmd,
 		Parent:  healthCmd,
 	})
 }