chore: use gofumpt for code formatting

This commit is contained in:
Quentin McGaw
2024-10-11 19:20:48 +00:00
parent 3daf15a612
commit 76a4bb5dc3
289 changed files with 784 additions and 548 deletions

View File

@@ -12,7 +12,8 @@ func ptrTo[T any](value T) *T { return &value }
// waitForError waits 100ms for an error in the waitError channel.
func (l *Loop) waitForError(ctx context.Context,
waitError chan error) (err error) {
waitError chan error,
) (err error) {
const waitDurationForError = 100 * time.Millisecond
timer := time.NewTimer(waitDurationForError)
select {

View File

@@ -54,7 +54,8 @@ func NewLoop(vpnSettings settings.VPN, ipv6Supported bool, vpnInputPorts []uint1
portForward PortForward, starter CmdStarter,
publicip PublicIPLoop, dnsLooper DNSLoop,
logger log.LoggerInterface, client *http.Client,
buildInfo models.BuildInformation, versionInfo bool) *Loop {
buildInfo models.BuildInformation, versionInfo bool,
) *Loop {
start := make(chan struct{})
running := make(chan models.LoopStatus)
stop := make(chan struct{})

View File

@@ -15,7 +15,8 @@ func setupOpenVPN(ctx context.Context, fw Firewall,
openvpnConf OpenVPN, providerConf provider.Provider,
settings settings.VPN, ipv6Supported bool, starter CmdStarter,
logger openvpn.Logger) (runner *openvpn.Runner, serverName string,
canPortForward bool, err error) {
canPortForward bool, err error,
) {
connection, err := providerConf.GetConnection(settings.Provider.ServerSelection, ipv6Supported)
if err != nil {
return nil, "", false, fmt.Errorf("finding a valid server connection: %w", err)

View File

@@ -11,7 +11,8 @@ import (
)
func getPortForwarder(provider Provider, providers Providers, //nolint:ireturn
customPortForwarderName string) (portForwarder PortForwarder) {
customPortForwarderName string,
) (portForwarder PortForwarder) {
if customPortForwarderName != "" {
provider = providers.Get(customPortForwarderName)
}
@@ -61,7 +62,8 @@ func (n *noPortForwarder) Name() string {
}
func (n *noPortForwarder) PortForward(context.Context, pfutils.PortForwardObjects) (
ports []uint16, err error) {
ports []uint16, err error,
) {
return nil, fmt.Errorf("%w: for %s", ErrPortForwardingNotSupported, n.providerName)
}

View File

@@ -12,6 +12,7 @@ func (l *Loop) GetSettings() (settings settings.VPN) {
func (l *Loop) SetSettings(ctx context.Context,
vpn settings.VPN) (
outcome string) {
outcome string,
) {
return l.state.SetSettings(ctx, vpn)
}

View File

@@ -16,7 +16,8 @@ func (s *State) GetSettings() (vpn settings.VPN) {
}
func (s *State) SetSettings(ctx context.Context, vpn settings.VPN) (
outcome string) {
outcome string,
) {
s.settingsMu.Lock()
settingsUnchanged := reflect.DeepEqual(s.vpn, vpn)
if settingsUnchanged {

View File

@@ -11,6 +11,7 @@ func (l *Loop) GetStatus() (status models.LoopStatus) {
}
func (l *Loop) ApplyStatus(ctx context.Context, status models.LoopStatus) (
outcome string, err error) {
outcome string, err error,
) {
return l.statusManager.ApplyStatus(ctx, status)
}

View File

@@ -16,7 +16,8 @@ import (
func setupWireguard(ctx context.Context, netlinker NetLinker,
fw Firewall, providerConf provider.Provider,
settings settings.VPN, ipv6Supported bool, logger wireguard.Logger) (
wireguarder *wireguard.Wireguard, serverName string, canPortForward bool, err error) {
wireguarder *wireguard.Wireguard, serverName string, canPortForward bool, err error,
) {
connection, err := providerConf.GetConnection(settings.Provider.ServerSelection, ipv6Supported)
if err != nil {
return nil, "", false, fmt.Errorf("finding a VPN server: %w", err)