Fix #11457: Use proxy-defaults protocol if service-defaults protocol …

…is unset
hashicorp · Mar 21, 2024 · c60968d · c60968d
1 parent fea6926
commit c60968d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/agent/consul/discoverychain/compile.go b/agent/consul/discoverychain/compile.go
@@ -239,7 +239,9 @@ func (c *compiler) recordNode(node *structs.DiscoveryGraphNode) {
 
 func (c *compiler) recordServiceProtocol(sid structs.ServiceID) error {
 	if serviceDefault := c.entries.GetService(sid); serviceDefault != nil {
-		return c.recordProtocol(sid, serviceDefault.Protocol)
+		if serviceDefault.Protocol != "" {
+			return c.recordProtocol(sid, serviceDefault.Protocol)
+		}
 	}
 	if proxyDefault := c.entries.GetProxyDefaults(sid.PartitionOrDefault()); proxyDefault != nil {
 		if proxyDefault.Protocol != "" {