test: use aigw also for llm in goose e2e (#1354)

**Description**

Before, our goose test only went through aigw for MCP instead of proving
single agent origin works, by also using it for LLM. Now.. we're good.

Signed-off-by: Adrian Cole <[email protected]>

Author: codefromthecrypt

go.mod

@@ -1,7 +1,7 @@
 module github.com/envoyproxy/ai-gateway
 
 // Explicitly specify the Go patch version to be able to purge the CI cache correctly.
-go 1.25.1
+go 1.25.2
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1

tests/e2e-aigw/aigw_test.go

@@ -57,21 +57,19 @@ func buildAigwOnDemand() (string, error) {
 }
 
 // startAIGWCLI starts the aigw CLI as a subprocess with the given config file.
-func startAIGWCLI(t *testing.T, aigwBin string, arg ...string) {
-	// aigw has many fixed ports, some are in the envoy subprocess, such as
-	// Envoy's gateway port, and its adminPort if in yaml configuration.
+func startAIGWCLI(t *testing.T, aigwBin string, env []string, arg ...string) {
+	// aigw has many fixed ports: some are in the envoy subprocess
 	gatewayPort := 1975
-	envoyAdminPort := 9901
 
 	// Wait up to 10 seconds for both ports to be free.
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
 	defer cancel()
 
-	for isPortInUse(ctx, gatewayPort) || isPortInUse(ctx, envoyAdminPort) {
+	for isPortInUse(ctx, gatewayPort) {
 		select {
 		case <-ctx.Done():
 			require.FailNow(t, "Ports still in use after timeout",
-				"Ports %d and/or %d are still in use", gatewayPort, envoyAdminPort)
+				"Port %d is still in use", gatewayPort)
 		case <-time.After(500 * time.Millisecond):
 			// Retry after a short delay.
 		}
@@ -92,6 +90,7 @@ func startAIGWCLI(t *testing.T, aigwBin string, arg ...string) {
 	cmd := exec.CommandContext(cmdCtx, aigwBin, arg...)
 	cmd.Stdout = buffers[0]
 	cmd.Stderr = buffers[1]
+	cmd.Env = append(os.Environ(), env...)
 	cmd.WaitDelay = 3 * time.Second // auto-kill after 3 seconds.
 
 	require.NoError(t, cmd.Start())
@@ -120,10 +119,10 @@ func startAIGWCLI(t *testing.T, aigwBin string, arg ...string) {
 	t.Logf("aigw process started with PID %d", cmd.Process.Pid)
 
 	// Wait for health check using RequireEventuallyNoError.
-	t.Log("Waiting for aigw to start (Envoy admin endpoint)...")
-	envoyAdmin, err := aigw.NewEnvoyAdminClient(t.Context(), 1, envoyAdminPort)
+	envoyAdmin, err := aigw.NewEnvoyAdminClient(t.Context(), cmd.Process.Pid, 0)
 	require.NoError(t, err)
 
+	t.Logf("Waiting for aigw to start (admin port %d)...", envoyAdmin.Port())
 	internaltesting.RequireEventuallyNoError(t, func() error {
 		return envoyAdmin.IsReady(t.Context())
 	}, 180*time.Second, 2*time.Second,

tests/e2e-aigw/examples_test.go

@@ -82,7 +82,7 @@ func TestMCP_standalone(t *testing.T) {
 	}
 
 	exampleYaml := path.Join(examplesDir, "mcp_example.yaml")
-	startAIGWCLI(t, aigwBin, "run", "--debug", exampleYaml)
+	startAIGWCLI(t, aigwBin, nil, "run", "--debug", exampleYaml)
 
 	url := fmt.Sprintf("http://localhost:%d/mcp", 1975)
 	mcpClient := mcp.NewClient(&mcp.Implementation{Name: "public-mcp-client", Version: "0.1.0"}, &mcp.ClientOptions{})
@@ -187,7 +187,7 @@ func (t *authTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 }
 
 func TestMCP_standalone_oauth(t *testing.T) {
-	startAIGWCLI(t, aigwBin, "run", "--debug", path.Join(examplesDir, "mcp_oauth_example.yaml"))
+	startAIGWCLI(t, aigwBin, nil, "run", "--debug", path.Join(examplesDir, "mcp_oauth_example.yaml"))
 
 	url := fmt.Sprintf("http://localhost:%d/mcp", 1975)
 

tests/e2e-aigw/goose_test.go

@@ -8,6 +8,7 @@ package e2emcp
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
@@ -18,7 +19,10 @@ import (
 )
 
 func TestMCPGooseRecipe(t *testing.T) {
-	startAIGWCLI(t, aigwBin, "run", "--debug", "aigw_config.yaml")
+	startAIGWCLI(t, aigwBin, []string{
+		"OPENAI_BASE_URL=http://127.0.0.1:11434/v1",
+		"OPENAI_API_KEY=unused",
+	}, "run", "--debug", "--mcp-json", `{"mcpServers":{"kiwi":{"type":"http","url":"https://mcp.kiwi.com"}}}`)
 
 	for _, tc := range []gooseRecipeTestCase{
 		{
@@ -52,6 +56,12 @@ func TestMCPGooseRecipe(t *testing.T) {
 				cmd := exec.CommandContext(t.Context(), "goose", args...)
 				cmd.Stdout = buffers[0]
 				cmd.Stderr = buffers[1]
+				// Point Goose at aigw also for LLM access
+				cmd.Env = append(os.Environ(),
+					"OPENAI_HOST=http://127.0.0.1:1975",
+					"OPENAI_BASE_PATH=v1/chat/completions",
+					"OPENAI_API_KEY=test-key",
+				)
 
 				if err := cmd.Run(); err != nil {
 					return err

tests/e2e-aigw/testdata/kiwi_recipe.yaml

@@ -31,6 +31,18 @@ prompt: |
 
   ***********ANY FLIGHT IS FINE. DO NOT CONSIDER ANY USER PREFERENCES.************
 
+# Start aigw like this to use Ollama and Kiwi MCP backends:
+# OPENAI_BASE_URL=http://localhost:11434/v1 OPENAI_API_KEY=unused aigw run --mcp-json '{
+#   "mcpServers": {
+#     "kiwi": {
+#       "type": "http",
+#       "url": "https://mcp.kiwi.com"
+#     }
+#   }
+# }'
+#
+# Then, run goose like this to use Envoy AI Gateway for both LLM and MCP:
+# OPENAI_HOST=http://127.0.0.1:1975 OPENAI_API_KEY=test-key goose run --provider openai --model qwen3:1.7b --recipe kiwi_recipe.yaml --params flight_date=31/12/2025
 extensions:
   - name: mcp_gateway
     type: streamable_http
@@ -41,11 +53,10 @@ parameters:
     input_type: string
     requirement: required
     description: flight date in DD/MM/YYYY format
-    default: "01/10/2025"
+    default: "31/12/2025"
 
 settings:
-  goose_provider: ollama
-  goose_model: qwen3:0.6b
+  # Remove this if using GPT-5 series (e.g., gpt-5, gpt-5-mini, gpt-5-nano)
   temperature: 0.0
 
 response: