mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-16 21:50:22 +02:00
refactor(storage): new storage file structure
- new directory structure containing manifest.json and one json file per provider, by default. - the manifest.json file can specify a filepath for each vpn provider - each vpn provider json data file can contain the `"preferred": true` field to enforce it is used even if outdated, unless there is a version mismatch - `STORAGE_SERVERS_DIRECTORY_PATH` replaces `STORAGE_FILEPATH` (which is now a migration source only). It sets the directory where server manifest and per-provider JSON files are stored (default: `/gluetun/servers/`). - First-run migration: On startup, gluetun checks for the old /gluetun/servers.json file; if found and no new manifest exists, it automatically migrates all data to /gluetun/servers/ directory structure - Silent fallback: If legacy file isn't found, uses the new directory path normally - Legacy cleanup: After successful migration, attempts to remove the old fat JSON file (logs warning only if removal fails, e.g., read-only bind mounts) Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
@@ -1,9 +1,13 @@
|
||||
package storage
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"path"
|
||||
"testing"
|
||||
|
||||
"github.com/qdm12/gluetun-servers/pkg/servers"
|
||||
"github.com/qdm12/gluetun/internal/constants/providers"
|
||||
"github.com/qdm12/gluetun/internal/models"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
@@ -11,9 +15,10 @@ import (
|
||||
func Test_parseHardcodedServers(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
servers, err := parseHardcodedServers()
|
||||
|
||||
require.NoError(t, err)
|
||||
var servers models.AllServers
|
||||
assert.NotPanics(t, func() {
|
||||
servers = parseHardcodedServers()
|
||||
})
|
||||
|
||||
// all providers minus custom
|
||||
allProviders := providers.All()
|
||||
@@ -24,3 +29,35 @@ func Test_parseHardcodedServers(t *testing.T) {
|
||||
assert.NotEmptyf(t, servers, "for provider %s", provider)
|
||||
}
|
||||
}
|
||||
|
||||
func Test_parseHardcodedServers_filepathsAndEmbeddedProviderFiles(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
hardcodedServers := parseHardcodedServers()
|
||||
|
||||
allProviders := providers.All()
|
||||
for _, provider := range allProviders {
|
||||
providerServers, ok := hardcodedServers.ProviderToServers[provider]
|
||||
require.Truef(t, ok, "for provider %s", provider)
|
||||
|
||||
require.NotEmptyf(t, providerServers.Filepath,
|
||||
"embedded servers filepath should be set for provider %s", provider)
|
||||
|
||||
filename := path.Base(providerServers.Filepath)
|
||||
file, err := servers.Files.Open(filename)
|
||||
require.NoErrorf(t, err, "opening embedded provider file for %s", provider)
|
||||
|
||||
var fileServers struct {
|
||||
Version uint16 `json:"version"`
|
||||
Timestamp int64 `json:"timestamp"`
|
||||
Servers []json.RawMessage `json:"servers"`
|
||||
}
|
||||
err = json.NewDecoder(file).Decode(&fileServers)
|
||||
require.NoErrorf(t, err, "decoding embedded provider file for %s", provider)
|
||||
require.NoError(t, file.Close())
|
||||
|
||||
assert.NotZerof(t, fileServers.Version, "for provider %s", provider)
|
||||
assert.NotZerof(t, fileServers.Timestamp, "for provider %s", provider)
|
||||
assert.NotEmptyf(t, fileServers.Servers, "for provider %s", provider)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user