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

chore(lint): upgrade from v1.51.2 to v1.52.2

Browse Source
This commit is contained in:
Quentin McGaw
2023-04-12 08:36:58 +00:00
parent 20f4d8cc0b
commit 723d0f5e12
18 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/provider/custom/connection.go
View File

@@ -15,7 +15,7 @@ var (
)
// GetConnection gets the connection from the OpenVPN configuration file.
func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
func (p *Provider) GetConnection(selection settings.ServerSelection, _ bool) (
connection models.Connection, err error) {
switch selection.VPN {
case vpn.OpenVPN:

4
internal/provider/privateinternetaccess/portforward.go
View File

@@ -90,8 +90,8 @@ var (
ErrPortForwardedExpired = errors.New("port forwarded data expired")
)
func (p *Provider) KeepPortForward(ctx context.Context, client *http.Client,
port uint16, gateway net.IP, serverName string) (err error) {
func (p *Provider) KeepPortForward(ctx context.Context,
gateway net.IP, serverName string) (err error) {
privateIPClient, err := newHTTPClient(serverName)
if err != nil {
return fmt.Errorf("creating custom HTTP client: %w", err)

3
internal/provider/protonvpn/provider.go
View File

@@ -18,8 +18,7 @@ type Provider struct {
}
func New(storage common.Storage, randSource rand.Source,
client *http.Client, updaterWarner common.Warner,
parallelResolver common.ParallelResolver) *Provider {
client *http.Client, updaterWarner common.Warner) *Provider {
return &Provider{
storage: storage,
randSource: randSource,

4
internal/provider/provider.go
View File

@@ -24,6 +24,6 @@ type PortForwarder interface {
PortForward(ctx context.Context, client *http.Client,
logger utils.Logger, gateway net.IP, serverName string) (
port uint16, err error)
KeepPortForward(ctx context.Context, client *http.Client,
port uint16, gateway net.IP, serverName string) (err error)
KeepPortForward(ctx context.Context, gateway net.IP,
serverName string) (err error)
}

2
internal/provider/providers.go
View File

@@ -73,7 +73,7 @@ func NewProviders(storage Storage, timeNow func() time.Time,
providers.Privado: privado.New(storage, randSource, ipFetcher, unzipper, updaterWarner, parallelResolver),
providers.PrivateInternetAccess: privateinternetaccess.New(storage, randSource, timeNow, client),
providers.Privatevpn: privatevpn.New(storage, randSource, unzipper, updaterWarner, parallelResolver),
providers.Protonvpn: protonvpn.New(storage, randSource, client, updaterWarner, parallelResolver),
providers.Protonvpn: protonvpn.New(storage, randSource, client, updaterWarner),
providers.Purevpn: purevpn.New(storage, randSource, ipFetcher, unzipper, updaterWarner, parallelResolver),
providers.SlickVPN: slickvpn.New(storage, randSource, client, updaterWarner, parallelResolver),
providers.Surfshark: surfshark.New(storage, randSource, client, unzipper, updaterWarner, parallelResolver),

2
internal/provider/utils/nofetcher.go
View File

@@ -20,7 +20,7 @@ func NewNoFetcher(providerName string) *NoFetcher {
var ErrFetcherNotSupported = errors.New("fetching of servers is not supported")
func (n *NoFetcher) FetchServers(ctx context.Context, minServers int) (
func (n *NoFetcher) FetchServers(context.Context, int) (
servers []models.Server, err error) {
return nil, fmt.Errorf("%w: for %s", ErrFetcherNotSupported, n.providerName)
}

11
internal/provider/utils/noportforward.go
View File

@@ -12,8 +12,8 @@ type NoPortForwarder interface {
PortForward(ctx context.Context, client *http.Client,
logger Logger, gateway net.IP, serverName string) (
port uint16, err error)
KeepPortForward(ctx context.Context, client *http.Client,
port uint16, gateway net.IP, serverName string) (err error)
KeepPortForward(ctx context.Context, gateway net.IP,
serverName string) (err error)
}
type NoPortForwarding struct {
@@ -28,12 +28,11 @@ func NewNoPortForwarding(providerName string) *NoPortForwarding {
var ErrPortForwardingNotSupported = errors.New("custom port forwarding obtention is not supported")
func (n *NoPortForwarding) PortForward(ctx context.Context, client *http.Client,
logger Logger, gateway net.IP, serverName string) (port uint16, err error) {
func (n *NoPortForwarding) PortForward(context.Context, *http.Client,
Logger, net.IP, string) (port uint16, err error) {
return 0, fmt.Errorf("%w: for %s", ErrPortForwardingNotSupported, n.providerName)
}
func (n *NoPortForwarding) KeepPortForward(ctx context.Context, client *http.Client,
port uint16, gateway net.IP, serverName string) (err error) {
func (n *NoPortForwarding) KeepPortForward(context.Context, net.IP, string) (err error) {
return fmt.Errorf("%w: for %s", ErrPortForwardingNotSupported, n.providerName)
}