dnsforward: imp code

internal/dnsforward/config.go

@@ -90,7 +90,8 @@ type Config struct {
 	FallbackDNS []string `yaml:"fallback_dns"`
 
 	// UpstreamMode determines the logic through which upstreams will be used.
-	// See UpstreamModeType* constants.
+	// Should be [UpstreamModeTypeParallel], [UpstreamModeTypeLoadBalance], or
+	// [UpstreamModeTypeFastestAddr].
 	UpstreamMode string `yaml:"upstream_mode"`
 
 	// FastestTimeout replaces the default timeout for dialing IP addresses

internal/dnsforward/http.go

@@ -146,7 +146,8 @@ func (s *Server) getDNSConfig() (c *jsonDNSConfig) {
 	localPTRUpstreams := stringutil.CloneSliceOrEmpty(s.conf.LocalPTRResolvers)
 
 	var upstreamMode string
-	// TODO(d.kolyshev): Set 'load_balance' type string instead of nil.
+	// TODO(d.kolyshev): Use 'load_balance' on frontend instead of nil as a
+	// default value.
 	switch s.conf.UpstreamMode {
 	case UpstreamModeTypeParallel:
 		upstreamMode = "parallel"
@@ -224,18 +225,24 @@ func (req *jsonDNSConfig) checkBlockingMode() (err error) {
 	return validateBlockingMode(*req.BlockingMode, req.BlockingIPv4, req.BlockingIPv6)
 }
 
-// checkUpstreamsMode returns an error if the upstream mode is invalid.
+// checkUpstreamMode returns an error if the upstream mode is invalid.
-func (req *jsonDNSConfig) checkUpstreamsMode() (err error) {
+func (req *jsonDNSConfig) checkUpstreamMode() (err error) {
 	if req.UpstreamMode == nil {
 		return nil
 	}
 
-	mode := *req.UpstreamMode
+	switch um := *req.UpstreamMode; um {
-	if ok := slices.Contains([]string{"", "fastest_addr", "parallel"}, mode); !ok {
+	case "":
-		return fmt.Errorf("upstream_mode: incorrect value %q", mode)
+		return nil
+	case "parallel":
+		return nil
+	case "fastest_addr":
+		return nil
+	case "load_balance":
+		return nil
+	default:
+		return fmt.Errorf("upstream_mode: incorrect value %q", um)
 	}
-
-	return nil
 }
 
 // checkBootstrap returns an error if any bootstrap address is invalid.
@@ -299,7 +306,7 @@ func (req *jsonDNSConfig) validate(privateNets netutil.SubnetSet) (err error) {
 		return err
 	}
 
-	err = req.checkUpstreamsMode()
+	err = req.checkUpstreamMode()
 	if err != nil {
 		// Don't wrap the error since it's informative enough as is.
 		return err
@@ -448,14 +455,7 @@ func (s *Server) setConfig(dc *jsonDNSConfig) (shouldRestart bool) {
 	}
 
 	if dc.UpstreamMode != nil {
-		switch *dc.UpstreamMode {
+		s.conf.UpstreamMode = mustParseUpstreamMode(*dc.UpstreamMode)
-		case "parallel":
-			s.conf.UpstreamMode = UpstreamModeTypeParallel
-		case "fastest_addr":
-			s.conf.UpstreamMode = UpstreamModeTypeFastestAddr
-		default:
-			s.conf.UpstreamMode = UpstreamModeTypeLoadBalance
-		}
 	} else {
 		s.conf.UpstreamMode = UpstreamModeTypeLoadBalance
 	}
@@ -470,6 +470,24 @@ func (s *Server) setConfig(dc *jsonDNSConfig) (shouldRestart bool) {
 	return s.setConfigRestartable(dc)
 }
 
+// mustParseUpstreamMode returns an upstream mode parsed from string.  Panics in
+// case of invalid value.
+func mustParseUpstreamMode(mode string) (um string) {
+	switch mode {
+	case "":
+		return UpstreamModeTypeLoadBalance
+	case "load_balance":
+		return UpstreamModeTypeLoadBalance
+	case "parallel":
+		return UpstreamModeTypeParallel
+	case "fastest_addr":
+		return UpstreamModeTypeFastestAddr
+	default:
+		// Should never happen, since the value should be validated.
+		panic(fmt.Errorf("unexpected upstream mode: %q", mode))
+	}
+}
+
 // setIfNotNil sets the value pointed at by currentPtr to the value pointed at
 // by newPtr if newPtr is not nil.  currentPtr must not be nil.
 func setIfNotNil[T any](currentPtr, newPtr *T) (hasSet bool) {