Maint: package local narrow Logger interfaces

internal/routing/logger.go

@@ -0,0 +1,10 @@
+package routing
+
+//go:generate mockgen -destination=logger_mock_test.go -package routing . Logger
+
+type Logger interface {
+	Debug(s string)
+	Info(s string)
+	Warn(s string)
+	Error(s string)
+}

internal/routing/logger_mock_test.go

@@ -0,0 +1,82 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/qdm12/gluetun/internal/routing (interfaces: Logger)
+
+// Package routing is a generated GoMock package.
+package routing
+
+import (
+	reflect "reflect"
+
+	gomock "github.com/golang/mock/gomock"
+)
+
+// MockLogger is a mock of Logger interface.
+type MockLogger struct {
+	ctrl     *gomock.Controller
+	recorder *MockLoggerMockRecorder
+}
+
+// MockLoggerMockRecorder is the mock recorder for MockLogger.
+type MockLoggerMockRecorder struct {
+	mock *MockLogger
+}
+
+// NewMockLogger creates a new mock instance.
+func NewMockLogger(ctrl *gomock.Controller) *MockLogger {
+	mock := &MockLogger{ctrl: ctrl}
+	mock.recorder = &MockLoggerMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockLogger) EXPECT() *MockLoggerMockRecorder {
+	return m.recorder
+}
+
+// Debug mocks base method.
+func (m *MockLogger) Debug(arg0 string) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "Debug", arg0)
+}
+
+// Debug indicates an expected call of Debug.
+func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0)
+}
+
+// Error mocks base method.
+func (m *MockLogger) Error(arg0 string) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "Error", arg0)
+}
+
+// Error indicates an expected call of Error.
+func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0)
+}
+
+// Info mocks base method.
+func (m *MockLogger) Info(arg0 string) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "Info", arg0)
+}
+
+// Info indicates an expected call of Info.
+func (mr *MockLoggerMockRecorder) Info(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0)
+}
+
+// Warn mocks base method.
+func (m *MockLogger) Warn(arg0 string) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "Warn", arg0)
+}
+
+// Warn indicates an expected call of Warn.
+func (mr *MockLoggerMockRecorder) Warn(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), arg0)
+}

internal/routing/routing.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 
 	"github.com/qdm12/gluetun/internal/netlink"
-	"github.com/qdm12/golibs/logging"
 )
 
 type ReadWriter interface {
@@ -35,14 +34,13 @@ type Writer interface {
 
 type Routing struct {
 	netLinker       netlink.NetLinker
-	logger          logging.Logger
+	logger          Logger
 	outboundSubnets []net.IPNet
 	stateMutex      sync.RWMutex
 }
 
 // New creates a new routing instance.
-func New(netLinker netlink.NetLinker,
-	logger logging.Logger) *Routing {
+func New(netLinker netlink.NetLinker, logger Logger) *Routing {
 	return &Routing{
 		netLinker: netLinker,
 		logger:    logger,

internal/routing/rules_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/qdm12/gluetun/internal/netlink"
 	"github.com/qdm12/gluetun/internal/netlink/mock_netlink"
-	"github.com/qdm12/golibs/logging/mock_logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -116,7 +115,7 @@ func Test_Routing_addIPRule(t *testing.T) {
 			t.Parallel()
 			ctrl := gomock.NewController(t)
 
-			logger := mock_logging.NewMockLogger(ctrl)
+			logger := NewMockLogger(ctrl)
 			logger.EXPECT().Debug(testCase.dbgMsg)
 
 			netLinker := mock_netlink.NewMockNetLinker(ctrl)
@@ -234,7 +233,7 @@ func Test_Routing_deleteIPRule(t *testing.T) {
 			t.Parallel()
 			ctrl := gomock.NewController(t)
 
-			logger := mock_logging.NewMockLogger(ctrl)
+			logger := NewMockLogger(ctrl)
 			logger.EXPECT().Debug(testCase.dbgMsg)
 
 			netLinker := mock_netlink.NewMockNetLinker(ctrl)