admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified GetUser and GetPassword using libparams

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2020-02-22 15:53:50 +00:00
parent f45f40eee1
commit 1aebe1a4c1
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/params/openvpn.go
View File

@@ -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