add dns-accept-family option ing global section

Signed-off-by: Vincent Gramer <vgramer@haproxy.com>

Author: vgramer

config-parser/section-parsers.go

@@ -460,6 +460,7 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
 	addParser(parser, &sequence, &simple.Enabled{Name: "expose-deprecated-directives"})
 	addParser(parser, &sequence, &simple.Time{Name: "force-cfg-parser-pause"})
 	addParser(parser, &sequence, &simple.Time{Name: "warn-blocked-traffic-after"})
+	addParser(parser, &sequence, &simple.Word{Name: "dns-accept-family"})
 	// the ConfigSnippet must be at the end to parsers load order to ensure
 	// the overloading of any option has been declared previously
 	addParser(parser, &sequence, &parsers.ConfigSnippet{})

config-parser/tests/configs/haproxy.cfg.go

@@ -66,6 +66,7 @@ global
   expose-deprecated-directives
   force-cfg-parser-pause 1s
   warn-blocked-traffic-after 50ms
+  dns-accept-family ipv4,ipv6
   # random comment before snippet
   ###_config-snippet_### BEGIN
   tune.ssl.default-dh-param 2048

configuration/global.go

@@ -2170,6 +2170,12 @@ func ParseGlobalSection(p parser.Parser) (*models.Global, error) { //nolint:goco
 	}
 	global.DeviceAtlasOptions = deviceAtlasOptions
 
+	dnsAcceptFamily, err := parseStringOption(p, "dns-accept-family")
+	if err != nil {
+		return nil, err
+	}
+	global.DNSAcceptFamily = dnsAcceptFamily
+
 	envOptions, err := parseEnvironmentOptions(p)
 	if err != nil {
 		return nil, err
@@ -3053,6 +3059,10 @@ func SerializeGlobalSection(p parser.Parser, data *models.Global, opt *options.C
 		return err
 	}
 
+	if err := serializeStringOption(p, "dns-accept-family", data.DNSAcceptFamily); err != nil {
+		return err
+	}
+
 	if err := serializeStringOption(p, "description", data.Description); err != nil {
 		return err
 	}

models/global_base.go

@@ -2147,6 +2147,10 @@ definitions:
         x-display-name: Text that describes the instance
       device_atlas_options:
         $ref: '#/definitions/device_atlas_options'
+      dns_accept_family:
+        pattern: ^[^\s]+$
+        type: string
+        x-display-name: DNS accept family
       environment_options:
         $ref: '#/definitions/environment_options'
       expose_deprecated_directives:

models/global_base_compare.go

@@ -311,6 +311,10 @@ global_base:
             quic:
               type: string
               enum: ["enabled", "disabled"]
+    dns_accept_family:
+      pattern: ^[^\s]+$
+      type: string
+      x-display-name: DNS accept family
     environment_options:
       $ref: "#/definitions/environment_options"
     performance_options:

models/global_base_compare_test.go

@@ -276,6 +276,7 @@ global
   ocsp-update.maxdelay 10
   ocsp-update.mindelay 7
   ocsp-update.mode on
+  dns-accept-family ipv4,ipv6
   warn-blocked-traffic-after 50ms
 
 defaults test_defaults # testing_defaults

specification/build/haproxy_spec.yaml

@@ -157,6 +157,7 @@
             "properties_cookie": "chocolate",
             "separator": "-"
         },
+        "dns_accept_family": "ipv4,ipv6",
         "expose_deprecated_directives": true,
         "expose_experimental_directives": true,
         "external_check": true,