From 991d75a1d07f25a7d534384927b94c14dc06981e Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Fri, 27 May 2022 22:04:14 +0000
Subject: [PATCH] chore(provider): rename all `BuildConf` to `OpenVPNConfig`

---
 internal/cli/openvpnconfig.go                          | 2 +-
 internal/provider/custom/openvpnconf.go                | 2 +-
 internal/provider/cyberghost/openvpnconf.go            | 2 +-
 internal/provider/expressvpn/openvpnconf.go            | 2 +-
 internal/provider/fastestvpn/openvpnconf.go            | 2 +-
 internal/provider/hidemyass/openvpnconf.go             | 2 +-
 internal/provider/ipvanish/openvpnconf.go              | 2 +-
 internal/provider/ivpn/openvpnconf.go                  | 2 +-
 internal/provider/mullvad/openvpnconf.go               | 2 +-
 internal/provider/nordvpn/openvpnconf.go               | 2 +-
 internal/provider/perfectprivacy/openvpnconf.go        | 2 +-
 internal/provider/privado/openvpnconf.go               | 2 +-
 internal/provider/privateinternetaccess/openvpnconf.go | 2 +-
 internal/provider/privatevpn/openvpnconf.go            | 2 +-
 internal/provider/protonvpn/openvpnconf.go             | 2 +-
 internal/provider/provider.go                          | 2 +-
 internal/provider/purevpn/openvpnconf.go               | 2 +-
 internal/provider/surfshark/openvpnconf.go             | 2 +-
 internal/provider/torguard/openvpnconf.go              | 2 +-
 internal/provider/vpnunlimited/openvpnconf.go          | 2 +-
 internal/provider/vyprvpn/openvpnconf.go               | 2 +-
 internal/provider/wevpn/openvpnconf.go                 | 2 +-
 internal/provider/windscribe/openvpnconf.go            | 2 +-
 internal/vpn/openvpn.go                                | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/internal/cli/openvpnconfig.go b/internal/cli/openvpnconfig.go
index 9e52c982..dc29706d 100644
--- a/internal/cli/openvpnconfig.go
+++ b/internal/cli/openvpnconfig.go
@@ -42,7 +42,7 @@ func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) e
 		return err
 	}
 
-	lines := providerConf.BuildConf(connection, allSettings.VPN.OpenVPN)
+	lines := providerConf.OpenVPNConfig(connection, allSettings.VPN.OpenVPN)
 
 	fmt.Println(strings.Join(lines, "\n"))
 	return nil
