system/info: failure to connect to docker socket should propagate error

Signed-off-by: Alano Terblanche <[email protected]>

Author: Benehiko

cli/command/system/info.go

@@ -22,6 +22,7 @@ import (
 	"github.com/docker/cli/templates"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/system"
+	"github.com/docker/docker/client"
 	"github.com/docker/docker/registry"
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
@@ -89,37 +90,32 @@ func runInfo(ctx context.Context, cmd *cobra.Command, dockerCli command.Cli, opt
 			clientVersion: newClientVersion(dockerCli.CurrentContext(), nil),
 			Debug:         debug.IsEnabled(),
 		},
-		Info: &system.Info{},
+		Info: nil,
 	}
 	if plugins, err := pluginmanager.ListPlugins(dockerCli, cmd.Root()); err == nil {
 		info.ClientInfo.Plugins = plugins
 	} else {
 		info.ClientErrors = append(info.ClientErrors, err.Error())
 	}
 
+	if opts.format == "" {
+		info.UserName = dockerCli.ConfigFile().AuthConfigs[registry.IndexServer].Username
+		info.ClientInfo.APIVersion = dockerCli.CurrentVersion()
+	}
+
 	if needsServerInfo(opts.format, info) {
-		if dinfo, err := dockerCli.Client().Info(ctx); err == nil {
-			info.Info = &dinfo
-		} else {
+		dinfo, err := dockerCli.Client().Info(ctx)
+		if err != nil && client.IsErrConnectionFailed(err) {
+			printErr := prettyPrintInfo(dockerCli, info)
+			return cli.StatusError{StatusCode: 125, Cause: errors.Join(err, printErr)}
+		} else if err != nil {
+			// if a format is provided, print the error, as it may be hidden
+			// otherwise if the template doesn't include the ServerErrors field.
 			info.ServerErrors = append(info.ServerErrors, err.Error())
-			if opts.format == "" {
-				// reset the server info to prevent printing "empty" Server info
-				// and warnings, but don't reset it if a custom format was specified
-				// to prevent errors from Go's template parsing during format.
-				info.Info = nil
-			} else {
-				// if a format is provided, print the error, as it may be hidden
-				// otherwise if the template doesn't include the ServerErrors field.
-				fprintln(dockerCli.Err(), err)
-			}
 		}
+		info.Info = &dinfo
 	}
 
-	if opts.format == "" {
-		info.UserName = dockerCli.ConfigFile().AuthConfigs[registry.IndexServer].Username
-		info.ClientInfo.APIVersion = dockerCli.CurrentVersion()
-		return prettyPrintInfo(dockerCli, info)
-	}
 	return formatInfo(dockerCli.Out(), info, opts.format)
 }