Skip to content

retry: remove well_known_names #16696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 1 commit into from
May 27, 2021
Merged

retry: remove well_known_names #16696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions source/extensions/retry/priority/BUILD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion source/extensions/retry/priority/previous_priorities/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
5 changes: 1 addition & 4 deletions source/extensions/retry/priority/previous_priorities/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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::
Expand Down
26 changes: 0 additions & 26 deletions source/extensions/retry/priority/well_known_names.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/extensions/retry/priority/previous_priorities/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions test/extensions/retry/priority/previous_priorities/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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_);
Expand Down