cli/command/system/runInfo: set negotiated API version when available

thaJeztah · thaJeztah · commit 64bf642345c0 · 2023-11-23T15:59:27.000+01:00
The current logic was ignoring (e.g.) `--format=json` formats, and was
only setting the negotiated API version if no format was specified.

While we do want to avoid calling the API if possible, we do already
check if the given template requires a server connection, so let's
move updating the API version to that block.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cli/command/system/info.go b/cli/command/system/info.go
@@ -111,11 +111,11 @@ func runInfo(cmd *cobra.Command, dockerCli command.Cli, opts *infoOptions) error
 				fprintln(dockerCli.Err(), err)
 			}
 		}
+		info.ClientInfo.APIVersion = dockerCli.CurrentVersion()
 	}
 
 	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)

Original file line number	Diff line number	Diff line change
`@@ -111,11 +111,11 @@ func runInfo(cmd cobra.Command, dockerCli command.Cli, opts infoOptions) error`
`111`	`111`	`fprintln(dockerCli.Err(), err)`
`112`	`112`	`}`
`113`	`113`	`}`
	`114`	`+ info.ClientInfo.APIVersion = dockerCli.CurrentVersion()`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`if opts.format == "" {`
`117`	`118`	`info.UserName = dockerCli.ConfigFile().AuthConfigs[registry.IndexServer].Username`
`118`		`- info.ClientInfo.APIVersion = dockerCli.CurrentVersion()`
`119`	`119`	`return prettyPrintInfo(dockerCli, info)`
`120`	`120`	`}`
`121`	`121`	`return formatInfo(dockerCli.Out(), info, opts.format)`