chore(all): return concrete types, accept interfaces

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

internal/healthcheck/client.go

@@ -12,12 +12,6 @@ var (
 	ErrHTTPStatusNotOK = errors.New("HTTP response status is not OK")
 )
 
-var _ Checker = (*Client)(nil)
-
-type Checker interface {
-	Check(ctx context.Context, url string) error
-}
-
 type Client struct {
 	httpClient *http.Client
 }

internal/healthcheck/openvpn.go

@@ -5,11 +5,10 @@ import (
 	"time"
 
 	"github.com/qdm12/gluetun/internal/constants"
-	"github.com/qdm12/gluetun/internal/vpn"
 )
 
 type vpnHealth struct {
-	looper       vpn.Looper
+	loop         StatusApplier
 	healthyWait  time.Duration
 	healthyTimer *time.Timer
 }
@@ -17,8 +16,8 @@ type vpnHealth struct {
 func (s *Server) onUnhealthyVPN(ctx context.Context) {
 	s.logger.Info("program has been unhealthy for " +
 		s.vpn.healthyWait.String() + ": restarting VPN")
-	_, _ = s.vpn.looper.ApplyStatus(ctx, constants.Stopped)
-	_, _ = s.vpn.looper.ApplyStatus(ctx, constants.Running)
+	_, _ = s.vpn.loop.ApplyStatus(ctx, constants.Stopped)
+	_, _ = s.vpn.loop.ApplyStatus(ctx, constants.Running)
 	s.vpn.healthyWait += *s.config.VPN.Addition
 	s.vpn.healthyTimer = time.NewTimer(s.vpn.healthyWait)
 }

internal/healthcheck/server.go

@@ -5,15 +5,9 @@ import (
 	"net"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/vpn"
+	"github.com/qdm12/gluetun/internal/models"
 )
 
-var _ ServerRunner = (*Server)(nil)
-
-type ServerRunner interface {
-	Run(ctx context.Context, done chan<- struct{})
-}
-
 type Server struct {
 	logger  Logger
 	handler *handler
@@ -23,15 +17,20 @@ type Server struct {
 }
 
 func NewServer(config settings.Health,
-	logger Logger, vpnLooper vpn.Looper) *Server {
+	logger Logger, vpnLoop StatusApplier) *Server {
 	return &Server{
 		logger:  logger,
 		handler: newHandler(),
 		dialer:  &net.Dialer{},
 		config:  config,
 		vpn: vpnHealth{
-			looper:      vpnLooper,
+			loop:        vpnLoop,
 			healthyWait: *config.VPN.Initial,
 		},
 	}
 }
+
+type StatusApplier interface {
+	ApplyStatus(ctx context.Context, status models.LoopStatus) (
+		outcome string, err error)
+}