update based on reviews

nginxinc · Jul 15, 2024 · 5fe59f5 · 5fe59f5
1 parent 506c197
commit 5fe59f5
Show file tree

Hide file tree

Showing 6 changed files with 709 additions and 976 deletions.
diff --git a/internal/mode/static/nginx/config/servers.go b/internal/mode/static/nginx/config/servers.go
@@ -93,7 +93,7 @@ func executeServers(conf dataplane.Configuration) []executeResult {
 
 // getIPFamily returns whether the server should be configured for IPv4, IPv6, or both.
 func getIPFamily(baseHTTPConfig dataplane.BaseHTTPConfig) http.IPFamily {
-	switch ip := baseHTTPConfig.IPFamily; ip {
+	switch baseHTTPConfig.IPFamily {
 	case dataplane.IPv4:
 		return http.IPFamily{IPv4: true}
 	case dataplane.IPv6:

diff --git a/internal/mode/static/state/dataplane/configuration.go b/internal/mode/static/state/dataplane/configuration.go
@@ -542,8 +542,10 @@ func getAllowedAddressType(ipFamily IPFamilyType) []discoveryV1.AddressType {
 		return []discoveryV1.AddressType{discoveryV1.AddressTypeIPv4}
 	case IPv6:
 		return []discoveryV1.AddressType{discoveryV1.AddressTypeIPv6}
-	default:
+	case Dual:
 		return []discoveryV1.AddressType{discoveryV1.AddressTypeIPv4, discoveryV1.AddressTypeIPv6}
+	default:
+		return []discoveryV1.AddressType{}
 	}
 }
 
@@ -686,7 +688,7 @@ func buildBaseHTTPConfig(g *graph.Graph) BaseHTTPConfig {
 	}
 
 	if g.NginxProxy.Source.Spec.IPFamily != nil {
-		switch ipFamily := g.NginxProxy.Source.Spec.IPFamily; *ipFamily {
+		switch *g.NginxProxy.Source.Spec.IPFamily {
 		case ngfAPI.IPv4:
 			baseConfig.IPFamily = IPv4
 		case ngfAPI.IPv6: