retry: remove well_known_names (envoyproxy#16696)

Signed-off-by: Long Dai <[email protected]>
leyao-daily · Sep 30, 2021 · d9bb7c9 · d9bb7c9
1 parent a95311b
commit d9bb7c9
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 51 deletions.
diff --git a/source/extensions/retry/priority/BUILD b/source/extensions/retry/priority/BUILD
diff --git a/source/extensions/retry/priority/previous_priorities/BUILD b/source/extensions/retry/priority/previous_priorities/BUILD
@@ -30,7 +30,6 @@ envoy_cc_extension(
         "//include/envoy/registry",
         "//include/envoy/upstream:retry_interface",
         "//source/common/protobuf",
-        "//source/extensions/retry/priority:well_known_names",
         "@envoy_api//envoy/extensions/retry/priority/previous_priorities/v3:pkg_cc_proto",
     ],
 )
diff --git a/source/extensions/retry/priority/previous_priorities/config.h b/source/extensions/retry/priority/previous_priorities/config.h
@@ -6,7 +6,6 @@
 #include "common/protobuf/protobuf.h"
 
 #include "extensions/retry/priority/previous_priorities/previous_priorities.h"
-#include "extensions/retry/priority/well_known_names.h"
 
 namespace Envoy {
 namespace Extensions {
@@ -20,9 +19,7 @@ class PreviousPrioritiesRetryPriorityFactory : public Upstream::RetryPriorityFac
                       ProtobufMessage::ValidationVisitor& validation_visitor,
                       uint32_t max_retries) override;
 
-  std::string name() const override {
-    return RetryPriorityValues::get().PreviousPrioritiesRetryPriority;
-  }
+  std::string name() const override { return "envoy.retry_priorities.previous_priorities"; }
 
   ProtobufTypes::MessagePtr createEmptyConfigProto() override {
     return ProtobufTypes::MessagePtr(new envoy::extensions::retry::priority::previous_priorities::

diff --git a/source/extensions/retry/priority/well_known_names.h b/source/extensions/retry/priority/well_known_names.h
diff --git a/test/extensions/retry/priority/previous_priorities/BUILD b/test/extensions/retry/priority/previous_priorities/BUILD
@@ -17,7 +17,6 @@ envoy_extension_cc_test(
     extension_name = "envoy.retry_priorities.previous_priorities",
     deps = [
         "//source/common/protobuf:message_validator_lib",
-        "//source/extensions/retry/priority:well_known_names",
         "//source/extensions/retry/priority/previous_priorities:config",
         "//test/mocks/upstream:host_mocks",
         "//test/mocks/upstream:host_set_mocks",

diff --git a/test/extensions/retry/priority/previous_priorities/config_test.cc b/test/extensions/retry/priority/previous_priorities/config_test.cc
@@ -5,7 +5,6 @@
 #include "common/protobuf/message_validator_impl.h"
 
 #include "extensions/retry/priority/previous_priorities/config.h"
-#include "extensions/retry/priority/well_known_names.h"
 
 #include "test/mocks/upstream/host.h"
 #include "test/mocks/upstream/host_set.h"
@@ -28,7 +27,7 @@ class RetryPriorityTest : public testing::Test {
   void initialize(const Upstream::HealthyLoad& original_healthy_priority_load,
                   const Upstream::DegradedLoad& original_degraded_priority_load) {
     auto factory = Registry::FactoryRegistry<Upstream::RetryPriorityFactory>::getFactory(
-        RetryPriorityValues::get().PreviousPrioritiesRetryPriority);
+        "envoy.retry_priorities.previous_priorities");
 
     envoy::extensions::retry::priority::previous_priorities::v3::PreviousPrioritiesConfig config;
     config.set_update_frequency(update_frequency_);