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

fix(hidemyass): REGION validation

Browse Source
This commit is contained in:
Quentin McGaw
2021-12-25 11:41:47 +00:00
parent ca82fcb48e
commit 46738b2934
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/configuration/hidemyass.go
View File

@@ -20,7 +20,7 @@ func (settings *Provider) readHideMyAss(r reader) (err error) {
return fmt.Errorf("environment variable COUNTRY: %w", err) return fmt.Errorf("environment variable COUNTRY: %w", err)
} }
settings.ServerSelection.Regions, err = r.env.CSVInside("REGION", constants.HideMyAssCountryChoices(servers)) settings.ServerSelection.Regions, err = r.env.CSVInside("REGION", constants.HideMyAssRegionChoices(servers))
if err != nil { if err != nil {
return fmt.Errorf("environment variable REGION: %w", err) return fmt.Errorf("environment variable REGION: %w", err)
} }

8
internal/constants/hidemyass.go
View File

@@ -19,6 +19,14 @@ func HideMyAssCountryChoices(servers []models.HideMyAssServer) (choices []string
return makeUnique(choices) return makeUnique(choices)
} }
func HideMyAssRegionChoices(servers []models.HideMyAssServer) (choices []string) {
choices = make([]string, len(servers))
for i := range servers {
choices[i] = servers[i].Region
}
return makeUnique(choices)
}
func HideMyAssCityChoices(servers []models.HideMyAssServer) (choices []string) { func HideMyAssCityChoices(servers []models.HideMyAssServer) (choices []string) {
choices = make([]string, len(servers)) choices = make([]string, len(servers))
for i := range servers { for i := range servers {