catch up the latest Envoy

Signed-off-by: spacewander <spacewanderlzx@gmail.com>

Author: spacewander

.github/workflows/test.yml

@@ -53,13 +53,13 @@ jobs:
         FULL_ENVOY_VERSION=${ENVOY_API_VERSION}.0
         if [[ $ENVOY_API_VERSION == dev ]]; then
           # update this once there are more breaking changes
-          FULL_ENVOY_VERSION=1.32.1-0.20241112025658-4fd9bb670eeb
-          # This is the envoy:contrib-dev image pull in 2024-11-12.
+          FULL_ENVOY_VERSION=1.33.1-0.20250411033243-86ca8d764bbd
+          # This is the envoy:contrib-dev image pull in 2025-04-11.
           # Use docker inspect --format='{{index .RepoDigests 0}}' envoyproxy/envoy:contrib-dev to get the sha256 ID.
           # We don't use the envoy:contrib-dev tag directly because it will be rewritten by the latest commit and
           # our test suite uses IfPresent policy to pull image.
           # We don't use the CI to catch the breaking change from the upstream so far.
-          export PROXY_IMAGE=envoyproxy/envoy@sha256:0eec2cbd45c2055ea37c2321e8b83f6907a95e98c250492b48ad9dab6a20a8cb
+          export PROXY_IMAGE=envoyproxy/envoy@sha256:2e1202c7b0bc3694a8d4a4b642888602deab77ec1bf54cb8569184112b5c0ab3
           echo PROXY_IMAGE=$PROXY_IMAGE >> $GITHUB_ENV
         fi
         pushd ..

api/pkg/filtermanager/api/api.go

@@ -210,6 +210,8 @@ type StreamFilterCallbacks interface {
 	// * ErrSerializationFailure (Currently, fetching attributes in List/Map type are unsupported)
 	// * ErrValueNotFound
 	GetProperty(key string) (string, error)
+	// TODO: add SecretManager
+
 	// ClearRouteCache clears the route cache for the current request, and filtermanager will re-fetch the route in the next filter.
 	// Please be careful to invoke it, since filtermanager will raise an 404 route_not_found response when failed to re-fetch a route.
 	ClearRouteCache()
@@ -254,6 +256,8 @@ type FilterProcessCallbacks interface {
 	// For example, turn a headers only request into a request with a body, add more body when processing trailers, and so on.
 	// The second argument isStreaming supplies if this caller streams data or buffers the full body.
 	AddData(data []byte, isStreaming bool)
+	// InjectData inject the content of slice data via Envoy StreamXXFilterCallbacks's injectXXDataToFilterChaininjectData.
+	InjectData(data []byte)
 
 	// hide Continue() method from the user
 }

api/pkg/filtermanager/api_impl_129.go

@@ -41,6 +41,10 @@ func (cb *filterManagerCallbackHandler) AddData([]byte, bool) {
 	api.LogErrorf("AddData is not implemented: %s", debug.Stack())
 }
 
+func (cb *filterManagerCallbackHandler) InjectData([]byte) {
+	api.LogErrorf("InjectData is not implemented: %s", debug.Stack())
+}
+
 func (cb *filterManagerCallbackHandler) DecoderFilterCallbacks() api.DecoderFilterCallbacks {
 	return cb
 }

api/pkg/filtermanager/api_impl_131_132.go

@@ -28,34 +28,41 @@ func (cb *filterManagerCallbackHandler) RefreshRouteCache() {
 	api.LogErrorf("RefreshRouteCache is not implemented: %s", debug.Stack())
 }
 
+type commonFilterCallbackHandlerWrapper struct {
+}
+
+func (w *commonFilterCallbackHandlerWrapper) AddData([]byte, bool) {
+	api.LogErrorf("AddData is not implemented: %s", debug.Stack())
+}
+
+func (w *commonFilterCallbackHandlerWrapper) InjectData([]byte) {
+	api.LogErrorf("InjectData is not implemented: %s", debug.Stack())
+}
+
 type decoderFilterCallbackHandlerWrapper struct {
+	commonFilterCallbackHandlerWrapper
+
 	capi.DecoderFilterCallbacks
 }
 
 func NewDecoderFilterCallbackHandlerWrapper(h capi.DecoderFilterCallbacks) api.DecoderFilterCallbacks {
 	return &decoderFilterCallbackHandlerWrapper{DecoderFilterCallbacks: h}
 }
 
-func (w *decoderFilterCallbackHandlerWrapper) AddData([]byte, bool) {
-	api.LogErrorf("AddData is not implemented: %s", debug.Stack())
-}
-
 func (cb *filterManagerCallbackHandler) DecoderFilterCallbacks() api.DecoderFilterCallbacks {
 	return NewDecoderFilterCallbackHandlerWrapper(cb.FilterCallbackHandler.DecoderFilterCallbacks())
 }
 
 type encoderFilterCallbackHandlerWrapper struct {
+	commonFilterCallbackHandlerWrapper
+
 	capi.EncoderFilterCallbacks
 }
 
 func NewEncoderFilterCallbackHandlerWrapper(h capi.EncoderFilterCallbacks) api.EncoderFilterCallbacks {
 	return &encoderFilterCallbackHandlerWrapper{EncoderFilterCallbacks: h}
 }
 
-func (w *encoderFilterCallbackHandlerWrapper) AddData([]byte, bool) {
-	api.LogErrorf("AddData is not implemented: %s", debug.Stack())
-}
-
 func (cb *filterManagerCallbackHandler) EncoderFilterCallbacks() api.EncoderFilterCallbacks {
 	return NewEncoderFilterCallbackHandlerWrapper(cb.FilterCallbackHandler.EncoderFilterCallbacks())
 }

api/pkg/plugins/type.go

@@ -177,6 +177,7 @@ type GoPlugin interface {
 	Plugin
 
 	Factory() api.FilterFactory
+	// TODO: add Destroy() support
 }
 
 type ConsumerPlugin interface {

api/plugins/tests/pkg/envoy/capi.go

@@ -564,6 +564,9 @@ func (i *filterCallbackHandler) RefreshRouteCache() {
 func (i *filterCallbackHandler) AddData([]byte, bool) {
 }
 
+func (i *filterCallbackHandler) InjectData([]byte) {
+}
+
 func (i *filterCallbackHandler) LookupConsumer(_, _ string) (api.Consumer, bool) {
 	return nil, false
 }

patch/switch-envoy-go-version.sh

@@ -35,7 +35,7 @@ if [[ "$envoy_version" =~ ^1\.32\.[0-9]+$ ]]; then
     exit 0
 fi
 
-if [[ ! "$envoy_version" =~ ^1\.(29|31|32)\. ]]; then
+if [[ ! "$envoy_version" =~ ^1\.(29|31|32|33)\. ]]; then
     echo "Unsupported envoy version $envoy_version"
     exit 1
 fi