Golangcilint in build pipeline and fix lint errors

- Fix bad permissions bits for files - VPNSP is 'private internet access' instead of 'pia' (retro compatible) - Check errors of deferred unsetEnv functions in params package - Other lint errors fixing and code simplifications
2020-04-12 20:05:28 +00:00
parent 8f6b6306d6
commit 768147095f
43 changed files with 2742 additions and 2598 deletions
--- a/internal/settings/tinyproxy.go
+++ b/internal/settings/tinyproxy.go
@@ -1,59 +1,59 @@
-package settings
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/qdm12/private-internet-access-docker/internal/models"
-	"github.com/qdm12/private-internet-access-docker/internal/params"
-)
-
-// TinyProxy contains settings to configure TinyProxy
-type TinyProxy struct {
-	Enabled  bool
-	User     string
-	Password string
-	Port     uint16
-	LogLevel models.TinyProxyLogLevel
-}
-
-func (t *TinyProxy) String() string {
-	if !t.Enabled {
-		return "TinyProxy settings: disabled"
-	}
-	auth := "disabled"
-	if t.User != "" {
-		auth = "enabled"
-	}
-	settingsList := []string{
-		fmt.Sprintf("Port: %d", t.Port),
-		"Authentication: " + auth,
-		"Log level: " + string(t.LogLevel),
-	}
-	return "TinyProxy settings:\n" + strings.Join(settingsList, "\n |--")
-}
-
-// GetTinyProxySettings obtains TinyProxy settings from environment variables using the params package.
-func GetTinyProxySettings(params params.ParamsReader) (settings TinyProxy, err error) {
-	settings.Enabled, err = params.GetTinyProxy()
-	if err != nil || !settings.Enabled {
-		return settings, err
-	}
-	settings.User, err = params.GetTinyProxyUser()
-	if err != nil {
-		return settings, err
-	}
-	settings.Password, err = params.GetTinyProxyPassword()
-	if err != nil {
-		return settings, err
-	}
-	settings.Port, err = params.GetTinyProxyPort()
-	if err != nil {
-		return settings, err
-	}
-	settings.LogLevel, err = params.GetTinyProxyLog()
-	if err != nil {
-		return settings, err
-	}
-	return settings, nil
-}
+package settings
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/qdm12/private-internet-access-docker/internal/models"
+	"github.com/qdm12/private-internet-access-docker/internal/params"
+)
+
+// TinyProxy contains settings to configure TinyProxy
+type TinyProxy struct {
+	User     string
+	Password string
+	LogLevel models.TinyProxyLogLevel
+	Port     uint16
+	Enabled  bool
+}
+
+func (t *TinyProxy) String() string {
+	if !t.Enabled {
+		return "TinyProxy settings: disabled"
+	}
+	auth := "disabled"
+	if t.User != "" {
+		auth = "enabled"
+	}
+	settingsList := []string{
+		fmt.Sprintf("Port: %d", t.Port),
+		"Authentication: " + auth,
+		"Log level: " + string(t.LogLevel),
+	}
+	return "TinyProxy settings:\n" + strings.Join(settingsList, "\n |--")
+}
+
+// GetTinyProxySettings obtains TinyProxy settings from environment variables using the params package.
+func GetTinyProxySettings(paramsReader params.Reader) (settings TinyProxy, err error) {
+	settings.Enabled, err = paramsReader.GetTinyProxy()
+	if err != nil || !settings.Enabled {
+		return settings, err
+	}
+	settings.User, err = paramsReader.GetTinyProxyUser()
+	if err != nil {
+		return settings, err
+	}
+	settings.Password, err = paramsReader.GetTinyProxyPassword()
+	if err != nil {
+		return settings, err
+	}
+	settings.Port, err = paramsReader.GetTinyProxyPort()
+	if err != nil {
+		return settings, err
+	}
+	settings.LogLevel, err = paramsReader.GetTinyProxyLog()
+	if err != nil {
+		return settings, err
+	}
+	return settings, nil
+}