[test] convert bootstrap test configs to v2

source/common/config/BUILD

@@ -21,25 +21,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "bootstrap_json_lib",
-    srcs = ["bootstrap_json.cc"],
-    hdrs = ["bootstrap_json.h"],
-    deps = [
-        ":address_json_lib",
-        ":cds_json_lib",
-        ":json_utility_lib",
-        ":lds_json_lib",
-        ":utility_lib",
-        "//include/envoy/json:json_object_interface",
-        "//source/common/common:assert_lib",
-        "//source/common/json:config_schemas_lib",
-        "//source/common/protobuf:utility_lib",
-        "//source/extensions/stat_sinks:well_known_names",
-        "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc",
-    ],
-)
-
 envoy_cc_library(
     name = "base_json_lib",
     srcs = ["base_json.cc"],
@@ -262,24 +243,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "lds_json_lib",
-    srcs = ["lds_json.cc"],
-    hdrs = ["lds_json.h"],
-    deps = [
-        ":address_json_lib",
-        ":json_utility_lib",
-        ":tls_context_json_lib",
-        ":utility_lib",
-        "//include/envoy/json:json_object_interface",
-        "//source/common/common:assert_lib",
-        "//source/common/json:config_schemas_lib",
-        "//source/common/network:utility_lib",
-        "//source/extensions/filters/network:well_known_names",
-        "@envoy_api//envoy/api/v2:lds_cc",
-    ],
-)
-
 envoy_cc_library(
     name = "metadata_lib",
     srcs = ["metadata.cc"],

source/common/config/utility.cc

@@ -184,14 +184,6 @@ Utility::configSourceInitialFetchTimeout(const envoy::api::v2::core::ConfigSourc
       PROTOBUF_GET_MS_OR_DEFAULT(config_source, initial_fetch_timeout, 0));
 }
 
-void Utility::translateCdsConfig(const Json::Object& json_config,
-                                 envoy::api::v2::core::ConfigSource& cds_config) {
-  translateApiConfigSource(json_config.getObject("cluster")->getString("name"),
-                           json_config.getInteger("refresh_delay_ms", 30000),
-                           json_config.getString("api_type", ApiType::get().UnsupportedRestLegacy),
-                           *cds_config.mutable_api_config_source());
-}
-
 void Utility::translateRdsConfig(
     const Json::Object& json_rds,
     envoy::config::filter::network::http_connection_manager::v2::Rds& rds) {
@@ -206,15 +198,6 @@ void Utility::translateRdsConfig(
                            *rds.mutable_config_source()->mutable_api_config_source());
 }
 
-void Utility::translateLdsConfig(const Json::Object& json_lds,
-                                 envoy::api::v2::core::ConfigSource& lds_config) {
-  json_lds.validateSchema(Json::Schema::LDS_CONFIG_SCHEMA);
-  translateApiConfigSource(json_lds.getString("cluster"),
-                           json_lds.getInteger("refresh_delay_ms", 30000),
-                           json_lds.getString("api_type", ApiType::get().UnsupportedRestLegacy),
-                           *lds_config.mutable_api_config_source());
-}
-
 RateLimitSettings
 Utility::parseRateLimitSettings(const envoy::api::v2::core::ApiConfigSource& api_config_source) {
   RateLimitSettings rate_limit_settings;

source/common/config/utility.h

@@ -187,14 +187,6 @@ class Utility {
       const Upstream::ClusterManager::ClusterInfoMap& clusters,
       const envoy::api::v2::core::ApiConfigSource& api_config_source);
 
-  /**
-   * Convert a v1 CDS JSON config to v2 CDS envoy::api::v2::core::ConfigSource.
-   * @param json_config source v1 CDS JSON config.
-   * @param cds_config destination v2 CDS envoy::api::v2::core::ConfigSource.
-   */
-  static void translateCdsConfig(const Json::Object& json_config,
-                                 envoy::api::v2::core::ConfigSource& cds_config);
-
   /**
    * Convert a v1 RDS JSON config to v2 RDS
    * envoy::config::filter::network::http_connection_manager::v2::Rds.
@@ -205,14 +197,6 @@ class Utility {
   translateRdsConfig(const Json::Object& json_rds,
                      envoy::config::filter::network::http_connection_manager::v2::Rds& rds);
 
-  /**
-   * Convert a v1 LDS JSON config to v2 LDS envoy::api::v2::core::ConfigSource.
-   * @param json_lds source v1 LDS JSON config.
-   * @param lds_config destination v2 LDS envoy::api::v2::core::ConfigSource.
-   */
-  static void translateLdsConfig(const Json::Object& json_lds,
-                                 envoy::api::v2::core::ConfigSource& lds_config);
-
   /**
    * Parses RateLimit configuration from envoy::api::v2::core::ApiConfigSource to RateLimitSettings.
    * @param api_config_source ApiConfigSource.