containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Doug Davis 2015-10-11 20:45:17 -07:00
parent c45ad0b02d
commit ba973f2d74
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/client/cli.go
View File

@ -105,20 +105,15 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
switch len(hosts) { switch len(hosts) {
case 0: case 0:
defaultHost := os.Getenv("DOCKER_HOST") hosts = []string{os.Getenv("DOCKER_HOST")}
hosts = []string{defaultHost}
case 1: case 1:
// only accept one host to talk to // only accept one host to talk to
default: default:
return errors.New("Please specify only one -H") return errors.New("Please specify only one -H")
} }
defaultHost := opts.DefaultTCPHost
if clientFlags.Common.TLSOptions != nil {
defaultHost = opts.DefaultTLSHost
}
var e error var e error
if hosts[0], e = opts.ParseHost(defaultHost, hosts[0]); e != nil { if hosts[0], e = opts.ParseHost(hosts[0]); e != nil {
return e return e
} }

4
docker/daemon.go
View File

@ -210,7 +210,6 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
} }
serverConfig = setPlatformServerConfig(serverConfig, cli.Config) serverConfig = setPlatformServerConfig(serverConfig, cli.Config)
defaultHost := opts.DefaultHost
if commonFlags.TLSOptions != nil { if commonFlags.TLSOptions != nil {
if !commonFlags.TLSOptions.InsecureSkipVerify { if !commonFlags.TLSOptions.InsecureSkipVerify {
// server requires and verifies client's certificate // server requires and verifies client's certificate
@ -221,12 +220,11 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
logrus.Fatal(err) logrus.Fatal(err)
} }
serverConfig.TLSConfig = tlsConfig serverConfig.TLSConfig = tlsConfig
defaultHost = opts.DefaultTLSHost
} }
for i := 0; i < len(commonFlags.Hosts); i++ { for i := 0; i < len(commonFlags.Hosts); i++ {
var err error var err error
if commonFlags.Hosts[i], err = opts.ParseHost(defaultHost, commonFlags.Hosts[i]); err != nil { if commonFlags.Hosts[i], err = opts.ParseHost(commonFlags.Hosts[i]); err != nil {
logrus.Fatalf("error parsing -H %s : %v", commonFlags.Hosts[i], err) logrus.Fatalf("error parsing -H %s : %v", commonFlags.Hosts[i], err)
} }
} }

2
opts/opts.go
View File

@ -352,7 +352,7 @@ func ValidateHost(val string) (string, error) {
} }
// ParseHost and set defaults for a Daemon host string // ParseHost and set defaults for a Daemon host string
func ParseHost(defaultHTTPHost, val string) (string, error) { func ParseHost(val string) (string, error) {
host, err := parsers.ParseDockerDaemonHost(DefaultTCPHost, DefaultUnixSocket, val) host, err := parsers.ParseDockerDaemonHost(DefaultTCPHost, DefaultUnixSocket, val)
if err != nil { if err != nil {
return val, err return val, err

4
opts/opts_test.go
View File

@ -458,12 +458,12 @@ func TestParseHost(t *testing.T) {
} }
for value, errorMessage := range invalid { for value, errorMessage := range invalid {
if _, err := ParseHost(defaultHTTPHost, value); err == nil || err.Error() != errorMessage { if _, err := ParseHost(value); err == nil || err.Error() != errorMessage {
t.Fatalf("Expected an error for %v with [%v], got [%v]", value, errorMessage, err) t.Fatalf("Expected an error for %v with [%v], got [%v]", value, errorMessage, err)
} }
} }
for value, expected := range valid { for value, expected := range valid {
if actual, err := ParseHost(defaultHTTPHost, value); err != nil || actual != expected { if actual, err := ParseHost(value); err != nil || actual != expected {
t.Fatalf("Expected for %v [%v], got [%v, %v]", value, expected, actual, err) t.Fatalf("Expected for %v [%v], got [%v, %v]", value, expected, actual, err)
} }
} }