Merge pull request #8436 from Luap99/remote-completion

Enable remote shell completion without a running endpoint

1 files changed, 23 insertions, 29 deletions

diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 34d92cd0f..7840e6100 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -113,33 +113,9 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	// Special case if command is hidden completion command ("__complete","__completeNoDesc")
-	// Since __completeNoDesc is an alias the cm.Name is always __complete
-	if cmd.Name() == cobra.ShellCompRequestCmd {
-		// Parse the cli arguments after the the completion cmd (always called as second argument)
-		// This ensures that the --url, --identity and --connection flags are properly set
-		compCmd, _, err := cmd.Root().Traverse(os.Args[2:])
-		if err != nil {
-			return err
-		}
-		// If we don't complete the root cmd hide all root flags
-		// so they won't show up in the completions on subcommands.
-		if compCmd != compCmd.Root() {
-			compCmd.Root().Flags().VisitAll(func(flag *pflag.Flag) {
-				flag.Hidden = true
-			})
-		}
-		// No need for further setup when completing commands with subcommands.
-		if compCmd.HasSubCommands() {
-			requireCleanup = false
-			return nil
-		}
-	}
-
 	cfg := registry.PodmanConfig()
 
 	// --connection is not as "special" as --remote so we can wait and process it here
-	var connErr error
 	conn := cmd.Root().LocalFlags().Lookup("connection")
 	if conn != nil && conn.Changed {
 		cfg.Engine.ActiveService = conn.Value.String()
@@ -147,19 +123,37 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
 		var err error
 		cfg.URI, cfg.Identity, err = cfg.ActiveDestination()
 		if err != nil {
-			connErr = errors.Wrap(err, "failed to resolve active destination")
+			return errors.Wrap(err, "failed to resolve active destination")
 		}
 
 		if err := cmd.Root().LocalFlags().Set("url", cfg.URI); err != nil {
-			connErr = errors.Wrap(err, "failed to override --url flag")
+			return errors.Wrap(err, "failed to override --url flag")
 		}
 
 		if err := cmd.Root().LocalFlags().Set("identity", cfg.Identity); err != nil {
-			connErr = errors.Wrap(err, "failed to override --identity flag")
+			return errors.Wrap(err, "failed to override --identity flag")
 		}
 	}
-	if connErr != nil {
-		return connErr
+
+	// Special case if command is hidden completion command ("__complete","__completeNoDesc")
+	// Since __completeNoDesc is an alias the cm.Name is always __complete
+	if cmd.Name() == cobra.ShellCompRequestCmd {
+		// Parse the cli arguments after the the completion cmd (always called as second argument)
+		// This ensures that the --url, --identity and --connection flags are properly set
+		compCmd, _, err := cmd.Root().Traverse(os.Args[2:])
+		if err != nil {
+			return err
+		}
+		// If we don't complete the root cmd hide all root flags
+		// so they won't show up in the completions on subcommands.
+		if compCmd != compCmd.Root() {
+			compCmd.Root().Flags().VisitAll(func(flag *pflag.Flag) {
+				flag.Hidden = true
+			})
+		}
+		// No need for further setup the completion logic setups the engines as needed.
+		requireCleanup = false
+		return nil
 	}
 
 	// Prep the engines