[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>

1 files changed, 5 insertions, 6 deletions

diff --git a/cmd/podman/images/trust.go b/cmd/podman/images/trust.go
index 2c51bb5f8..28eb53193 100644
--- a/cmd/podman/images/trust.go
+++ b/cmd/podman/images/trust.go
@@ -3,7 +3,6 @@ package images
 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"
 )
 
@@ -11,16 +10,16 @@ var (
 	trustDescription = `Manages which registries you trust as a source of container images based on their location.
   The location is determined by the transport and the registry host of the image.  Using this container image docker://quay.io/podman/stable as an example, docker is the transport and quay.io is the registry host.`
 	trustCmd = &cobra.Command{
-		Use:   "trust",
-		Short: "Manage container image trust policy",
-		Long:  trustDescription,
-		RunE:  validate.SubCommandExists,
+		Annotations: map[string]string{registry.EngineMode: registry.ABIMode},
+		Use:         "trust",
+		Short:       "Manage container image trust policy",
+		Long:        trustDescription,
+		RunE:        validate.SubCommandExists,
 	}
 )
 
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode},
 		Command: trustCmd,
 		Parent:  imageCmd,
 	})