admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(settings): clearer error message for surfshark regions

Browse Source 
- only log possible 'new' server regions
- do not log old retro-compatible server regions
- maintains compatibility with older names
This commit is contained in:
Quentin McGaw
2024-02-06 20:39:00 +00:00
parent a369745101
commit 827e591174
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/configuration/settings/serverselection.go
View File

@@ -166,9 +166,12 @@ func getLocationFilterChoices(vpnServiceProvider string,
if vpnServiceProvider == providers.Surfshark {
// // Retro compatibility
// TODO v4 remove
filterChoices.Regions = append(filterChoices.Regions, validation.SurfsharkRetroLocChoices()...)
err := validate.AreAllOneOfCaseInsensitive(ss.Regions, filterChoices.Regions)
newAndRetroRegions := append(filterChoices.Regions, validation.SurfsharkRetroLocChoices()...) //nolint:gocritic
err := validate.AreAllOneOfCaseInsensitive(ss.Regions, newAndRetroRegions)
if err != nil {
// Only return error comparing with newer regions, we don't want to confuse the user
// with the retro regions in the error message.
err = validate.AreAllOneOfCaseInsensitive(ss.Regions, filterChoices.Regions)
return models.FilterChoices{}, fmt.Errorf("%w: %w", ErrRegionNotValid, err)
}
}