Minor changes

cmd/main.go

@@ -55,7 +55,7 @@ func main() {
 	dnsConf := dns.NewConfigurator(logger, client, fileManager)
 	firewallConf := firewall.NewConfigurator(logger, fileManager)
 	piaConf := pia.NewConfigurator(client, fileManager, firewallConf, logger)
-	mullvadConf := mullvad.NewConfigurator(client, fileManager, logger)
+	mullvadConf := mullvad.NewConfigurator(fileManager, logger)
 	tinyProxyConf := tinyproxy.NewConfigurator(fileManager, logger)
 	shadowsocksConf := shadowsocks.NewConfigurator(fileManager, logger)
 	ctx, cancel := context.WithCancel(context.Background())

internal/mullvad/mullvad.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/qdm12/golibs/files"
 	"github.com/qdm12/golibs/logging"
-	"github.com/qdm12/golibs/network"
 	"github.com/qdm12/private-internet-access-docker/internal/models"
 )
 
@@ -18,12 +17,11 @@ type Configurator interface {
 }
 
 type configurator struct {
-	client      network.Client
 	fileManager files.FileManager
 	logger      logging.Logger
 }
 
 // NewConfigurator returns a new Configurator object
-func NewConfigurator(client network.Client, fileManager files.FileManager, logger logging.Logger) Configurator {
-	return &configurator{client, fileManager, logger}
+func NewConfigurator(fileManager files.FileManager, logger logging.Logger) Configurator {
+	return &configurator{fileManager, logger}
 }

internal/pia/conf.go

@@ -22,9 +22,6 @@ func (c *configurator) GetOpenVPNConnections(region models.PIARegion, protocol m
 	if len(subdomain) == 0 {
 		return nil, fmt.Errorf("region %q has no associated PIA subdomain", region)
 	}
-	if err != nil {
-		return nil, err
-	}
 	hostname := subdomain + ".privateinternetaccess.com"
 	IPs, err := c.lookupIP(hostname)
 	if err != nil {

internal/settings/mullvad.go

@@ -17,7 +17,6 @@ type Mullvad struct {
 }
 
 func (m *Mullvad) String() string {
-
 	settingsList := []string{
 		"Mullvad settings:",
 		"User: [redacted]",

internal/settings/pia.go

@@ -33,6 +33,8 @@ func (p *PortForwarding) String() string {
 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(),