diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index 5b141cf8a7f9..93ef61b84438 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -17,8 +17,6 @@ Bug Fixes --------- *Changes expected to improve the state of the world and are unlikely to have negative effects* -* active health checks: health checks using a TLS transport socket and secrets delivered via :ref:`SDS ` will now wait until secrets are loaded before the first health check attempt. This should improve startup times by not having to wait for the :ref:`no_traffic_interval ` until the next attempt. - * http: sending CONNECT_ERROR for HTTP/2 where appropriate during CONNECT requests. Removed Config or Runtime diff --git a/include/envoy/network/transport_socket.h b/include/envoy/network/transport_socket.h index db500f86a8a6..fe054ce2f16d 100644 --- a/include/envoy/network/transport_socket.h +++ b/include/envoy/network/transport_socket.h @@ -226,13 +226,6 @@ class TransportSocketFactory { */ virtual TransportSocketPtr createTransportSocket(TransportSocketOptionsSharedPtr options) const PURE; - - /** - * @param a callback to be invoked when the secrets required by the created transport - * sockets are ready. Will be invoked immediately if no secrets are required or if they - * are already loaded. - */ - virtual void addReadyCb(std::function callback) PURE; }; using TransportSocketFactoryPtr = std::unique_ptr; diff --git a/include/envoy/upstream/upstream.h b/include/envoy/upstream/upstream.h index 2c51a7c261c4..127df14c923a 100644 --- a/include/envoy/upstream/upstream.h +++ b/include/envoy/upstream/upstream.h @@ -112,15 +112,6 @@ class Host : virtual public HostDescription { Network::TransportSocketOptionsSharedPtr transport_socket_options, const envoy::config::core::v3::Metadata* metadata) const PURE; - /** - * Register a callback to be invoked when secrets are ready for the transport socket that - * corresponds to the provided metadata. - * @param callback supplies the callback to be invoked. - * @param metadata supplies the metadata to be used for resolving transport socket matches. - */ - virtual void addReadyCb(std::function callback, - const envoy::config::core::v3::Metadata* metadata) const PURE; - /** * @return host specific gauges. */ diff --git a/source/common/network/raw_buffer_socket.h b/source/common/network/raw_buffer_socket.h index 8f17279890aa..fe87bbeda605 100644 --- a/source/common/network/raw_buffer_socket.h +++ b/source/common/network/raw_buffer_socket.h @@ -32,7 +32,6 @@ class RawBufferSocketFactory : public TransportSocketFactory { // Network::TransportSocketFactory TransportSocketPtr createTransportSocket(TransportSocketOptionsSharedPtr options) const override; bool implementsSecureTransport() const override; - void addReadyCb(std::function callback) override { callback(); } }; } // namespace Network diff --git a/source/common/upstream/health_checker_base_impl.cc b/source/common/upstream/health_checker_base_impl.cc index 29e2aa6493c4..f6357559eec8 100644 --- a/source/common/upstream/health_checker_base_impl.cc +++ b/source/common/upstream/health_checker_base_impl.cc @@ -384,14 +384,6 @@ void HealthCheckerImplBase::ActiveHealthCheckSession::onTimeoutBase() { handleFailure(envoy::data::core::v3::NETWORK); } -void HealthCheckerImplBase::ActiveHealthCheckSession::start() { - // Start health checks only after secrets are ready for the transport socket - // that health checks will be performed on. If health checks start - // immediately, they may fail with "network" errors due to TLS credentials - // not yet being loaded, which can result in long startup times. - host_->addReadyCb([this] { onInitialInterval(); }, parent_.transportSocketMatchMetadata().get()); -} - void HealthCheckerImplBase::ActiveHealthCheckSession::onInitialInterval() { if (parent_.initial_jitter_.count() == 0) { onIntervalBase(); diff --git a/source/common/upstream/health_checker_base_impl.h b/source/common/upstream/health_checker_base_impl.h index 9620713cf399..c1e4bb7affff 100644 --- a/source/common/upstream/health_checker_base_impl.h +++ b/source/common/upstream/health_checker_base_impl.h @@ -77,7 +77,7 @@ class HealthCheckerImplBase : public HealthChecker, ~ActiveHealthCheckSession() override; HealthTransition setUnhealthy(envoy::data::core::v3::HealthCheckFailureType type); void onDeferredDeleteBase(); - void start(); + void start() { onInitialInterval(); } protected: ActiveHealthCheckSession(HealthCheckerImplBase& parent, HostSharedPtr host); diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc index 48d426f65250..8e6a6db3c507 100644 --- a/source/common/upstream/upstream_impl.cc +++ b/source/common/upstream/upstream_impl.cc @@ -356,14 +356,6 @@ HostImpl::createConnection(Event::Dispatcher& dispatcher, const ClusterInfo& clu return connection; } -void HostImpl::addReadyCb(std::function callback, - const envoy::config::core::v3::Metadata* metadata) const { - Network::TransportSocketFactory& factory = - (metadata != nullptr) ? cluster_->transportSocketMatcher().resolve(metadata).factory_ - : socket_factory_; - factory.addReadyCb(callback); -} - void HostImpl::weight(uint32_t new_weight) { weight_ = std::max(1U, new_weight); } std::vector HostsPerLocalityImpl::filter( diff --git a/source/common/upstream/upstream_impl.h b/source/common/upstream/upstream_impl.h index ed8ef917b047..c74e489384f0 100644 --- a/source/common/upstream/upstream_impl.h +++ b/source/common/upstream/upstream_impl.h @@ -189,8 +189,6 @@ class HostImpl : public HostDescriptionImpl, createHealthCheckConnection(Event::Dispatcher& dispatcher, Network::TransportSocketOptionsSharedPtr transport_socket_options, const envoy::config::core::v3::Metadata* metadata) const override; - void addReadyCb(std::function callback, - const envoy::config::core::v3::Metadata* metadata) const override; std::vector> gauges() const override { diff --git a/source/extensions/quic_listeners/quiche/quic_transport_socket_factory.h b/source/extensions/quic_listeners/quiche/quic_transport_socket_factory.h index 4fbe83286b38..2ada9e2de17b 100644 --- a/source/extensions/quic_listeners/quiche/quic_transport_socket_factory.h +++ b/source/extensions/quic_listeners/quiche/quic_transport_socket_factory.h @@ -24,9 +24,6 @@ class QuicTransportSocketFactoryBase : public Network::TransportSocketFactory { NOT_REACHED_GCOVR_EXCL_LINE; } bool implementsSecureTransport() const override { return true; } - - // TODO(mpuncel) only invoke callback() once secrets are ready. - void addReadyCb(std::function callback) override { callback(); }; }; // TODO(danzh): when implement ProofSource, examine of it's necessary to diff --git a/source/extensions/transport_sockets/alts/tsi_socket.h b/source/extensions/transport_sockets/alts/tsi_socket.h index 7bf5877870ab..0acba405022d 100644 --- a/source/extensions/transport_sockets/alts/tsi_socket.h +++ b/source/extensions/transport_sockets/alts/tsi_socket.h @@ -101,9 +101,6 @@ class TsiSocketFactory : public Network::TransportSocketFactory { Network::TransportSocketPtr createTransportSocket(Network::TransportSocketOptionsSharedPtr options) const override; - // TODO(mpuncel) only invoke callback() once secrets are ready. - void addReadyCb(std::function callback) override { callback(); }; - private: HandshakerFactory handshaker_factory_; HandshakeValidator handshake_validator_; diff --git a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h index bcddef7bf547..4a191ebf539d 100644 --- a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h +++ b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h @@ -49,7 +49,6 @@ class UpstreamProxyProtocolSocketFactory : public Network::TransportSocketFactor Network::TransportSocketPtr createTransportSocket(Network::TransportSocketOptionsSharedPtr options) const override; bool implementsSecureTransport() const override; - void addReadyCb(std::function callback) override { callback(); }; private: Network::TransportSocketFactoryPtr transport_socket_factory_; diff --git a/source/extensions/transport_sockets/tap/tap.h b/source/extensions/transport_sockets/tap/tap.h index d04712b2a50a..33156b705153 100644 --- a/source/extensions/transport_sockets/tap/tap.h +++ b/source/extensions/transport_sockets/tap/tap.h @@ -41,8 +41,6 @@ class TapSocketFactory : public Network::TransportSocketFactory, Network::TransportSocketPtr createTransportSocket(Network::TransportSocketOptionsSharedPtr options) const override; bool implementsSecureTransport() const override; - // TODO(mpuncel) only invoke callback() once secrets are ready. - void addReadyCb(std::function callback) override { callback(); }; private: Network::TransportSocketFactoryPtr transport_socket_factory_; diff --git a/source/extensions/transport_sockets/tls/ssl_socket.cc b/source/extensions/transport_sockets/tls/ssl_socket.cc index 523242f8fada..485468443096 100644 --- a/source/extensions/transport_sockets/tls/ssl_socket.cc +++ b/source/extensions/transport_sockets/tls/ssl_socket.cc @@ -355,39 +355,13 @@ bool ClientSslSocketFactory::implementsSecureTransport() const { return true; } void ClientSslSocketFactory::onAddOrUpdateSecret() { ENVOY_LOG(debug, "Secret is updated."); - bool should_run_callbacks = false; { absl::WriterMutexLock l(&ssl_ctx_mu_); ssl_ctx_ = manager_.createSslClientContext(stats_scope_, *config_); - if (ssl_ctx_) { - should_run_callbacks = true; - } - } - if (should_run_callbacks) { - for (const auto& cb : secrets_ready_callbacks_) { - cb(); - } - secrets_ready_callbacks_.clear(); } stats_.ssl_context_update_by_sds_.inc(); } -void ClientSslSocketFactory::addReadyCb(std::function callback) { - bool immediately_run_callback = false; - { - absl::ReaderMutexLock l(&ssl_ctx_mu_); - if (ssl_ctx_) { - immediately_run_callback = true; - } - } - - if (immediately_run_callback) { - callback(); - } else { - secrets_ready_callbacks_.push_back(callback); - } -} - ServerSslSocketFactory::ServerSslSocketFactory(Envoy::Ssl::ServerContextConfigPtr config, Envoy::Ssl::ContextManager& manager, Stats::Scope& stats_scope, @@ -422,39 +396,13 @@ bool ServerSslSocketFactory::implementsSecureTransport() const { return true; } void ServerSslSocketFactory::onAddOrUpdateSecret() { ENVOY_LOG(debug, "Secret is updated."); - bool should_run_callbacks = false; { absl::WriterMutexLock l(&ssl_ctx_mu_); ssl_ctx_ = manager_.createSslServerContext(stats_scope_, *config_, server_names_); - - if (ssl_ctx_) { - should_run_callbacks = true; - } - } - if (should_run_callbacks) { - for (const auto& cb : secrets_ready_callbacks_) { - cb(); - } - secrets_ready_callbacks_.clear(); } stats_.ssl_context_update_by_sds_.inc(); } -void ServerSslSocketFactory::addReadyCb(std::function callback) { - bool immediately_run_callback = false; - { - absl::ReaderMutexLock l(&ssl_ctx_mu_); - if (ssl_ctx_) { - immediately_run_callback = true; - } - } - if (immediately_run_callback) { - callback(); - } else { - secrets_ready_callbacks_.push_back(callback); - } -} - } // namespace Tls } // namespace TransportSockets } // namespace Extensions diff --git a/source/extensions/transport_sockets/tls/ssl_socket.h b/source/extensions/transport_sockets/tls/ssl_socket.h index b0dcb139a319..c14cb502bed1 100644 --- a/source/extensions/transport_sockets/tls/ssl_socket.h +++ b/source/extensions/transport_sockets/tls/ssl_socket.h @@ -109,8 +109,6 @@ class ClientSslSocketFactory : public Network::TransportSocketFactory, createTransportSocket(Network::TransportSocketOptionsSharedPtr options) const override; bool implementsSecureTransport() const override; - void addReadyCb(std::function callback) override; - // Secret::SecretCallbacks void onAddOrUpdateSecret() override; @@ -121,7 +119,6 @@ class ClientSslSocketFactory : public Network::TransportSocketFactory, Envoy::Ssl::ClientContextConfigPtr config_; mutable absl::Mutex ssl_ctx_mu_; Envoy::Ssl::ClientContextSharedPtr ssl_ctx_ ABSL_GUARDED_BY(ssl_ctx_mu_); - std::list> secrets_ready_callbacks_; }; class ServerSslSocketFactory : public Network::TransportSocketFactory, @@ -136,8 +133,6 @@ class ServerSslSocketFactory : public Network::TransportSocketFactory, createTransportSocket(Network::TransportSocketOptionsSharedPtr options) const override; bool implementsSecureTransport() const override; - void addReadyCb(std::function callback) override; - // Secret::SecretCallbacks void onAddOrUpdateSecret() override; @@ -149,7 +144,6 @@ class ServerSslSocketFactory : public Network::TransportSocketFactory, const std::vector server_names_; mutable absl::Mutex ssl_ctx_mu_; Envoy::Ssl::ServerContextSharedPtr ssl_ctx_ ABSL_GUARDED_BY(ssl_ctx_mu_); - std::list> secrets_ready_callbacks_; }; } // namespace Tls diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index cc24eff5273c..4a1ed5a7ae35 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -942,8 +942,6 @@ TEST_F(HttpHealthCheckerImplTest, TlsOptions) { Network::TransportSocketFactoryPtr(socket_factory)); cluster_->info_->transport_socket_matcher_.reset(transport_socket_match); - EXPECT_CALL(*socket_factory, addReadyCb(_)) - .WillOnce(Invoke([&](std::function callback) -> void { callback(); })); EXPECT_CALL(*socket_factory, createTransportSocket(ApplicationProtocolListEq("http1"))); allocHealthChecker(yaml); @@ -2431,19 +2429,13 @@ TEST_F(HttpHealthCheckerImplTest, TransportSocketMatchCriteria) { ALL_TRANSPORT_SOCKET_MATCH_STATS(POOL_COUNTER_PREFIX(stats_store, "test"))}; auto health_check_only_socket_factory = std::make_unique(); - // We expect resolve() to be called 3 times, once for endpoint socket matching (with no metadata - // in this test) and twice for health check socket matching (once for checking if secrets are - // ready on the transport socket, and again for actually getting the health check transport socket - // to create a connection). In the latter 2 calls, we expect metadata that matches the above - // object. + // We expect resolve() to be called twice, once for endpoint socket matching (with no metadata in + // this test) and once for health check socket matching. In the latter we expect metadata that + // matches the above object. EXPECT_CALL(*transport_socket_match, resolve(nullptr)); EXPECT_CALL(*transport_socket_match, resolve(MetadataEq(metadata))) - .Times(2) - .WillRepeatedly(Return(TransportSocketMatcher::MatchData( - *health_check_only_socket_factory, health_transport_socket_stats, "health_check_only"))) - .RetiresOnSaturation(); - EXPECT_CALL(*health_check_only_socket_factory, addReadyCb(_)) - .WillOnce(Invoke([&](std::function callback) -> void { callback(); })); + .WillOnce(Return(TransportSocketMatcher::MatchData( + *health_check_only_socket_factory, health_transport_socket_stats, "health_check_only"))); // The health_check_only_socket_factory should be used to create a transport socket for the health // check connection. EXPECT_CALL(*health_check_only_socket_factory, createTransportSocket(_)); @@ -2479,9 +2471,6 @@ TEST_F(HttpHealthCheckerImplTest, NoTransportSocketMatchCriteria) { )EOF"; auto default_socket_factory = std::make_unique(); - - EXPECT_CALL(*default_socket_factory, addReadyCb(_)) - .WillOnce(Invoke([&](std::function callback) -> void { callback(); })); // The default_socket_factory should be used to create a transport socket for the health check // connection. EXPECT_CALL(*default_socket_factory, createTransportSocket(_)); diff --git a/test/common/upstream/transport_socket_matcher_test.cc b/test/common/upstream/transport_socket_matcher_test.cc index f770d1f4fdd8..cfde130d1d1f 100644 --- a/test/common/upstream/transport_socket_matcher_test.cc +++ b/test/common/upstream/transport_socket_matcher_test.cc @@ -33,7 +33,6 @@ class FakeTransportSocketFactory : public Network::TransportSocketFactory { MOCK_METHOD(bool, implementsSecureTransport, (), (const)); MOCK_METHOD(Network::TransportSocketPtr, createTransportSocket, (Network::TransportSocketOptionsSharedPtr), (const)); - MOCK_METHOD(void, addReadyCb, (std::function)); FakeTransportSocketFactory(std::string id) : id_(std::move(id)) {} std::string id() const { return id_; } @@ -49,7 +48,6 @@ class FooTransportSocketFactory MOCK_METHOD(bool, implementsSecureTransport, (), (const)); MOCK_METHOD(Network::TransportSocketPtr, createTransportSocket, (Network::TransportSocketOptionsSharedPtr), (const)); - MOCK_METHOD(void, addReadyCb, (std::function)); Network::TransportSocketFactoryPtr createTransportSocketFactory(const Protobuf::Message& proto, diff --git a/test/extensions/transport_sockets/tls/ssl_socket_test.cc b/test/extensions/transport_sockets/tls/ssl_socket_test.cc index b06a9ac66203..b4bdb84e5737 100644 --- a/test/extensions/transport_sockets/tls/ssl_socket_test.cc +++ b/test/extensions/transport_sockets/tls/ssl_socket_test.cc @@ -59,7 +59,6 @@ using testing::ContainsRegex; using testing::DoAll; using testing::InSequence; using testing::Invoke; -using testing::MockFunction; using testing::NiceMock; using testing::Return; using testing::ReturnRef; @@ -4491,12 +4490,6 @@ TEST_P(SslSocketTest, DownstreamNotReadySslSocket) { ContextManagerImpl manager(time_system_); ServerSslSocketFactory server_ssl_socket_factory(std::move(server_cfg), manager, stats_store, std::vector{}); - - // Add a secrets ready callback that should not be invoked. - MockFunction mock_callback_; - EXPECT_CALL(mock_callback_, Call()).Times(0); - server_ssl_socket_factory.addReadyCb(mock_callback_.AsStdFunction()); - auto transport_socket = server_ssl_socket_factory.createTransportSocket(nullptr); EXPECT_EQ(EMPTY_STRING, transport_socket->protocol()); EXPECT_EQ(nullptr, transport_socket->ssl()); @@ -4532,12 +4525,6 @@ TEST_P(SslSocketTest, UpstreamNotReadySslSocket) { ContextManagerImpl manager(time_system_); ClientSslSocketFactory client_ssl_socket_factory(std::move(client_cfg), manager, stats_store); - - // Add a secrets ready callback that should not be invoked. - MockFunction mock_callback_; - EXPECT_CALL(mock_callback_, Call()).Times(0); - client_ssl_socket_factory.addReadyCb(mock_callback_.AsStdFunction()); - auto transport_socket = client_ssl_socket_factory.createTransportSocket(nullptr); EXPECT_EQ(EMPTY_STRING, transport_socket->protocol()); EXPECT_EQ(nullptr, transport_socket->ssl()); @@ -4549,97 +4536,6 @@ TEST_P(SslSocketTest, UpstreamNotReadySslSocket) { EXPECT_EQ("TLS error: Secret is not supplied by SDS", transport_socket->failureReason()); } -// Validate that secrets callbacks are invoked when secrets become ready. -TEST_P(SslSocketTest, ClientAddSecretsReadyCallback) { - Stats::TestUtil::TestStore stats_store; - NiceMock local_info; - testing::NiceMock factory_context; - NiceMock init_manager; - NiceMock dispatcher; - EXPECT_CALL(factory_context, localInfo()).WillOnce(ReturnRef(local_info)); - EXPECT_CALL(factory_context, stats()).WillOnce(ReturnRef(stats_store)); - EXPECT_CALL(factory_context, initManager()).WillRepeatedly(ReturnRef(init_manager)); - EXPECT_CALL(factory_context, dispatcher()).WillRepeatedly(ReturnRef(dispatcher)); - - envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext tls_context; - auto sds_secret_configs = - tls_context.mutable_common_tls_context()->mutable_tls_certificate_sds_secret_configs()->Add(); - sds_secret_configs->set_name("abc.com"); - sds_secret_configs->mutable_sds_config(); - auto client_cfg = std::make_unique(tls_context, factory_context); - EXPECT_TRUE(client_cfg->tlsCertificates().empty()); - EXPECT_FALSE(client_cfg->isReady()); - - NiceMock context_manager; - ClientSslSocketFactory client_ssl_socket_factory(std::move(client_cfg), context_manager, - stats_store); - - // Add a secrets ready callback. It should not be invoked until onAddOrUpdateSecret() is called. - MockFunction mock_callback_; - EXPECT_CALL(mock_callback_, Call()).Times(0); - client_ssl_socket_factory.addReadyCb(mock_callback_.AsStdFunction()); - - // Call onAddOrUpdateSecret, but return a null ssl_ctx. This should not invoke the callback. - EXPECT_CALL(context_manager, createSslClientContext(_, _)).WillOnce(Return(nullptr)); - client_ssl_socket_factory.onAddOrUpdateSecret(); - - EXPECT_CALL(mock_callback_, Call()); - Ssl::ClientContextSharedPtr mock_context = std::make_shared(); - EXPECT_CALL(context_manager, createSslClientContext(_, _)).WillOnce(Return(mock_context)); - client_ssl_socket_factory.onAddOrUpdateSecret(); - - // Add another callback, it should be invoked immediately. - MockFunction second_callback_; - EXPECT_CALL(second_callback_, Call()); - client_ssl_socket_factory.addReadyCb(second_callback_.AsStdFunction()); -} - -// Validate that secrets callbacks are invoked when secrets become ready. -TEST_P(SslSocketTest, ServerAddSecretsReadyCallback) { - Stats::TestUtil::TestStore stats_store; - NiceMock local_info; - testing::NiceMock factory_context; - NiceMock init_manager; - NiceMock dispatcher; - EXPECT_CALL(factory_context, localInfo()).WillOnce(ReturnRef(local_info)); - EXPECT_CALL(factory_context, stats()).WillOnce(ReturnRef(stats_store)); - EXPECT_CALL(factory_context, initManager()).WillRepeatedly(ReturnRef(init_manager)); - EXPECT_CALL(factory_context, dispatcher()).WillRepeatedly(ReturnRef(dispatcher)); - - envoy::extensions::transport_sockets::tls::v3::DownstreamTlsContext tls_context; - auto sds_secret_configs = - tls_context.mutable_common_tls_context()->mutable_tls_certificate_sds_secret_configs()->Add(); - sds_secret_configs->set_name("abc.com"); - sds_secret_configs->mutable_sds_config(); - auto server_cfg = std::make_unique(tls_context, factory_context); - EXPECT_TRUE(server_cfg->tlsCertificates().empty()); - EXPECT_FALSE(server_cfg->isReady()); - - NiceMock context_manager; - ServerSslSocketFactory server_ssl_socket_factory(std::move(server_cfg), context_manager, - stats_store, std::vector{}); - - // Add a secrets ready callback. It should not be invoked until onAddOrUpdateSecret() is called. - MockFunction mock_callback_; - EXPECT_CALL(mock_callback_, Call()).Times(0); - server_ssl_socket_factory.addReadyCb(mock_callback_.AsStdFunction()); - - // Call onAddOrUpdateSecret, but return a null ssl_ctx. This should not invoke the callback. - EXPECT_CALL(context_manager, createSslServerContext(_, _, _)).WillOnce(Return(nullptr)); - server_ssl_socket_factory.onAddOrUpdateSecret(); - - // Now return a ssl context which should result in the callback being invoked. - EXPECT_CALL(mock_callback_, Call()); - Ssl::ServerContextSharedPtr mock_context = std::make_shared(); - EXPECT_CALL(context_manager, createSslServerContext(_, _, _)).WillOnce(Return(mock_context)); - server_ssl_socket_factory.onAddOrUpdateSecret(); - - // Add another callback, it should be invoked immediately. - MockFunction second_callback_; - EXPECT_CALL(second_callback_, Call()); - server_ssl_socket_factory.addReadyCb(second_callback_.AsStdFunction()); -} - TEST_P(SslSocketTest, TestTransportSocketCallback) { // Make MockTransportSocketCallbacks. Network::MockIoHandle io_handle; diff --git a/test/mocks/network/transport_socket.h b/test/mocks/network/transport_socket.h index af8949aea99b..ee53570c20ac 100644 --- a/test/mocks/network/transport_socket.h +++ b/test/mocks/network/transport_socket.h @@ -38,7 +38,6 @@ class MockTransportSocketFactory : public TransportSocketFactory { MOCK_METHOD(bool, implementsSecureTransport, (), (const)); MOCK_METHOD(TransportSocketPtr, createTransportSocket, (TransportSocketOptionsSharedPtr), (const)); - MOCK_METHOD(void, addReadyCb, (std::function)); }; } // namespace Network diff --git a/test/mocks/ssl/mocks.cc b/test/mocks/ssl/mocks.cc index 14ee85239d87..50ed3f3ae6c0 100644 --- a/test/mocks/ssl/mocks.cc +++ b/test/mocks/ssl/mocks.cc @@ -15,9 +15,6 @@ MockClientContext::~MockClientContext() = default; MockClientContextConfig::MockClientContextConfig() = default; MockClientContextConfig::~MockClientContextConfig() = default; -MockServerContext::MockServerContext() = default; -MockServerContext::~MockServerContext() = default; - MockServerContextConfig::MockServerContextConfig() = default; MockServerContextConfig::~MockServerContextConfig() = default; diff --git a/test/mocks/ssl/mocks.h b/test/mocks/ssl/mocks.h index beafd9de8720..6a5cbe8df649 100644 --- a/test/mocks/ssl/mocks.h +++ b/test/mocks/ssl/mocks.h @@ -97,17 +97,6 @@ class MockClientContextConfig : public ClientContextConfig { MOCK_METHOD(const std::string&, signingAlgorithmsForTest, (), (const)); }; -class MockServerContext : public ServerContext { -public: - MockServerContext(); - ~MockServerContext() override; - - MOCK_METHOD(size_t, daysUntilFirstCertExpires, (), (const)); - MOCK_METHOD(absl::optional, secondsUntilFirstOcspResponseExpires, (), (const)); - MOCK_METHOD(CertificateDetailsPtr, getCaCertInformation, (), (const)); - MOCK_METHOD(std::vector, getCertChainInformation, (), (const)); -}; - class MockServerContextConfig : public ServerContextConfig { public: MockServerContextConfig(); diff --git a/test/mocks/upstream/host.h b/test/mocks/upstream/host.h index b5d857a5c184..95183622dbb7 100644 --- a/test/mocks/upstream/host.h +++ b/test/mocks/upstream/host.h @@ -192,8 +192,6 @@ class MockHost : public Host { MOCK_METHOD(uint32_t, priority, (), (const)); MOCK_METHOD(void, priority, (uint32_t)); MOCK_METHOD(bool, warmed, (), (const)); - MOCK_METHOD(void, addReadyCb, (std::function, const envoy::config::core::v3::Metadata*), - (const)); testing::NiceMock cluster_; Network::TransportSocketFactoryPtr socket_factory_;