From ecdf9396a5bc192e6fa3de6ab1d91c346c5975b5 Mon Sep 17 00:00:00 2001
From: "Quentin McGaw (desktop)" <quentin.mcgaw@gmail.com>
Date: Wed, 18 Aug 2021 20:23:50 +0000
Subject: [PATCH] Maint: move OpenVPN configurator to openvpn/config

---
 cmd/gluetun/main.go                      | 3 ++-
 internal/openvpn/{ => config}/auth.go    | 2 +-
 internal/openvpn/{ => config}/command.go | 2 +-
 internal/openvpn/{ => config}/config.go  | 4 ++--
 internal/openvpn/{ => config}/openvpn.go | 6 ++----
 internal/openvpn/loop.go                 | 5 +++--
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename internal/openvpn/{ => config}/auth.go (98%)
 rename internal/openvpn/{ => config}/command.go (99%)
 rename internal/openvpn/{ => config}/config.go (90%)
 rename internal/openvpn/{ => config}/openvpn.go (83%)

diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go
index 77e7769d..57854645 100644
--- a/cmd/gluetun/main.go
+++ b/cmd/gluetun/main.go
@@ -23,6 +23,7 @@ import (
 	"github.com/qdm12/gluetun/internal/httpproxy"
 	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gluetun/internal/openvpn"
+	openvpnconfig "github.com/qdm12/gluetun/internal/openvpn/config"
 	"github.com/qdm12/gluetun/internal/portforward"
 	"github.com/qdm12/gluetun/internal/publicip"
 	"github.com/qdm12/gluetun/internal/routing"
@@ -142,7 +143,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	httpClient := &http.Client{Timeout: clientTimeout}
 	// Create configurators
 	alpineConf := alpine.New()
-	ovpnConf := openvpn.NewConfigurator(
+	ovpnConf := openvpnconfig.NewConfigurator(
 		logger.NewChild(logging.Settings{Prefix: "openvpn configurator: "}),
 		cmder, puid, pgid)
 	dnsCrypto := dnscrypto.New(httpClient, "", "")
diff --git a/internal/openvpn/auth.go b/internal/openvpn/config/auth.go
similarity index 98%
rename from internal/openvpn/auth.go
rename to internal/openvpn/config/auth.go
index f9cfe6fd..03f21698 100644
--- a/internal/openvpn/auth.go
+++ b/internal/openvpn/config/auth.go
@@ -1,4 +1,4 @@
-package openvpn
+package config
 
 import (
 	"io"
diff --git a/internal/openvpn/command.go b/internal/openvpn/config/command.go
similarity index 99%
rename from internal/openvpn/command.go
rename to internal/openvpn/config/command.go
index 8c073640..3232cff0 100644
--- a/internal/openvpn/command.go
+++ b/internal/openvpn/config/command.go
@@ -1,4 +1,4 @@
-package openvpn
+package config
 
 import (
 	"context"
diff --git a/internal/openvpn/config.go b/internal/openvpn/config/config.go
similarity index 90%
rename from internal/openvpn/config.go
rename to internal/openvpn/config/config.go
index dd36a907..1b6fa8d7 100644
--- a/internal/openvpn/config.go
+++ b/internal/openvpn/config/config.go
@@ -1,11 +1,11 @@
-package openvpn
+package config
 
 import (
 	"os"
 	"strings"
 )
 
-type ConfigWriter interface {
+type Writer interface {
 	WriteConfig(lines []string) error
 }
 
diff --git a/internal/openvpn/openvpn.go b/internal/openvpn/config/openvpn.go
similarity index 83%
rename from internal/openvpn/openvpn.go
rename to internal/openvpn/config/openvpn.go
index 370422c4..ea792dc2 100644
--- a/internal/openvpn/openvpn.go
+++ b/internal/openvpn/config/openvpn.go
@@ -1,6 +1,4 @@
-// Package openvpn defines interfaces to interact with openvpn
-// and run it in a stateful loop.
-package openvpn
+package config
 
 import (
 	"github.com/qdm12/gluetun/internal/constants"
@@ -12,7 +10,7 @@ type Configurator interface {
 	VersionGetter
 	AuthWriter
 	Starter
-	ConfigWriter
+	Writer
 }
 
 type configurator struct {
diff --git a/internal/openvpn/loop.go b/internal/openvpn/loop.go
index c3155e6a..e1c101de 100644
--- a/internal/openvpn/loop.go
+++ b/internal/openvpn/loop.go
@@ -10,6 +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/state"
 	"github.com/qdm12/gluetun/internal/portforward"
 	"github.com/qdm12/gluetun/internal/publicip"
@@ -34,7 +35,7 @@ type Loop struct {
 	buildInfo   models.BuildInformation
 	versionInfo bool
 	// Configurators
-	conf        Configurator
+	conf        config.Configurator
 	fw          firewallConfigurer
 	routing     routing.VPNGetter
 	portForward portforward.StartStopper
@@ -64,7 +65,7 @@ const (
 
 func NewLoop(openVPNSettings configuration.OpenVPN,
 	providerSettings configuration.Provider,
-	allServers models.AllServers, conf Configurator,
+	allServers models.AllServers, conf config.Configurator,
 	fw firewallConfigurer, routing routing.VPNGetter,
 	portForward portforward.StartStopper,
 	publicip publicip.Looper, dnsLooper dns.Looper,