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/pia.go
+++ b/internal/settings/pia.go
@@ -1,74 +1,74 @@
-package settings
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/qdm12/private-internet-access-docker/internal/models"
-	"github.com/qdm12/private-internet-access-docker/internal/params"
-)
-
-// PIA contains the settings to connect to a PIA server
-type PIA struct {
-	User           string
-	Password       string
-	Encryption     models.PIAEncryption
-	Region         models.PIARegion
-	PortForwarding PortForwarding
-}
-
-// PortForwarding contains settings for port forwarding
-type PortForwarding struct {
-	Enabled  bool
-	Filepath models.Filepath
-}
-
-func (p *PortForwarding) String() string {
-	if p.Enabled {
-		return fmt.Sprintf("on, saved in %s", p.Filepath)
-	}
-	return "off"
-}
-
-func (p *PIA) String() string {
-	settingsList := []string{
-		"PIA settings:",
-		"User: [redacted]",
-		"Password: [redacted]",
-		"Region: " + string(p.Region),
-		"Encryption: " + string(p.Encryption),
-		"Port forwarding: " + p.PortForwarding.String(),
-	}
-	return strings.Join(settingsList, "\n |--")
-}
-
-// GetPIASettings obtains PIA settings from environment variables using the params package.
-func GetPIASettings(params params.ParamsReader) (settings PIA, err error) {
-	settings.User, err = params.GetUser()
-	if err != nil {
-		return settings, err
-	}
-	settings.Password, err = params.GetPassword()
-	if err != nil {
-		return settings, err
-	}
-	settings.Encryption, err = params.GetPIAEncryption()
-	if err != nil {
-		return settings, err
-	}
-	settings.Region, err = params.GetPIARegion()
-	if err != nil {
-		return settings, err
-	}
-	settings.PortForwarding.Enabled, err = params.GetPortForwarding()
-	if err != nil {
-		return settings, err
-	}
-	if settings.PortForwarding.Enabled {
-		settings.PortForwarding.Filepath, err = params.GetPortForwardingStatusFilepath()
-		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"
+)
+
+// PIA contains the settings to connect to a PIA server
+type PIA struct {
+	User           string
+	Password       string
+	Encryption     models.PIAEncryption
+	Region         models.PIARegion
+	PortForwarding PortForwarding
+}
+
+// PortForwarding contains settings for port forwarding
+type PortForwarding struct {
+	Enabled  bool
+	Filepath models.Filepath
+}
+
+func (p *PortForwarding) String() string {
+	if p.Enabled {
+		return fmt.Sprintf("on, saved in %s", p.Filepath)
+	}
+	return "off"
+}
+
+func (p *PIA) String() string {
+	settingsList := []string{
+		"PIA settings:",
+		"User: [redacted]",
+		"Password: [redacted]",
+		"Region: " + string(p.Region),
+		"Encryption: " + string(p.Encryption),
+		"Port forwarding: " + p.PortForwarding.String(),
+	}
+	return strings.Join(settingsList, "\n |--")
+}
+
+// GetPIASettings obtains PIA settings from environment variables using the params package.
+func GetPIASettings(paramsReader params.Reader) (settings PIA, err error) {
+	settings.User, err = paramsReader.GetUser()
+	if err != nil {
+		return settings, err
+	}
+	settings.Password, err = paramsReader.GetPassword()
+	if err != nil {
+		return settings, err
+	}
+	settings.Encryption, err = paramsReader.GetPIAEncryption()
+	if err != nil {
+		return settings, err
+	}
+	settings.Region, err = paramsReader.GetPIARegion()
+	if err != nil {
+		return settings, err
+	}
+	settings.PortForwarding.Enabled, err = paramsReader.GetPortForwarding()
+	if err != nil {
+		return settings, err
+	}
+	if settings.PortForwarding.Enabled {
+		settings.PortForwarding.Filepath, err = paramsReader.GetPortForwardingStatusFilepath()
+		if err != nil {
+			return settings, err
+		}
+	}
+	return settings, nil
+}