From 56fdae9ace58d860c36794b972082d76e900170a Mon Sep 17 00:00:00 2001
From: freddygv <gh@freddygv.xyz>
Date: Thu, 3 Sep 2020 13:08:44 -0600
Subject: [PATCH] Update resolver defaulting

---
 agent/consul/discoverychain/compile_test.go  | 8 ++++----
 agent/structs/config_entry_discoverychain.go | 3 ++-
 agent/structs/discovery_chain.go             | 3 ---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/agent/consul/discoverychain/compile_test.go b/agent/consul/discoverychain/compile_test.go
index af6597175..1d5c3e582 100644
--- a/agent/consul/discoverychain/compile_test.go
+++ b/agent/consul/discoverychain/compile_test.go
@@ -2372,7 +2372,7 @@ func testcase_LBSplitterAndResolver() compileTestCase {
 				Type: structs.DiscoveryGraphNodeTypeResolver,
 				Name: "foo.default.dc1",
 				Resolver: &structs.DiscoveryResolver{
-					Default:        true,
+					Default:        false,
 					ConnectTimeout: 5 * time.Second,
 					Target:         "foo.default.dc1",
 				},
@@ -2389,7 +2389,7 @@ func testcase_LBSplitterAndResolver() compileTestCase {
 				Type: structs.DiscoveryGraphNodeTypeResolver,
 				Name: "bar.default.dc1",
 				Resolver: &structs.DiscoveryResolver{
-					Default:        true,
+					Default:        false,
 					ConnectTimeout: 5 * time.Second,
 					Target:         "bar.default.dc1",
 				},
@@ -2411,7 +2411,7 @@ func testcase_LBSplitterAndResolver() compileTestCase {
 				Type: structs.DiscoveryGraphNodeTypeResolver,
 				Name: "baz.default.dc1",
 				Resolver: &structs.DiscoveryResolver{
-					Default:        true,
+					Default:        false,
 					ConnectTimeout: 5 * time.Second,
 					Target:         "baz.default.dc1",
 				},
@@ -2476,7 +2476,7 @@ func testcase_LBResolver() compileTestCase {
 				Type: structs.DiscoveryGraphNodeTypeResolver,
 				Name: "main.default.dc1",
 				Resolver: &structs.DiscoveryResolver{
-					Default:        true,
+					Default:        false,
 					ConnectTimeout: 5 * time.Second,
 					Target:         "main.default.dc1",
 				},
diff --git a/agent/structs/config_entry_discoverychain.go b/agent/structs/config_entry_discoverychain.go
index d0cd7e46d..96ef3b3a2 100644
--- a/agent/structs/config_entry_discoverychain.go
+++ b/agent/structs/config_entry_discoverychain.go
@@ -730,7 +730,8 @@ func (e *ServiceResolverConfigEntry) IsDefault() bool {
 		len(e.Subsets) == 0 &&
 		e.Redirect == nil &&
 		len(e.Failover) == 0 &&
-		e.ConnectTimeout == 0
+		e.ConnectTimeout == 0 &&
+		e.LoadBalancer == nil
 }
 
 func (e *ServiceResolverConfigEntry) GetKind() string {
diff --git a/agent/structs/discovery_chain.go b/agent/structs/discovery_chain.go
index 5e2ff9498..77eb03937 100644
--- a/agent/structs/discovery_chain.go
+++ b/agent/structs/discovery_chain.go
@@ -82,9 +82,6 @@ func (c *CompiledDiscoveryChain) IsDefault() bool {
 	if !node.Resolver.Default {
 		return false
 	}
-	if node.LoadBalancer != nil {
-		return false
-	}
 
 	target := c.Targets[node.Resolver.Target]