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/openvpn.go
+++ b/internal/settings/openvpn.go
@@ -1,66 +1,66 @@
-package settings
-
-import (
-	"fmt"
-	"net"
-	"strings"
-
-	"github.com/qdm12/private-internet-access-docker/internal/models"
-	"github.com/qdm12/private-internet-access-docker/internal/params"
-)
-
-// OpenVPN contains settings to configure the OpenVPN client
-type OpenVPN struct {
-	NetworkProtocol models.NetworkProtocol
-	Verbosity       int
-	Root            bool
-	TargetIP        net.IP
-	Cipher          string
-	Auth            string
-}
-
-// GetOpenVPNSettings obtains the OpenVPN settings using the params functions
-func GetOpenVPNSettings(params params.ParamsReader) (settings OpenVPN, err error) {
-	settings.NetworkProtocol, err = params.GetNetworkProtocol()
-	if err != nil {
-		return settings, err
-	}
-	settings.Verbosity, err = params.GetOpenVPNVerbosity()
-	if err != nil {
-		return settings, err
-	}
-	settings.Root, err = params.GetOpenVPNRoot()
-	if err != nil {
-		return settings, err
-	}
-	settings.TargetIP, err = params.GetTargetIP()
-	if err != nil {
-		return settings, err
-	}
-	settings.Cipher, err = params.GetOpenVPNCipher()
-	if err != nil {
-		return settings, err
-	}
-	settings.Auth, err = params.GetOpenVPNAuth()
-	if err != nil {
-		return settings, err
-	}
-	return settings, nil
-}
-
-func (o *OpenVPN) String() string {
-	runAsRoot := "no"
-	if o.Root {
-		runAsRoot = "yes"
-	}
-	settingsList := []string{
-		"OpenVPN settings:",
-		"Network protocol: " + string(o.NetworkProtocol),
-		"Verbosity level: " + fmt.Sprintf("%d", o.Verbosity),
-		"Run as root: " + runAsRoot,
-		"Target IP address: " + o.TargetIP.String(),
-		"Custom cipher: " + o.Cipher,
-		"Custom auth algorithm: " + o.Auth,
-	}
-	return strings.Join(settingsList, "\n|--")
-}
+package settings
+
+import (
+	"fmt"
+	"net"
+	"strings"
+
+	"github.com/qdm12/private-internet-access-docker/internal/models"
+	"github.com/qdm12/private-internet-access-docker/internal/params"
+)
+
+// OpenVPN contains settings to configure the OpenVPN client
+type OpenVPN struct {
+	NetworkProtocol models.NetworkProtocol
+	Verbosity       int
+	Root            bool
+	TargetIP        net.IP
+	Cipher          string
+	Auth            string
+}
+
+// GetOpenVPNSettings obtains the OpenVPN settings using the params functions
+func GetOpenVPNSettings(paramsReader params.Reader) (settings OpenVPN, err error) {
+	settings.NetworkProtocol, err = paramsReader.GetNetworkProtocol()
+	if err != nil {
+		return settings, err
+	}
+	settings.Verbosity, err = paramsReader.GetOpenVPNVerbosity()
+	if err != nil {
+		return settings, err
+	}
+	settings.Root, err = paramsReader.GetOpenVPNRoot()
+	if err != nil {
+		return settings, err
+	}
+	settings.TargetIP, err = paramsReader.GetTargetIP()
+	if err != nil {
+		return settings, err
+	}
+	settings.Cipher, err = paramsReader.GetOpenVPNCipher()
+	if err != nil {
+		return settings, err
+	}
+	settings.Auth, err = paramsReader.GetOpenVPNAuth()
+	if err != nil {
+		return settings, err
+	}
+	return settings, nil
+}
+
+func (o *OpenVPN) String() string {
+	runAsRoot := "no"
+	if o.Root {
+		runAsRoot = "yes"
+	}
+	settingsList := []string{
+		"OpenVPN settings:",
+		"Network protocol: " + string(o.NetworkProtocol),
+		"Verbosity level: " + fmt.Sprintf("%d", o.Verbosity),
+		"Run as root: " + runAsRoot,
+		"Target IP address: " + o.TargetIP.String(),
+		"Custom cipher: " + o.Cipher,
+		"Custom auth algorithm: " + o.Auth,
+	}
+	return strings.Join(settingsList, "\n|--")
+}