diff --git a/ci/filter_example_setup.sh b/ci/filter_example_setup.sh index ae0113c2d0857..c3926e5d2c7a5 100644 --- a/ci/filter_example_setup.sh +++ b/ci/filter_example_setup.sh @@ -5,7 +5,7 @@ set -e # This is the hash on https://github.com/envoyproxy/envoy-filter-example.git we pin to. -ENVOY_FILTER_EXAMPLE_GITSHA="30e5df3b73aec14ca3b70e4537e0b42f2e9d7fd0" +ENVOY_FILTER_EXAMPLE_GITSHA="8f0f8bba38868e875613b74f57df38f543e764ba" ENVOY_FILTER_EXAMPLE_SRCDIR="${BUILD_DIR}/envoy-filter-example" # shellcheck disable=SC2034 diff --git a/test/extensions/filters/http/admission_control/admission_control_integration_test.cc b/test/extensions/filters/http/admission_control/admission_control_integration_test.cc index ce22454a68f42..fc4f4b49ff315 100644 --- a/test/extensions/filters/http/admission_control/admission_control_integration_test.cc +++ b/test/extensions/filters/http/admission_control/admission_control_integration_test.cc @@ -34,7 +34,7 @@ class AdmissionControlIntegrationTest : public Event::TestUsingSimulatedTime, public HttpIntegrationTest { public: AdmissionControlIntegrationTest() - : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam(), realTime()) {} + : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam()) {} void SetUp() override {} diff --git a/test/integration/base_integration_test.h b/test/integration/base_integration_test.h index 0bb4b2249911e..cc3008b249f27 100644 --- a/test/integration/base_integration_test.h +++ b/test/integration/base_integration_test.h @@ -43,16 +43,12 @@ struct ApiFilesystemConfig { */ class BaseIntegrationTest : protected Logger::Loggable { public: - using TestTimeSystemPtr = std::unique_ptr; using InstanceConstSharedPtrFn = std::function; // Creates a test fixture with an upstream bound to INADDR_ANY on an unspecified port using the // provided IP |version|. BaseIntegrationTest(Network::Address::IpVersion version, const std::string& config = ConfigHelper::httpProxyConfig()); - BaseIntegrationTest(Network::Address::IpVersion version, TestTimeSystemPtr, - const std::string& config = ConfigHelper::httpProxyConfig()) - : BaseIntegrationTest(version, config) {} // Creates a test fixture with a specified |upstream_address| function that provides the IP and // port to use. BaseIntegrationTest(const InstanceConstSharedPtrFn& upstream_address_fn, @@ -60,10 +56,6 @@ class BaseIntegrationTest : protected Logger::Loggable { const std::string& config = ConfigHelper::httpProxyConfig()); virtual ~BaseIntegrationTest() = default; - // TODO(jmarantz): Remove this once - // https://github.com/envoyproxy/envoy-filter-example/pull/69 is reverted. - static TestTimeSystemPtr realTime() { return TestTimeSystemPtr(); } - // Initialize the basic proto configuration, create fake upstreams, and start Envoy. virtual void initialize(); // Set up the fake upstream connections. This is called by initialize() and diff --git a/test/integration/custom_cluster_integration_test.cc b/test/integration/custom_cluster_integration_test.cc index 84c936e006c56..e5553e9a87ef7 100644 --- a/test/integration/custom_cluster_integration_test.cc +++ b/test/integration/custom_cluster_integration_test.cc @@ -19,7 +19,7 @@ class CustomClusterIntegrationTest : public testing::TestWithParam; */ class HttpIntegrationTest : public BaseIntegrationTest { public: - // TODO(jmarantz): Remove this once - // https://github.com/envoyproxy/envoy-filter-example/pull/69 is reverted. - HttpIntegrationTest(Http::CodecClient::Type downstream_protocol, - Network::Address::IpVersion version, TestTimeSystemPtr, - const std::string& config = ConfigHelper::httpProxyConfig()) - : HttpIntegrationTest(downstream_protocol, version, config) {} - HttpIntegrationTest(Http::CodecClient::Type downstream_protocol, Network::Address::IpVersion version, const std::string& config = ConfigHelper::httpProxyConfig()); diff --git a/test/integration/listener_lds_integration_test.cc b/test/integration/listener_lds_integration_test.cc index 779f24380bc02..e256e8a09275c 100644 --- a/test/integration/listener_lds_integration_test.cc +++ b/test/integration/listener_lds_integration_test.cc @@ -30,8 +30,7 @@ class ListenerIntegrationTest : public HttpIntegrationTest, absl::flat_hash_map stream_by_resource_name_; }; - ListenerIntegrationTest() - : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, ipVersion(), realTime()) {} + ListenerIntegrationTest() : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, ipVersion()) {} ~ListenerIntegrationTest() override { resetConnections(); } diff --git a/test/integration/scoped_rds_integration_test.cc b/test/integration/scoped_rds_integration_test.cc index 0c6e3adf57431..2b711feaa5923 100644 --- a/test/integration/scoped_rds_integration_test.cc +++ b/test/integration/scoped_rds_integration_test.cc @@ -29,8 +29,7 @@ class ScopedRdsIntegrationTest : public HttpIntegrationTest, absl::flat_hash_map stream_by_resource_name_; }; - ScopedRdsIntegrationTest() - : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, ipVersion(), realTime()) {} + ScopedRdsIntegrationTest() : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, ipVersion()) {} ~ScopedRdsIntegrationTest() override { resetConnections(); } diff --git a/test/integration/vhds_integration_test.cc b/test/integration/vhds_integration_test.cc index 50601ebe8c2bb..2f94c0fac1425 100644 --- a/test/integration/vhds_integration_test.cc +++ b/test/integration/vhds_integration_test.cc @@ -152,7 +152,7 @@ class VhdsInitializationTest : public HttpIntegrationTest, public Grpc::GrpcClientIntegrationParamTest { public: VhdsInitializationTest() - : HttpIntegrationTest(Http::CodecClient::Type::HTTP2, ipVersion(), realTime(), config()) { + : HttpIntegrationTest(Http::CodecClient::Type::HTTP2, ipVersion(), config()) { use_lds_ = false; } @@ -249,7 +249,7 @@ class VhdsIntegrationTest : public HttpIntegrationTest, public Grpc::GrpcClientIntegrationParamTest { public: VhdsIntegrationTest() - : HttpIntegrationTest(Http::CodecClient::Type::HTTP2, ipVersion(), realTime(), config()) { + : HttpIntegrationTest(Http::CodecClient::Type::HTTP2, ipVersion(), config()) { use_lds_ = false; }