The `QuotedString` option was added in [moby@e4c1f07] and [moby@abe32de] to work around a regression in Docker 1.13 that caused `docker-machine` to fail. `docker-machine` produced instructions on how to set up a cli to connect to the Machine it produced. These instructions used quotes around the paths for TLS certificates, but with an `=` for the flag's values instead of a space; due to this the shell would not handle stripping quotes, so the CLI would now get the value including quotes. Preserving quotes in such cases is expected (and standard behavior), but versions of Docker before 1.13 used a custom "mflag" package for flag parsing, and that package contained custom handling for quotes (added in [moby@0e9c40e]). For other flags, this problem could be solved by the user, but as these instructions were produced by `docker-machine`'s `config` command, an exception was made for the `--tls-xxx` flags. From [moby-29761]: > The flag trimming behaviour is really unusual, and I would say unexpected. > I think removing it is generally the right idea. Since we have one very > common case where it's necessary for backwards compatibility we need to > add a special case, but I don't think we should apply that case to every > flag. The `QuotedString` implementation has various limitations, as it doesn't follow the same handling of quotes as a shell would. Given that Docker Machine reached EOL a long time ago and other options, such as `docker context`, have been added to configure the CLI to connect to a specific host (with corresponding TLS configuration), we should remove the special handling for these flags, as it's inconsitent with all other flags, and not worth maintaining for a tool that no longer exists. This patch deprecates the `QuotedString` option and removes its use. A temporary, non-exported copy is added, but will be removed in the next release. [moby-29761]: https://github.com/moby/moby/issues/29761#issuecomment-270211265 [moby@e4c1f07]:e4c1f07729[moby@abe32de]:abe32de6b4[moby@0e9c40e]:0e9c40eb82[moby@c79a169]:c79a169a35Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
45 lines
1.0 KiB
Go
45 lines
1.0 KiB
Go
package opts
|
|
|
|
// QuotedString is a string that may have extra quotes around the value. The
|
|
// quotes are stripped from the value.
|
|
//
|
|
// Deprecated: This option type is no longer used and will be removed in the next release.
|
|
type QuotedString struct {
|
|
value *string
|
|
}
|
|
|
|
// Set sets a new value
|
|
func (s *QuotedString) Set(val string) error {
|
|
*s.value = trimQuotes(val)
|
|
return nil
|
|
}
|
|
|
|
// Type returns the type of the value
|
|
func (*QuotedString) Type() string {
|
|
return "string"
|
|
}
|
|
|
|
func (s *QuotedString) String() string {
|
|
return *s.value
|
|
}
|
|
|
|
func trimQuotes(value string) string {
|
|
if len(value) < 2 {
|
|
return value
|
|
}
|
|
lastIndex := len(value) - 1
|
|
for _, char := range []byte{'\'', '"'} {
|
|
if value[0] == char && value[lastIndex] == char {
|
|
return value[1:lastIndex]
|
|
}
|
|
}
|
|
return value
|
|
}
|
|
|
|
// NewQuotedString returns a new quoted string option
|
|
//
|
|
// Deprecated: This option type is no longer used and will be removed in the next release.
|
|
func NewQuotedString(value *string) *QuotedString {
|
|
return &QuotedString{value: value}
|
|
}
|