Merge d6ce04640f into d2b87a0a3b

cli/command/registry/login.go

@@ -58,9 +58,9 @@ func NewLoginCommand(dockerCli command.Cli) *cobra.Command {
 	return cmd
 }
 
-func verifyLoginOptions(dockerCli command.Cli, opts *loginOptions) error {
+func verifyloginOptions(dockerCli command.Cli, opts *loginOptions) error {
 	if opts.password != "" {
-		_, _ = fmt.Fprintln(dockerCli.Err(), "WARNING! Using --password via the CLI is insecure. Use --password-stdin.")
+		fmt.Fprintln(dockerCli.Err(), "WARNING! Using --password via the CLI is insecure. Use --password-stdin.")
 		if opts.passwordStdin {
 			return errors.New("--password and --password-stdin are mutually exclusive")
 		}
@@ -83,7 +83,7 @@ func verifyLoginOptions(dockerCli command.Cli, opts *loginOptions) error {
 }
 
 func runLogin(ctx context.Context, dockerCli command.Cli, opts loginOptions) error {
-	if err := verifyLoginOptions(dockerCli, &opts); err != nil {
+	if err := verifyloginOptions(dockerCli, &opts); err != nil {
 		return err
 	}
 	var (
@@ -174,7 +174,7 @@ func loginUser(ctx context.Context, dockerCli command.Cli, opts loginOptions, de
 		if !errors.Is(err, manager.ErrDeviceLoginStartFail) {
 			return response, err
 		}
-		_, _ = fmt.Fprint(dockerCli.Err(), "Failed to start web-based login - falling back to command line login...\n\n")
+		fmt.Fprint(dockerCli.Err(), "Failed to start web-based login - falling back to command line login...\n\n")
 	}
 
 	return loginWithUsernameAndPassword(ctx, dockerCli, opts, defaultUsername, serverAddress)

cli/command/utils.go

@@ -199,7 +199,7 @@ func PruneFilters(dockerCli Cli, pruneFilters filters.Args) filters.Args {
 // AddPlatformFlag adds `platform` to a set of flags for API version 1.32 and later.
 func AddPlatformFlag(flags *pflag.FlagSet, target *string) {
 	flags.StringVar(target, "platform", os.Getenv("DOCKER_DEFAULT_PLATFORM"), "Set platform if server is multi-platform capable")
-	_ = flags.SetAnnotation("platform", "version", []string{"1.32"})
+	flags.SetAnnotation("platform", "version", []string{"1.32"})
 }
 
 // ValidateOutputPath validates the output paths of the `export` and `save` commands.

cli/hints/hints.go

@@ -5,9 +5,7 @@ import (
 	"strconv"
 )
 
-// Enabled returns whether cli hints are enabled or not. Hints are enabled by
+// Enabled returns whether cli hints are enabled or not
-// default, but can be disabled through the "DOCKER_CLI_HINTS" environment
-// variable.
 func Enabled() bool {
 	if v := os.Getenv("DOCKER_CLI_HINTS"); v != "" {
 		enabled, err := strconv.ParseBool(v)

cli/hints/hints_test.go

@@ -1,52 +0,0 @@
-package hints
-
-import (
-	"testing"
-
-	"gotest.tools/v3/assert"
-)
-
-func TestEnabled(t *testing.T) {
-	tests := []struct {
-		doc      string
-		env      string
-		expected bool
-	}{
-		{
-			doc:      "default",
-			expected: true,
-		},
-		{
-			doc:      "DOCKER_CLI_HINTS=1",
-			env:      "1",
-			expected: true,
-		},
-		{
-			doc:      "DOCKER_CLI_HINTS=true",
-			env:      "true",
-			expected: true,
-		},
-		{
-			doc:      "DOCKER_CLI_HINTS=0",
-			env:      "0",
-			expected: false,
-		},
-		{
-			doc:      "DOCKER_CLI_HINTS=false",
-			env:      "false",
-			expected: false,
-		},
-		{
-			doc:      "DOCKER_CLI_HINTS=not-a-bool",
-			env:      "not-a-bool",
-			expected: true,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.doc, func(t *testing.T) {
-			t.Setenv("DOCKER_CLI_HINTS", tc.env)
-			assert.Equal(t, Enabled(), tc.expected)
-		})
-	}
-}