From 105d81c018231858a5583830be0ea57b2f96583d Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Thu, 19 Aug 2021 13:31:12 +0000 Subject: [PATCH] Maint: move Openvpn package files - Move internal/openvpn/config/*.go to internal/openvpn/ - Move internal/openvpn/setup.go to internal/vpn/openvpn.go --- cmd/gluetun/main.go | 4 ++-- internal/openvpn/{config => }/auth.go | 2 +- internal/openvpn/{config => }/config.go | 2 +- internal/openvpn/{config => }/logs.go | 2 +- internal/openvpn/{config => }/logs_test.go | 2 +- internal/openvpn/{config => }/openvpn.go | 2 +- internal/openvpn/{config => }/run.go | 2 +- internal/openvpn/{config => }/start.go | 2 +- internal/openvpn/{config => }/stream.go | 2 +- internal/openvpn/{config => }/version.go | 2 +- internal/vpn/loop.go | 6 +++--- internal/{openvpn/setup.go => vpn/openvpn.go} | 10 +++++----- internal/vpn/run.go | 3 +-- 13 files changed, 20 insertions(+), 21 deletions(-) rename internal/openvpn/{config => }/auth.go (98%) rename internal/openvpn/{config => }/config.go (96%) rename internal/openvpn/{config => }/logs.go (99%) rename internal/openvpn/{config => }/logs_test.go (98%) rename internal/openvpn/{config => }/openvpn.go (97%) rename internal/openvpn/{config => }/run.go (98%) rename internal/openvpn/{config => }/start.go (98%) rename internal/openvpn/{config => }/stream.go (98%) rename internal/openvpn/{config => }/version.go (98%) rename internal/{openvpn/setup.go => vpn/openvpn.go} (85%) diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go index b4975139..10db23a9 100644 --- a/cmd/gluetun/main.go +++ b/cmd/gluetun/main.go @@ -22,7 +22,7 @@ import ( "github.com/qdm12/gluetun/internal/healthcheck" "github.com/qdm12/gluetun/internal/httpproxy" "github.com/qdm12/gluetun/internal/models" - openvpnconfig "github.com/qdm12/gluetun/internal/openvpn/config" + "github.com/qdm12/gluetun/internal/openvpn" "github.com/qdm12/gluetun/internal/portforward" "github.com/qdm12/gluetun/internal/publicip" "github.com/qdm12/gluetun/internal/routing" @@ -145,7 +145,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation, httpClient := &http.Client{Timeout: clientTimeout} // Create configurators alpineConf := alpine.New() - ovpnConf := openvpnconfig.New( + ovpnConf := openvpn.New( logger.NewChild(logging.Settings{Prefix: "openvpn configurator: "}), cmder, puid, pgid) dnsCrypto := dnscrypto.New(httpClient, "", "") diff --git a/internal/openvpn/config/auth.go b/internal/openvpn/auth.go similarity index 98% rename from internal/openvpn/config/auth.go rename to internal/openvpn/auth.go index 04af1324..885995bd 100644 --- a/internal/openvpn/config/auth.go +++ b/internal/openvpn/auth.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "io" diff --git a/internal/openvpn/config/config.go b/internal/openvpn/config.go similarity index 96% rename from internal/openvpn/config/config.go rename to internal/openvpn/config.go index 2d678e1d..77a7006a 100644 --- a/internal/openvpn/config/config.go +++ b/internal/openvpn/config.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "os" diff --git a/internal/openvpn/config/logs.go b/internal/openvpn/logs.go similarity index 99% rename from internal/openvpn/config/logs.go rename to internal/openvpn/logs.go index 04b66a05..f48cdc92 100644 --- a/internal/openvpn/config/logs.go +++ b/internal/openvpn/logs.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "strings" diff --git a/internal/openvpn/config/logs_test.go b/internal/openvpn/logs_test.go similarity index 98% rename from internal/openvpn/config/logs_test.go rename to internal/openvpn/logs_test.go index 03c3f57d..4c30332f 100644 --- a/internal/openvpn/config/logs_test.go +++ b/internal/openvpn/logs_test.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "testing" diff --git a/internal/openvpn/config/openvpn.go b/internal/openvpn/openvpn.go similarity index 97% rename from internal/openvpn/config/openvpn.go rename to internal/openvpn/openvpn.go index d35b17eb..fa23e4be 100644 --- a/internal/openvpn/config/openvpn.go +++ b/internal/openvpn/openvpn.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "github.com/qdm12/gluetun/internal/constants" diff --git a/internal/openvpn/config/run.go b/internal/openvpn/run.go similarity index 98% rename from internal/openvpn/config/run.go rename to internal/openvpn/run.go index 6c1607f5..760ea44c 100644 --- a/internal/openvpn/config/run.go +++ b/internal/openvpn/run.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "context" diff --git a/internal/openvpn/config/start.go b/internal/openvpn/start.go similarity index 98% rename from internal/openvpn/config/start.go rename to internal/openvpn/start.go index ef982dc4..87985e3f 100644 --- a/internal/openvpn/config/start.go +++ b/internal/openvpn/start.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "context" diff --git a/internal/openvpn/config/stream.go b/internal/openvpn/stream.go similarity index 98% rename from internal/openvpn/config/stream.go rename to internal/openvpn/stream.go index d01b88e5..b02554d3 100644 --- a/internal/openvpn/config/stream.go +++ b/internal/openvpn/stream.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "context" diff --git a/internal/openvpn/config/version.go b/internal/openvpn/version.go similarity index 98% rename from internal/openvpn/config/version.go rename to internal/openvpn/version.go index ccae9393..65bd2c55 100644 --- a/internal/openvpn/config/version.go +++ b/internal/openvpn/version.go @@ -1,4 +1,4 @@ -package config +package openvpn import ( "context" diff --git a/internal/vpn/loop.go b/internal/vpn/loop.go index 5d23f9f9..fc95a077 100644 --- a/internal/vpn/loop.go +++ b/internal/vpn/loop.go @@ -10,7 +10,7 @@ import ( "github.com/qdm12/gluetun/internal/firewall" "github.com/qdm12/gluetun/internal/loopstate" "github.com/qdm12/gluetun/internal/models" - "github.com/qdm12/gluetun/internal/openvpn/config" + "github.com/qdm12/gluetun/internal/openvpn" "github.com/qdm12/gluetun/internal/portforward" "github.com/qdm12/gluetun/internal/publicip" "github.com/qdm12/gluetun/internal/routing" @@ -35,7 +35,7 @@ type Loop struct { buildInfo models.BuildInformation versionInfo bool // Configurators - openvpnConf config.Interface + openvpnConf openvpn.Interface fw firewallConfigurer routing routing.VPNGetter portForward portforward.StartStopper @@ -65,7 +65,7 @@ const ( func NewLoop(vpnSettings configuration.VPN, providerSettings configuration.Provider, - allServers models.AllServers, openvpnConf config.Interface, + allServers models.AllServers, openvpnConf openvpn.Interface, fw firewallConfigurer, routing routing.VPNGetter, portForward portforward.StartStopper, publicip publicip.Looper, dnsLooper dns.Looper, diff --git a/internal/openvpn/setup.go b/internal/vpn/openvpn.go similarity index 85% rename from internal/openvpn/setup.go rename to internal/vpn/openvpn.go index 22865847..d8475ba9 100644 --- a/internal/openvpn/setup.go +++ b/internal/vpn/openvpn.go @@ -1,4 +1,4 @@ -package openvpn +package vpn import ( "context" @@ -8,7 +8,7 @@ import ( "github.com/qdm12/gluetun/internal/configuration" "github.com/qdm12/gluetun/internal/firewall" "github.com/qdm12/gluetun/internal/models" - "github.com/qdm12/gluetun/internal/openvpn/config" + "github.com/qdm12/gluetun/internal/openvpn" "github.com/qdm12/gluetun/internal/openvpn/custom" "github.com/qdm12/gluetun/internal/provider" ) @@ -20,10 +20,10 @@ var ( errFirewall = errors.New("failed allowing VPN connection through firewall") ) -// Setup sets OpenVPN up using the configurators and settings given. +// setupOpenVPN sets OpenVPN up using the configurators and settings given. // It returns a serverName for port forwarding (PIA) and an error if it fails. -func Setup(ctx context.Context, fw firewall.VPNConnectionSetter, - openvpnConf config.Interface, providerConf provider.Provider, +func setupOpenVPN(ctx context.Context, fw firewall.VPNConnectionSetter, + openvpnConf openvpn.Interface, providerConf provider.Provider, openVPNSettings configuration.OpenVPN, providerSettings configuration.Provider) ( serverName string, err error) { var connection models.OpenVPNConnection diff --git a/internal/vpn/run.go b/internal/vpn/run.go index 8004530e..72bdff5b 100644 --- a/internal/vpn/run.go +++ b/internal/vpn/run.go @@ -5,7 +5,6 @@ import ( "time" "github.com/qdm12/gluetun/internal/constants" - "github.com/qdm12/gluetun/internal/openvpn" "github.com/qdm12/gluetun/internal/provider" ) @@ -27,7 +26,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) { providerConf := provider.New(providerSettings.Name, allServers, time.Now) - serverName, err := openvpn.Setup(ctx, l.fw, l.openvpnConf, providerConf, VPNSettings.OpenVPN, providerSettings) + serverName, err := setupOpenVPN(ctx, l.fw, l.openvpnConf, providerConf, VPNSettings.OpenVPN, providerSettings) if err != nil { l.crashed(ctx, err) continue