feat(updater): Configurable min ratio

- `UPDATER_MIN_RATIO` variable
- `-minratio` flag for CLI operation

internal/configuration/settings/errors.go

@@ -10,6 +10,7 @@ var (
 	ErrFirewallZeroPort                = errors.New("cannot have a zero port to block")
 	ErrHostnameNotValid                = errors.New("the hostname specified is not valid")
 	ErrISPNotValid                     = errors.New("the ISP specified is not valid")
+	ErrMinRatioNotValid                = errors.New("minimum ratio is not valid")
 	ErrMissingValue                    = errors.New("missing value")
 	ErrNameNotValid                    = errors.New("the server name specified is not valid")
 	ErrOpenVPNClientKeyMissing         = errors.New("client key is missing")

internal/configuration/settings/helpers/merge.go

@@ -34,6 +34,13 @@ func MergeWithInt(existing, other int) (result int) {
 	return other
 }
 
+func MergeWithFloat64(existing, other float64) (result float64) {
+	if existing != 0 {
+		return existing
+	}
+	return other
+}
+
 func MergeWithStringPtr(existing, other *string) (result *string) {
 	if existing != nil {
 		return existing

internal/configuration/settings/helpers/override.go

@@ -32,6 +32,13 @@ func OverrideWithInt(existing, other int) (result int) {
 	return other
 }
 
+func OverrideWithFloat64(existing, other float64) (result float64) {
+	if other == 0 {
+		return existing
+	}
+	return other
+}
+
 func OverrideWithStringPtr(existing, other *string) (result *string) {
 	if other == nil {
 		return existing

internal/configuration/settings/updater.go

@@ -22,6 +22,10 @@ type Updater struct {
 	// to resolve VPN server hostnames to IP addresses.
 	// It cannot be the empty string in the internal state.
 	DNSAddress string
+	// MinRatio is the minimum ratio of servers to
+	// find per provider, compared to the total current
+	// number of servers. It defaults to 0.8.
+	MinRatio float64
 	// Providers is the list of VPN service providers
 	// to update server information for.
 	Providers []string
@@ -34,6 +38,11 @@ func (u Updater) Validate() (err error) {
 			ErrUpdaterPeriodTooSmall, *u.Period, minPeriod)
 	}
 
+	if u.MinRatio <= 0 || u.MinRatio > 1 {
+		return fmt.Errorf("%w: %.2f must be between 0+ and 1",
+			ErrMinRatioNotValid, u.MinRatio)
+	}
+
 	validProviders := providers.All()
 	for _, provider := range u.Providers {
 		valid := false
@@ -56,6 +65,7 @@ func (u *Updater) copy() (copied Updater) {
 	return Updater{
 		Period:     helpers.CopyDurationPtr(u.Period),
 		DNSAddress: u.DNSAddress,
+		MinRatio:   u.MinRatio,
 		Providers:  helpers.CopyStringSlice(u.Providers),
 	}
 }
@@ -65,6 +75,7 @@ func (u *Updater) copy() (copied Updater) {
 func (u *Updater) mergeWith(other Updater) {
 	u.Period = helpers.MergeWithDuration(u.Period, other.Period)
 	u.DNSAddress = helpers.MergeWithString(u.DNSAddress, other.DNSAddress)
+	u.MinRatio = helpers.MergeWithFloat64(u.MinRatio, other.MinRatio)
 	u.Providers = helpers.MergeStringSlices(u.Providers, other.Providers)
 }
 
@@ -74,12 +85,19 @@ func (u *Updater) mergeWith(other Updater) {
 func (u *Updater) overrideWith(other Updater) {
 	u.Period = helpers.OverrideWithDuration(u.Period, other.Period)
 	u.DNSAddress = helpers.OverrideWithString(u.DNSAddress, other.DNSAddress)
+	u.MinRatio = helpers.OverrideWithFloat64(u.MinRatio, other.MinRatio)
 	u.Providers = helpers.OverrideWithStringSlice(u.Providers, other.Providers)
 }
 
 func (u *Updater) SetDefaults(vpnProvider string) {
 	u.Period = helpers.DefaultDuration(u.Period, 0)
 	u.DNSAddress = helpers.DefaultString(u.DNSAddress, "1.1.1.1:53")
+
+	if u.MinRatio == 0 {
+		const defaultMinRatio = 0.8
+		u.MinRatio = defaultMinRatio
+	}
+
 	if len(u.Providers) == 0 && vpnProvider != providers.Custom {
 		u.Providers = []string{vpnProvider}
 	}
@@ -97,6 +115,7 @@ func (u Updater) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Server data updater settings:")
 	node.Appendf("Update period: %s", *u.Period)
 	node.Appendf("DNS address: %s", u.DNSAddress)
+	node.Appendf("Minimum ratio: %.1f", u.MinRatio)
 	node.Appendf("Providers to update: %s", strings.Join(u.Providers, ", "))
 
 	return node

internal/configuration/sources/env/helpers.go

@@ -38,6 +38,15 @@ func envToInt(envKey string) (n int, err error) {
 	return strconv.Atoi(s)
 }
 
+func envToFloat64(envKey string) (f float64, err error) {
+	s := getCleanedEnv(envKey)
+	if s == "" {
+		return 0, nil
+	}
+	const bits = 64
+	return strconv.ParseFloat(s, bits)
+}
+
 func envToStringPtr(envKey string) (stringPtr *string) {
 	s := getCleanedEnv(envKey)
 	if s == "" {

internal/configuration/sources/env/updater.go

@@ -18,6 +18,11 @@ func readUpdater() (updater settings.Updater, err error) {
 		return updater, err
 	}
 
+	updater.MinRatio, err = envToFloat64("UPDATER_MIN_RATIO")
+	if err != nil {
+		return updater, fmt.Errorf("environment variable UPDATER_MIN_RATIO: %w", err)
+	}
+
 	updater.Providers = envToCSV("UPDATER_VPN_SERVICE_PROVIDERS")
 
 	return updater, nil