Merge branch 'main' into feature-passthrough

.github/workflows/build-and-push-wasm-plugin-image.yaml

@@ -133,8 +133,8 @@ jobs:
           command="
           set -e
           cd /workspace/plugins/wasm-rust/extensions/${PLUGIN_NAME}
-          cargo build --target wasm32-wasi --release
-          cp target/wasm32-wasi/release/*.wasm plugin.wasm
+          cargo build --target wasm32-wasip1 --release
+          cp target/wasm32-wasip1/release/*.wasm plugin.wasm
           tar czvf plugin.tar.gz plugin.wasm
           echo ${{ secrets.REGISTRY_PASSWORD }} | oras login -u ${{ secrets.REGISTRY_USERNAME }} --password-stdin ${{ env.IMAGE_REGISTRY_SERVICE }}
           oras push ${target_image} ${push_command}

.gitignore

@@ -17,4 +17,3 @@ target/
 tools/hack/cluster.conf
 envoy/1.20
 istio/1.12
-Cargo.lock

plugins/wasm-go/extensions/ext-auth/config/config.go

@@ -65,7 +65,7 @@ func ParseConfig(json gjson.Result, config *ExtAuthConfig, log wrapper.Log) erro
 		return err
 	}
 
-	if err := parseMatchRules(json, config, log); err != nil {
+	if err := parseMatchRules(json, config); err != nil {
 		return err
 	}
 
@@ -241,7 +241,7 @@ func parseAuthorizationResponseConfig(json gjson.Result, httpService *HttpServic
 	return nil
 }
 
-func parseMatchRules(json gjson.Result, config *ExtAuthConfig, log wrapper.Log) error {
+func parseMatchRules(json gjson.Result, config *ExtAuthConfig) error {
 	matchListConfig := json.Get("match_list")
 	if !matchListConfig.Exists() {
 		config.MatchRules = expr.MatchRulesDefaults()
@@ -260,10 +260,15 @@ func parseMatchRules(json gjson.Result, config *ExtAuthConfig, log wrapper.Log)
 	var err error
 
 	matchListConfig.ForEach(func(key, value gjson.Result) bool {
-		pathMatcher, err := expr.BuildStringMatcher(
+		pathMatcher, buildErr := expr.BuildStringMatcher(
 			value.Get("match_rule_type").Str,
 			value.Get("match_rule_path").Str, false)
-		if err != nil {
+		if buildErr != nil {
+			err = fmt.Errorf("failed to build string matcher for rule with domain %q, path %q, type %q: %w",
+				value.Get("match_rule_domain").Str,
+				value.Get("match_rule_path").Str,
+				value.Get("match_rule_type").Str,
+				buildErr)
 			return false // stop iterating
 		}
 		ruleList = append(ruleList, expr.Rule{
@@ -274,7 +279,7 @@ func parseMatchRules(json gjson.Result, config *ExtAuthConfig, log wrapper.Log)
 	})
 
 	if err != nil {
-		return fmt.Errorf("failed to build string matcher for rule %v: %w", matchListConfig, err)
+		return err
 	}
 
 	config.MatchRules = expr.MatchRules{