backport of commit b8aa15e

hashicorp · Feb 22, 2023 · 0757756 · 0757756
1 parent 71c95f0
commit 0757756
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/test/integration/consul-container/libs/topology/peering_topology.go b/test/integration/consul-container/libs/topology/peering_topology.go
@@ -132,7 +132,7 @@ func BasicPeeringTwoClustersSetup(
 	_, adminPort := clientSidecarService.GetAdminAddr()
 	libassert.AssertUpstreamEndpointStatus(t, adminPort, fmt.Sprintf("static-server.default.%s.external", DialingPeerName), "HEALTHY", 1)
 	_, port := clientSidecarService.GetAddr()
-	libassert.HTTPServiceEchoes(t, "localhost", port, "", nil)
+	libassert.HTTPServiceEchoes(t, "localhost", port, "")
 	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server")
 
 	return &BuiltCluster{

diff --git a/test/integration/consul-container/test/gateways/http_route_test.go b/test/integration/consul-container/test/gateways/http_route_test.go
@@ -90,9 +90,9 @@ func TestHTTPRouteFlattening(t *testing.T) {
 		Name: gatewayName,
 		Listeners: []api.APIGatewayListener{
 			{
+				Name:     "listener",
 				Port:     listenerPort,
 				Protocol: "http",
-				Hostname: "test.foo",
 			},
 		},
 	}
@@ -237,11 +237,10 @@ func TestHTTPRouteFlattening(t *testing.T) {
 	}, checkOptions{statusCode: service2ResponseCode, testName: "service2 just path match"})
 
 	////v1 path with the header
-	//TODO this test case was validated manually but does not want to work here with golang runners for whatever reason
-	//checkRoute(t, ip, gatewayService.GetPort(listenerPort), "check", map[string]string{
-	//	"Host": "test.foo",
-	//	"x-v2": "v2",
-	//}, checkOptions{statusCode: service2ResponseCode, testName: "service2 just header match"})
+	checkRoute(t, ip, gatewayService.GetPort(listenerPort), "check", map[string]string{
+		"Host": "test.foo",
+		"x-v2": "v2",
+	}, checkOptions{statusCode: service2ResponseCode, testName: "service2 just header match"})
 
 	checkRoute(t, ip, gatewayService.GetPort(listenerPort), "v2/path/value", map[string]string{
 		"Host": "test.foo",