diff --git a/internal/provider/custom/openvpnconf.go b/internal/provider/custom/openvpnconf.go
index 27031f52..a6ee53ad 100644
--- a/internal/provider/custom/openvpnconf.go
+++ b/internal/provider/custom/openvpnconf.go
@@ -14,7 +14,7 @@ import (
 
 var ErrExtractData = errors.New("failed extracting information from custom configuration file")
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	lines, _, err := p.extractor.Data(*settings.ConfFile)
 	if err != nil {
diff --git a/internal/provider/cyberghost/openvpnconf.go b/internal/provider/cyberghost/openvpnconf.go
index 353da729..3560f378 100644
--- a/internal/provider/cyberghost/openvpnconf.go
+++ b/internal/provider/cyberghost/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/expressvpn/openvpnconf.go b/internal/provider/expressvpn/openvpnconf.go
index 2b8e45f8..5452f6ef 100644
--- a/internal/provider/expressvpn/openvpnconf.go
+++ b/internal/provider/expressvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/fastestvpn/openvpnconf.go b/internal/provider/fastestvpn/openvpnconf.go
index 5d59c4d0..e3dc4607 100644
--- a/internal/provider/fastestvpn/openvpnconf.go
+++ b/internal/provider/fastestvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/hidemyass/openvpnconf.go b/internal/provider/hidemyass/openvpnconf.go
index 137ece88..22eb69f3 100644
--- a/internal/provider/hidemyass/openvpnconf.go
+++ b/internal/provider/hidemyass/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/ipvanish/openvpnconf.go b/internal/provider/ipvanish/openvpnconf.go
index f58b9ce5..6b5a1834 100644
--- a/internal/provider/ipvanish/openvpnconf.go
+++ b/internal/provider/ipvanish/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
diff --git a/internal/provider/ivpn/openvpnconf.go b/internal/provider/ivpn/openvpnconf.go
index 8d85673b..58332f9b 100644
--- a/internal/provider/ivpn/openvpnconf.go
+++ b/internal/provider/ivpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/mullvad/openvpnconf.go b/internal/provider/mullvad/openvpnconf.go
index c62518bb..865a1566 100644
--- a/internal/provider/mullvad/openvpnconf.go
+++ b/internal/provider/mullvad/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/nordvpn/openvpnconf.go b/internal/provider/nordvpn/openvpnconf.go
index 3d6dfa24..00a0c808 100644
--- a/internal/provider/nordvpn/openvpnconf.go
+++ b/internal/provider/nordvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/perfectprivacy/openvpnconf.go b/internal/provider/perfectprivacy/openvpnconf.go
index f580869c..b90d2c4d 100644
--- a/internal/provider/perfectprivacy/openvpnconf.go
+++ b/internal/provider/perfectprivacy/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/privado/openvpnconf.go b/internal/provider/privado/openvpnconf.go
index 9d457dbd..a5db5569 100644
--- a/internal/provider/privado/openvpnconf.go
+++ b/internal/provider/privado/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/privateinternetaccess/openvpnconf.go b/internal/provider/privateinternetaccess/openvpnconf.go
index be003d16..bb308660 100644
--- a/internal/provider/privateinternetaccess/openvpnconf.go
+++ b/internal/provider/privateinternetaccess/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/privatevpn/openvpnconf.go b/internal/provider/privatevpn/openvpnconf.go
index 2ce39cfc..9071ba40 100644
--- a/internal/provider/privatevpn/openvpnconf.go
+++ b/internal/provider/privatevpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/protonvpn/openvpnconf.go b/internal/provider/protonvpn/openvpnconf.go
index b7338b35..1575b6dc 100644
--- a/internal/provider/protonvpn/openvpnconf.go
+++ b/internal/provider/protonvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index e0c81cbc..a051dab6 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -38,7 +38,7 @@ import (
 // Provider contains methods to read and modify the openvpn configuration to connect as a client.
 type Provider interface {
 	GetConnection(selection settings.ServerSelection) (connection models.Connection, err error)
-	BuildConf(connection models.Connection, settings settings.OpenVPN) (lines []string)
+	OpenVPNConfig(connection models.Connection, settings settings.OpenVPN) (lines []string)
 	PortForwarder
 }
 
diff --git a/internal/provider/purevpn/openvpnconf.go b/internal/provider/purevpn/openvpnconf.go
index 5110c8ee..864c4a0f 100644
--- a/internal/provider/purevpn/openvpnconf.go
+++ b/internal/provider/purevpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/surfshark/openvpnconf.go b/internal/provider/surfshark/openvpnconf.go
index ef3b492a..01c8c6c9 100644
--- a/internal/provider/surfshark/openvpnconf.go
+++ b/internal/provider/surfshark/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/torguard/openvpnconf.go b/internal/provider/torguard/openvpnconf.go
index 6b9c1f59..bd88634f 100644
--- a/internal/provider/torguard/openvpnconf.go
+++ b/internal/provider/torguard/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/vpnunlimited/openvpnconf.go b/internal/provider/vpnunlimited/openvpnconf.go
index 802c05c2..d7c7fd44 100644
--- a/internal/provider/vpnunlimited/openvpnconf.go
+++ b/internal/provider/vpnunlimited/openvpnconf.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/vyprvpn/openvpnconf.go b/internal/provider/vyprvpn/openvpnconf.go
index 5aca5909..34432043 100644
--- a/internal/provider/vyprvpn/openvpnconf.go
+++ b/internal/provider/vyprvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/wevpn/openvpnconf.go b/internal/provider/wevpn/openvpnconf.go
index c89e2f96..44720b9f 100644
--- a/internal/provider/wevpn/openvpnconf.go
+++ b/internal/provider/wevpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/windscribe/openvpnconf.go b/internal/provider/windscribe/openvpnconf.go
index 6e527a63..bae91866 100644
--- a/internal/provider/windscribe/openvpnconf.go
+++ b/internal/provider/windscribe/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Provider) BuildConf(connection models.Connection,
+func (p *Provider) OpenVPNConfig(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/vpn/openvpn.go b/internal/vpn/openvpn.go
index c7138de4..aaf05bbd 100644
--- a/internal/vpn/openvpn.go
+++ b/internal/vpn/openvpn.go
@@ -22,7 +22,7 @@ func setupOpenVPN(ctx context.Context, fw firewall.VPNConnectionSetter,
 		return nil, "", fmt.Errorf("failed finding a valid server connection: %w", err)
 	}
 
-	lines := providerConf.BuildConf(connection, settings.OpenVPN)
+	lines := providerConf.OpenVPNConfig(connection, settings.OpenVPN)
 
 	if err := openvpnConf.WriteConfig(lines); err != nil {
 		return nil, "", fmt.Errorf("failed writing configuration to file: %w", err)