From e13211498bb241336de23fe8abad21bb1f8dee09 Mon Sep 17 00:00:00 2001 From: Sevki Hasirci Date: Mon, 20 Jul 2015 20:48:00 +0300 Subject: [PATCH 1/2] golint fix TLs->TLS in docker/ Signed-off-by: Sevki Hasirci Upstream-commit: 16ea3cf3a3cd0ce19f6c55138992442cd6cfddc8 Component: engine --- components/engine/docker/daemon.go | 4 ++-- components/engine/docker/docker.go | 8 ++++---- components/engine/docker/flags.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/engine/docker/daemon.go b/components/engine/docker/daemon.go index cf2a3a213e..338d6208bc 100644 --- a/components/engine/docker/daemon.go +++ b/components/engine/docker/daemon.go @@ -123,8 +123,8 @@ func mainDaemon() { } serverConfig = setPlatformServerConfig(serverConfig, daemonCfg) - if *flTls { - if *flTlsVerify { + if *flTlS { + if *flTlSVerify { tlsOptions.ClientAuth = tls.RequireAndVerifyClientCert } tlsConfig, err := tlsconfig.Server(tlsOptions) diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go index d9f9c43a6a..195c4ab124 100644 --- a/components/engine/docker/docker.go +++ b/components/engine/docker/docker.go @@ -92,8 +92,8 @@ func main() { // Regardless of whether the user sets it to true or false, if they // specify --tlsverify at all then we need to turn on tls // *flTlsVerify can be true even if not set due to DOCKER_TLS_VERIFY env var, so we need to check that here as well - if flag.IsSet("-tlsverify") || *flTlsVerify { - *flTls = true + if flag.IsSet("-tlsverify") || *flTlSVerify { + *flTlS = true } if *flDaemon { @@ -114,8 +114,8 @@ func main() { protoAddrParts := strings.SplitN(flHosts[0], "://", 2) var tlsConfig *tls.Config - if *flTls { - tlsOptions.InsecureSkipVerify = !*flTlsVerify + if *flTlS { + tlsOptions.InsecureSkipVerify = !*flTlSVerify if !flag.IsSet("-tlscert") { if _, err := os.Stat(tlsOptions.CertFile); os.IsNotExist(err) { tlsOptions.CertFile = "" diff --git a/components/engine/docker/flags.go b/components/engine/docker/flags.go index 90b687e408..b53c760118 100644 --- a/components/engine/docker/flags.go +++ b/components/engine/docker/flags.go @@ -26,7 +26,7 @@ func (a byName) Less(i, j int) bool { return a[i].name < a[j].name } var ( dockerCertPath = os.Getenv("DOCKER_CERT_PATH") - dockerTlsVerify = os.Getenv("DOCKER_TLS_VERIFY") != "" + dockerTlSVerify = os.Getenv("DOCKER_TLS_VERIFY") != "" dockerCommands = []command{ {"attach", "Attach to a running container"}, @@ -91,9 +91,9 @@ var ( flDaemon = flag.Bool([]string{"d", "-daemon"}, false, "Enable daemon mode") flDebug = flag.Bool([]string{"D", "-debug"}, false, "Enable debug mode") flLogLevel = flag.String([]string{"l", "-log-level"}, "info", "Set the logging level") - flTls = flag.Bool([]string{"-tls"}, false, "Use TLS; implied by --tlsverify") + flTlS = flag.Bool([]string{"-tls"}, false, "Use TLS; implied by --tlsverify") flHelp = flag.Bool([]string{"h", "-help"}, false, "Print usage") - flTlsVerify = flag.Bool([]string{"-tlsverify"}, dockerTlsVerify, "Use TLS and verify the remote") + flTlSVerify = flag.Bool([]string{"-tlsverify"}, dockerTlSVerify, "Use TLS and verify the remote") // these are initialized in init() below since their default values depend on dockerCertPath which isn't fully initialized until init() runs tlsOptions tlsconfig.Options From 27f60d95025f7a72a77a22fe88c11ae5fdbc9e9f Mon Sep 17 00:00:00 2001 From: Sevki Hasirci Date: Mon, 20 Jul 2015 21:14:45 +0300 Subject: [PATCH 2/2] fix mixed typo TlS -> TLS Signed-off-by: Sevki Hasirci Upstream-commit: ce3156f1ebab0857b686682b317410f0eb27f6d5 Component: engine --- components/engine/docker/daemon.go | 4 ++-- components/engine/docker/docker.go | 8 ++++---- components/engine/docker/flags.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/engine/docker/daemon.go b/components/engine/docker/daemon.go index 338d6208bc..e7e0dfe3f9 100644 --- a/components/engine/docker/daemon.go +++ b/components/engine/docker/daemon.go @@ -123,8 +123,8 @@ func mainDaemon() { } serverConfig = setPlatformServerConfig(serverConfig, daemonCfg) - if *flTlS { - if *flTlSVerify { + if *flTLS { + if *flTLSVerify { tlsOptions.ClientAuth = tls.RequireAndVerifyClientCert } tlsConfig, err := tlsconfig.Server(tlsOptions) diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go index 195c4ab124..b589f94440 100644 --- a/components/engine/docker/docker.go +++ b/components/engine/docker/docker.go @@ -92,8 +92,8 @@ func main() { // Regardless of whether the user sets it to true or false, if they // specify --tlsverify at all then we need to turn on tls // *flTlsVerify can be true even if not set due to DOCKER_TLS_VERIFY env var, so we need to check that here as well - if flag.IsSet("-tlsverify") || *flTlSVerify { - *flTlS = true + if flag.IsSet("-tlsverify") || *flTLSVerify { + *flTLS = true } if *flDaemon { @@ -114,8 +114,8 @@ func main() { protoAddrParts := strings.SplitN(flHosts[0], "://", 2) var tlsConfig *tls.Config - if *flTlS { - tlsOptions.InsecureSkipVerify = !*flTlSVerify + if *flTLS { + tlsOptions.InsecureSkipVerify = !*flTLSVerify if !flag.IsSet("-tlscert") { if _, err := os.Stat(tlsOptions.CertFile); os.IsNotExist(err) { tlsOptions.CertFile = "" diff --git a/components/engine/docker/flags.go b/components/engine/docker/flags.go index b53c760118..9243b46f4d 100644 --- a/components/engine/docker/flags.go +++ b/components/engine/docker/flags.go @@ -91,9 +91,9 @@ var ( flDaemon = flag.Bool([]string{"d", "-daemon"}, false, "Enable daemon mode") flDebug = flag.Bool([]string{"D", "-debug"}, false, "Enable debug mode") flLogLevel = flag.String([]string{"l", "-log-level"}, "info", "Set the logging level") - flTlS = flag.Bool([]string{"-tls"}, false, "Use TLS; implied by --tlsverify") + flTLS = flag.Bool([]string{"-tls"}, false, "Use TLS; implied by --tlsverify") flHelp = flag.Bool([]string{"h", "-help"}, false, "Print usage") - flTlSVerify = flag.Bool([]string{"-tlsverify"}, dockerTlSVerify, "Use TLS and verify the remote") + flTLSVerify = flag.Bool([]string{"-tlsverify"}, dockerTlSVerify, "Use TLS and verify the remote") // these are initialized in init() below since their default values depend on dockerCertPath which isn't fully initialized until init() runs tlsOptions tlsconfig.Options