chore(config): define Source interface locally where needed

This commit is contained in:
Quentin McGaw
2022-08-26 15:03:59 +00:00
parent 26f3832187
commit ae5cba519c
8 changed files with 24 additions and 27 deletions

View File

@@ -6,11 +6,10 @@ import (
"net/http"
"time"
"github.com/qdm12/gluetun/internal/configuration/sources"
"github.com/qdm12/gluetun/internal/healthcheck"
)
func (c *CLI) HealthCheck(ctx context.Context, source sources.Source, warner Warner) error {
func (c *CLI) HealthCheck(ctx context.Context, source Source, warner Warner) error {
// Extract the health server port from the configuration.
config, err := source.ReadHealth()
if err != nil {

View File

@@ -0,0 +1,9 @@
package cli
import "github.com/qdm12/gluetun/internal/configuration/settings"
type Source interface {
Read() (settings settings.Settings, err error)
ReadHealth() (health settings.Health, err error)
String() string
}

View File

@@ -8,7 +8,6 @@ import (
"strings"
"time"
"github.com/qdm12/gluetun/internal/configuration/sources"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/openvpn/extract"
"github.com/qdm12/gluetun/internal/provider"
@@ -36,7 +35,7 @@ type IPFetcher interface {
FetchMultiInfo(ctx context.Context, ips []net.IP) (data []ipinfo.Response, err error)
}
func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) error {
func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source Source) error {
storage, err := storage.New(logger, constants.ServersData)
if err != nil {
return err