NET-2292: port ingress-gateway test case "http" from BATS addendum

test/integration/consul-container/libs/assert/service.go

@@ -122,8 +122,10 @@ func ServiceLogContains(t *testing.T, service libservice.Service, target string)
 // has a `FORTIO_NAME` env variable set. This validates that the client is sending
 // traffic to the right envoy proxy.
 //
+// If reqHost is set, the Host field of the HTTP request will be set to its value.
+//
 // It retries with timeout defaultHTTPTimeout and wait defaultHTTPWait.
-func AssertFortioName(t *testing.T, urlbase string, name string) {
+func AssertFortioName(t *testing.T, urlbase string, name string, reqHost string) {
 	t.Helper()
 	var fortioNameRE = regexp.MustCompile(("\nFORTIO_NAME=(.+)\n"))
 	client := &http.Client{
@@ -133,11 +135,13 @@ func AssertFortioName(t *testing.T, urlbase string, name string) {
 	}
 	retry.RunWith(&retry.Timer{Timeout: defaultHTTPTimeout, Wait: defaultHTTPWait}, t, func(r *retry.R) {
 		fullurl := fmt.Sprintf("%s/debug?env=dump", urlbase)
-		t.Logf("making call to %s", fullurl)
 		req, err := http.NewRequest("GET", fullurl, nil)
 		if err != nil {
 			r.Fatal("could not make request to service ", fullurl)
 		}
+		if reqHost != "" {
+			req.Host = reqHost
+		}
 
 		resp, err := client.Do(req)
 		if err != nil {

test/integration/consul-container/libs/cluster/cluster.go

@@ -125,10 +125,10 @@ func (c *Cluster) Add(configs []Config, serfJoin bool, ports ...int) (xe error)
 		// Each agent gets it's own area in the cluster scratch.
 		conf.ScratchDir = filepath.Join(c.ScratchDir, strconv.Itoa(c.Index))
 		if err := os.MkdirAll(conf.ScratchDir, 0777); err != nil {
-			return err
+			return fmt.Errorf("container %d: %w", idx, err)
 		}
 		if err := os.Chmod(conf.ScratchDir, 0777); err != nil {
-			return err
+			return fmt.Errorf("container %d: %w", idx, err)
 		}
 
 		n, err := NewConsulContainer(
@@ -138,7 +138,7 @@ func (c *Cluster) Add(configs []Config, serfJoin bool, ports ...int) (xe error)
 			ports...,
 		)
 		if err != nil {
-			return fmt.Errorf("could not add container index %d: %w", idx, err)
+			return fmt.Errorf("container %d: %w", idx, err)
 		}
 		agents = append(agents, n)
 		c.Index++

test/integration/consul-container/libs/topology/peering_topology.go

@@ -44,12 +44,12 @@ func BasicPeeringTwoClustersSetup(
 	peeringThroughMeshgateway bool,
 ) (*BuiltCluster, *BuiltCluster) {
 	// acceptingCluster, acceptingCtx, acceptingClient := NewPeeringCluster(t, "dc1", 3, consulVersion, true)
-	acceptingCluster, acceptingCtx, acceptingClient := NewPeeringCluster(t, 3, &libcluster.BuildOptions{
+	acceptingCluster, acceptingCtx, acceptingClient := NewPeeringCluster(t, 3, 1, &libcluster.BuildOptions{
 		Datacenter:           "dc1",
 		ConsulVersion:        consulVersion,
 		InjectAutoEncryption: true,
 	})
-	dialingCluster, dialingCtx, dialingClient := NewPeeringCluster(t, 1, &libcluster.BuildOptions{
+	dialingCluster, dialingCtx, dialingClient := NewPeeringCluster(t, 1, 1, &libcluster.BuildOptions{
 		Datacenter:           "dc2",
 		ConsulVersion:        consulVersion,
 		InjectAutoEncryption: true,
@@ -133,7 +133,7 @@ func BasicPeeringTwoClustersSetup(
 	libassert.AssertUpstreamEndpointStatus(t, adminPort, fmt.Sprintf("static-server.default.%s.external", DialingPeerName), "HEALTHY", 1)
 	_, port := clientSidecarService.GetAddr()
 	libassert.HTTPServiceEchoes(t, "localhost", port, "")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server")
+	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 
 	return &BuiltCluster{
 			Cluster:   acceptingCluster,
@@ -210,6 +210,7 @@ func NewDialingCluster(
 func NewPeeringCluster(
 	t *testing.T,
 	numServers int,
+	numClients int,
 	buildOpts *libcluster.BuildOptions,
 ) (*libcluster.Cluster, *libcluster.BuildContext, *api.Client) {
 	require.NotEmpty(t, buildOpts.Datacenter)
@@ -239,21 +240,21 @@ func NewPeeringCluster(
 		retryJoin = append(retryJoin, fmt.Sprintf("agent-%d", i))
 	}
 
-	// Add a stable client to register the service
+	// Add numClients static clients to register the service
 	configbuiilder := libcluster.NewConfigBuilder(ctx).
 		Client().
 		Peering(true).
 		RetryJoin(retryJoin...)
 	clientConf := configbuiilder.ToAgentConfig(t)
 	t.Logf("%s client config: \n%s", opts.Datacenter, clientConf.JSON)
 
-	require.NoError(t, cluster.AddN(*clientConf, 1, true))
+	require.NoError(t, cluster.AddN(*clientConf, numClients, true))
 
 	// Use the client agent as the HTTP endpoint since we will not rotate it in many tests.
 	clientNode := cluster.Agents[numServers]
 	client := clientNode.GetClient()
 	libcluster.WaitForLeader(t, cluster, client)
-	libcluster.WaitForMembers(t, client, numServers+1)
+	libcluster.WaitForMembers(t, client, numServers+numClients)
 
 	// Default Proxy Settings
 	ok, err := utils.ApplyDefaultProxySettings(client)

test/integration/consul-container/test/basic/connect_service_test.go

@@ -41,7 +41,7 @@ func TestBasicConnectService(t *testing.T) {
 
 	libassert.AssertContainerState(t, clientService, "running")
 	libassert.HTTPServiceEchoes(t, "localhost", port, "")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server")
+	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 }
 
 func createServices(t *testing.T, cluster *libcluster.Cluster) libservice.Service {

test/integration/consul-container/test/observability/access_logs_test.go

@@ -45,7 +45,7 @@ func TestAccessLogs(t *testing.T) {
 		t.Skip()
 	}
 
-	cluster, _, _ := topology.NewPeeringCluster(t, 1, &libcluster.BuildOptions{
+	cluster, _, _ := topology.NewPeeringCluster(t, 1, 1, &libcluster.BuildOptions{
 		Datacenter:           "dc1",
 		InjectAutoEncryption: true,
 	})
@@ -70,7 +70,7 @@ func TestAccessLogs(t *testing.T) {
 	// Validate Custom JSON
 	require.Eventually(t, func() bool {
 		libassert.HTTPServiceEchoes(t, "localhost", port, "banana")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 		client := libassert.ServiceLogContains(t, clientService, "\"banana_path\":\"/banana\"")
 		server := libassert.ServiceLogContains(t, serverService, "\"banana_path\":\"/banana\"")
 		return client && server
@@ -112,7 +112,7 @@ func TestAccessLogs(t *testing.T) {
 	_, port = clientService.GetAddr()
 	require.Eventually(t, func() bool {
 		libassert.HTTPServiceEchoes(t, "localhost", port, "orange")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 		client := libassert.ServiceLogContains(t, clientService, "Orange you glad I didn't say banana: /orange, -")
 		server := libassert.ServiceLogContains(t, serverService, "Orange you glad I didn't say banana: /orange, -")
 		return client && server

test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go

@@ -94,7 +94,7 @@ func TestPeering_RotateServerAndCAThenFail_(t *testing.T) {
 
 		_, port := clientSidecarService.GetAddr()
 		libassert.HTTPServiceEchoes(t, "localhost", port, "")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 	}
 
 	testutil.RunStep(t, "rotate exporting cluster's root CA", func(t *testing.T) {
@@ -144,7 +144,7 @@ func TestPeering_RotateServerAndCAThenFail_(t *testing.T) {
 		// Connectivity should still be contained
 		_, port := clientSidecarService.GetAddr()
 		libassert.HTTPServiceEchoes(t, "localhost", port, "")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 
 		verifySidecarHasTwoRootCAs(t, clientSidecarService)
 	})
@@ -166,7 +166,7 @@ func TestPeering_RotateServerAndCAThenFail_(t *testing.T) {
 
 		_, port := clientSidecarService.GetAddr()
 		libassert.HTTPServiceEchoes(t, "localhost", port, "")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 	})
 }
 

test/integration/consul-container/test/troubleshoot/troubleshoot_test.go

@@ -18,7 +18,7 @@ import (
 
 func TestTroubleshootProxy(t *testing.T) {
 	t.Parallel()
-	cluster, _, _ := topology.NewPeeringCluster(t, 1, &libcluster.BuildOptions{
+	cluster, _, _ := topology.NewPeeringCluster(t, 1, 1, &libcluster.BuildOptions{
 		Datacenter:           "dc1",
 		InjectAutoEncryption: true,
 	})

test/integration/consul-container/test/upgrade/acl_node_test.go

@@ -36,7 +36,7 @@ func TestACL_Upgrade_Node_Token(t *testing.T) {
 
 	run := func(t *testing.T, tc testcase) {
 		// NOTE: Disable auto.encrypt due to its conflict with ACL token during bootstrap
-		cluster, _, _ := libtopology.NewPeeringCluster(t, 1, &libcluster.BuildOptions{
+		cluster, _, _ := libtopology.NewPeeringCluster(t, 1, 1, &libcluster.BuildOptions{
 			Datacenter:           "dc1",
 			ConsulVersion:        tc.oldversion,
 			InjectAutoEncryption: false,