review: implement Cluster.endpoints as LocalityLbEndpoints

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>

source/common/upstream/logical_dns_cluster.cc

@@ -45,12 +45,13 @@ LogicalDnsCluster::LogicalDnsCluster(const envoy::api::v2::Cluster& cluster,
     NOT_REACHED;
   }
 
-  const auto& socket_address = endpoints_[0].address().socket_address();
+  const envoy::api::v2::endpoint::Endpoint& endpoint = endpoints_[0].endpoint();
+  const envoy::api::v2::core::SocketAddress& socket_address = endpoint.address().socket_address();
   dns_url_ = fmt::format("tcp://{}:{}", socket_address.address(), socket_address.port_value());
   hostname_ = Network::Utility::hostFromTcpUrl(dns_url_);
   Network::Utility::portFromTcpUrl(dns_url_);
 
-  health_check_config_ = endpoints_[0].health_check_config();
+  health_check_config_ = endpoint.health_check_config();
 
   tls_->set([](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr {
     return std::make_shared<PerThreadCurrentHostData>();

source/common/upstream/upstream_impl.cc

@@ -415,7 +415,7 @@ ClusterImplBase::ClusterImplBase(const envoy::api::v2::Cluster& cluster,
                                  Ssl::ContextManager& ssl_context_manager, bool added_via_api)
     : runtime_(runtime), info_(new ClusterInfoImpl(cluster, bind_config, runtime, stats,
                                                    ssl_context_manager, added_via_api)),
-      endpoints_(cluster.endpoints()) {
+      endpoints_(cluster.endpoints().lb_endpoints()) {
   // Create the default (empty) priority set before registering callbacks to
   // avoid getting an update the first time it is accessed.
   priority_set_.getOrCreateHostSet(0);
@@ -447,8 +447,8 @@ void ClusterImplBase::translateClusterHosts(
 
   endpoints_.Reserve(hosts.size());
   for (const envoy::api::v2::core::Address& host : hosts) {
-    envoy::api::v2::endpoint::Endpoint* endpoint = endpoints_.Add();
-    endpoint->mutable_address()->CopyFrom(host);
+    envoy::api::v2::endpoint::LbEndpoint* lb_endpoint = endpoints_.Add();
+    lb_endpoint->mutable_endpoint()->mutable_address()->CopyFrom(host);
   }
 }
 
@@ -641,10 +641,11 @@ StaticClusterImpl::StaticClusterImpl(const envoy::api::v2::Cluster& cluster,
                                      bool added_via_api)
     : ClusterImplBase(cluster, cm.bindConfig(), runtime, stats, ssl_context_manager, added_via_api),
       initial_hosts_(new HostVector()) {
-  for (const auto& endpoint : endpoints_) {
-    const auto& host = endpoint.address();
+  for (const envoy::api::v2::endpoint::LbEndpoint& lb_endpoint : endpoints_) {
+    const envoy::api::v2::endpoint::Endpoint& endpoint = lb_endpoint.endpoint();
     initial_hosts_->emplace_back(HostSharedPtr{new HostImpl(
-        info_, "", resolveProtoAddress(host), envoy::api::v2::core::Metadata::default_instance(), 1,
+        info_, EMPTY_STRING, resolveProtoAddress(endpoint.address()),
+        envoy::api::v2::core::Metadata::default_instance(), 1,
         envoy::api::v2::core::Locality().default_instance(), endpoint.health_check_config())});
   }
 }
@@ -807,13 +808,13 @@ StrictDnsClusterImpl::StrictDnsClusterImpl(const envoy::api::v2::Cluster& cluste
     NOT_REACHED;
   }
 
-  for (const auto& endpoint : endpoints_) {
-    const auto& host = endpoint.address();
-    resolve_targets_.emplace_back(
-        new ResolveTarget(*this, dispatcher,
-                          fmt::format("tcp://{}:{}", host.socket_address().address(),
-                                      host.socket_address().port_value()),
-                          endpoint.health_check_config()));
+  for (const envoy::api::v2::endpoint::LbEndpoint& lb_endpoint : endpoints_) {
+    const envoy::api::v2::core::SocketAddress& socket_address =
+        lb_endpoint.endpoint().address().socket_address();
+    resolve_targets_.emplace_back(new ResolveTarget(
+        *this, dispatcher,
+        fmt::format("tcp://{}:{}", socket_address.address(), socket_address.port_value()),
+        lb_endpoint.endpoint().health_check_config()));
   }
 }
 

source/common/upstream/upstream_impl.h

@@ -477,7 +477,7 @@ class ClusterImplBase : public Cluster, protected Logger::Loggable<Logger::Id::u
 
 protected:
   PrioritySetImpl priority_set_;
-  Protobuf::RepeatedPtrField<envoy::api::v2::endpoint::Endpoint> endpoints_;
+  Protobuf::RepeatedPtrField<envoy::api::v2::endpoint::LbEndpoint> endpoints_;
 
 private:
   void finishInitialization();

test/common/upstream/upstream_impl_test.cc

@@ -325,18 +325,22 @@ TEST(StrictDnsClusterImplTest, BasicEndpoints) {
     connect_timeout: 0.25s
     lb_policy: ROUND_ROBIN
     endpoints:
-    - address:
-        socket_address:
-          address: localhost1
-          port_value: 11001
-      health_check_config:
-        port_value: 8000
-    - address:
-        socket_address:
-          address: localhost2
-          port_value: 11002
-      health_check_config:
-        port_value: 8000
+      lb_endpoints:
+      - endpoint:
+          address:
+            socket_address:
+              address: localhost1
+              port_value: 11001
+          health_check_config:
+            port_value: 8000
+
+      - endpoint:
+          address:
+            socket_address:
+              address: localhost2
+              port_value: 11002
+          health_check_config:
+            port_value: 8000
   )EOF";
 
   NiceMock<MockClusterManager> cm;
@@ -492,12 +496,14 @@ TEST(StaticClusterImplTest, StaticEndpoints) {
     type: STATIC
     lb_policy: ROUND_ROBIN
     endpoints:
-    - address:
-        socket_address:
-          address: 10.0.0.1
-          port_value: 443
-      health_check_config:
-        port_value: 8000
+      lb_endpoints:
+      - endpoint:
+          address:
+            socket_address:
+              address: 10.0.0.1
+              port_value: 443
+          health_check_config:
+            port_value: 8000
   )EOF";
 
   NiceMock<MockClusterManager> cm;