From d3ef846b5920d8aafc8332111bfc726207796ce6 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Feb 2020 16:56:35 -0500 Subject: [PATCH] fix: correct stickler issues --- plugins/common/common.go | 2 +- plugins/proxy/proxy.go | 3 ++- plugins/proxy/subcommands.go | 2 +- plugins/proxy/triggers.go | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/common/common.go b/plugins/common/common.go index e42801f82..118924559 100644 --- a/plugins/common/common.go +++ b/plugins/common/common.go @@ -395,7 +395,7 @@ func ReportSingleApp(reportType string, appName string, infoFlag string, infoFla strkeys[i] = keys[i].String() } - return errors.New(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", "))) + return fmt.Errorf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")) } // RightPad right-pads the string with pad up to len runes diff --git a/plugins/proxy/proxy.go b/plugins/proxy/proxy.go index aeab9736e..522241d08 100644 --- a/plugins/proxy/proxy.go +++ b/plugins/proxy/proxy.go @@ -12,6 +12,7 @@ import ( columnize "github.com/ryanuber/columnize" ) +// PortMap is a struct that contains a scheme:host-port:container-port mapping type PortMap struct { ContainerPort int HostPort int @@ -167,7 +168,7 @@ func removeProxyPorts(appName string, proxyPortMap []PortMap) error { func parseProxyPortMapString(stringPortMap string) []PortMap { var proxyPortMap []PortMap - for _, v := range strings.Split(strings.TrimSpace(stringPortMap), "") { + for _, v := range strings.Split(strings.TrimSpace(stringPortMap), " ") { parts := strings.SplitN(v, ":", 3) if len(parts) != 3 { common.LogWarn(fmt.Sprintf("Invalid port map %s", v)) diff --git a/plugins/proxy/subcommands.go b/plugins/proxy/subcommands.go index 89fbc35ee..bcddd4e41 100644 --- a/plugins/proxy/subcommands.go +++ b/plugins/proxy/subcommands.go @@ -190,7 +190,7 @@ func CommandSet(args []string) error { } if len(appName) < 2 { - return errors.New("Please specify a proxy type!") + return errors.New("Please specify a proxy type") } proxyType := args[1] diff --git a/plugins/proxy/triggers.go b/plugins/proxy/triggers.go index cc82dff84..626f95a30 100644 --- a/plugins/proxy/triggers.go +++ b/plugins/proxy/triggers.go @@ -6,6 +6,7 @@ import ( "github.com/dokku/dokku/plugins/config" ) +// TriggerProxyIsEnabled prints true or false depending on whether the proxy is enabled func TriggerProxyIsEnabled(appName string) error { if IsAppProxyEnabled(appName) { fmt.Println("true") @@ -16,6 +17,7 @@ func TriggerProxyIsEnabled(appName string) error { return nil } +// TriggerProxyType prints out the current proxy type, defaulting to nginx func TriggerProxyType(appName string) error { proxyType := getAppProxyType(appName) fmt.Println(proxyType) @@ -23,6 +25,7 @@ func TriggerProxyType(appName string) error { return nil } +// TriggerPostCertsRemove unsets port config vars after SSL cert is added func TriggerPostCertsRemove(appName string) error { keys := []string{"DOKKU_PROXY_SSL_PORT"} if err := config.UnsetMany(appName, keys, false); err != nil { @@ -32,7 +35,7 @@ func TriggerPostCertsRemove(appName string) error { return removeProxyPorts(appName, filterAppProxyPorts(appName, "https", 443)) } -// TriggerPostCertsUpdate unsets port config vars after SSL cert is added +// TriggerPostCertsUpdate sets port config vars after SSL cert is added func TriggerPostCertsUpdate(appName string) error { port := config.GetWithDefault(appName, "DOKKU_PROXY_PORT", "") sslPort := config.GetWithDefault(appName, "DOKKU_PROXY_SSL_PORT", "")