Browse code
Remove used param on ParseHost
The first param on opts.ParseHost() wasn't being used for anything.
Once we get rid of that param we can then also clean-up some code
that calls ParseHost() because the param that was passed in wasn't
being used for anything else.
Signed-off-by: Doug Davis <dug@us.ibm.com>
Doug Davis authored on 2015/10/12 12:45:17Showing 4 changed files
| ... | ... |
@@ -105,20 +105,15 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF |
| 105 | 105 |
|
| 106 | 106 |
switch len(hosts) {
|
| 107 | 107 |
case 0: |
| 108 |
- defaultHost := os.Getenv("DOCKER_HOST")
|
|
| 109 |
- hosts = []string{defaultHost}
|
|
| 108 |
+ hosts = []string{os.Getenv("DOCKER_HOST")}
|
|
| 110 | 109 |
case 1: |
| 111 | 110 |
// only accept one host to talk to |
| 112 | 111 |
default: |
| 113 | 112 |
return errors.New("Please specify only one -H")
|
| 114 | 113 |
} |
| 115 | 114 |
|
| 116 |
- defaultHost := opts.DefaultTCPHost |
|
| 117 |
- if clientFlags.Common.TLSOptions != nil {
|
|
| 118 |
- defaultHost = opts.DefaultTLSHost |
|
| 119 |
- } |
|
| 120 | 115 |
var e error |
| 121 |
- if hosts[0], e = opts.ParseHost(defaultHost, hosts[0]); e != nil {
|
|
| 116 |
+ if hosts[0], e = opts.ParseHost(hosts[0]); e != nil {
|
|
| 122 | 117 |
return e |
| 123 | 118 |
} |
| 124 | 119 |
|
| ... | ... |
@@ -210,7 +210,6 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
|
| 210 | 210 |
} |
| 211 | 211 |
serverConfig = setPlatformServerConfig(serverConfig, cli.Config) |
| 212 | 212 |
|
| 213 |
- defaultHost := opts.DefaultHost |
|
| 214 | 213 |
if commonFlags.TLSOptions != nil {
|
| 215 | 214 |
if !commonFlags.TLSOptions.InsecureSkipVerify {
|
| 216 | 215 |
// server requires and verifies client's certificate |
| ... | ... |
@@ -221,12 +220,11 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
|
| 221 | 221 |
logrus.Fatal(err) |
| 222 | 222 |
} |
| 223 | 223 |
serverConfig.TLSConfig = tlsConfig |
| 224 |
- defaultHost = opts.DefaultTLSHost |
|
| 225 | 224 |
} |
| 226 | 225 |
|
| 227 | 226 |
for i := 0; i < len(commonFlags.Hosts); i++ {
|
| 228 | 227 |
var err error |
| 229 |
- if commonFlags.Hosts[i], err = opts.ParseHost(defaultHost, commonFlags.Hosts[i]); err != nil {
|
|
| 228 |
+ if commonFlags.Hosts[i], err = opts.ParseHost(commonFlags.Hosts[i]); err != nil {
|
|
| 230 | 229 |
logrus.Fatalf("error parsing -H %s : %v", commonFlags.Hosts[i], err)
|
| 231 | 230 |
} |
| 232 | 231 |
} |
| ... | ... |
@@ -352,7 +352,7 @@ func ValidateHost(val string) (string, error) {
|
| 352 | 352 |
} |
| 353 | 353 |
|
| 354 | 354 |
// ParseHost and set defaults for a Daemon host string |
| 355 |
-func ParseHost(defaultHTTPHost, val string) (string, error) {
|
|
| 355 |
+func ParseHost(val string) (string, error) {
|
|
| 356 | 356 |
host, err := parsers.ParseDockerDaemonHost(DefaultTCPHost, DefaultUnixSocket, val) |
| 357 | 357 |
if err != nil {
|
| 358 | 358 |
return val, err |
| ... | ... |
@@ -458,12 +458,12 @@ func TestParseHost(t *testing.T) {
|
| 458 | 458 |
} |
| 459 | 459 |
|
| 460 | 460 |
for value, errorMessage := range invalid {
|
| 461 |
- if _, err := ParseHost(defaultHTTPHost, value); err == nil || err.Error() != errorMessage {
|
|
| 461 |
+ if _, err := ParseHost(value); err == nil || err.Error() != errorMessage {
|
|
| 462 | 462 |
t.Fatalf("Expected an error for %v with [%v], got [%v]", value, errorMessage, err)
|
| 463 | 463 |
} |
| 464 | 464 |
} |
| 465 | 465 |
for value, expected := range valid {
|
| 466 |
- if actual, err := ParseHost(defaultHTTPHost, value); err != nil || actual != expected {
|
|
| 466 |
+ if actual, err := ParseHost(value); err != nil || actual != expected {
|
|
| 467 | 467 |
t.Fatalf("Expected for %v [%v], got [%v, %v]", value, expected, actual, err)
|
| 468 | 468 |
} |
| 469 | 469 |
} |