Skip to content

remove support for v2 UNSUPPORTED_REST_LEGACY #16968

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 3 commits into from
Jul 2, 2021
Merged

remove support for v2 UNSUPPORTED_REST_LEGACY #16968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
437057a
remove support for v2 UNSUPPORTED_REST_LEGACY
ankatare Jun 14, 2021
2c8cd59
incorporating review comments by htuch
ankatare Jun 26, 2021
d5ff475
reverting FilesystemCollectionSubscriptionNonExistentFile test case a…
ankatare Jun 30, 2021
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
8 changes: 2 additions & 6 deletions source/common/config/utility.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,8 @@ void Utility::translateApiConfigSource(
envoy::config::core::v3::GrpcService* grpc_service = api_config_source.add_grpc_services();
grpc_service->mutable_envoy_grpc()->set_cluster_name(cluster);
} else {
if (api_type == ApiType::get().UnsupportedRestLegacy) {
api_config_source.set_api_type(envoy::config::core::v3::ApiConfigSource::
hidden_envoy_deprecated_UNSUPPORTED_REST_LEGACY);
} else if (api_type == ApiType::get().Rest) {
api_config_source.set_api_type(envoy::config::core::v3::ApiConfigSource::REST);
}
ASSERT(api_type == ApiType::get().Rest);
api_config_source.set_api_type(envoy::config::core::v3::ApiConfigSource::REST);
api_config_source.add_cluster_names(cluster);
}

Expand Down
14 changes: 0 additions & 14 deletions test/common/config/subscription_factory_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,20 +227,6 @@ TEST_F(SubscriptionFactoryTest, FilesystemCollectionSubscriptionNonExistentFile)
"'/blahblah' does not exist");
}

TEST_F(SubscriptionFactoryTest, LegacySubscription) {
envoy::config::core::v3::ConfigSource config;
auto* api_config_source = config.mutable_api_config_source();
api_config_source->set_api_type(
envoy::config::core::v3::ApiConfigSource::hidden_envoy_deprecated_UNSUPPORTED_REST_LEGACY);
api_config_source->set_transport_api_version(envoy::config::core::v3::V3);
api_config_source->add_cluster_names("static_cluster");
Upstream::ClusterManager::ClusterSet primary_clusters;
primary_clusters.insert("static_cluster");
EXPECT_CALL(cm_, primaryClusters()).WillOnce(ReturnRef(primary_clusters));
EXPECT_THROW_WITH_REGEX(subscriptionFromConfigSource(config)->start({"static_cluster"}),
EnvoyException, "REST_LEGACY no longer a supported ApiConfigSource.*");
}

TEST_F(SubscriptionFactoryTest, HttpSubscriptionCustomRequestTimeout) {
envoy::config::core::v3::ConfigSource config;
auto* api_config_source = config.mutable_api_config_source();
Expand Down
8 changes: 3 additions & 5 deletions test/common/config/utility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@ TEST(UtilityTest, ConfigSourceInitFetchTimeout) {

TEST(UtilityTest, TranslateApiConfigSource) {
envoy::config::core::v3::ApiConfigSource api_config_source_rest_legacy;
Utility::translateApiConfigSource("test_rest_legacy_cluster", 10000,
ApiType::get().UnsupportedRestLegacy,
Utility::translateApiConfigSource("test_rest_legacy_cluster", 10000, ApiType::get().Rest,
api_config_source_rest_legacy);
EXPECT_EQ(
envoy::config::core::v3::ApiConfigSource::hidden_envoy_deprecated_UNSUPPORTED_REST_LEGACY,
api_config_source_rest_legacy.api_type());
EXPECT_EQ(envoy::config::core::v3::ApiConfigSource::REST,
api_config_source_rest_legacy.api_type());
EXPECT_EQ(10000,
DurationUtil::durationToMilliseconds(api_config_source_rest_legacy.refresh_delay()));
EXPECT_EQ("test_rest_legacy_cluster", api_config_source_rest_legacy.cluster_names(0));
Expand Down