diff --git a/internal/dns/loop.go b/internal/dns/loop.go index aa90664c..0bf68d19 100644 --- a/internal/dns/loop.go +++ b/internal/dns/loop.go @@ -23,7 +23,7 @@ type Looper interface { RestartTickerRunner loopstate.Applier loopstate.Getter - SettingsGetterSetter + SettingsGetSetter } type Loop struct { diff --git a/internal/dns/settings.go b/internal/dns/settings.go index 7d4a8dac..56eeb0f3 100644 --- a/internal/dns/settings.go +++ b/internal/dns/settings.go @@ -6,7 +6,7 @@ import ( "github.com/qdm12/gluetun/internal/configuration" ) -type SettingsGetterSetter interface { +type SettingsGetSetter interface { SettingsGetter SettingsSetter } diff --git a/internal/dns/state/settings.go b/internal/dns/state/settings.go index af5ef272..cac90243 100644 --- a/internal/dns/state/settings.go +++ b/internal/dns/state/settings.go @@ -8,7 +8,7 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -type SettingsGetterSetter interface { +type SettingsGetSetter interface { GetSettings() (settings configuration.DNS) SetSettings(ctx context.Context, settings configuration.DNS) (outcome string) diff --git a/internal/dns/state/state.go b/internal/dns/state/state.go index 52679d7e..59d339ab 100644 --- a/internal/dns/state/state.go +++ b/internal/dns/state/state.go @@ -10,7 +10,7 @@ import ( var _ Manager = (*State)(nil) type Manager interface { - SettingsGetterSetter + SettingsGetSetter } func New(statusApplier loopstate.Applier, diff --git a/internal/httpproxy/loop.go b/internal/httpproxy/loop.go index 07bcaf2e..d513d361 100644 --- a/internal/httpproxy/loop.go +++ b/internal/httpproxy/loop.go @@ -17,7 +17,7 @@ type Looper interface { Runner loopstate.Getter loopstate.Applier - SettingsGetterSetter + SettingsGetSetter } type Loop struct { diff --git a/internal/httpproxy/settings.go b/internal/httpproxy/settings.go index 6dbecd3a..1b266376 100644 --- a/internal/httpproxy/settings.go +++ b/internal/httpproxy/settings.go @@ -7,7 +7,7 @@ import ( "github.com/qdm12/gluetun/internal/httpproxy/state" ) -type SettingsGetterSetter = state.SettingsGetterSetter +type SettingsGetSetter = state.SettingsGetSetter func (l *Loop) GetSettings() (settings configuration.HTTPProxy) { return l.state.GetSettings() diff --git a/internal/httpproxy/state/settings.go b/internal/httpproxy/state/settings.go index 8ac83c86..455a66f4 100644 --- a/internal/httpproxy/state/settings.go +++ b/internal/httpproxy/state/settings.go @@ -8,7 +8,7 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -type SettingsGetterSetter interface { +type SettingsGetSetter interface { SettingsGetter SettingsSetter } diff --git a/internal/httpproxy/state/state.go b/internal/httpproxy/state/state.go index 73240b36..185f0b6f 100644 --- a/internal/httpproxy/state/state.go +++ b/internal/httpproxy/state/state.go @@ -10,7 +10,7 @@ import ( var _ Manager = (*State)(nil) type Manager interface { - SettingsGetterSetter + SettingsGetSetter } func New(statusApplier loopstate.Applier, diff --git a/internal/openvpn/loop.go b/internal/openvpn/loop.go index 8840f468..2271b788 100644 --- a/internal/openvpn/loop.go +++ b/internal/openvpn/loop.go @@ -19,7 +19,7 @@ type Looper interface { Runner loopstate.Getter loopstate.Applier - SettingsGetterSetter + SettingsGetSetter ServersGetterSetter PortForwadedGetter PortForwader diff --git a/internal/openvpn/settings.go b/internal/openvpn/settings.go index 244b7d9c..67cbe45e 100644 --- a/internal/openvpn/settings.go +++ b/internal/openvpn/settings.go @@ -7,7 +7,7 @@ import ( "github.com/qdm12/gluetun/internal/openvpn/state" ) -type SettingsGetterSetter = state.SettingsGetterSetter +type SettingsGetSetter = state.SettingsGetSetter func (l *Loop) GetSettings() (settings configuration.OpenVPN) { return l.state.GetSettings() diff --git a/internal/openvpn/state/settings.go b/internal/openvpn/state/settings.go index 1f9df456..7409efd7 100644 --- a/internal/openvpn/state/settings.go +++ b/internal/openvpn/state/settings.go @@ -8,7 +8,7 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -type SettingsGetterSetter interface { +type SettingsGetSetter interface { GetSettings() (settings configuration.OpenVPN) SetSettings(ctx context.Context, settings configuration.OpenVPN) ( outcome string) diff --git a/internal/openvpn/state/state.go b/internal/openvpn/state/state.go index 1b2fb257..a9333901 100644 --- a/internal/openvpn/state/state.go +++ b/internal/openvpn/state/state.go @@ -11,7 +11,7 @@ import ( var _ Manager = (*State)(nil) type Manager interface { - SettingsGetterSetter + SettingsGetSetter ServersGetterSetter PortForwardedGetterSetter GetSettingsAndServers() (settings configuration.OpenVPN, diff --git a/internal/publicip/alias.go b/internal/publicip/alias.go index fe53c8c1..87e13dfe 100644 --- a/internal/publicip/alias.go +++ b/internal/publicip/alias.go @@ -3,4 +3,4 @@ package publicip import "github.com/qdm12/gluetun/internal/publicip/state" type Getter = state.PublicIPGetter -type SettingsGetterSetter = state.SettingsGetterSetter +type SettingsGetSetter = state.SettingsGetSetter diff --git a/internal/publicip/loop.go b/internal/publicip/loop.go index 4846e618..3a3a76c3 100644 --- a/internal/publicip/loop.go +++ b/internal/publicip/loop.go @@ -19,7 +19,7 @@ type Looper interface { RestartTickerRunner loopstate.Getter loopstate.Applier - SettingsGetterSetter + SettingsGetSetter Getter } diff --git a/internal/publicip/state/settings.go b/internal/publicip/state/settings.go index 0e4274ad..1ec6a782 100644 --- a/internal/publicip/state/settings.go +++ b/internal/publicip/state/settings.go @@ -7,7 +7,7 @@ import ( "github.com/qdm12/gluetun/internal/configuration" ) -type SettingsGetterSetter interface { +type SettingsGetSetter interface { GetSettings() (settings configuration.PublicIP) SetSettings(ctx context.Context, settings configuration.PublicIP) (outcome string) diff --git a/internal/publicip/state/state.go b/internal/publicip/state/state.go index 61221309..b350103e 100644 --- a/internal/publicip/state/state.go +++ b/internal/publicip/state/state.go @@ -11,7 +11,7 @@ import ( var _ Manager = (*State)(nil) type Manager interface { - SettingsGetterSetter + SettingsGetSetter PublicIPGetSetter }