fix

Signed-off-by: zirain <zirain2009@gmail.com>

Author: zirain

internal/xds/translator/jsonpatch.go

@@ -120,7 +120,6 @@ func processJSONPatches(tCtx *types.ResourceVersionTable, envoyPatchPolicies []*
 			}
 
 			var patchErrors error
-			var anyPatched bool
 			for _, dest := range dests {
 				var (
 					resourceJSON []byte
@@ -170,15 +169,10 @@ func processJSONPatches(tCtx *types.ResourceVersionTable, envoyPatchPolicies []*
 					patchErrors = errors.Join(patchErrors, tErr)
 					continue
 				}
-
-				// Mark that at least one dest has been patched successfully,
-				// so that we can report partial success if there are multiple dests and some of them fail
-				anyPatched = true
 			}
 
-			// If there are multiple dests and some of them fail,
-			// consider it as successful and ignore the failures to patch other dests.
-			if !anyPatched && patchErrors != nil {
+			// Report all patch errors, including partial failures
+			if patchErrors != nil {
 				tErrs = errors.Join(tErrs, patchErrors)
 			}
 		}

internal/xds/translator/testdata/in/xds-ir/jsonpatch-patch-multiple-resources.yaml

@@ -11,7 +11,8 @@ envoyPatchPolicies:
     jsonPatches:
       - type: "type.googleapis.com/envoy.config.listener.v3.Listener"
         name:
-          safeRegex: ".*"
+          # patch first-* listeners
+          prefix: "first"
         operation:
           op: add
           path: "/filter_chains/0/filters/0/typed_config/preserve_external_request_id"

internal/xds/translator/testdata/out/xds-ir/jsonpatch-patch-multiple-resources.envoypatchpolicies.yaml

@@ -9,8 +9,9 @@
         namespace: envoy-gateway
       conditions:
       - lastTransitionTime: null
-        message: Patches have been successfully applied.
-        reason: Programmed
-        status: "True"
+        message: 'Unable to unmarshal xds resource {"name":"second-listener","address":{"socket_address":{"address":"0.0.0.0","port_value":10080}},"default_filter_chain":{"filters":[{"name":"envoy.filters.network.http_connection_manager","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager","stat_prefix":"http-10080","rds":{"config_source":{"ads":{},"resource_api_version":"V3"},"route_config_name":"second-listener"},"http_filters":[{"name":"envoy.filters.http.router","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router","suppress_envoy_headers":true}}],"common_http_protocol_options":{"headers_with_underscores_action":"REJECT_REQUEST"},"http2_protocol_options":{"max_concurrent_streams":100,"initial_stream_window_size":65536,"initial_connection_window_size":1048576},"server_header_transformation":"PASS_THROUGH","use_remote_address":true,"normalize_path":true,"merge_slashes":true,"path_with_escaped_slashes_action":"UNESCAPE_AND_REDIRECT"}}],"name":"second-listener"},"per_connection_buffer_limit_bytes":32768,"max_connections_to_accept_per_socket_event":1,"filter_chains":[{"filters":[{"typed_config":{"http_filters":[{"name":"envoy.filters.http.ratelimit","typed_config":{"@type":"type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit","domain":"eg-ratelimit","failure_mode_deny":true,"rate_limit_service":{"grpc_service":{"envoy_grpc":{"cluster_name":"rate-limit-cluster"}},"transport_api_version":"V3"},"timeout":"1s"}}]}}]}]},
+          err:proto: (line 1:1175): missing "@type" field.'
+        reason: Invalid
+        status: "False"
         type: Programmed
       controllerName: ""

internal/xds/translator/testdata/out/xds-ir/jsonpatch-patch-multiple-resources.listeners.yaml

@@ -32,7 +32,6 @@
           typedConfig:
             '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
             suppressEnvoyHeaders: true
-        preserveExternalRequestId: true
         routeConfig:
           name: ready_route
           virtualHosts: