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/mullvad.go
+++ b/internal/settings/mullvad.go
@@ -1,56 +1,56 @@
-package settings
-
-import (
-	"strings"
-
-	"github.com/qdm12/private-internet-access-docker/internal/models"
-	"github.com/qdm12/private-internet-access-docker/internal/params"
-)
-
-// Mullvad contains the settings to connect to a Mullvad server
-type Mullvad struct {
-	User    string
-	Country models.MullvadCountry
-	City    models.MullvadCity
-	ISP     models.MullvadProvider
-	Port    uint16
-}
-
-func (m *Mullvad) String() string {
-	settingsList := []string{
-		"Mullvad settings:",
-		"User: [redacted]",
-		"Country: " + string(m.Country),
-		"City: " + string(m.City),
-		"ISP: " + string(m.ISP),
-		"Port: " + string(m.Port),
-	}
-	return strings.Join(settingsList, "\n |--")
-}
-
-// GetMullvadSettings obtains Mullvad settings from environment variables using the params package.
-func GetMullvadSettings(params params.ParamsReader) (settings Mullvad, err error) {
-	settings.User, err = params.GetUser()
-	if err != nil {
-		return settings, err
-	}
-	// Remove spaces in user ID to simplify user's life, thanks @JeordyR
-	settings.User = strings.ReplaceAll(settings.User, " ", "")
-	settings.Country, err = params.GetMullvadCountry()
-	if err != nil {
-		return settings, err
-	}
-	settings.City, err = params.GetMullvadCity()
-	if err != nil {
-		return settings, err
-	}
-	settings.ISP, err = params.GetMullvadISP()
-	if err != nil {
-		return settings, err
-	}
-	settings.Port, err = params.GetMullvadPort()
-	if err != nil {
-		return settings, err
-	}
-	return settings, nil
-}
+package settings
+
+import (
+	"strings"
+
+	"github.com/qdm12/private-internet-access-docker/internal/models"
+	"github.com/qdm12/private-internet-access-docker/internal/params"
+)
+
+// Mullvad contains the settings to connect to a Mullvad server
+type Mullvad struct {
+	User    string
+	Country models.MullvadCountry
+	City    models.MullvadCity
+	ISP     models.MullvadProvider
+	Port    uint16
+}
+
+func (m *Mullvad) String() string {
+	settingsList := []string{
+		"Mullvad settings:",
+		"User: [redacted]",
+		"Country: " + string(m.Country),
+		"City: " + string(m.City),
+		"ISP: " + string(m.ISP),
+		"Port: " + string(m.Port),
+	}
+	return strings.Join(settingsList, "\n |--")
+}
+
+// GetMullvadSettings obtains Mullvad settings from environment variables using the params package.
+func GetMullvadSettings(paramsReader params.Reader) (settings Mullvad, err error) {
+	settings.User, err = paramsReader.GetUser()
+	if err != nil {
+		return settings, err
+	}
+	// Remove spaces in user ID to simplify user's life, thanks @JeordyR
+	settings.User = strings.ReplaceAll(settings.User, " ", "")
+	settings.Country, err = paramsReader.GetMullvadCountry()
+	if err != nil {
+		return settings, err
+	}
+	settings.City, err = paramsReader.GetMullvadCity()
+	if err != nil {
+		return settings, err
+	}
+	settings.ISP, err = paramsReader.GetMullvadISP()
+	if err != nil {
+		return settings, err
+	}
+	settings.Port, err = paramsReader.GetMullvadPort()
+	if err != nil {
+		return settings, err
+	}
+	return settings, nil
+}