diff --git a/source/common/config/utility.cc b/source/common/config/utility.cc index b7288b401ed7f..c7ec896d3f911 100644 --- a/source/common/config/utility.cc +++ b/source/common/config/utility.cc @@ -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); } diff --git a/test/common/config/subscription_factory_impl_test.cc b/test/common/config/subscription_factory_impl_test.cc index f41376504c025..c99d7558e9ee5 100644 --- a/test/common/config/subscription_factory_impl_test.cc +++ b/test/common/config/subscription_factory_impl_test.cc @@ -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(); diff --git a/test/common/config/utility_test.cc b/test/common/config/utility_test.cc index cd2ff60b96f36..adc3c22f24e0a 100644 --- a/test/common/config/utility_test.cc +++ b/test/common/config/utility_test.cc @@ -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));