Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify ElectAuthServer 

Instead of using an `if else if else`, switch to a sequence of independent
`if` blocks containing a `return`.

Instead of defining a return variable and updating it in the `if` blocks
and returning at the end, make each `if` block return the desired value
independenly.

Signed-off-by: David Scott <dave.scott@docker.com>
This commit is contained in:
David Scott 2019-03-28 21:08:00 +00:00
parent a82e6868cc
commit c9d0e47414
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cli/command/registry.go
View File

@ -28,21 +28,22 @@ func ElectAuthServer(ctx context.Context, cli Cli) string {
// used. This is essential in cross-platforms environment, where for // used. This is essential in cross-platforms environment, where for
// example a Linux client might be interacting with a Windows daemon, hence // example a Linux client might be interacting with a Windows daemon, hence
// the default registry URL might be Windows specific. // the default registry URL might be Windows specific.
serverAddress := registry.IndexServer info, err := cli.Client().Info(ctx)
if info, err := cli.Client().Info(ctx); err != nil { if err != nil {
// Daemon is not responding so use system default. // Daemon is not responding so use system default.
if debug.IsEnabled() { if debug.IsEnabled() {
// Only report the warning if we're in debug mode to prevent nagging during engine initialization workflows // Only report the warning if we're in debug mode to prevent nagging during engine initialization workflows
fmt.Fprintf(cli.Err(), "Warning: failed to get default registry endpoint from daemon (%v). Using system default: %s\n", err, serverAddress) fmt.Fprintf(cli.Err(), "Warning: failed to get default registry endpoint from daemon (%v). Using system default: %s\n", err, registry.IndexServer)
} }
} else if info.IndexServerAddress == "" { return registry.IndexServer
}
if info.IndexServerAddress == "" {
if debug.IsEnabled() { if debug.IsEnabled() {
fmt.Fprintf(cli.Err(), "Warning: Empty registry endpoint from daemon. Using system default: %s\n", serverAddress) fmt.Fprintf(cli.Err(), "Warning: Empty registry endpoint from daemon. Using system default: %s\n", registry.IndexServer)
} }
} else { return registry.IndexServer
serverAddress = info.IndexServerAddress
} }
return serverAddress return info.IndexServerAddress
} }
// EncodeAuthToBase64 serializes the auth configuration as JSON base64 payload // EncodeAuthToBase64 serializes the auth configuration as JSON base64 payload