Skip to content

Commit

Permalink
add http url path rewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
@sarahalsmiller
sarahalsmiller committed Feb 28, 2023
1 parent 29db217 commit 9503082
Show file tree
Hide file tree
Showing 2 changed files with 207 additions and 257 deletions.
130 changes: 68 additions & 62 deletions test/integration/consul-container/test/gateways/gateway_endpoint_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestAPIGatewayCreate(t *testing.T) {
},
}
_, _, err := client.ConfigEntries().Set(apiGateway, nil)
assert.NoError(t, err)
require.NoError(t, err)

tcpRoute := &api.TCPRouteConfigEntry{
Kind: "tcp-route",
Expand All @@ -70,32 +70,18 @@ func TestAPIGatewayCreate(t *testing.T) {
}

_, _, err = client.ConfigEntries().Set(tcpRoute, nil)
assert.NoError(t, err)
require.NoError(t, err)

// Create a client proxy instance with the server as an upstream
_, gatewayService := createServices(t, cluster, listenerPortOne)

//check statuses
gatewayReady := false
routeReady := false

//make sure the gateway/route come online
require.Eventually(t, func() bool {
entry, _, err := client.ConfigEntries().Get("api-gateway", "api-gateway", nil)
assert.NoError(t, err)
apiEntry := entry.(*api.APIGatewayConfigEntry)
gatewayReady = isAccepted(apiEntry.Status.Conditions)

e, _, err := client.ConfigEntries().Get("tcp-route", "api-gateway-route", nil)
assert.NoError(t, err)
routeEntry := e.(*api.TCPRouteConfigEntry)
routeReady = isBound(routeEntry.Status.Conditions)

return gatewayReady && routeReady
}, time.Second*10, time.Second*1)
//make sure config entries have been properly created
checkGatewayConfigEntry(t, client, "api-gateway", "")
checkTCPRouteConfigEntry(t, client, "api-gateway-route", "")

port, err := gatewayService.GetPort(listenerPortOne)
assert.NoError(t, err)
require.NoError(t, err)
libassert.HTTPServiceEchoes(t, "localhost", port, "")
}

Expand Down Expand Up @@ -150,12 +136,64 @@ func createCluster(t *testing.T, ports ...int) *libcluster.Cluster {
return cluster
}

func createGateway(gatewayName string, protocol string, listenerPort int) *api.APIGatewayConfigEntry {
return &api.APIGatewayConfigEntry{
Kind: "api-gateway",
Name: gatewayName,
Listeners: []api.APIGatewayListener{
{
Name: "listener",
Port: listenerPort,
Protocol: protocol,
},
},
}
}

func checkGatewayConfigEntry(t *testing.T, client *api.Client, gatewayName string, namespace string) {
require.Eventually(t, func() bool {
entry, _, err := client.ConfigEntries().Get(api.APIGateway, gatewayName, &api.QueryOptions{Namespace: namespace})
require.NoError(t, err)
if entry == nil {
return false
}
apiEntry := entry.(*api.APIGatewayConfigEntry)
return isAccepted(apiEntry.Status.Conditions)
}, time.Second*10, time.Second*1)
}

func checkHTTPRouteConfigEntry(t *testing.T, client *api.Client, routeName string, namespace string) {
require.Eventually(t, func() bool {
entry, _, err := client.ConfigEntries().Get(api.HTTPRoute, routeName, &api.QueryOptions{Namespace: namespace})
require.NoError(t, err)
if entry == nil {
return false
}

apiEntry := entry.(*api.HTTPRouteConfigEntry)
return isBound(apiEntry.Status.Conditions)
}, time.Second*10, time.Second*1)
}

func checkTCPRouteConfigEntry(t *testing.T, client *api.Client, routeName string, namespace string) {
require.Eventually(t, func() bool {
entry, _, err := client.ConfigEntries().Get(api.TCPRoute, routeName, &api.QueryOptions{Namespace: namespace})
require.NoError(t, err)
if entry == nil {
return false
}

apiEntry := entry.(*api.TCPRouteConfigEntry)
return isBound(apiEntry.Status.Conditions)
}, time.Second*10, time.Second*1)
}

func createService(t *testing.T, cluster *libcluster.Cluster, serviceOpts *libservice.ServiceOpts, containerArgs []string) libservice.Service {
node := cluster.Agents[0]
client := node.GetClient()
// Create a service and proxy instance
service, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts, containerArgs...)
assert.NoError(t, err)
require.NoError(t, err)

libassert.CatalogServiceExists(t, client, serviceOpts.Name+"-sidecar-proxy")
libassert.CatalogServiceExists(t, client, serviceOpts.Name)
Expand Down Expand Up @@ -183,33 +221,34 @@ func createServices(t *testing.T, cluster *libcluster.Cluster, ports ...int) (li
return clientConnectProxy, gatewayService
}

// checkRoute, customized version of libassert.RouteEchos to allow for headers/distinguishing between the server instances

type checkOptions struct {
debug bool
statusCode int
testName string
}

func checkRoute(t *testing.T, ip string, port int, path string, headers map[string]string, expected checkOptions) {
// checkRoute, customized version of libassert.RouteEchos to allow for headers/distinguishing between the server instances
func checkRoute(t *testing.T, port int, path string, headers map[string]string, expected checkOptions) {
ip := "localhost"
if expected.testName != "" {
t.Log("running " + expected.testName)
}
const phrase = "hello"

failer := func() *retry.Timer {
return &retry.Timer{Timeout: time.Second * 60, Wait: time.Second * 60}
}

client := cleanhttp.DefaultClient()
url := fmt.Sprintf("http://%s:%d", ip, port)

if path != "" {
url += "/" + path
}
path = strings.TrimPrefix(path, "/")
url := fmt.Sprintf("http://%s:%d/%s", ip, port, path)

retry.RunWith(failer(), t, func(r *retry.R) {
t.Logf("making call to %s", url)
reader := strings.NewReader(phrase)
req, err := http.NewRequest("POST", url, reader)
assert.NoError(t, err)
require.NoError(t, err)
headers["content-type"] = "text/plain"

for k, v := range headers {
Expand Down Expand Up @@ -248,36 +287,3 @@ func checkRoute(t *testing.T, ip string, port int, path string, headers map[stri

})
}

func checkRouteError(t *testing.T, ip string, port int, path string, headers map[string]string, expected string) {
failer := func() *retry.Timer {
return &retry.Timer{Timeout: time.Second * 60, Wait: time.Second * 60}
}

client := cleanhttp.DefaultClient()
url := fmt.Sprintf("http://%s:%d", ip, port)

if path != "" {
url += "/" + path
}

retry.RunWith(failer(), t, func(r *retry.R) {
t.Logf("making call to %s", url)
req, err := http.NewRequest("GET", url, nil)
assert.NoError(t, err)

for k, v := range headers {
req.Header.Set(k, v)

if k == "Host" {
req.Host = v
}
}
_, err = client.Do(req)
assert.Error(t, err)

if expected != "" {
assert.ErrorContains(t, err, expected)
}
})
}
Loading

0 comments on commit 9503082

Please sign in to comment.