v1 cleanup: delete several unused conversion paths

source/common/config/BUILD

@@ -31,27 +31,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "cds_json_lib",
-    srcs = ["cds_json.cc"],
-    hdrs = ["cds_json.h"],
-    external_deps = ["abseil_optional"],
-    deps = [
-        ":address_json_lib",
-        ":json_utility_lib",
-        ":protocol_json_lib",
-        ":tls_context_json_lib",
-        ":utility_lib",
-        "//include/envoy/json:json_object_interface",
-        "//include/envoy/upstream:cluster_manager_interface",
-        "//source/common/common:assert_lib",
-        "//source/common/json:config_schemas_lib",
-        "//source/common/network:utility_lib",
-        "@envoy_api//envoy/api/v2:cds_cc",
-        "@envoy_api//envoy/api/v2/cluster:circuit_breaker_cc",
-    ],
-)
-
 envoy_cc_library(
     name = "filesystem_subscription_lib",
     srcs = ["filesystem_subscription_impl.cc"],
@@ -336,18 +315,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "tls_context_json_lib",
-    srcs = ["tls_context_json.cc"],
-    hdrs = ["tls_context_json.h"],
-    deps = [
-        ":json_utility_lib",
-        "//include/envoy/json:json_object_interface",
-        "//source/common/common:utility_lib",
-        "@envoy_api//envoy/api/v2/auth:cert_cc",
-    ],
-)
-
 envoy_cc_library(
     name = "type_to_endpoint_lib",
     srcs = ["type_to_endpoint.cc"],

source/common/config/address_json.cc

@@ -7,32 +7,6 @@
 namespace Envoy {
 namespace Config {
 
-void AddressJson::translateAddress(const std::string& json_address, bool url, bool resolved,
-                                   envoy::api::v2::core::Address& address) {
-  if (resolved) {
-    Network::Address::InstanceConstSharedPtr instance =
-        url ? Network::Utility::resolveUrl(json_address)
-            : Network::Utility::parseInternetAddressAndPort(json_address);
-    if (instance->type() == Network::Address::Type::Ip) {
-      address.mutable_socket_address()->set_address(instance->ip()->addressAsString());
-      address.mutable_socket_address()->set_port_value(instance->ip()->port());
-    } else {
-      ASSERT(instance->type() == Network::Address::Type::Pipe);
-      address.mutable_pipe()->set_path(instance->asString());
-    }
-    return;
-  }
-
-  // We don't have v1 JSON with unresolved addresses in non-URL form.
-  ASSERT(url);
-  // Non-TCP scheme (e.g. Unix scheme) is not supported with unresolved address.
-  if (!Network::Utility::urlIsTcpScheme(json_address)) {
-    throw EnvoyException(fmt::format("unresolved URL must be TCP scheme, got: {}", json_address));
-  }
-  address.mutable_socket_address()->set_address(Network::Utility::hostFromTcpUrl(json_address));
-  address.mutable_socket_address()->set_port_value(Network::Utility::portFromTcpUrl(json_address));
-}
-
 void AddressJson::translateCidrRangeList(
     const std::vector<std::string>& json_ip_list,
     Protobuf::RepeatedPtrField<envoy::api::v2::core::CidrRange>& range_list) {

source/common/config/address_json.h

@@ -10,17 +10,6 @@ namespace Config {
 
 class AddressJson {
 public:
-  /**
-   * Translate a v1 JSON address to v2 envoy::api::v2::core::Address.
-   * @param json_address source address.
-   * @param url is json_address a URL? E.g. tcp://<ip>:<port>. If not, it is
-   *            treated as <ip>:<port>.
-   * @param resolved is json_address a concrete IP/pipe or unresolved hostname?
-   * @param address destination envoy::api::v2::core::Address.
-   */
-  static void translateAddress(const std::string& json_address, bool url, bool resolved,
-                               envoy::api::v2::core::Address& address);
-
   /**
    * Translate a v1 JSON array of IP ranges to v2
    * Protobuf::RepeatedPtrField<envoy::api::v2::core::CidrRange>.