align "conflicting options" errors for consistency

[thaJeztah]

• follow-up to cli/command/container: stop, restart: rename "--time" to "--timeout" #5485 (comment)

- Description for the changelog

Updated some error messages for "conflicting options" to be more consistent

- A picture of a cute animal (not mandatory but encouraged)

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 60.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 60.05%. Comparing base (3907414) to head (bd96bda).
Report is 2 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #5488   +/-   ##
=======================================
  Coverage   60.04%   60.05%           
=======================================
  Files         345      345           
  Lines       23440    23440           
=======================================
+ Hits        14074    14076    +2     
+ Misses       8391     8390    -1     
+ Partials      975      974    -1     

[thaJeztah]

Oh! Looks like I broke something; I was testing some things, so perhaps I forgot to restore some code;

#20 60.26 === FAIL: cli/command/container TestParseRestartPolicyAutoRemove (0.00s)
#20 60.26     opts_test.go:823: Expected error Conflicting options: --restart and --rm, but got none

[thaJeztah]

LOL, yeah, that test isn't great as it reports "but got none" which... is a LIE!

cli/cli/command/container/opts_test.go

Lines 819 to 825 in 3907414

	func TestParseRestartPolicyAutoRemove(t *testing.T) {
	expected := "Conflicting options: --restart and --rm"
	_, _, _, err := parseRun([]string{"--rm", "--restart=always", "img", "cmd"}) //nolint:dogsled
	if err == nil || err.Error() != expected {
	t.Fatalf("Expected error %v, but got none", expected)
	}
	}

[krissetto]

is there a specific (i'd guess historical) reason this command has support for both an option and a positional arg for the name?

[thaJeztah]

Yeah, there was some back-and-forth whether name should be a positional arg or a flag. The --name was changed to a positional arg, but because it already shipped was kept (but soft-deprecated / hidden).

[thaJeztah]

I think I may have been partially responsible for that, considering that docker volume create foobar is more convenient than docker volume create --name=foobar, but later discussions were that, because name is optional, using a --flag is a more common convention.