From 1aebe1a4c13a63253332c54e02b078875395a206 Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Sat, 22 Feb 2020 15:53:50 +0000 Subject: [PATCH] Simplified GetUser and GetPassword using libparams --- internal/params/openvpn.go | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/internal/params/openvpn.go b/internal/params/openvpn.go index 2d6b95c2..caf172bf 100644 --- a/internal/params/openvpn.go +++ b/internal/params/openvpn.go @@ -1,8 +1,6 @@ package params import ( - "fmt" - libparams "github.com/qdm12/golibs/params" "github.com/qdm12/private-internet-access-docker/internal/models" ) @@ -15,13 +13,7 @@ func (p *paramsReader) GetUser() (s string, err error) { err = unsetenvErr } }() - s, err = p.envParams.GetEnv("USER", libparams.CaseSensitiveValue()) - if err != nil { - return "", err - } else if len(s) == 0 { - return s, fmt.Errorf("USER environment variable cannot be empty") - } - return s, nil + return p.envParams.GetEnv("USER", libparams.CaseSensitiveValue(), libparams.Compulsory()) } // GetPassword obtains the password to use to connect to the VPN servers @@ -32,13 +24,7 @@ func (p *paramsReader) GetPassword() (s string, err error) { err = unsetenvErr } }() - s, err = p.envParams.GetEnv("PASSWORD", libparams.CaseSensitiveValue()) - if err != nil { - return "", err - } else if len(s) == 0 { - return s, fmt.Errorf("PASSWORD environment variable cannot be empty") - } - return s, nil + return p.envParams.GetEnv("PASSWORD", libparams.CaseSensitiveValue(), libparams.Compulsory()) } // GetNetworkProtocol obtains the network protocol to use to connect to the