Fix integration test (not really)

Signed-off-by: Steven Jin Xuan <[email protected]>
Stevenjin8 · Oct 15, 2024 · a9a5a5c · a9a5a5c
1 parent 5420879
commit a9a5a5c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/source/extensions/clusters/logical_dns/logical_dns_cluster.cc b/source/extensions/clusters/logical_dns/logical_dns_cluster.cc
@@ -72,16 +72,8 @@ LogicalDnsCluster::create(const envoy::config::cluster::v3::Cluster& cluster,
   absl::Status creation_status = absl::OkStatus();
   std::unique_ptr<LogicalDnsCluster> ret;
 
-  // dns_cluster should be cluster.cluster_type.typed_config cast to the right type.
-  if (cluster.has_cluster_type()) {
-    ret = std::unique_ptr<LogicalDnsCluster>(new LogicalDnsCluster(
-        cluster, dns_cluster, context, std::move(dns_resolver), creation_status));
-  } else {
-    envoy::extensions::clusters::dns::v3::DnsCluster legacy_dns_cluster{};
-    createDnsClusterFromLegacyFields(cluster, legacy_dns_cluster);
-    ret = std::unique_ptr<LogicalDnsCluster>(new LogicalDnsCluster(
-        cluster, legacy_dns_cluster, context, std::move(dns_resolver), creation_status));
-  }
+  ret = std::unique_ptr<LogicalDnsCluster>(new LogicalDnsCluster(
+      cluster, dns_cluster, context, std::move(dns_resolver), creation_status));
   RETURN_IF_NOT_OK(creation_status);
   return ret;
 }
@@ -101,10 +93,9 @@ LogicalDnsCluster::LogicalDnsCluster(
           [this]() -> void { startResolve(); })),
       local_info_(context.serverFactoryContext().localInfo()),
       load_assignment_(convertPriority(cluster.load_assignment())) {
-  failure_backoff_strategy_ =
-      Config::Utility::prepareDnsRefreshStrategy<envoy::config::cluster::v3::Cluster>(
-          cluster, dns_refresh_rate_ms_.count(),
-          context.serverFactoryContext().api().randomGenerator());
+  failure_backoff_strategy_ = Config::Utility::prepareDnsRefreshStrategy(
+      dns_cluster, dns_refresh_rate_ms_.count(),
+      context.serverFactoryContext().api().randomGenerator());
 
   const envoy::config::core::v3::SocketAddress& socket_address =
       lbEndpoint().endpoint().address().socket_address();

diff --git a/source/extensions/clusters/logical_dns/logical_dns_cluster.h b/source/extensions/clusters/logical_dns/logical_dns_cluster.h
@@ -40,14 +40,14 @@ class LogicalDnsCluster : public ClusterImplBase {
 public:
   ~LogicalDnsCluster() override;
 
-  absl::StatusOr<std::unique_ptr<LogicalDnsCluster>> static create(
-      const envoy::config::cluster::v3::Cluster& cluster,
-      const envoy::extensions::clusters::dns::v3::DnsCluster& dns_cluster,
-      ClusterFactoryContext& context, Network::DnsResolverSharedPtr dns_resolver);
-
   // Upstream::Cluster
   InitializePhase initializePhase() const override { return InitializePhase::Primary; }
 
+  static absl::StatusOr<std::unique_ptr<LogicalDnsCluster>>
+  create(const envoy::config::cluster::v3::Cluster& cluster,
+         const envoy::extensions::clusters::dns::v3::DnsCluster& dns_cluster,
+         ClusterFactoryContext& context, Network::DnsResolverSharedPtr dns_resolver);
+
 protected:
   LogicalDnsCluster(const envoy::config::cluster::v3::Cluster& cluster,
                     const envoy::extensions::clusters::dns::v3::DnsCluster& dns_cluster,

diff --git a/source/extensions/clusters/strict_dns/strict_dns_cluster.h b/source/extensions/clusters/strict_dns/strict_dns_cluster.h
@@ -19,6 +19,7 @@ class StrictDnsClusterImpl : public BaseDynamicClusterImpl {
 public:
   // Upstream::Cluster
   InitializePhase initializePhase() const override { return InitializePhase::Primary; }
+
   static absl::StatusOr<std::unique_ptr<StrictDnsClusterImpl>>
   create(const envoy::config::cluster::v3::Cluster& cluster,
          const envoy::extensions::clusters::dns::v3::DnsCluster& dns_cluster,

diff --git a/test/config/utility.cc b/test/config/utility.cc
@@ -1021,7 +1021,8 @@ void ConfigHelper::setPorts(const std::vector<uint32_t>& ports, bool override_po
       eds_hosts = true;
     } else if (cluster->type() == envoy::config::cluster::v3::Cluster::ORIGINAL_DST) {
       original_dst_cluster = true;
-    } else if (cluster->has_cluster_type()) {
+    } else if (cluster->has_cluster_type() &&
+               !cluster->cluster_type().name().starts_with("envoy.cluster.")) {
       custom_cluster = true;
     } else {
       // Assign ports to statically defined load_assignment hosts.

diff --git a/test/extensions/clusters/common/logical_host_integration_test.cc b/test/extensions/clusters/common/logical_host_integration_test.cc
@@ -1,4 +1,5 @@
 #include "envoy/extensions/clusters/dns/v3/dns_cluster.pb.h"
+
 #include "source/common/config/utility.h"
 
 #include "test/integration/http_integration.h"