Use go-httpbin in the integration test (#22)

closes #21

Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>

Author: mathetake

integration/envoy.yaml

@@ -158,5 +158,5 @@ static_resources:
               - endpoint:
                   address:
                     socket_address:
-                      address: httpbin.org
-                      port_value: 80
+                      address: 127.0.0.1
+                      port_value: 1234

integration/go.mod

@@ -2,7 +2,10 @@ module github.com/envoyproxy/dynamic-modules-examples/integration
 
 go 1.24.0
 
-require github.com/stretchr/testify v1.10.0
+require (
+	github.com/mccutchen/go-httpbin/v2 v2.18.0
+	github.com/stretchr/testify v1.10.0
+)
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect

integration/go.sum

@@ -1,5 +1,7 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/mccutchen/go-httpbin/v2 v2.18.0 h1:WFU1OELp3nHYLvXct/3nrGVIgxU0X+RJfDPYRBnvicY=
+github.com/mccutchen/go-httpbin/v2 v2.18.0/go.mod h1:GBy5I7XwZ4ZLhT3hcq39I4ikwN9x4QUt6EAxNiR8Jus=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=

integration/main_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/mccutchen/go-httpbin/v2/httpbin"
 	"github.com/stretchr/testify/require"
 )
 
@@ -21,6 +22,16 @@ func TestIntegration(t *testing.T) {
 	cwd, err := os.Getwd()
 	require.NoError(t, err)
 
+	// Setup the httpbin upstream local server.
+	httpbinHandler := httpbin.New()
+	server := &http.Server{Addr: ":1234", Handler: httpbinHandler}
+	go func() {
+		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			t.Logf("HTTP server error: %v", err)
+		}
+	}()
+	t.Cleanup(func() { _ = server.Close() })
+
 	// Create a directory for the access logs to be written to.
 	accessLogsDir := cwd + "/access_logs"
 	require.NoError(t, os.RemoveAll(accessLogsDir))
@@ -140,15 +151,15 @@ func TestIntegration(t *testing.T) {
 			t.Logf("response: headers=%v, body=%s", resp.Header, string(body))
 			require.Equal(t, 200, resp.StatusCode)
 
-			// HttpBin returns a JSON object containing the request headers.
+			// HttpBin returns a JSON object containing the request headers in this format.
 			type httpBinHeadersBody struct {
-				Headers map[string]string `json:"headers"`
+				Headers map[string][]string `json:"headers"`
 			}
 			var headersBody httpBinHeadersBody
 			require.NoError(t, json.Unmarshal(body, &headersBody))
 
-			require.Equal(t, "envoy-header", headersBody.Headers["X-Envoy-Header"])
-			require.Equal(t, "envoy-header2", headersBody.Headers["X-Envoy-Header2"])
+			require.Contains(t, headersBody.Headers["X-Envoy-Header"], "envoy-header")
+			require.Contains(t, headersBody.Headers["X-Envoy-Header2"], "envoy-header2")
 			require.NotContains(t, headersBody.Headers, "apple")
 
 			// We also need to check that the response headers were mutated.