chore(updater): move updater packages to pkg/updaters/<name>

internal/provider/expressvpn/connection_test.go

@@ -7,11 +7,12 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/constants/providers"
-	"github.com/qdm12/gluetun/internal/constants/vpn"
 	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gluetun/internal/provider/common"
+	updaters "github.com/qdm12/gluetun/pkg/updaters/common"
+	"github.com/qdm12/gluetun/pkg/updaters/constants"
+	umodels "github.com/qdm12/gluetun/pkg/updaters/models"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -21,7 +22,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 	const provider = providers.Expressvpn
 
 	testCases := map[string]struct {
-		filteredServers []models.Server
+		filteredServers []umodels.Server
 		storageErr      error
 		selection       settings.ServerSelection
 		ipv6Supported   bool
@@ -34,7 +35,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 			errMessage: "filtering servers: test error",
 		},
 		"default OpenVPN TCP port": {
-			filteredServers: []models.Server{
+			filteredServers: []umodels.Server{
 				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
@@ -45,7 +46,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 			panicMessage: "no default OpenVPN TCP port is defined!",
 		},
 		"default OpenVPN UDP port": {
-			filteredServers: []models.Server{
+			filteredServers: []umodels.Server{
 				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
@@ -54,18 +55,18 @@ func Test_Provider_GetConnection(t *testing.T) {
 				},
 			}.WithDefaults(provider),
 			connection: models.Connection{
-				Type:     vpn.OpenVPN,
+				Type:     constants.OpenVPN,
 				IP:       netip.AddrFrom4([4]byte{1, 1, 1, 1}),
 				Port:     1195,
 				Protocol: constants.UDP,
 			},
 		},
 		"default Wireguard port": {
-			filteredServers: []models.Server{
+			filteredServers: []umodels.Server{
 				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
-				VPN: vpn.Wireguard,
+				VPN: constants.Wireguard,
 			}.WithDefaults(provider),
 			panicMessage: "no default Wireguard port is defined!",
 		},
@@ -80,9 +81,9 @@ func Test_Provider_GetConnection(t *testing.T) {
 			storage.EXPECT().FilterServers(provider, testCase.selection).
 				Return(testCase.filteredServers, testCase.storageErr)
 
-			unzipper := (common.Unzipper)(nil)
-			warner := (common.Warner)(nil)
-			parallelResolver := (common.ParallelResolver)(nil)
+			unzipper := (updaters.Unzipper)(nil)
+			warner := (updaters.Warner)(nil)
+			parallelResolver := (updaters.ParallelResolver)(nil)
 			provider := New(storage, unzipper, warner, parallelResolver)
 
 			if testCase.panicMessage != "" {