more

Signed-off-by: Takeshi Yoneda <[email protected]>

Author: mathetake

.envoy-version

@@ -0,0 +1 @@
+1.36

.github/workflows/build_and_test.yaml

@@ -167,8 +167,6 @@ jobs:
           TEST_SAMBANOVA_API_KEY: ${{ secrets.ENVOY_AI_GATEWAY_SAMBANOVA_API_KEY }}
           TEST_DEEPINFRA_API_KEY: ${{ secrets.ENVOY_AI_GATEWAY_DEEPINFRA_API_KEY }}
           TEST_GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # This will be picked up by func-e to run the specified Envoy version.
-          ENVOY_VERSION: 1.36.0
         run: make test-extproc
 
   test_e2e:

Makefile

@@ -156,7 +156,7 @@ test-crdcel: apigen ## Run the integration tests of CEL validation in CRD defini
 test-extproc: build.extproc ## Run the integration tests for extproc without controller or k8s at all.
 	@$(MAKE) build.testupstream CMD_PATH_PREFIX=tests/internal/testupstreamlib
 	@echo "Ensure func-e is built and Envoy is installed"
-	@@$(GO_TOOL) func-e run --help >/dev/null 2>&1
+	@@$(GO_TOOL) func-e run --version >/dev/null 2>&1
 	@echo "Run ExtProc test"
 	@EXTPROC_BIN=$(OUTPUT_DIR)/extproc-$(shell go env GOOS)-$(shell go env GOARCH) go test ./tests/extproc/... $(GO_TEST_E2E_ARGS)
 

tests/extproc/extproc_test.go

@@ -59,9 +59,7 @@ var (
 		Region:      "gcp-region",
 		ProjectName: "gcp-project-name",
 	}}}
-	// This always failing backend is configured to have AWS Bedrock schema so that
-	// we can test that the extproc can fallback to the different schema. E.g. Primary AWS and then OpenAI.
-	alwaysFailingBackend = filterapi.Backend{Name: "always-failing-backend", Schema: awsBedrockSchema}
+	alwaysFailingBackend = filterapi.Backend{Name: "always-failing-backend", Schema: openAISchema}
 
 	// envoyConfig is the embedded Envoy configuration template.
 	//

tests/internal/testenvironment/test_environment.go

@@ -13,6 +13,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
@@ -275,8 +276,11 @@ func requireEnvoy(t testing.TB,
 		// Add debug logging for http.
 		"--component-log-level", "http:debug",
 	)
-	// Use the existing environment for func-e.
-	cmd.Env = os.Environ()
+	// func-e will use the version specified in the project root's .envoy-version file.
+	cmd.Dir = internaltesting.FindProjectRoot()
+	version, err := os.ReadFile(filepath.Join(cmd.Dir, ".envoy-version"))
+	require.NoError(t, err)
+	t.Logf("Starting Envoy version %s", strings.TrimSpace(string(version)))
 	cmd.WaitDelay = 3 * time.Second // auto-kill after 3 seconds.
 	t.Cleanup(func() {
 		defer cancel()