chore(all): return concrete types, accept interfaces

- Remove exported interfaces unused locally
- Define interfaces to accept arguments
- Return concrete types, not interfaces

internal/portforward/get.go

@@ -1,9 +1,5 @@
 package portforward
 
-import "github.com/qdm12/gluetun/internal/portforward/state"
-
-type Getter = state.PortForwardedGetter
-
 func (l *Loop) GetPortForwarded() (port uint16) {
 	return l.state.GetPortForwarded()
 }

internal/portforward/interfaces.go

@@ -0,0 +1,30 @@
+package portforward
+
+import (
+	"context"
+
+	"github.com/qdm12/gluetun/internal/configuration/settings"
+	"github.com/qdm12/gluetun/internal/models"
+)
+
+type PortAllower interface {
+	SetAllowedPort(ctx context.Context, port uint16, intf string) (err error)
+	RemoveAllowedPort(ctx context.Context, port uint16) (err error)
+}
+
+type statusManager interface {
+	GetStatus() (status models.LoopStatus)
+	SetStatus(status models.LoopStatus)
+	ApplyStatus(ctx context.Context, status models.LoopStatus) (
+		outcome string, err error)
+}
+
+type StateManager interface {
+	GetSettings() (settings settings.PortForwarding)
+	SetSettings(ctx context.Context,
+		settings settings.PortForwarding) (outcome string)
+	GetPortForwarded() (port uint16)
+	SetPortForwarded(port uint16)
+	GetStartData() (startData StartData)
+	SetStartData(startData StartData)
+}

internal/portforward/loop.go

@@ -7,28 +7,17 @@ import (
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/constants"
-	"github.com/qdm12/gluetun/internal/firewall"
 	"github.com/qdm12/gluetun/internal/loopstate"
 	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gluetun/internal/portforward/state"
 )
 
-var _ Looper = (*Loop)(nil)
-
-type Looper interface {
-	Runner
-	loopstate.Getter
-	StartStopper
-	SettingsGetSetter
-	Getter
-}
-
 type Loop struct {
-	statusManager loopstate.Manager
-	state         state.Manager
+	statusManager statusManager
+	state         StateManager
 	// Objects
 	client      *http.Client
-	portAllower firewall.PortAllower
+	portAllower PortAllower
 	logger      Logger
 	// Internal channels and locks
 	start       chan struct{}
@@ -43,7 +32,7 @@ type Loop struct {
 const defaultBackoffTime = 5 * time.Second
 
 func NewLoop(settings settings.PortForwarding,
-	client *http.Client, portAllower firewall.PortAllower,
+	client *http.Client, portAllower PortAllower,
 	logger Logger) *Loop {
 	start := make(chan struct{})
 	running := make(chan models.LoopStatus)

internal/portforward/run.go

@@ -7,10 +7,6 @@ import (
 	"github.com/qdm12/gluetun/internal/constants"
 )
 
-type Runner interface {
-	Run(ctx context.Context, done chan<- struct{})
-}
-
 func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
 	defer close(done)
 

internal/portforward/settings.go

@@ -4,11 +4,8 @@ import (
 	"context"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/portforward/state"
 )
 
-type SettingsGetSetter = state.SettingsGetSetter
-
 func (l *Loop) GetSettings() (settings settings.PortForwarding) {
 	return l.state.GetSettings()
 }

internal/portforward/state/portforwarded.go

@@ -1,14 +1,5 @@
 package state
 
-type PortForwardedGetterSetter interface {
-	PortForwardedGetter
-	SetPortForwarded(port uint16)
-}
-
-type PortForwardedGetter interface {
-	GetPortForwarded() (port uint16)
-}
-
 // GetPortForwarded is used by the control HTTP server
 // to obtain the port currently forwarded.
 func (s *State) GetPortForwarded() (port uint16) {

internal/portforward/state/settings.go

@@ -9,12 +9,6 @@ import (
 	"github.com/qdm12/gluetun/internal/constants"
 )
 
-type SettingsGetSetter interface {
-	GetSettings() (settings settings.PortForwarding)
-	SetSettings(ctx context.Context,
-		settings settings.PortForwarding) (outcome string)
-}
-
 func (s *State) GetSettings() (settings settings.PortForwarding) {
 	s.settingsMu.RLock()
 	defer s.settingsMu.RUnlock()

internal/portforward/state/startdata.go

@@ -13,25 +13,12 @@ type StartData struct {
 	Interface     string // tun0 for example
 }
 
-type StartDataGetterSetter interface {
-	StartDataGetter
-	StartDataSetter
-}
-
-type StartDataGetter interface {
-	GetStartData() (startData StartData)
-}
-
 func (s *State) GetStartData() (startData StartData) {
 	s.startDataMu.RLock()
 	defer s.startDataMu.RUnlock()
 	return s.startData
 }
 
-type StartDataSetter interface {
-	SetStartData(startData StartData)
-}
-
 func (s *State) SetStartData(startData StartData) {
 	s.startDataMu.Lock()
 	defer s.startDataMu.Unlock()

internal/portforward/state/state.go

@@ -1,21 +1,14 @@
 package state
 
 import (
+	"context"
 	"sync"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/loopstate"
+	"github.com/qdm12/gluetun/internal/models"
 )
 
-var _ Manager = (*State)(nil)
-
-type Manager interface {
-	SettingsGetSetter
-	PortForwardedGetterSetter
-	StartDataGetterSetter
-}
-
-func New(statusApplier loopstate.Applier,
+func New(statusApplier StatusApplier,
 	settings settings.PortForwarding) *State {
 	return &State{
 		statusApplier: statusApplier,
@@ -24,7 +17,7 @@ func New(statusApplier loopstate.Applier,
 }
 
 type State struct {
-	statusApplier loopstate.Applier
+	statusApplier StatusApplier
 
 	settings   settings.PortForwarding
 	settingsMu sync.RWMutex
@@ -35,3 +28,8 @@ type State struct {
 	startData   StartData
 	startDataMu sync.RWMutex
 }
+
+type StatusApplier interface {
+	ApplyStatus(ctx context.Context, status models.LoopStatus) (
+		outcome string, err error)
+}

internal/portforward/status.go

@@ -14,12 +14,6 @@ func (l *Loop) GetStatus() (status models.LoopStatus) {
 
 type StartData = state.StartData
 
-type StartStopper interface {
-	Start(ctx context.Context, data StartData) (
-		outcome string, err error)
-	Stop(ctx context.Context) (outcome string, err error)
-}
-
 func (l *Loop) Start(ctx context.Context, data StartData) (
 	outcome string, err error) {
 	l.startMu.Lock()