fix ai fallback (alibaba#1541)

CH3CHO · Nov 25, 2024 · a759338 · a759338
1 parent e68a8ac
commit a759338
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -144,7 +144,7 @@ docker-buildx-push: clean-env docker.higress-buildx
 export PARENT_GIT_TAG:=$(shell cat VERSION)
 export PARENT_GIT_REVISION:=$(TAG)
 
-export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.0.0/envoy-symbol-ARCH.tar.gz
+export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.1.0/envoy-symbol-ARCH.tar.gz
 
 build-envoy: prebuild
 	./tools/hack/build-envoy.sh

diff --git a/envoy/envoy b/envoy/envoy
diff --git a/istio/istio b/istio/istio
diff --git a/istio/proxy b/istio/proxy
diff --git a/pkg/ingress/config/ingress_config.go b/pkg/ingress/config/ingress_config.go
@@ -906,6 +906,7 @@ func (m *IngressConfig) convertIstioWasmPlugin(obj *higressext.WasmPlugin) (*ext
 				StructValue: rule.Config,
 			}
 
+			validRule := false
 			var matchItems []*_struct.Value
 			// match ingress
 			for _, ing := range rule.Ingress {
@@ -916,19 +917,17 @@ func (m *IngressConfig) convertIstioWasmPlugin(obj *higressext.WasmPlugin) (*ext
 				})
 			}
 			if len(matchItems) > 0 {
+				validRule = true
 				v.StructValue.Fields["_match_route_"] = &_struct.Value{
 					Kind: &_struct.Value_ListValue{
 						ListValue: &_struct.ListValue{
 							Values: matchItems,
 						},
 					},
 				}
-				ruleValues = append(ruleValues, &_struct.Value{
-					Kind: v,
-				})
-				continue
 			}
 			// match service
+			matchItems = nil
 			for _, service := range rule.Service {
 				matchItems = append(matchItems, &_struct.Value{
 					Kind: &_struct.Value_StringValue{
@@ -937,39 +936,41 @@ func (m *IngressConfig) convertIstioWasmPlugin(obj *higressext.WasmPlugin) (*ext
 				})
 			}
 			if len(matchItems) > 0 {
+				validRule = true
 				v.StructValue.Fields["_match_service_"] = &_struct.Value{
 					Kind: &_struct.Value_ListValue{
 						ListValue: &_struct.ListValue{
 							Values: matchItems,
 						},
 					},
 				}
-				ruleValues = append(ruleValues, &_struct.Value{
-					Kind: v,
-				})
-				continue
 			}
 			// match domain
+			matchItems = nil
 			for _, domain := range rule.Domain {
 				matchItems = append(matchItems, &_struct.Value{
 					Kind: &_struct.Value_StringValue{
 						StringValue: domain,
 					},
 				})
 			}
-			if len(matchItems) == 0 {
-				return nil, fmt.Errorf("invalid match rule has no match condition, rule:%v", rule)
-			}
-			v.StructValue.Fields["_match_domain_"] = &_struct.Value{
-				Kind: &_struct.Value_ListValue{
-					ListValue: &_struct.ListValue{
-						Values: matchItems,
+			if len(matchItems) > 0 {
+				validRule = true
+				v.StructValue.Fields["_match_domain_"] = &_struct.Value{
+					Kind: &_struct.Value_ListValue{
+						ListValue: &_struct.ListValue{
+							Values: matchItems,
+						},
 					},
-				},
+				}
+			}
+			if validRule {
+				ruleValues = append(ruleValues, &_struct.Value{
+					Kind: v,
+				})
+			} else {
+				return nil, fmt.Errorf("invalid match rule has no match condition, rule:%v", rule)
 			}
-			ruleValues = append(ruleValues, &_struct.Value{
-				Kind: v,
-			})
 		}
 		if len(ruleValues) > 0 {
 			hasValidRule = true
+2 −0		api/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
+2 −0		api/envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.proto
+8 −4		envoy/router/scopes.h
+5 −0		source/common/http/conn_manager_config.h
+35 −1		source/common/http/conn_manager_impl.cc
+3 −0		source/common/http/conn_manager_impl.h
+3 −0		source/common/http/conn_manager_utility.cc
+5 −0		source/common/http/headers.h
+24 −10		source/common/router/scoped_config_impl.cc
+9 −0		source/common/router/scoped_config_impl.h
+23 −1		source/extensions/common/wasm/context.cc
+13 −22		source/extensions/filters/http/custom_response/custom_response_filter.cc
+0 −3		source/extensions/filters/http/custom_response/custom_response_filter.h
+2 −0		source/extensions/filters/network/http_connection_manager/config.cc
+4 −0		source/extensions/filters/network/http_connection_manager/config.h
+30 −10		source/extensions/http/custom_response/redirect_policy/redirect_policy.cc
+1 −0		source/extensions/http/custom_response/redirect_policy/redirect_policy.h
+1 −0		source/server/admin/admin.h
+2 −0		test/common/http/conn_manager_impl_fuzz_test.cc
+14 −12		test/common/http/conn_manager_impl_test_2.cc
+2 −0		test/common/http/conn_manager_impl_test_base.h
+71 −0		test/common/router/scoped_rds_test.cc
+1 −0		test/mocks/http/mocks.h
+1 −0		test/mocks/router/mocks.cc
+4 −0		test/mocks/router/mocks.h
+2 −12		pkg/wasm/convert.go
+2 −0		tools/packaging/common/higress-proxy-container-init.sh