From ad3b729ead63287ce46c6baf3e25c6a05be16c4d Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Wed, 29 May 2024 21:35:34 +0000 Subject: [PATCH] fix CI Change-Id: I6879168b887b83044603f438fbecba1e54bbdeb6 Signed-off-by: Kuat Yessenov --- test/extensions/filters/http/ext_proc/BUILD | 1 + .../ext_proc/ext_proc_integration_test.cc | 6 +++- test/integration/BUILD | 1 + .../shadow_policy_integration_test.cc | 29 ++++++++++++------- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/test/extensions/filters/http/ext_proc/BUILD b/test/extensions/filters/http/ext_proc/BUILD index 4f3a82ff7f01..ab9f67733d31 100644 --- a/test/extensions/filters/http/ext_proc/BUILD +++ b/test/extensions/filters/http/ext_proc/BUILD @@ -165,6 +165,7 @@ envoy_extension_cc_test( "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/ext_proc/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/set_metadata/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/upstream_codec/v3:pkg_cc_proto", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", "@ocp//ocpdiag/core/testing:status_matchers", ], diff --git a/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc b/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc index f5ab80b2b707..f46fb1e8eac8 100644 --- a/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc +++ b/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc @@ -5,6 +5,7 @@ #include "envoy/config/trace/v3/opentelemetry.pb.h" #include "envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.h" #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h" +#include "envoy/extensions/filters/http/upstream_codec/v3/upstream_codec.pb.h" #include "envoy/network/address.h" #include "envoy/service/ext_proc/v3/external_processor.pb.h" @@ -3894,7 +3895,10 @@ TEST_P(ExtProcIntegrationTest, GetAndSetHeadersUpstream) { ["envoy.extensions.upstreams.http.v3.HttpProtocolOptions"]); } if (old_protocol_options.http_filters().empty()) { - old_protocol_options.add_http_filters()->set_name("envoy.filters.http.upstream_codec"); + auto* upstream_codec = old_protocol_options.add_http_filters(); + upstream_codec->set_name("envoy.filters.http.upstream_codec"); + upstream_codec->mutable_typed_config()->PackFrom( + envoy::extensions::filters::http::upstream_codec::v3::UpstreamCodec::default_instance()); } auto* ext_proc_filter = old_protocol_options.add_http_filters(); ext_proc_filter->set_name("envoy.filters.http.ext_proc"); diff --git a/test/integration/BUILD b/test/integration/BUILD index 6b11284cae7c..78b09c8bbf8a 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -569,6 +569,7 @@ envoy_cc_test( "//test/test_common:test_runtime_lib", "@envoy_api//envoy/extensions/access_loggers/file/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/upstream_codec/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", ], ) diff --git a/test/integration/shadow_policy_integration_test.cc b/test/integration/shadow_policy_integration_test.cc index c84bb83fed37..8572223f7a17 100644 --- a/test/integration/shadow_policy_integration_test.cc +++ b/test/integration/shadow_policy_integration_test.cc @@ -3,6 +3,7 @@ #include "envoy/extensions/access_loggers/file/v3/file.pb.h" #include "envoy/extensions/filters/http/router/v3/router.pb.h" +#include "envoy/extensions/filters/http/upstream_codec/v3/upstream_codec.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "test/integration/filters/repick_cluster_filter.h" @@ -46,7 +47,11 @@ class ShadowPolicyIntegrationTest (*cluster->mutable_typed_extension_protocol_options()) ["envoy.extensions.upstreams.http.v3.HttpProtocolOptions"]); protocol_options.add_http_filters()->set_name(filter_name_); - protocol_options.add_http_filters()->set_name("envoy.filters.http.upstream_codec"); + auto* upstream_codec = protocol_options.add_http_filters(); + upstream_codec->set_name("envoy.filters.http.upstream_codec"); + upstream_codec->mutable_typed_config()->PackFrom( + envoy::extensions::filters::http::upstream_codec::v3::UpstreamCodec:: + default_instance()); (*cluster->mutable_typed_extension_protocol_options()) ["envoy.extensions.upstreams.http.v3.HttpProtocolOptions"] .PackFrom(protocol_options); @@ -797,16 +802,18 @@ TEST_P(ShadowPolicyIntegrationTest, RequestMirrorPolicyWithCluster) { // Test request mirroring / shadowing with upstream HTTP filters in the router. TEST_P(ShadowPolicyIntegrationTest, RequestMirrorPolicyWithRouterUpstreamFilters) { initialConfigSetup("cluster_1", ""); - config_helper_.addConfigModifier( - [](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& - hcm) -> void { - auto* router_filter_config = hcm.mutable_http_filters(hcm.http_filters_size() - 1); - envoy::extensions::filters::http::router::v3::Router router_filter; - router_filter_config->typed_config().UnpackTo(&router_filter); - router_filter.add_upstream_http_filters()->set_name("add-body-filter"); - router_filter.add_upstream_http_filters()->set_name("envoy.filters.http.upstream_codec"); - router_filter_config->mutable_typed_config()->PackFrom(router_filter); - }); + config_helper_.addConfigModifier([](envoy::extensions::filters::network::http_connection_manager:: + v3::HttpConnectionManager& hcm) -> void { + auto* router_filter_config = hcm.mutable_http_filters(hcm.http_filters_size() - 1); + envoy::extensions::filters::http::router::v3::Router router_filter; + router_filter_config->typed_config().UnpackTo(&router_filter); + router_filter.add_upstream_http_filters()->set_name("add-body-filter"); + auto* upstream_codec = router_filter.add_upstream_http_filters(); + upstream_codec->set_name("envoy.filters.http.upstream_codec"); + upstream_codec->mutable_typed_config()->PackFrom( + envoy::extensions::filters::http::upstream_codec::v3::UpstreamCodec::default_instance()); + router_filter_config->mutable_typed_config()->PackFrom(router_filter); + }); filter_name_ = "add-body-filter"; initialize(); sendRequestAndValidateResponse();