From ec92cc38c6304d524fca818f732f3c435e7abab7 Mon Sep 17 00:00:00 2001 From: chenylh Date: Thu, 19 Sep 2024 21:16:22 +0800 Subject: [PATCH] dns: rename `Success` to `Completed` (#36143) Signed-off-by: chenyuliang5 --- envoy/network/dns.h | 6 +- .../network/connectivity_manager_test.cc | 8 +- .../logical_dns/logical_dns_cluster.cc | 2 +- .../clusters/redis/redis_cluster.cc | 4 +- .../clusters/strict_dns/strict_dns_cluster.cc | 2 +- .../dynamic_forward_proxy/dns_cache_impl.cc | 6 +- source/extensions/common/wasm/context.cc | 2 +- .../filters/udp/dns_filter/dns_filter.cc | 2 +- .../udp/dns_filter/dns_filter_resolver.cc | 4 +- .../filters/udp/dns_filter/dns_parser.h | 2 +- .../dns_resolver/apple/apple_dns_impl.cc | 2 +- .../dns_resolver/apple/apple_dns_impl.h | 2 +- .../network/dns_resolver/cares/dns_impl.cc | 4 +- .../network/dns_resolver/cares/dns_impl.h | 7 +- .../dns_resolver/getaddrinfo/getaddrinfo.cc | 4 +- .../upstream/cluster_manager_impl_test.cc | 20 +- test/common/upstream/upstream_impl_test.cc | 70 +++---- .../common/logical_host_integration_test.cc | 2 +- .../logical_dns/logical_dns_cluster_test.cc | 22 +- .../clusters/redis/redis_cluster_test.cc | 12 +- .../dns_cache_impl_test.cc | 140 ++++++------- test/extensions/common/wasm/wasm_test.cc | 8 +- .../aws_request_signing_integration_test.cc | 4 +- .../filters/udp/dns_filter/dns_filter_test.cc | 11 +- .../dns_resolver/apple/apple_dns_impl_test.cc | 192 +++++++++--------- .../dns_resolver/cares/dns_impl_test.cc | 124 +++++------ .../getaddrinfo/getaddrinfo_test.cc | 24 +-- 27 files changed, 347 insertions(+), 339 deletions(-) diff --git a/envoy/network/dns.h b/envoy/network/dns.h index 4aa5f655dd4d..c7847babcc83 100644 --- a/envoy/network/dns.h +++ b/envoy/network/dns.h @@ -86,11 +86,11 @@ class DnsResolver { /** * Final status for a DNS resolution. - * TODO(abeyad): Rename `Success` to `Completed` or something similar. DNS resolution can return - * result statuses like NODATA and NONAME, which indicate successful completion of the query but + * DNS resolution can return result statuses like NODATA、SERVFAIL and NONAME, + * which indicate successful completion of the query but * no results, and `Completed` is a more accurate way of reflecting that. */ - enum class ResolutionStatus { Success, Failure }; + enum class ResolutionStatus { Completed, Failure }; /** * Called when a resolution attempt is complete. diff --git a/mobile/test/common/network/connectivity_manager_test.cc b/mobile/test/common/network/connectivity_manager_test.cc index 4230c3c9d40f..61e36c7e83e2 100644 --- a/mobile/test/common/network/connectivity_manager_test.cc +++ b/mobile/test/common/network/connectivity_manager_test.cc @@ -81,15 +81,15 @@ TEST_F(ConnectivityManagerTest, WhenDrainPostDnsRefreshEnabledDrainsPostDnsRefre connectivity_manager_->onDnsResolutionComplete( "cached.example.com", std::make_shared(), - Network::DnsResolver::ResolutionStatus::Success); + Network::DnsResolver::ResolutionStatus::Completed); connectivity_manager_->onDnsResolutionComplete( "not-cached.example.com", std::make_shared(), - Network::DnsResolver::ResolutionStatus::Success); + Network::DnsResolver::ResolutionStatus::Completed); connectivity_manager_->onDnsResolutionComplete( "not-cached2.example.com", std::make_shared(), - Network::DnsResolver::ResolutionStatus::Success); + Network::DnsResolver::ResolutionStatus::Completed); } TEST_F(ConnectivityManagerTest, WhenDrainPostDnsNotEnabledDoesntDrainPostDnsRefresh) { @@ -102,7 +102,7 @@ TEST_F(ConnectivityManagerTest, WhenDrainPostDnsNotEnabledDoesntDrainPostDnsRefr EXPECT_CALL(cm_, drainConnections(_)).Times(0); connectivity_manager_->onDnsResolutionComplete( "example.com", std::make_shared(), - Network::DnsResolver::ResolutionStatus::Success); + Network::DnsResolver::ResolutionStatus::Completed); } TEST_F(ConnectivityManagerTest, diff --git a/source/extensions/clusters/logical_dns/logical_dns_cluster.cc b/source/extensions/clusters/logical_dns/logical_dns_cluster.cc index a29ac2194940..ef3d443af702 100644 --- a/source/extensions/clusters/logical_dns/logical_dns_cluster.cc +++ b/source/extensions/clusters/logical_dns/logical_dns_cluster.cc @@ -107,7 +107,7 @@ void LogicalDnsCluster::startResolve() { // If the DNS resolver successfully resolved with an empty response list, the logical DNS // cluster does not update. This ensures that a potentially previously resolved address does // not stabilize back to 0 hosts. - if (status == Network::DnsResolver::ResolutionStatus::Success && !response.empty()) { + if (status == Network::DnsResolver::ResolutionStatus::Completed && !response.empty()) { info_->configUpdateStats().update_success_.inc(); const auto addrinfo = response.front().addrInfo(); // TODO(mattklein123): Move port handling into the DNS interface. diff --git a/source/extensions/clusters/redis/redis_cluster.cc b/source/extensions/clusters/redis/redis_cluster.cc index d667efea6d9b..ed96a0a49a10 100644 --- a/source/extensions/clusters/redis/redis_cluster.cc +++ b/source/extensions/clusters/redis/redis_cluster.cc @@ -365,7 +365,7 @@ void RedisCluster::RedisDiscoverySession::resolveClusterHostnames( updateDnsStats(status, response.empty()); // If DNS resolution for a primary fails, we stop resolution for remaining, and reset // the timer. - if (status != Network::DnsResolver::ResolutionStatus::Success) { + if (status != Network::DnsResolver::ResolutionStatus::Completed) { ENVOY_LOG(error, "Unable to resolve cluster slot primary hostname {}", slot.primary_hostname_); resolve_timer_->enableTimer(parent_.cluster_refresh_rate_); @@ -419,7 +419,7 @@ void RedisCluster::RedisDiscoverySession::resolveReplicas( updateDnsStats(status, response.empty()); // If DNS resolution fails here, we move on to resolve other replicas in the list. // We log a warn message. - if (status != Network::DnsResolver::ResolutionStatus::Success) { + if (status != Network::DnsResolver::ResolutionStatus::Completed) { ENVOY_LOG(warn, "Unable to resolve cluster replica address {}", replica.first); } else { // Replica resolved diff --git a/source/extensions/clusters/strict_dns/strict_dns_cluster.cc b/source/extensions/clusters/strict_dns/strict_dns_cluster.cc index d2b1794ec57c..b379ef1e890e 100644 --- a/source/extensions/clusters/strict_dns/strict_dns_cluster.cc +++ b/source/extensions/clusters/strict_dns/strict_dns_cluster.cc @@ -130,7 +130,7 @@ void StrictDnsClusterImpl::ResolveTarget::startResolve() { std::chrono::milliseconds final_refresh_rate = parent_.dns_refresh_rate_ms_; - if (status == Network::DnsResolver::ResolutionStatus::Success) { + if (status == Network::DnsResolver::ResolutionStatus::Completed) { parent_.info_->configUpdateStats().update_success_.inc(); HostVector new_hosts; diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc index b06e8ab4aee1..d7841bad164c 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc @@ -216,7 +216,7 @@ void DnsCacheImpl::startCacheLoad(const std::string& host, uint16_t default_port // If the DNS request was simply to create a host endpoint in a Dynamic Forward Proxy cluster, // fast fail the look-up as the address is not needed. if (is_proxy_lookup) { - finishResolve(host, Network::DnsResolver::ResolutionStatus::Success, "proxy_resolve", {}, {}, + finishResolve(host, Network::DnsResolver::ResolutionStatus::Completed, "proxy_resolve", {}, {}, true); } else { startResolve(host, *primary_host); @@ -503,7 +503,7 @@ void DnsCacheImpl::finishResolve(const std::string& host, runResolutionCompleteCallbacks(host, primary_host_info->host_info_, status); // Kick off the refresh timer. - if (status == Network::DnsResolver::ResolutionStatus::Success) { + if (status == Network::DnsResolver::ResolutionStatus::Completed) { primary_host_info->failure_backoff_strategy_->reset( std::chrono::duration_cast(dns_ttl).count()); primary_host_info->refresh_timer_->enableTimer(dns_ttl); @@ -682,7 +682,7 @@ void DnsCacheImpl::loadCacheEntries( key, accumulateToString(responses, [](const auto& dns_response) { return dns_response.addrInfo().address_->asString(); })); - finishResolve(key, Network::DnsResolver::ResolutionStatus::Success, "from_cache", + finishResolve(key, Network::DnsResolver::ResolutionStatus::Completed, "from_cache", std::move(responses), resolution_time); stats_.cache_load_.inc(); return KeyValueStore::Iterate::Continue; diff --git a/source/extensions/common/wasm/context.cc b/source/extensions/common/wasm/context.cc index d21983da96a2..8d717c38d23e 100644 --- a/source/extensions/common/wasm/context.cc +++ b/source/extensions/common/wasm/context.cc @@ -202,7 +202,7 @@ void Context::onResolveDns(uint32_t token, Envoy::Network::DnsResolver::Resoluti if (wasm()->isFailed() || !wasm()->on_resolve_dns_) { return; } - if (status != Network::DnsResolver::ResolutionStatus::Success) { + if (status != Network::DnsResolver::ResolutionStatus::Completed) { buffer_.set(""); wasm()->on_resolve_dns_(this, id_, token, 0); return; diff --git a/source/extensions/filters/udp/dns_filter/dns_filter.cc b/source/extensions/filters/udp/dns_filter/dns_filter.cc index e971791fe4d1..d895ac8f5f14 100644 --- a/source/extensions/filters/udp/dns_filter/dns_filter.cc +++ b/source/extensions/filters/udp/dns_filter/dns_filter.cc @@ -234,7 +234,7 @@ DnsFilter::DnsFilter(Network::UdpReadFilterCallbacks& callbacks, // We cannot retry the resolution if ares returns without a response. The ares context // is still dirty and will result in a segfault when it is freed during a subsequent resolve // call from here. We will retry resolutions for pending lookups only - if (context->resolution_status_ != Network::DnsResolver::ResolutionStatus::Success && + if (context->resolution_status_ != Network::DnsResolver::ResolutionStatus::Completed && !context->in_callback_ && context->retry_ > 0) { --context->retry_; ENVOY_LOG(debug, "resolving name [{}] via external resolvers [retry {}]", query->name_, diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc index ae2a72dca517..9930ffcf4556 100644 --- a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc +++ b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc @@ -30,7 +30,7 @@ void DnsFilterResolver::resolveExternalQuery(DnsQueryContextPtr context, // We don't support other lookups other than A and AAAA. Set success here so that we don't // retry for something that we are certain will fail. ENVOY_LOG(debug, "Unknown query type [{}] for upstream lookup", domain_query->type_); - ctx.query_context->resolution_status_ = Network::DnsResolver::ResolutionStatus::Success; + ctx.query_context->resolution_status_ = Network::DnsResolver::ResolutionStatus::Completed; ctx.resolver_status = DnsFilterResolverStatus::Complete; invokeCallback(ctx); return; @@ -87,7 +87,7 @@ void DnsFilterResolver::resolveExternalQuery(DnsQueryContextPtr context, ctx.resolver_status = DnsFilterResolverStatus::Complete; // C-ares doesn't expose the TTL in the data available here. - if (status == Network::DnsResolver::ResolutionStatus::Success) { + if (status == Network::DnsResolver::ResolutionStatus::Completed) { ctx.resolved_hosts.reserve(response.size()); for (const auto& resp : response) { const auto& addrinfo = resp.addrInfo(); diff --git a/source/extensions/filters/udp/dns_filter/dns_parser.h b/source/extensions/filters/udp/dns_filter/dns_parser.h index 3449c19d6478..1b5b1a2eeb7e 100644 --- a/source/extensions/filters/udp/dns_filter/dns_parser.h +++ b/source/extensions/filters/udp/dns_filter/dns_parser.h @@ -200,7 +200,7 @@ class DnsQueryContext { uint64_t retry_; uint16_t id_; Network::DnsResolver::ResolutionStatus resolution_status_ = - Network::DnsResolver::ResolutionStatus::Success; + Network::DnsResolver::ResolutionStatus::Completed; DnsHeader header_; DnsHeader response_header_; DnsQueryPtrVec queries_; diff --git a/source/extensions/network/dns_resolver/apple/apple_dns_impl.cc b/source/extensions/network/dns_resolver/apple/apple_dns_impl.cc index cf2694c66096..c84253693345 100644 --- a/source/extensions/network/dns_resolver/apple/apple_dns_impl.cc +++ b/source/extensions/network/dns_resolver/apple/apple_dns_impl.cc @@ -72,7 +72,7 @@ AppleDnsResolverImpl::startResolution(const std::string& dns_name, ENVOY_LOG_EVENT(debug, "apple_dns_immediate_resolution", "DNS resolver resolved ({}) to ({}) without issuing call to Apple API", dns_name, address->asString()); - callback(DnsResolver::ResolutionStatus::Success, "apple_dns_success", + callback(DnsResolver::ResolutionStatus::Completed, "apple_dns_success", {DnsResponse(address, std::chrono::seconds(60))}); return {nullptr, true}; } diff --git a/source/extensions/network/dns_resolver/apple/apple_dns_impl.h b/source/extensions/network/dns_resolver/apple/apple_dns_impl.h index c89914e59459..d8f01bd7360f 100644 --- a/source/extensions/network/dns_resolver/apple/apple_dns_impl.h +++ b/source/extensions/network/dns_resolver/apple/apple_dns_impl.h @@ -122,7 +122,7 @@ class AppleDnsResolverImpl : public DnsResolver, protected Logger::Loggablenodes != nullptr) { @@ -264,7 +264,7 @@ void DnsResolverImpl::AddrInfoPendingResolution::onAresGetAddrInfoCallback( } else if (isResponseWithNoRecords(status)) { // Treat `ARES_ENODATA` or `ARES_ENOTFOUND` here as success to populate back the // "empty records" response. - pending_response_.status_ = ResolutionStatus::Success; + pending_response_.status_ = ResolutionStatus::Completed; pending_response_.details_ = absl::StrCat("cares_norecords:", ares_strerror(status)); ASSERT(addrinfo == nullptr); } else { diff --git a/source/extensions/network/dns_resolver/cares/dns_impl.h b/source/extensions/network/dns_resolver/cares/dns_impl.h index af806315c0df..a6ead6741560 100644 --- a/source/extensions/network/dns_resolver/cares/dns_impl.h +++ b/source/extensions/network/dns_resolver/cares/dns_impl.h @@ -110,10 +110,9 @@ class DnsResolverImpl : public DnsResolver, protected Logger::LoggableasString(); })); - return std::make_pair(ResolutionStatus::Success, final_results); + return std::make_pair(ResolutionStatus::Completed, final_results); } // Background thread which wakes up and does resolutions. @@ -190,7 +190,7 @@ void GetAddrInfoDnsResolver::resolveThreadRoutine() { // https://github.com/envoyproxy/envoy/blob/099d85925b32ce8bf06e241ee433375a0a3d751b/source/extensions/network/dns_resolver/cares/dns_impl.h#L109-L111. ENVOY_LOG(debug, "getaddrinfo for host={} has no results rc={}", next_query->dns_name_, gai_strerror(rc.return_value_)); - response = std::make_pair(ResolutionStatus::Success, std::list()); + response = std::make_pair(ResolutionStatus::Completed, std::list()); } else { ENVOY_LOG(debug, "getaddrinfo failed for host={} with rc={} errno={}", next_query->dns_name_, gai_strerror(rc.return_value_), errorDetails(rc.errno_)); diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index ad2c80b5f45b..8d9d2ca7b8e5 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -2824,7 +2824,7 @@ TEST_P(ClusterManagerLifecycleTest, DynamicHostRemove) { cluster_manager_->setInitializedCb([&]() -> void { initialized.ready(); }); EXPECT_CALL(initialized, ready()); - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); // After we are initialized, we should immediately get called back if someone asks for an @@ -2878,7 +2878,7 @@ TEST_P(ClusterManagerLifecycleTest, DynamicHostRemove) { // Remove the first host, this should lead to the first cp being drained. dns_timer_->invokeCallback(); - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2"})); cp1->idle_cb_(); cp1->idle_cb_ = nullptr; @@ -2912,7 +2912,7 @@ TEST_P(ClusterManagerLifecycleTest, DynamicHostRemove) { // Now add and remove a host that we never have a conn pool to. This should not lead to any // drain callbacks, etc. dns_timer_->invokeCallback(); - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.3"})); factory_.tls_.shutdownThread(); @@ -2980,7 +2980,7 @@ TEST_P(ClusterManagerLifecycleTest, DynamicHostRemoveWithTls) { cluster_manager_->setInitializedCb([&]() -> void { initialized.ready(); }); EXPECT_CALL(initialized, ready()); - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); // After we are initialized, we should immediately get called back if someone asks for an @@ -3076,7 +3076,7 @@ TEST_P(ClusterManagerLifecycleTest, DynamicHostRemoveWithTls) { // Remove the first host, this should lead to the first cp being drained. dns_timer_->invokeCallback(); - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2"})); cp1->idle_cb_(); cp1->idle_cb_ = nullptr; @@ -3134,7 +3134,7 @@ TEST_P(ClusterManagerLifecycleTest, DynamicHostRemoveWithTls) { // Now add and remove a host that we never have a conn pool to. This should not lead to any // drain callbacks, etc. dns_timer_->invokeCallback(); - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.3"})); factory_.tls_.shutdownThread(); @@ -3924,7 +3924,7 @@ TEST_P(ClusterManagerLifecycleTest, DynamicHostRemoveDefaultPriority) { EXPECT_FALSE(all_clusters.active_clusters_.at("cluster_1").get().info()->addedViaApi()); EXPECT_EQ(nullptr, cluster_manager_->getThreadLocalCluster("cluster_1")); - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2"})); EXPECT_CALL(factory_, allocateConnPool_(_, _, _, _, _, _)) @@ -3957,7 +3957,7 @@ TEST_P(ClusterManagerLifecycleTest, DynamicHostRemoveDefaultPriority) { // crash. dns_timer_->invokeCallback(); // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({})); factory_.tls_.shutdownThread(); @@ -4018,7 +4018,7 @@ TEST_P(ClusterManagerLifecycleTest, ConnPoolDestroyWithDraining) { EXPECT_FALSE(all_clusters.active_clusters_.at("cluster_1").get().info()->addedViaApi()); EXPECT_EQ(nullptr, cluster_manager_->getThreadLocalCluster("cluster_1")); - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2"})); MockConnPoolWithDestroy* mock_cp = new MockConnPoolWithDestroy(); @@ -4043,7 +4043,7 @@ TEST_P(ClusterManagerLifecycleTest, ConnPoolDestroyWithDraining) { // Remove the first host, this should lead to the cp being drained. dns_timer_->invokeCallback(); // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({})); // The drained callback might get called when the CP is being destroyed. diff --git a/test/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index be63bcf58db9..034c6fdefaf1 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -235,7 +235,7 @@ TEST_P(StrictDnsParamTest, ImmediateResolve) { EXPECT_CALL(*dns_resolver, resolve("foo.bar.com", std::get<1>(GetParam()), _)) .WillOnce(Invoke([&](const std::string&, Network::DnsLookupFamily, Network::DnsResolver::ResolveCb cb) -> Network::ActiveDnsQuery* { - cb(Network::DnsResolver::ResolutionStatus::Success, "", + cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse(std::get<2>(GetParam()))); return nullptr; })); @@ -480,7 +480,7 @@ TEST_F(StrictDnsClusterImplTest, ZeroHostsHealthChecker) { EXPECT_CALL(*health_checker, addHostCheckCompleteCb(_)); EXPECT_CALL(initialized, ready()); EXPECT_CALL(*resolver.timer_, enableTimer(_, _)); - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", {}); + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", {}); EXPECT_EQ(0UL, cluster->prioritySet().hostSetsPerPriority()[0]->hosts().size()); EXPECT_EQ(0UL, cluster->prioritySet().hostSetsPerPriority()[0]->healthyHosts().size()); } @@ -531,7 +531,7 @@ TEST_F(StrictDnsClusterImplTest, DontWaitForDNSOnInit) { EXPECT_CALL(*resolver.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.1"})); } @@ -642,7 +642,7 @@ TEST_F(StrictDnsClusterImplTest, Basic) { resolver1.expectResolve(*dns_resolver_); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -653,7 +653,7 @@ TEST_F(StrictDnsClusterImplTest, Basic) { resolver1.expectResolve(*dns_resolver_); resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -662,7 +662,7 @@ TEST_F(StrictDnsClusterImplTest, Basic) { resolver1.expectResolve(*dns_resolver_); resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -671,7 +671,7 @@ TEST_F(StrictDnsClusterImplTest, Basic) { resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.3"})); EXPECT_THAT( std::list({"127.0.0.3:11001"}), @@ -680,7 +680,7 @@ TEST_F(StrictDnsClusterImplTest, Basic) { // Make sure we de-dup the same address. EXPECT_CALL(*resolver2.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1", "10.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.3:11001", "10.0.0.1:11002"}), @@ -702,7 +702,7 @@ TEST_F(StrictDnsClusterImplTest, Basic) { resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({})); EXPECT_THAT( std::list({"10.0.0.1:11002"}), @@ -774,7 +774,7 @@ TEST_F(StrictDnsClusterImplTest, HostRemovalActiveHealthSkipped) { EXPECT_CALL(*health_checker, addHostCheckCompleteCb(_)); EXPECT_CALL(*resolver.timer_, enableTimer(_, _)).Times(2); - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); // Verify that both endpoints are initially marked with FAILED_ACTIVE_HC, then @@ -792,7 +792,7 @@ TEST_F(StrictDnsClusterImplTest, HostRemovalActiveHealthSkipped) { } // Re-resolve the DNS name with only one record - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1"})); const auto& hosts = cluster->prioritySet().hostSetsPerPriority()[0]->hosts(); @@ -835,7 +835,7 @@ TEST_F(StrictDnsClusterImplTest, HostRemovalAfterHcFail) { EXPECT_CALL(*health_checker, addHostCheckCompleteCb(_)); EXPECT_CALL(*resolver.timer_, enableTimer(_, _)).Times(2); - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); // Verify that both endpoints are initially marked with FAILED_ACTIVE_HC, then @@ -857,7 +857,7 @@ TEST_F(StrictDnsClusterImplTest, HostRemovalAfterHcFail) { } // Re-resolve the DNS name with only one record, we should still have 2 hosts. - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1"})); { @@ -915,7 +915,7 @@ TEST_F(StrictDnsClusterImplTest, HostUpdateWithDisabledACEndpoint) { EXPECT_CALL(*health_checker, addHostCheckCompleteCb(_)); EXPECT_CALL(*resolver.timer_, enableTimer(_, _)).Times(2); - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); { @@ -930,7 +930,7 @@ TEST_F(StrictDnsClusterImplTest, HostUpdateWithDisabledACEndpoint) { } // Re-resolve the DNS name with only one record, we should have 1 host. - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1"})); { @@ -1058,7 +1058,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { resolver1.expectResolve(*dns_resolver_); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -1078,7 +1078,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { resolver1.expectResolve(*dns_resolver_); resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -1092,7 +1092,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { resolver1.expectResolve(*dns_resolver_); resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -1105,7 +1105,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { EXPECT_CALL(*resolver2.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1", "10.0.0.1"})); // We received a new set of hosts for localhost2. Should rebuild the cluster-> @@ -1114,7 +1114,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { resolver1.expectResolve(*dns_resolver_); resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.1"})); // We again received the same set as before for localhost1. No rebuild this time. @@ -1123,7 +1123,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.3"})); EXPECT_THAT( std::list({"127.0.0.3:11001", "10.0.0.1:11002"}), @@ -1131,7 +1131,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { // Make sure we de-dup the same address. EXPECT_CALL(*resolver2.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1", "10.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.3:11001", "10.0.0.1:11002"}), @@ -1146,7 +1146,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { // Make sure that we *don't* de-dup between resolve targets. EXPECT_CALL(*resolver3.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver3.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver3.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); const auto hosts = cluster->prioritySet().hostSetsPerPriority()[0]->hosts(); @@ -1183,12 +1183,12 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasic) { EXPECT_CALL(*resolver2.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({})); EXPECT_CALL(*resolver3.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver3.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver3.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({})); // Ensure that we called the update membership callback. @@ -1275,7 +1275,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasicMultiplePriorities) { resolver1.expectResolve(*dns_resolver_); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -1286,7 +1286,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasicMultiplePriorities) { resolver1.expectResolve(*dns_resolver_); resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -1295,7 +1295,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasicMultiplePriorities) { resolver1.expectResolve(*dns_resolver_); resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "127.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.1:11001", "127.0.0.2:11001"}), @@ -1304,7 +1304,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasicMultiplePriorities) { resolver1.timer_->invokeCallback(); EXPECT_CALL(*resolver1.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver1.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.3"})); EXPECT_THAT( std::list({"127.0.0.3:11001"}), @@ -1313,7 +1313,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasicMultiplePriorities) { // Make sure we de-dup the same address. EXPECT_CALL(*resolver2.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver2.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1", "10.0.0.1"})); EXPECT_THAT( std::list({"127.0.0.3:11001", "10.0.0.1:11002"}), @@ -1330,7 +1330,7 @@ TEST_F(StrictDnsClusterImplTest, LoadAssignmentBasicMultiplePriorities) { EXPECT_CALL(*resolver3.timer_, enableTimer(std::chrono::milliseconds(4000), _)); EXPECT_CALL(membership_updated, ready()); - resolver3.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver3.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"192.168.1.1", "192.168.1.2"})); // Make sure we have multiple priorities. @@ -1424,7 +1424,7 @@ TEST_F(StrictDnsClusterImplTest, FailureRefreshRateBackoffResetsWhenSuccessHappe // Successful call should reset the failure backoff strategy. EXPECT_CALL(*resolver.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({})); // Therefore, a subsequent failure should get a [0,base * 1] refresh. @@ -1475,13 +1475,13 @@ TEST_F(StrictDnsClusterImplTest, TtlAsDnsRefreshRateNoJitter) { EXPECT_CALL(membership_updated, ready()); EXPECT_CALL(*resolver.timer_, enableTimer(std::chrono::milliseconds(5000), _)); resolver.dns_callback_( - Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"192.168.1.1", "192.168.1.2"}, std::chrono::seconds(5))); // If the response is successful but empty, the cluster uses the cluster configured refresh rate. EXPECT_CALL(membership_updated, ready()); EXPECT_CALL(*resolver.timer_, enableTimer(std::chrono::milliseconds(4000), _)); - resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + resolver.dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({}, std::chrono::seconds(5))); // On failure, the cluster uses the cluster configured refresh rate. @@ -1529,7 +1529,7 @@ TEST_F(StrictDnsClusterImplTest, TtlAsDnsRefreshRateYesJitter) { enableTimer(std::chrono::milliseconds(ttl_s * 1000 + jitter_ms), _)); ON_CALL(random_, random()).WillByDefault(Return(random_return)); resolver.dns_callback_( - Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"192.168.1.1", "192.168.1.2"}, std::chrono::seconds(ttl_s))); } diff --git a/test/extensions/clusters/common/logical_host_integration_test.cc b/test/extensions/clusters/common/logical_host_integration_test.cc index 8a0763814da3..66beadcdd2cd 100644 --- a/test/extensions/clusters/common/logical_host_integration_test.cc +++ b/test/extensions/clusters/common/logical_host_integration_test.cc @@ -54,7 +54,7 @@ TEST_P(LogicalHostIntegrationTest, LogicalDNSRaceCrashTest) { Network::DnsResolver::ResolveCb dns_callback) -> Network::ActiveDnsQuery* { const uint32_t address = address_ptr->address_; // Keep changing the returned addresses to force address update. - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({ // The only significant address is the first one; the other ones are // just used to populate a list whose maintenance is race-prone. diff --git a/test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc b/test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc index b781b28e2697..8c4a1c68d488 100644 --- a/test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc +++ b/test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc @@ -99,7 +99,7 @@ class LogicalDnsClusterTest : public Event::TestUsingSimulatedTime, public testi EXPECT_CALL(membership_updated_, ready()); EXPECT_CALL(initialized_, ready()); EXPECT_CALL(*resolve_timer_, enableTimer(std::chrono::milliseconds(4000), _)); - dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); EXPECT_EQ(1UL, cluster_->prioritySet().hostSetsPerPriority()[0]->hosts().size()); @@ -129,7 +129,7 @@ class LogicalDnsClusterTest : public Event::TestUsingSimulatedTime, public testi // Should not cause any changes. EXPECT_CALL(*resolve_timer_, enableTimer(_, _)); - dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2", "127.0.0.3"})); EXPECT_EQ("127.0.0.1:" + std::to_string(expected_hc_port), @@ -167,7 +167,7 @@ class LogicalDnsClusterTest : public Event::TestUsingSimulatedTime, public testi // Should cause a change. EXPECT_CALL(*resolve_timer_, enableTimer(_, _)); - dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.3", "127.0.0.1", "127.0.0.2"})); EXPECT_EQ("127.0.0.3:" + std::to_string(expected_hc_port), @@ -196,10 +196,10 @@ class LogicalDnsClusterTest : public Event::TestUsingSimulatedTime, public testi .WillOnce(Return(new NiceMock())); logical_host->createConnection(server_context_.dispatcher_, nullptr, nullptr); - // Empty Success should not cause any change. + // Empty Completed should not cause any change. ON_CALL(random_, random()).WillByDefault(Return(6000)); EXPECT_CALL(*resolve_timer_, enableTimer(std::chrono::milliseconds(6000), _)); - dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", {}); + dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", {}); EXPECT_EQ(logical_host, cluster_->prioritySet().hostSetsPerPriority()[0]->hosts()[0]); EXPECT_CALL(server_context_.dispatcher_, @@ -301,7 +301,7 @@ TEST_P(LogicalDnsParamTest, ImmediateResolve) { .WillOnce(Invoke([&](const std::string&, Network::DnsLookupFamily, Network::DnsResolver::ResolveCb cb) -> Network::ActiveDnsQuery* { EXPECT_CALL(*resolve_timer_, enableTimer(_, _)); - cb(Network::DnsResolver::ResolutionStatus::Success, "", + cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse(std::get<2>(GetParam()))); return nullptr; })); @@ -350,7 +350,7 @@ TEST_F(LogicalDnsParamTest, FailureRefreshRateBackoffResetsWhenSuccessHappens) { // Successful call should reset the failure backoff strategy. EXPECT_CALL(membership_updated_, ready()); EXPECT_CALL(*resolve_timer_, enableTimer(std::chrono::milliseconds(4000), _)); - dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); EXPECT_EQ(1UL, cluster_->prioritySet().hostSetsPerPriority()[0]->hosts().size()); EXPECT_EQ(1UL, cluster_->prioritySet().hostSetsPerPriority()[0]->healthyHosts().size()); @@ -390,12 +390,12 @@ TEST_F(LogicalDnsParamTest, TtlAsDnsRefreshRate) { EXPECT_CALL(membership_updated_, ready()); EXPECT_CALL(initialized_, ready()); EXPECT_CALL(*resolve_timer_, enableTimer(std::chrono::milliseconds(5000), _)); - dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"}, std::chrono::seconds(5))); // If the response is successful but empty, the cluster uses the cluster configured refresh rate. EXPECT_CALL(*resolve_timer_, enableTimer(std::chrono::milliseconds(4000), _)); - dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({}, std::chrono::seconds(5))); // On failure, the cluster uses the cluster configured refresh rate. @@ -603,7 +603,7 @@ TEST_F(LogicalDnsClusterTest, DontWaitForDNSOnInit) { EXPECT_CALL(membership_updated_, ready()); EXPECT_CALL(*resolve_timer_, enableTimer(std::chrono::milliseconds(4000), _)); - dns_callback_(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback_(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); } @@ -643,7 +643,7 @@ TEST_F(LogicalDnsClusterTest, DNSRefreshHasJitter) { ON_CALL(random_, random()).WillByDefault(Return(random_return)); dns_callback_( - Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"}, std::chrono::seconds(3000))); } diff --git a/test/extensions/clusters/redis/redis_cluster_test.cc b/test/extensions/clusters/redis/redis_cluster_test.cc index d8236942e02f..cf3e3570e324 100644 --- a/test/extensions/clusters/redis/redis_cluster_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_test.cc @@ -173,7 +173,7 @@ class RedisClusterTest : public testing::Test, const std::string& expected_address, const std::list& resolved_addresses, Network::DnsResolver::ResolutionStatus status = - Network::DnsResolver::ResolutionStatus::Success) { + Network::DnsResolver::ResolutionStatus::Completed) { EXPECT_CALL(*dns_resolver_, resolve(expected_address, dns_lookup_family, _)) .WillOnce(Invoke([status, resolved_addresses]( const std::string&, Network::DnsLookupFamily, @@ -775,7 +775,7 @@ TEST_P(RedisDnsParamTest, ImmediateResolveDns) { .WillOnce(Invoke([&](const std::string&, Network::DnsLookupFamily, Network::DnsResolver::ResolveCb cb) -> Network::ActiveDnsQuery* { std::list address_pair = std::get<2>(GetParam()); - cb(Network::DnsResolver::ResolutionStatus::Success, "", + cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse(address_pair)); EXPECT_CALL(*cluster_callback_, onClusterSlotUpdate(_, _)); expectClusterSlotResponse( @@ -856,9 +856,9 @@ TEST_F(RedisClusterTest, AddressAsHostnameParallelResolution) { EXPECT_CALL(*cluster_callback_, onClusterSlotUpdate(_, _)); cluster_->initialize([&]() -> void { initialized_.ready(); }); expectClusterSlotResponse(twoSlotsPrimariesHostnames("primary1.com", "primary2.com", 22120)); - primary1_resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + primary1_resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse(std::list{"127.0.1.1"})); - primary2_resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + primary2_resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse(std::list{"127.0.1.2"})); expectHealthyHosts(std::list({ "127.0.1.1:22120", @@ -1241,7 +1241,7 @@ TEST_F(RedisClusterTest, MultipleDnsDiscovery) { EXPECT_CALL(*dns_resolver_, resolve("foo.bar.com", _, _)) .WillOnce(Invoke([&](const std::string&, Network::DnsLookupFamily, Network::DnsResolver::ResolveCb cb) -> Network::ActiveDnsQuery* { - cb(Network::DnsResolver::ResolutionStatus::Success, "", + cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse(std::list({"127.0.0.1", "127.0.0.2"}))); return nullptr; })); @@ -1249,7 +1249,7 @@ TEST_F(RedisClusterTest, MultipleDnsDiscovery) { EXPECT_CALL(*dns_resolver_, resolve("foo1.bar.com", _, _)) .WillOnce(Invoke([&](const std::string&, Network::DnsLookupFamily, Network::DnsResolver::ResolveCb cb) -> Network::ActiveDnsQuery* { - cb(Network::DnsResolver::ResolutionStatus::Success, "", + cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse(std::list({"127.0.0.3", "127.0.0.4"}))); return nullptr; })); diff --git a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc index fd3a4819cf10..2cba229e1f0f 100644 --- a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc +++ b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc @@ -148,11 +148,11 @@ TEST_F(DnsCacheImplTest, PreresolveSuccess) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete(authority, DnsHostInfoEquals("10.0.0.1:443", "bar.baz.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); initialize({{host, port}} /* preresolve_hostnames */); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); checkStats(1 /* attempt */, 1 /* success */, 0 /* failure */, 1 /* address changed */, 1 /* added */, 0 /* removed */, 1 /* num hosts */); @@ -186,10 +186,10 @@ TEST_F(DnsCacheImplTest, DnsFirstResolveComplete) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("bar.baz.com:443", DnsHostInfoEquals("10.0.0.1:443", "bar.baz.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); initialize({{"bar.baz.com", 443}}); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); checkStats(1 /* attempt */, 1 /* success */, 0 /* failure */, 1 /* address changed */, 1 /* added */, 0 /* removed */, 1 /* num hosts */); @@ -232,9 +232,9 @@ TEST_F(DnsCacheImplTest, ResolveSuccess) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); checkStats(1 /* attempt */, 1 /* success */, 0 /* failure */, 1 /* address changed */, @@ -254,9 +254,9 @@ TEST_F(DnsCacheImplTest, ResolveSuccess) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); checkStats(2 /* attempt */, 2 /* success */, 0 /* failure */, 1 /* address changed */, @@ -279,9 +279,9 @@ TEST_F(DnsCacheImplTest, ResolveSuccess) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.2:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.2"})); checkStats(3 /* attempt */, 3 /* success */, 0 /* failure */, 2 /* address changed */, @@ -395,9 +395,9 @@ TEST_F(DnsCacheImplTest, Ipv4Address) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("127.0.0.1:80", DnsHostInfoEquals("127.0.0.1:80", "127.0.0.1", true), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1"})); } @@ -429,9 +429,9 @@ TEST_F(DnsCacheImplTest, Ipv4AddressWithPort) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("127.0.0.1:10000", DnsHostInfoEquals("127.0.0.1:10000", "127.0.0.1", true), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1"})); } @@ -460,9 +460,9 @@ TEST_F(DnsCacheImplTest, Ipv6Address) { EXPECT_CALL(callbacks, onLoadDnsCacheComplete(DnsHostInfoEquals("[::1]:80", "::1", true))); EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("[::1]:80", DnsHostInfoEquals("[::1]:80", "::1", true), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"::1"})); } @@ -491,9 +491,9 @@ TEST_F(DnsCacheImplTest, Ipv6AddressWithPort) { EXPECT_CALL(callbacks, onLoadDnsCacheComplete(DnsHostInfoEquals("[::1]:10000", "::1", true))); EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("[::1]:10000", DnsHostInfoEquals("[::1]:10000", "::1", true), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"::1"})); } @@ -528,9 +528,9 @@ TEST_F(DnsCacheImplTest, TTL) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(6000), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); checkStats(1 /* attempt */, 1 /* success */, 0 /* failure */, 1 /* address changed */, @@ -549,9 +549,9 @@ TEST_F(DnsCacheImplTest, TTL) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(6000), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); checkStats(2 /* attempt */, 2 /* success */, 0 /* failure */, 1 /* address changed */, 1 /* added */, 0 /* removed */, 1 /* num hosts */); @@ -607,9 +607,9 @@ TEST_F(DnsCacheImplTest, TTLWithMinRefreshRate) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(45000), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); } @@ -644,9 +644,9 @@ TEST_F(DnsCacheImplTest, TTLWithCustomParameters) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); // Re-resolve with ~30s passed. TTL should still be OK at 60s. @@ -659,9 +659,9 @@ TEST_F(DnsCacheImplTest, TTLWithCustomParameters) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); // Re-resolve with ~30s passed. TTL should expire. @@ -692,7 +692,7 @@ TEST_F(DnsCacheImplTest, InlineResolve) { EXPECT_CALL(*resolver_, resolve("localhost", _, _)) .WillOnce(Invoke([](const std::string&, Network::DnsLookupFamily, Network::DnsResolver::ResolveCb callback) { - callback(Network::DnsResolver::ResolutionStatus::Success, "", + callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1"})); return nullptr; })); @@ -705,7 +705,7 @@ TEST_F(DnsCacheImplTest, InlineResolve) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("localhost:80", DnsHostInfoEquals("127.0.0.1:80", "localhost", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); post_cb(); } @@ -880,9 +880,10 @@ TEST_F(DnsCacheImplTest, ResolveSuccessWithEmptyResult) { EXPECT_CALL(callbacks, onLoadDnsCacheComplete(DnsHostInfoAddressIsNull())); EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoAddressIsNull(), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(configured_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", TestUtility::makeDnsResponse({})); + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", + TestUtility::makeDnsResponse({})); checkStats(1 /* attempt */, 1 /* success */, 0 /* failure */, 0 /* address changed */, 1 /* added */, 0 /* removed */, 1 /* num hosts */); @@ -926,8 +927,8 @@ TEST_F(DnsCacheImplTest, CancelResolve) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed)); + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); } @@ -962,8 +963,8 @@ TEST_F(DnsCacheImplTest, MultipleResolveSameHost) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed)); + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); } @@ -1000,8 +1001,8 @@ TEST_F(DnsCacheImplTest, MultipleResolveDifferentHost) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("bar.com:443", DnsHostInfoEquals("10.0.0.1:443", "bar.com", false), - Network::DnsResolver::ResolutionStatus::Success)); - resolve_cb2(Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed)); + resolve_cb2(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); EXPECT_CALL( @@ -1012,8 +1013,8 @@ TEST_F(DnsCacheImplTest, MultipleResolveDifferentHost) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.2:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); - resolve_cb1(Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed)); + resolve_cb1(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.2"})); absl::flat_hash_map hosts; @@ -1054,8 +1055,8 @@ TEST_F(DnsCacheImplTest, CacheHit) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed)); + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); result = dns_cache_->loadDnsCacheEntry("foo.com", 80, false, callbacks); @@ -1087,8 +1088,8 @@ TEST_F(DnsCacheImplTest, CacheHitWithDifferentDefaultPort) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed)); + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); // Using the same DNS cache, resolve the same host but different default port 443 @@ -1136,8 +1137,9 @@ TEST_F(DnsCacheImplTest, InvalidPort) { EXPECT_CALL(callbacks, onLoadDnsCacheComplete(DnsHostInfoAddressIsNull())); EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:abc:80", DnsHostInfoAddressIsNull(), - Network::DnsResolver::ResolutionStatus::Success)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", TestUtility::makeDnsResponse({})); + Network::DnsResolver::ResolutionStatus::Completed)); + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", + TestUtility::makeDnsResponse({})); } // Max host overflow. @@ -1275,9 +1277,9 @@ TEST_F(DnsCacheImplTest, SetIpVersionToRemoveYieldsNonEmptyResponse) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("127.0.0.2:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "::2"})); // Verify that only the address is now set to an IPv4. result = dns_cache_->loadDnsCacheEntry("foo.com", 80, false, callbacks); @@ -1296,10 +1298,10 @@ TEST_F(DnsCacheImplTest, SetIpVersionToRemoveYieldsNonEmptyResponse) { onDnsHostAddOrUpdate("foo.com:80", DnsHostInfoEquals("[::2]:80", "foo.com", false))); EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("[::2]:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); dns_cache_->forceRefreshHosts(); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "::2"})); // Verify that only the address is now set to an IPv6. result = dns_cache_->loadDnsCacheEntry("foo.com", 80, false, callbacks); @@ -1320,10 +1322,10 @@ TEST_F(DnsCacheImplTest, SetIpVersionToRemoveYieldsNonEmptyResponse) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("127.0.0.2:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); dns_cache_->forceRefreshHosts(); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2", "::2"})); // Verify that only the address is now set to an IPv4 (the first entry in the DNS response). result = dns_cache_->loadDnsCacheEntry("foo.com", 80, false, callbacks); @@ -1361,9 +1363,9 @@ TEST_F(DnsCacheImplTest, SetIpVersionToRemoveYieldsEmptyResponse) { EXPECT_CALL(callbacks, onLoadDnsCacheComplete(DnsHostInfoAddressIsNull())); EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoAddressIsNull(), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(configured_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"::2"})); result = dns_cache_->loadDnsCacheEntry("foo.com", 80, false, callbacks); @@ -1406,9 +1408,9 @@ TEST_F(DnsCacheImplTest, SetIpVersionToRemoveIgnoreIPv4LoopbackAddress) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("127.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1"})); // Verify that only the address is now set to an IPv4. result = dns_cache_->loadDnsCacheEntry("foo.com", 80, false, callbacks); @@ -1447,9 +1449,9 @@ TEST_F(DnsCacheImplTest, SetIpVersionToRemoveIgnoreIPv6LoopbackAddress) { EXPECT_CALL(callbacks, onLoadDnsCacheComplete(DnsHostInfoEquals("[::1]:80", "foo.com", false))); EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("[::1]:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"::1"})); // Verify that only the address is now set to an IPv4. result = dns_cache_->loadDnsCacheEntry("foo.com", 80, false, callbacks); @@ -1472,16 +1474,16 @@ TEST_F(DnsCacheImplTest, SetIpVersionToRemoveWithDnsPreresolveHostnames) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("127.0.0.2:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)) + Network::DnsResolver::ResolutionStatus::Completed)) .Times(AtLeast(1)); initialize(/* preresolve_hostnames= */ {{"foo.com", 80}}); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2"})); dns_cache_->setIpVersionToRemove(Network::Address::IpVersion::v4); EXPECT_ENVOY_BUG( - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.2"})), "Unable to delete IP version addresses when DNS preresolve hostnames are not empty."); @@ -1763,9 +1765,9 @@ TEST_F(DnsCacheImplTest, ResolveSuccessWithCaching) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(6000), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); checkStats(1 /* attempt */, 1 /* success */, 0 /* failure */, 1 /* address changed */, @@ -1786,9 +1788,9 @@ TEST_F(DnsCacheImplTest, ResolveSuccessWithCaching) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.1:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.1"})); checkStats(2 /* attempt */, 2 /* success */, 0 /* failure */, 1 /* address changed */, @@ -1812,9 +1814,9 @@ TEST_F(DnsCacheImplTest, ResolveSuccessWithCaching) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.2:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(dns_ttl_), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.2", "10.0.0.1"})); checkStats(3 /* attempt */, 3 /* success */, 0 /* failure */, 2 /* address changed */, @@ -1834,9 +1836,9 @@ TEST_F(DnsCacheImplTest, ResolveSuccessWithCaching) { EXPECT_CALL(update_callbacks_, onDnsResolutionComplete("foo.com:80", DnsHostInfoEquals("10.0.0.2:80", "foo.com", false), - Network::DnsResolver::ResolutionStatus::Success)); + Network::DnsResolver::ResolutionStatus::Completed)); EXPECT_CALL(*resolve_timer, enableTimer(std::chrono::milliseconds(40000), _)); - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"10.0.0.2", "10.0.0.1"}, std::chrono::seconds(40))); } diff --git a/test/extensions/common/wasm/wasm_test.cc b/test/extensions/common/wasm/wasm_test.cc index 7544b234939c..e12e68eccf7e 100644 --- a/test/extensions/common/wasm/wasm_test.cc +++ b/test/extensions/common/wasm/wasm_test.cc @@ -301,7 +301,7 @@ TEST_P(WasmCommonTest, Segv) { // Subsequent calls should be NOOP(s). - root_context->onResolveDns(0, Envoy::Network::DnsResolver::ResolutionStatus::Success, {}); + root_context->onResolveDns(0, Envoy::Network::DnsResolver::ResolutionStatus::Completed, {}); Envoy::Stats::MockMetricSnapshot stats_snapshot; root_context->onStatsUpdate(stats_snapshot); } @@ -1353,7 +1353,7 @@ TEST_P(WasmCommonContextTest, OnDnsResolve) { EXPECT_CALL(rootContext(), log_(spdlog::level::warn, Eq("TestRootContext::onDone 1"))); dns_callback( - Network::DnsResolver::ResolutionStatus::Success, "", + Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"192.168.1.101", "192.168.1.102"}, std::chrono::seconds(1001))); rootContext().onResolveDns(1 /* token */, Envoy::Network::DnsResolver::ResolutionStatus::Failure, @@ -1366,7 +1366,7 @@ TEST_P(WasmCommonContextTest, OnDnsResolve) { } // Wait till the Wasm is destroyed and then the late callback should do nothing. deferred_runner_.setFunction([dns_callback] { - dns_callback(Network::DnsResolver::ResolutionStatus::Success, "", + dns_callback(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"192.168.1.101", "192.168.1.102"}, std::chrono::seconds(1001))); }); @@ -1386,7 +1386,7 @@ TEST_P(WasmCommonContextTest, EmptyContext) { setup(code, "context", "empty"); setupContext(); - root_context_->onResolveDns(0, Envoy::Network::DnsResolver::ResolutionStatus::Success, {}); + root_context_->onResolveDns(0, Envoy::Network::DnsResolver::ResolutionStatus::Completed, {}); NiceMock stats_snapshot; root_context_->onStatsUpdate(stats_snapshot); root_context_->validateConfiguration("", plugin_); diff --git a/test/extensions/filters/http/aws_request_signing/aws_request_signing_integration_test.cc b/test/extensions/filters/http/aws_request_signing/aws_request_signing_integration_test.cc index 6ddd2e81ffe1..ab25ca80d041 100644 --- a/test/extensions/filters/http/aws_request_signing/aws_request_signing_integration_test.cc +++ b/test/extensions/filters/http/aws_request_signing/aws_request_signing_integration_test.cc @@ -248,7 +248,7 @@ class InitializeFilterTest : public ::testing::Test, public HttpIntegrationTest EXPECT_CALL(*dns_resolver_, resolve(expected_address, _, _)) .WillRepeatedly(Invoke([&](const std::string&, Network::DnsLookupFamily, Network::DnsResolver::ResolveCb cb) -> Network::ActiveDnsQuery* { - cb(Network::DnsResolver::ResolutionStatus::Success, "", + cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); return nullptr; @@ -495,7 +495,7 @@ class CdsInteractionTest : public testing::Test, public HttpIntegrationTest { EXPECT_CALL(*dns_resolver_, resolve(expected_address, _, _)) .WillRepeatedly(Invoke([&](const std::string&, Network::DnsLookupFamily, Network::DnsResolver::ResolveCb cb) -> Network::ActiveDnsQuery* { - cb(Network::DnsResolver::ResolutionStatus::Success, "", + cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"127.0.0.1", "127.0.0.2"})); return nullptr; diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc index aa698ba161a3..985090ba7efa 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc @@ -759,7 +759,7 @@ TEST_F(DnsFilterTest, ExternalResolutionReturnSingleAddress) { EXPECT_CALL(*timeout_timer, disableTimer()).Times(AnyNumber()); // Execute resolve callback - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({expected_address})); // parse the result @@ -812,7 +812,7 @@ TEST_F(DnsFilterTest, ExternalResolutionIpv6SingleAddress) { EXPECT_CALL(*timeout_timer, disableTimer()); // Execute resolve callback - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({expected_address})); // parse the result @@ -865,7 +865,7 @@ TEST_F(DnsFilterTest, ExternalResolutionReturnMultipleAddresses) { EXPECT_CALL(*timeout_timer, disableTimer()); // Execute resolve callback - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({expected_address})); // parse the result @@ -917,7 +917,8 @@ TEST_F(DnsFilterTest, ExternalResolutionReturnNoAddresses) { EXPECT_CALL(*timeout_timer, disableTimer()); // Execute resolve callback - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", TestUtility::makeDnsResponse({})); + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", + TestUtility::makeDnsResponse({})); // parse the result response_ctx_ = ResponseValidator::createResponseContext(udp_response_, counters_); @@ -1003,7 +1004,7 @@ TEST_F(DnsFilterTest, ExternalResolutionTimeout2) { // Execute resolve callback. This should harmlessly return and not alter // the response received by the client. Even though we are returning a successful // response, the client does not get an answer - resolve_cb(Network::DnsResolver::ResolutionStatus::Success, "", + resolve_cb(Network::DnsResolver::ResolutionStatus::Completed, "", TestUtility::makeDnsResponse({"130.207.244.251"})); // parse the result diff --git a/test/extensions/network/dns_resolver/apple/apple_dns_impl_test.cc b/test/extensions/network/dns_resolver/apple/apple_dns_impl_test.cc index ae263ae91fcf..4318229b032a 100644 --- a/test/extensions/network/dns_resolver/apple/apple_dns_impl_test.cc +++ b/test/extensions/network/dns_resolver/apple/apple_dns_impl_test.cc @@ -287,35 +287,35 @@ TEST_F(AppleDnsImplTest, DestructPending) { TEST_F(AppleDnsImplTest, LocalLookup) { EXPECT_NE(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionAuto) { EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV4Preferred) { EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV4Only) { EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV6Only) { EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } @@ -326,114 +326,119 @@ TEST_F(AppleDnsImplTest, DnsIpAddressVersionV6Only) { TEST_F(AppleDnsImplTest, DnsIpAddressVersionAllSupportsV4Only) { EXPECT_NE(nullptr, resolveWithExpectations("ipv4.google.com", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionAllSupportsV6Only) { - auto* dns_query = resolver_->resolve("ipv6.google.com", DnsLookupFamily::All, - [=](DnsResolver::ResolutionStatus status, absl::string_view, - std::list&& results) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); - // On v4 only networks, there will be no results. - for (const auto& result : results) { - const auto& addrinfo = result.addrInfo(); - EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); - EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); - } - dispatcher_->exit(); - }); + auto* dns_query = + resolver_->resolve("ipv6.google.com", DnsLookupFamily::All, + [=](DnsResolver::ResolutionStatus status, absl::string_view, + std::list&& results) -> void { + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); + // On v4 only networks, there will be no results. + for (const auto& result : results) { + const auto& addrinfo = result.addrInfo(); + EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); + EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); + } + dispatcher_->exit(); + }); EXPECT_THAT(dns_query, NotNull()); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV4OnlySupportsV4Only) { EXPECT_NE(nullptr, resolveWithExpectations("ipv4.google.com", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV4OnlySupportsV6Only) { EXPECT_NE(nullptr, resolveWithExpectations("ipv6.google.com", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, false)); + DnsResolver::ResolutionStatus::Completed, false)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV6OnlySupportsV4Only) { - auto* dns_query = resolver_->resolve("ipv4.google.com", DnsLookupFamily::V6Only, - [=](DnsResolver::ResolutionStatus status, absl::string_view, - std::list&& results) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); - for (const auto& result : results) { - const auto& addrinfo = result.addrInfo(); - EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); - EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); - } - dispatcher_->exit(); - }); + auto* dns_query = + resolver_->resolve("ipv4.google.com", DnsLookupFamily::V6Only, + [=](DnsResolver::ResolutionStatus status, absl::string_view, + std::list&& results) -> void { + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); + for (const auto& result : results) { + const auto& addrinfo = result.addrInfo(); + EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); + EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); + } + dispatcher_->exit(); + }); EXPECT_THAT(dns_query, NotNull()); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV6OnlySupportsV6Only) { - auto* dns_query = resolver_->resolve("ipv6.google.com", DnsLookupFamily::V6Only, - [=](DnsResolver::ResolutionStatus status, absl::string_view, - std::list&& results) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); - EXPECT_FALSE(results.empty()); - for (const auto& result : results) { - const auto& addrinfo = result.addrInfo(); - EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); - EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); - } - dispatcher_->exit(); - }); + auto* dns_query = + resolver_->resolve("ipv6.google.com", DnsLookupFamily::V6Only, + [=](DnsResolver::ResolutionStatus status, absl::string_view, + std::list&& results) -> void { + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); + EXPECT_FALSE(results.empty()); + for (const auto& result : results) { + const auto& addrinfo = result.addrInfo(); + EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); + EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); + } + dispatcher_->exit(); + }); EXPECT_THAT(dns_query, NotNull()); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionAutoSupportsV4Only) { EXPECT_NE(nullptr, resolveWithExpectations("ipv4.google.com", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionAutoSupportsV6Only) { - auto* dns_query = resolver_->resolve("ipv6.google.com", DnsLookupFamily::Auto, - [=](DnsResolver::ResolutionStatus status, absl::string_view, - std::list&& results) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); - // On v4 only networks, there will be no results. - for (const auto& result : results) { - const auto& addrinfo = result.addrInfo(); - EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); - EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); - } - dispatcher_->exit(); - }); + auto* dns_query = + resolver_->resolve("ipv6.google.com", DnsLookupFamily::Auto, + [=](DnsResolver::ResolutionStatus status, absl::string_view, + std::list&& results) -> void { + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); + // On v4 only networks, there will be no results. + for (const auto& result : results) { + const auto& addrinfo = result.addrInfo(); + EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); + EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); + } + dispatcher_->exit(); + }); EXPECT_THAT(dns_query, NotNull()); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV4PreferredSupportsV4Only) { EXPECT_NE(nullptr, resolveWithExpectations("ipv4.google.com", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionV4PreferredSupportsV6Only) { - auto* dns_query = resolver_->resolve("ipv6.google.com", DnsLookupFamily::V4Preferred, - [=](DnsResolver::ResolutionStatus status, absl::string_view, - std::list&& results) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); - // On v4 only networks, there will be no results. - for (const auto& result : results) { - const auto& addrinfo = result.addrInfo(); - EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); - EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); - } - dispatcher_->exit(); - }); + auto* dns_query = + resolver_->resolve("ipv6.google.com", DnsLookupFamily::V4Preferred, + [=](DnsResolver::ResolutionStatus status, absl::string_view, + std::list&& results) -> void { + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); + // On v4 only networks, there will be no results. + for (const auto& result : results) { + const auto& addrinfo = result.addrInfo(); + EXPECT_THAT(addrinfo.address_->ip()->ipv6(), NotNull()); + EXPECT_THAT(addrinfo.address_->ip()->ipv4(), IsNull()); + } + dispatcher_->exit(); + }); EXPECT_THAT(dns_query, NotNull()); dispatcher_->run(Event::Dispatcher::RunType::Block); } @@ -444,43 +449,44 @@ TEST_F(AppleDnsImplTest, DnsIpAddressVersionV4PreferredSupportsV6Only) { // queries. TEST_F(AppleDnsImplTest, DoubleLookup) { EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DoubleLookupInOneLoop) { - EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, true, false)); + EXPECT_NE(nullptr, + resolveWithExpectations("google.com", DnsLookupFamily::V4Only, + DnsResolver::ResolutionStatus::Completed, true, false)); EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); dispatcher_->run(Event::Dispatcher::RunType::Block); } TEST_F(AppleDnsImplTest, DnsIpAddressVersionInvalid) { // The DNS queries are successful, but return no results. EXPECT_NE(nullptr, resolveWithExpectations("invalidDnsName", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, false)); + DnsResolver::ResolutionStatus::Completed, false)); dispatcher_->run(Event::Dispatcher::RunType::Block); EXPECT_NE(nullptr, resolveWithExpectations("invalidDnsName", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, false)); + DnsResolver::ResolutionStatus::Completed, false)); dispatcher_->run(Event::Dispatcher::RunType::Block); EXPECT_NE(nullptr, resolveWithExpectations("invalidDnsName", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, false)); + DnsResolver::ResolutionStatus::Completed, false)); dispatcher_->run(Event::Dispatcher::RunType::Block); EXPECT_NE(nullptr, resolveWithExpectations("invalidDnsName", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, false)); + DnsResolver::ResolutionStatus::Completed, false)); dispatcher_->run(Event::Dispatcher::RunType::Block); EXPECT_NE(nullptr, resolveWithExpectations("invalidDnsName", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, false)); + DnsResolver::ResolutionStatus::Completed, false)); dispatcher_->run(Event::Dispatcher::RunType::Block); } @@ -501,7 +507,7 @@ TEST_F(AppleDnsImplTest, Cancel) { resolveWithUnreferencedParameters("some.domain", DnsLookupFamily::Auto, false); EXPECT_NE(nullptr, resolveWithExpectations("google.com", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, true)); + DnsResolver::ResolutionStatus::Completed, true)); ASSERT_NE(nullptr, query); query->cancel(Network::ActiveDnsQuery::CancelReason::QueryAbandoned); @@ -511,7 +517,7 @@ TEST_F(AppleDnsImplTest, Cancel) { TEST_F(AppleDnsImplTest, NonExistentDomain) { EXPECT_NE(nullptr, resolveWithExpectations("some.domain", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, false)); + DnsResolver::ResolutionStatus::Completed, false)); dispatcher_->run(Event::Dispatcher::RunType::Block); } @@ -520,7 +526,7 @@ TEST_F(AppleDnsImplTest, LocalResolution) { resolver_->resolve("0.0.0.0", DnsLookupFamily::Auto, [](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& results) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(1, results.size()); EXPECT_EQ("0.0.0.0:0", results.front().addrInfo().address_->asString()); EXPECT_EQ(std::chrono::seconds(60), results.front().addrInfo().ttl_); @@ -644,7 +650,7 @@ class AppleDnsImplFakeApiTest : public testing::Test { [&dns_callback_executed, dns_lookup_family, address_type, expected_address_size](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(expected_address_size, response.size()); if (dns_lookup_family == DnsLookupFamily::Auto) { @@ -757,7 +763,7 @@ TEST_F(AppleDnsImplFakeApiTest, ErrorInSocketAccess) { hostname, Network::DnsLookupFamily::Auto, [&dns_callback_executed](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - // Status is success because it isn't possible to attach a file event + // Status is Completed because it isn't possible to attach a file event // error to a specific query. EXPECT_EQ(DnsResolver::ResolutionStatus::Failure, status); EXPECT_EQ(0, response.size()); @@ -898,7 +904,7 @@ TEST_F(AppleDnsImplFakeApiTest, QuerySynchronousCompletionUnroutableFamilies) { hostname, Network::DnsLookupFamily::Auto, [&dns_callback_executed](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(1, response.size()); EXPECT_EQ("1.2.3.4:0", response.front().addrInfo().address_->asString()); EXPECT_EQ(std::chrono::seconds(30), response.front().addrInfo().ttl_); @@ -937,7 +943,7 @@ TEST_F(AppleDnsImplFakeApiTest, QuerySynchronousCompletion) { hostname, Network::DnsLookupFamily::Auto, [&dns_callback_executed](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(1, response.size()); EXPECT_EQ("1.2.3.4:0", response.front().addrInfo().address_->asString()); EXPECT_EQ(std::chrono::seconds(30), response.front().addrInfo().ttl_); @@ -993,7 +999,7 @@ TEST_F(AppleDnsImplFakeApiTest, MultipleAddresses) { hostname, Network::DnsLookupFamily::Auto, [&dns_callback_executed](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(2, response.size()); dns_callback_executed.Notify(); }); @@ -1124,7 +1130,7 @@ TEST_F(AppleDnsImplFakeApiTest, MultipleQueries) { hostname, Network::DnsLookupFamily::Auto, [&dns_callback_executed](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(1, response.size()); EXPECT_EQ("1.2.3.4:0", response.front().addrInfo().address_->asString()); EXPECT_EQ(std::chrono::seconds(30), response.front().addrInfo().ttl_); @@ -1145,7 +1151,7 @@ TEST_F(AppleDnsImplFakeApiTest, MultipleQueries) { hostname2, Network::DnsLookupFamily::V4Only, [&dns_callback_executed2](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(1, response.size()); EXPECT_EQ("5.6.7.8:0", response.front().addrInfo().address_->asString()); EXPECT_EQ(std::chrono::seconds(30), response.front().addrInfo().ttl_); @@ -1199,7 +1205,7 @@ TEST_F(AppleDnsImplFakeApiTest, MultipleQueriesOneFails) { std::list&& response) -> void { // Even though the second query will fail, this one will flush with the // state it had. - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(1, response.size()); EXPECT_EQ("1.2.3.4:0", response.front().addrInfo().address_->asString()); EXPECT_EQ(std::chrono::seconds(30), response.front().addrInfo().ttl_); @@ -1261,7 +1267,7 @@ TEST_F(AppleDnsImplFakeApiTest, ResultWithOnlyNonAdditiveReplies) { hostname, Network::DnsLookupFamily::Auto, [&dns_callback_executed](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_TRUE(response.empty()); dns_callback_executed.Notify(); }); @@ -1338,7 +1344,7 @@ TEST_F(AppleDnsImplFakeApiTest, DeallocateOnDestruction) { hostname, Network::DnsLookupFamily::Auto, [&dns_callback_executed](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); EXPECT_EQ(1, response.size()); dns_callback_executed.Notify(); }); diff --git a/test/extensions/network/dns_resolver/cares/dns_impl_test.cc b/test/extensions/network/dns_resolver/cares/dns_impl_test.cc index b57c5e4a80c8..44353d23afae 100644 --- a/test/extensions/network/dns_resolver/cares/dns_impl_test.cc +++ b/test/extensions/network/dns_resolver/cares/dns_impl_test.cc @@ -841,7 +841,7 @@ class DnsImplTest : public testing::TestWithParam { return resolver_->resolve(address, lookup_family, [=, this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& results) -> void { - EXPECT_EQ(DnsResolver::ResolutionStatus::Success, status); + EXPECT_EQ(DnsResolver::ResolutionStatus::Completed, status); std::list address_as_string_list = getAddressAsStringList(results); EXPECT_EQ(0, address_as_string_list.size()); @@ -879,7 +879,7 @@ class DnsImplTest : public testing::TestWithParam { const DnsLookupFamily lookup_family, const std::list& expected_addresses, const DnsResolver::ResolutionStatus resolution_status = - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, const bool getifaddrs_supported = true, const bool getifaddrs_success = true) { server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); @@ -1036,7 +1036,7 @@ TEST_P(DnsImplTest, LocalLookup) { if (GetParam() == Address::IpVersion::v4) { EXPECT_EQ(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"127.0.0.1"}, {"::1"}, absl::nullopt)); } @@ -1045,12 +1045,12 @@ TEST_P(DnsImplTest, LocalLookup) { "Synchronous DNS IPv6 localhost resolution failed. Please verify localhost resolves to ::1 " "in /etc/hosts, since this misconfiguration is a common cause of these failures."; EXPECT_EQ(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, {"::1"}, + DnsResolver::ResolutionStatus::Completed, {"::1"}, {"127.0.0.1"}, absl::nullopt)) << error_msg; EXPECT_EQ(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {"::1"}, + DnsResolver::ResolutionStatus::Completed, {"::1"}, {"127.0.0.1"}, absl::nullopt)) << error_msg; } @@ -1059,14 +1059,14 @@ TEST_P(DnsImplTest, LocalLookup) { TEST_P(DnsImplTest, DnsIpAddressVersion) { server_->addHosts("some.good.domain", {"1.2.3.4"}, RecordType::A); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {"1.2.3.4"}, + DnsResolver::ResolutionStatus::Completed, {"1.2.3.4"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, {"1.2.3.4"}, + DnsResolver::ResolutionStatus::Completed, {"1.2.3.4"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(3 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, @@ -1081,7 +1081,7 @@ TEST_P(DnsImplTest, DnsIpAddressVersion) { TEST_P(DnsImplTest, DnsIpAddressVersionV6) { server_->addHosts("some.good.domain", {"1::2"}, RecordType::AAAA); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {"1::2"}, {}, + DnsResolver::ResolutionStatus::Completed, {"1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1093,7 +1093,7 @@ TEST_P(DnsImplTest, DnsIpAddressVersionV6) { 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, {"1::2"}, {}, + DnsResolver::ResolutionStatus::Completed, {"1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(3 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, @@ -1124,7 +1124,7 @@ TEST_P(DnsImplTest, DestroyChannelOnResetNetworking) { ASSERT_FALSE(peer_->isChannelDirty()); server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, @@ -1135,7 +1135,7 @@ TEST_P(DnsImplTest, DestroyChannelOnResetNetworking) { resetChannel(); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(4 /*resolve_total*/, 0 /*pending_resolutions*/, 2 /*not_found*/, @@ -1184,7 +1184,7 @@ TEST_P(DnsImplTest, DestroyChannelOnRefused) { 1 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); EXPECT_FALSE(peer_->isChannelDirty()); @@ -1192,7 +1192,7 @@ TEST_P(DnsImplTest, DestroyChannelOnRefused) { 1 /*get_addr_failure*/, 0 /*timeouts*/); } -// Validate success/fail lookup behavior via TestDnsServer. This exercises the +// Validate completed/fail lookup behavior via TestDnsServer. This exercises the // network event handling in DnsResolverImpl. TEST_P(DnsImplTest, RemoteAsyncLookup) { server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); @@ -1203,7 +1203,7 @@ TEST_P(DnsImplTest, RemoteAsyncLookup) { 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(4 /*resolve_total*/, 0 /*pending_resolutions*/, 3 /*not_found*/, @@ -1216,7 +1216,7 @@ TEST_P(DnsImplTest, MultiARecordLookup) { EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7", "123.4.5.6", "6.5.4.3"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, @@ -1230,7 +1230,7 @@ TEST_P(DnsImplTest, CNameARecordLookupV4) { server_->setCnameTtl(std::chrono::seconds(60)); EXPECT_NE(nullptr, resolveWithExpectations("root.cnam.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, std::chrono::seconds(60))); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1244,7 +1244,7 @@ TEST_P(DnsImplTest, CNameARecordLookupWithV6) { server_->setCnameTtl(std::chrono::seconds(60)); EXPECT_NE(nullptr, resolveWithExpectations("root.cnam.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, std::chrono::seconds(60))); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, @@ -1261,7 +1261,7 @@ TEST_P(DnsImplTest, CNameARecordLookupV4InvalidTTL) { server_->setCnameTtl(std::chrono::seconds(60)); EXPECT_NE(nullptr, resolveWithExpectations("root.cnam.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, std::chrono::seconds(0))); dispatcher_->run(Event::Dispatcher::RunType::Block); @@ -1270,7 +1270,7 @@ TEST_P(DnsImplTest, CNameARecordLookupV4InvalidTTL) { server_->setCnameTtl(std::chrono::seconds(2147483648)); EXPECT_NE(nullptr, resolveWithExpectations("root.cnam.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, std::chrono::seconds(0))); dispatcher_->run(Event::Dispatcher::RunType::Block); @@ -1280,7 +1280,7 @@ TEST_P(DnsImplTest, CNameARecordLookupV4InvalidTTL) { EXPECT_NE(nullptr, resolveWithExpectations("root.cnam.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, {"201.134.56.7"}, {}, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, std::chrono::seconds(2147483647))); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(3 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1293,21 +1293,21 @@ TEST_P(DnsImplTest, MultiARecordLookupWithV6) { EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7", "123.4.5.6", "6.5.4.3"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {{"1::2", "1::2:3", "1::2:3:4"}}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {{"1::2", "1::2:3", "1::2:3:4"}}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(3 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1319,8 +1319,8 @@ TEST_P(DnsImplTest, AutoOnlyV6IfBothV6andV4) { server_->addHosts("some.good.domain", {"1::2"}, RecordType::AAAA); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {{"1::2"}}, {}, - absl::nullopt)); + DnsResolver::ResolutionStatus::Completed, {{"1::2"}}, + {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); @@ -1330,8 +1330,8 @@ TEST_P(DnsImplTest, AutoV6IfOnlyV6) { server_->addHosts("some.good.domain", {"1::2"}, RecordType::AAAA); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {{"1::2"}}, {}, - absl::nullopt)); + DnsResolver::ResolutionStatus::Completed, {{"1::2"}}, + {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); @@ -1340,7 +1340,7 @@ TEST_P(DnsImplTest, AutoV6IfOnlyV6) { TEST_P(DnsImplTest, AutoV4IfOnlyV4) { server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {{"201.134.56.7"}}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, @@ -1352,7 +1352,7 @@ TEST_P(DnsImplTest, V4PreferredOnlyV4IfBothV6andV4) { server_->addHosts("some.good.domain", {"1::2"}, RecordType::AAAA); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {{"201.134.56.7"}}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1363,8 +1363,8 @@ TEST_P(DnsImplTest, V4PreferredV6IfOnlyV6) { server_->addHosts("some.good.domain", {"1::2"}, RecordType::AAAA); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, {{"1::2"}}, {}, - absl::nullopt)); + DnsResolver::ResolutionStatus::Completed, {{"1::2"}}, + {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); @@ -1373,7 +1373,7 @@ TEST_P(DnsImplTest, V4PreferredV6IfOnlyV6) { TEST_P(DnsImplTest, V4PreferredV4IfOnlyV4) { server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {{"201.134.56.7"}}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1385,7 +1385,7 @@ TEST_P(DnsImplTest, AllIfBothV6andV4) { server_->addHosts("some.good.domain", {"1::2"}, RecordType::AAAA); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {{"201.134.56.7"}, {"1::2"}}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1396,8 +1396,8 @@ TEST_P(DnsImplTest, AllV6IfOnlyV6) { server_->addHosts("some.good.domain", {"1::2"}, RecordType::AAAA); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, {{"1::2"}}, {}, - absl::nullopt)); + DnsResolver::ResolutionStatus::Completed, {{"1::2"}}, + {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); @@ -1406,7 +1406,7 @@ TEST_P(DnsImplTest, AllV6IfOnlyV6) { TEST_P(DnsImplTest, AllV4IfOnlyV4) { server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {{"201.134.56.7"}}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1421,7 +1421,7 @@ TEST_P(DnsImplTest, Cancel) { resolveWithUnreferencedParameters("some.domain", DnsLookupFamily::Auto, false); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); ASSERT_NE(nullptr, query); @@ -1442,7 +1442,7 @@ TEST_P(DnsImplTest, RecordTtlLookup) { uint64_t resolve_total = 0; if (GetParam() == Address::IpVersion::v4) { EXPECT_EQ(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"127.0.0.1"}, {}, std::chrono::seconds(0))); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1452,16 +1452,16 @@ TEST_P(DnsImplTest, RecordTtlLookup) { if (GetParam() == Address::IpVersion::v6) { EXPECT_EQ(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, {"::1"}, {}, - std::chrono::seconds(0))); + DnsResolver::ResolutionStatus::Completed, {"::1"}, + {}, std::chrono::seconds(0))); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(resolve_total + 1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); resolve_total++; EXPECT_EQ(nullptr, resolveWithExpectations("localhost", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {"::1"}, {}, - std::chrono::seconds(0))); + DnsResolver::ResolutionStatus::Completed, {"::1"}, + {}, std::chrono::seconds(0))); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(resolve_total + 1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); @@ -1474,7 +1474,7 @@ TEST_P(DnsImplTest, RecordTtlLookup) { EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7", "123.4.5.6", "6.5.4.3"}, {"1::2", "1::2:3", "1::2:3:4"}, std::chrono::seconds(300))); dispatcher_->run(Event::Dispatcher::RunType::Block); @@ -1484,7 +1484,7 @@ TEST_P(DnsImplTest, RecordTtlLookup) { EXPECT_NE(nullptr, resolveWithExpectations( "some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {"1::2", "1::2:3", "1::2:3:4"}, + DnsResolver::ResolutionStatus::Completed, {"1::2", "1::2:3", "1::2:3:4"}, {"201.134.56.7", "123.4.5.6", "6.5.4.3"}, std::chrono::seconds(300))); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(resolve_total + 1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1493,7 +1493,7 @@ TEST_P(DnsImplTest, RecordTtlLookup) { EXPECT_NE(nullptr, resolveWithExpectations( "some.good.domain", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, {"1::2", "1::2:3", "1::2:3:4"}, + DnsResolver::ResolutionStatus::Completed, {"1::2", "1::2:3", "1::2:3:4"}, {"201.134.56.7", "123.4.5.6", "6.5.4.3"}, std::chrono::seconds(300))); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(resolve_total + 1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1538,7 +1538,7 @@ TEST_P(DnsImplTest, PendingTimerEnable) { TEST_P(DnsImplTest, PendingResolutions) { server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {{"201.134.56.7"}}, {}, absl::nullopt)); checkStats(0 /*resolve_total*/, 1 /*pending_resolutions*/, 0 /*not_found*/, @@ -1579,7 +1579,7 @@ TEST_P(DnsImplTest, WithNoRecord) { TEST_P(DnsImplTest, WithARecord) { server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1591,21 +1591,21 @@ TEST_P(DnsImplTest, WithARecord) { 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(4 /*resolve_total*/, 0 /*pending_resolutions*/, 2 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(5 /*resolve_total*/, 0 /*pending_resolutions*/, 2 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(6 /*resolve_total*/, 0 /*pending_resolutions*/, 2 /*not_found*/, @@ -1620,28 +1620,28 @@ TEST_P(DnsImplTest, WithAAAARecord) { 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, {"1::2"}, {}, + DnsResolver::ResolutionStatus::Completed, {"1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {"1::2"}, {}, + DnsResolver::ResolutionStatus::Completed, {"1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(3 /*resolve_total*/, 0 /*pending_resolutions*/, 1 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, {"1::2"}, {}, + DnsResolver::ResolutionStatus::Completed, {"1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(5 /*resolve_total*/, 0 /*pending_resolutions*/, 2 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, {"1::2"}, {}, + DnsResolver::ResolutionStatus::Completed, {"1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(6 /*resolve_total*/, 0 /*pending_resolutions*/, 2 /*not_found*/, @@ -1652,35 +1652,35 @@ TEST_P(DnsImplTest, WithBothAAndAAAARecord) { server_->addHosts("some.good.domain", {"201.134.56.7"}, RecordType::A); server_->addHosts("some.good.domain", {"1::2"}, RecordType::AAAA); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Only, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V6Only, - DnsResolver::ResolutionStatus::Success, {"1::2"}, {}, + DnsResolver::ResolutionStatus::Completed, {"1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, {"1::2"}, {}, + DnsResolver::ResolutionStatus::Completed, {"1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(3 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::V4Preferred, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(4 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::All, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7", "1::2"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); checkStats(5 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, @@ -1872,14 +1872,14 @@ TEST_P(DnsImplFilterUnroutableFamiliesTest, FilterAllV6) { TEST_P(DnsImplFilterUnroutableFamiliesTest, DontFilterIfGetifaddrsIsNotSupported) { testFilterAddresses({}, DnsLookupFamily::All, {"201.134.56.7", "1::2"}, - DnsResolver::ResolutionStatus::Success, false /* getifaddrs_supported */); + DnsResolver::ResolutionStatus::Completed, false /* getifaddrs_supported */); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); } TEST_P(DnsImplFilterUnroutableFamiliesTest, DontFilterIfThereIsAGetifaddrsFailure) { testFilterAddresses({}, DnsLookupFamily::All, {"201.134.56.7", "1::2"}, - DnsResolver::ResolutionStatus::Success, true /* getifaddrs_supported */, + DnsResolver::ResolutionStatus::Completed, true /* getifaddrs_supported */, false /* getifaddrs_success */); checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/, 0 /*get_addr_failure*/, 0 /*timeouts*/); @@ -2099,7 +2099,7 @@ TEST_P(DnsImplCustomResolverTest, CustomResolverValidAfterChannelDestruction) { // server's address was passed as a custom resolver on construction, the new channel should still // point to the test dns server, and the query should succeed. EXPECT_NE(nullptr, resolveWithExpectations("some.good.domain", DnsLookupFamily::Auto, - DnsResolver::ResolutionStatus::Success, + DnsResolver::ResolutionStatus::Completed, {"201.134.56.7"}, {}, absl::nullopt)); dispatcher_->run(Event::Dispatcher::RunType::Block); EXPECT_FALSE(peer_->isChannelDirty()); diff --git a/test/extensions/network/dns_resolver/getaddrinfo/getaddrinfo_test.cc b/test/extensions/network/dns_resolver/getaddrinfo/getaddrinfo_test.cc index 932fc270bde1..b2a830cd2173 100644 --- a/test/extensions/network/dns_resolver/getaddrinfo/getaddrinfo_test.cc +++ b/test/extensions/network/dns_resolver/getaddrinfo/getaddrinfo_test.cc @@ -93,7 +93,7 @@ class GetAddrInfoDnsImplTest : public testing::Test { std::list&& response) { // Since we use AF_UNSPEC, depending on the CI environment we might get either 1 or 2 // addresses. - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_TRUE(response.size() == 1 || response.size() == 2); EXPECT_TRUE("127.0.0.1:0" == response.front().addrInfo().address_->asString() || "[::1]:0" == response.front().addrInfo().address_->asString()); @@ -166,7 +166,7 @@ TEST_F(GetAddrInfoDnsImplTest, NoData) { resolver_->resolve("localhost", DnsLookupFamily::All, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_TRUE(response.empty()); dispatcher_->exit(); @@ -183,7 +183,7 @@ TEST_F(GetAddrInfoDnsImplTest, NoName) { resolver_->resolve("localhost", DnsLookupFamily::All, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_TRUE(response.empty()); dispatcher_->exit(); @@ -203,7 +203,7 @@ TEST_F(GetAddrInfoDnsImplTest, TryAgainIndefinitelyAndSuccess) { resolver_->resolve("localhost", DnsLookupFamily::All, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_TRUE(response.empty()); dispatcher_->exit(); @@ -247,7 +247,7 @@ TEST_F(GetAddrInfoDnsImplTest, TryAgainWithNumRetriesAndSuccess) { resolver_->resolve("localhost", DnsLookupFamily::All, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_TRUE(response.empty()); dispatcher_->exit(); @@ -293,7 +293,7 @@ TEST_F(GetAddrInfoDnsImplTest, All) { "localhost", DnsLookupFamily::All, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_EQ(2, response.size()); EXPECT_EQ("[[::1]:0, 127.0.0.1:0]", accumulateToString(response, [](const auto& dns_response) { @@ -317,7 +317,7 @@ TEST_F(GetAddrInfoDnsImplTest, V4Only) { "localhost", DnsLookupFamily::V4Only, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_EQ(1, response.size()); EXPECT_EQ("[127.0.0.1:0]", accumulateToString(response, [](const auto& dns_response) { @@ -341,7 +341,7 @@ TEST_F(GetAddrInfoDnsImplTest, V6Only) { "localhost", DnsLookupFamily::V6Only, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_EQ(1, response.size()); EXPECT_EQ("[[::1]:0]", accumulateToString(response, [](const auto& dns_response) { @@ -365,7 +365,7 @@ TEST_F(GetAddrInfoDnsImplTest, V4Preferred) { "localhost", DnsLookupFamily::V4Preferred, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_EQ(1, response.size()); EXPECT_EQ("[127.0.0.1:0]", accumulateToString(response, [](const auto& dns_response) { @@ -389,7 +389,7 @@ TEST_F(GetAddrInfoDnsImplTest, V4PreferredNoV4) { "localhost", DnsLookupFamily::V4Preferred, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_EQ(1, response.size()); EXPECT_EQ("[[::1]:0]", accumulateToString(response, [](const auto& dns_response) { @@ -413,7 +413,7 @@ TEST_F(GetAddrInfoDnsImplTest, Auto) { "localhost", DnsLookupFamily::Auto, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_EQ(1, response.size()); EXPECT_EQ("[[::1]:0]", accumulateToString(response, [](const auto& dns_response) { @@ -437,7 +437,7 @@ TEST_F(GetAddrInfoDnsImplTest, AutoNoV6) { "localhost", DnsLookupFamily::Auto, [this](DnsResolver::ResolutionStatus status, absl::string_view, std::list&& response) { - EXPECT_EQ(status, DnsResolver::ResolutionStatus::Success); + EXPECT_EQ(status, DnsResolver::ResolutionStatus::Completed); EXPECT_EQ(1, response.size()); EXPECT_EQ("[127.0.0.1:0]", accumulateToString(response, [](const auto& dns_response) {