differnet fix

hashicorp · Aug 22, 2019 · a69c0b9 · a69c0b9
1 parent 080dc05
commit a69c0b9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/agent/proxycfg/testing.go b/agent/proxycfg/testing.go
@@ -559,6 +559,12 @@ func TestGatewayServiceGroupFooDC1(t testing.T) structs.CheckServiceNodes {
 // TestConfigSnapshot returns a fully populated snapshot
 func TestConfigSnapshot(t testing.T) *ConfigSnapshot {
 	roots, leaf := TestCerts(t)
+
+	// no entries implies we'll get a default chain
+	dbChain := discoverychain.TestCompileConfigEntries(
+		t, "db", "default", "dc1",
+		connect.TestClusterID+".consul", "dc1", nil)
+
 	return &ConfigSnapshot{
 		Kind:    structs.ServiceKindConnectProxy,
 		Service: "web-sidecar-proxy",
@@ -578,10 +584,17 @@ func TestConfigSnapshot(t testing.T) *ConfigSnapshot {
 		Roots: roots,
 		ConnectProxy: configSnapshotConnectProxy{
 			Leaf: leaf,
+			DiscoveryChain: map[string]*structs.CompiledDiscoveryChain{
+				"db": dbChain,
+			},
 			UpstreamEndpoints: map[string]structs.CheckServiceNodes{
-				"db":                       TestUpstreamNodes(t),
 				"prepared_query:geo-cache": TestUpstreamNodes(t),
 			},
+			WatchedUpstreamEndpoints: map[string]map[string]structs.CheckServiceNodes{
+				"db": map[string]structs.CheckServiceNodes{
+					"db.default.dc1": TestUpstreamNodes(t),
+				},
+			},
 		},
 		Datacenter: "dc1",
 	}

diff --git a/agent/xds/clusters.go b/agent/xds/clusters.go
@@ -341,8 +341,6 @@ func (s *Server) makeUpstreamClustersForDiscoveryChain(
 		defaultCluster := out[0]
 
 		// Overlay what the user provided.
-		escapeHatchCluster.Name = defaultCluster.Name
-		escapeHatchCluster.AltStatName = defaultCluster.AltStatName
 		escapeHatchCluster.TlsContext = defaultCluster.TlsContext
 
 		out = []*envoy.Cluster{escapeHatchCluster}

diff --git a/agent/xds/testdata/clusters/custom-local-app.golden b/agent/xds/testdata/clusters/custom-local-app.golden
@@ -4,6 +4,7 @@
     {
       "@type": "type.googleapis.com/envoy.api.v2.Cluster",
       "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
@@ -12,7 +13,7 @@
           }
         }
       },
-      "connectTimeout": "1s",
+      "connectTimeout": "5s",
       "tlsContext": {
         "commonTlsContext": {
           "tlsParams": {
@@ -38,6 +39,11 @@
       },
       "outlierDetection": {
 
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       }
     },
     {

diff --git a/agent/xds/testdata/clusters/custom-timeouts.golden b/agent/xds/testdata/clusters/custom-timeouts.golden
@@ -4,6 +4,7 @@
     {
       "@type": "type.googleapis.com/envoy.api.v2.Cluster",
       "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
@@ -12,7 +13,7 @@
           }
         }
       },
-      "connectTimeout": "2.345s",
+      "connectTimeout": "5s",
       "tlsContext": {
         "commonTlsContext": {
           "tlsParams": {
@@ -38,6 +39,11 @@
       },
       "outlierDetection": {
 
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       }
     },
     {

diff --git a/agent/xds/testdata/clusters/defaults.golden b/agent/xds/testdata/clusters/defaults.golden
@@ -4,6 +4,7 @@
     {
       "@type": "type.googleapis.com/envoy.api.v2.Cluster",
       "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
@@ -12,7 +13,7 @@
           }
         }
       },
-      "connectTimeout": "1s",
+      "connectTimeout": "5s",
       "tlsContext": {
         "commonTlsContext": {
           "tlsParams": {
@@ -38,6 +39,11 @@
       },
       "outlierDetection": {
 
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       }
     },
     {