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/shadowsocks.go
+++ b/internal/settings/shadowsocks.go
@@ -1,60 +1,60 @@
-package settings
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/qdm12/private-internet-access-docker/internal/params"
-)
-
-// ShadowSocks contains settings to configure the Shadowsocks server
-type ShadowSocks struct {
-	Enabled  bool
-	Password string
-	Log      bool
-	Port     uint16
-	Method   string
-}
-
-func (s *ShadowSocks) String() string {
-	if !s.Enabled {
-		return "ShadowSocks settings: disabled"
-	}
-	log := "disabled"
-	if s.Log {
-		log = "enabled"
-	}
-	settingsList := []string{
-		"ShadowSocks settings:",
-		"Password: [redacted]",
-		"Log: " + log,
-		fmt.Sprintf("Port: %d", s.Port),
-		"Method: " + s.Method,
-	}
-	return strings.Join(settingsList, "\n |--")
-}
-
-// GetShadowSocksSettings obtains ShadowSocks settings from environment variables using the params package.
-func GetShadowSocksSettings(params params.ParamsReader) (settings ShadowSocks, err error) {
-	settings.Enabled, err = params.GetShadowSocks()
-	if err != nil || !settings.Enabled {
-		return settings, err
-	}
-	settings.Port, err = params.GetShadowSocksPort()
-	if err != nil {
-		return settings, err
-	}
-	settings.Password, err = params.GetShadowSocksPassword()
-	if err != nil {
-		return settings, err
-	}
-	settings.Log, err = params.GetShadowSocksLog()
-	if err != nil {
-		return settings, err
-	}
-	settings.Method, err = params.GetShadowSocksMethod()
-	if err != nil {
-		return settings, err
-	}
-	return settings, nil
-}
+package settings
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/qdm12/private-internet-access-docker/internal/params"
+)
+
+// ShadowSocks contains settings to configure the Shadowsocks server
+type ShadowSocks struct {
+	Method   string
+	Password string
+	Port     uint16
+	Enabled  bool
+	Log      bool
+}
+
+func (s *ShadowSocks) String() string {
+	if !s.Enabled {
+		return "ShadowSocks settings: disabled"
+	}
+	log := "disabled"
+	if s.Log {
+		log = "enabled"
+	}
+	settingsList := []string{
+		"ShadowSocks settings:",
+		"Password: [redacted]",
+		"Log: " + log,
+		fmt.Sprintf("Port: %d", s.Port),
+		"Method: " + s.Method,
+	}
+	return strings.Join(settingsList, "\n |--")
+}
+
+// GetShadowSocksSettings obtains ShadowSocks settings from environment variables using the params package.
+func GetShadowSocksSettings(paramsReader params.Reader) (settings ShadowSocks, err error) {
+	settings.Enabled, err = paramsReader.GetShadowSocks()
+	if err != nil || !settings.Enabled {
+		return settings, err
+	}
+	settings.Port, err = paramsReader.GetShadowSocksPort()
+	if err != nil {
+		return settings, err
+	}
+	settings.Password, err = paramsReader.GetShadowSocksPassword()
+	if err != nil {
+		return settings, err
+	}
+	settings.Log, err = paramsReader.GetShadowSocksLog()
+	if err != nil {
+		return settings, err
+	}
+	settings.Method, err = paramsReader.GetShadowSocksMethod()
+	if err != nil {
+		return settings, err
+	}
+	return settings, nil
+}