xds: returning absl::Status (envoyproxy#29497)

follow up to envoyproxy#29439 using the new status return code

Risk Level: medium
Testing: updated tests
Docs Changes: n/a
Release Notes: n/a
envoyproxy/envoy-mobile#176

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>

source/common/config/BUILD

@@ -174,7 +174,6 @@ envoy_cc_library(
         ":custom_config_validators_lib",
         ":type_to_endpoint_lib",
         ":utility_lib",
-        ":xds_resource_lib",
         "//envoy/config:subscription_factory_interface",
         "//envoy/config:subscription_interface",
         "//envoy/config:xds_config_tracker_interface",

source/common/config/subscription_factory_impl.cc

@@ -6,7 +6,6 @@
 #include "source/common/config/custom_config_validators_impl.h"
 #include "source/common/config/type_to_endpoint.h"
 #include "source/common/config/utility.h"
-#include "source/common/config/xds_resource.h"
 #include "source/common/http/utility.h"
 #include "source/common/protobuf/protobuf.h"
 #include "source/common/protobuf/utility.h"

source/common/config/xds_resource.cc

@@ -104,19 +104,20 @@ std::string XdsResourceIdentifier::encodeUrl(const xds::core::v3::ResourceLocato
 
 namespace {
 
-void decodePath(absl::string_view path, std::string* resource_type, std::string& id) {
+absl::Status decodePath(absl::string_view path, std::string* resource_type, std::string& id) {
   // This is guaranteed by Http::Utility::extractHostPathFromUrn.
   ASSERT(absl::StartsWith(path, "/"));
   const std::vector<absl::string_view> path_components = absl::StrSplit(path.substr(1), '/');
   auto id_it = path_components.cbegin();
   if (resource_type != nullptr) {
     *resource_type = std::string(path_components[0]);
     if (resource_type->empty()) {
-      throwEnvoyExceptionOrPanic(fmt::format("Resource type missing from {}", path));
+      return absl::InvalidArgumentError(fmt::format("Resource type missing from {}", path));
     }
     id_it = std::next(id_it);
   }
   id = PercentEncoding::decode(absl::StrJoin(id_it, path_components.cend(), "/"));
+  return absl::OkStatus();
 }
 
 void decodeQueryParams(absl::string_view query_params,
@@ -147,9 +148,9 @@ void decodeFragment(
 
 } // namespace
 
-xds::core::v3::ResourceName XdsResourceIdentifier::decodeUrn(absl::string_view resource_urn) {
+absl::StatusOr<xds::core::v3::ResourceName> XdsResourceIdentifier::decodeUrn(absl::string_view resource_urn) {
   if (!hasXdsTpScheme(resource_urn)) {
-    throwEnvoyExceptionOrPanic(fmt::format("{} does not have an xdstp: scheme", resource_urn));
+    absl::InvalidArgumentError(fmt::format("{} does not have an xdstp: scheme", resource_urn));
   }
   absl::string_view host, path;
   Http::Utility::extractHostPathFromUri(resource_urn, host, path);
@@ -160,8 +161,11 @@ xds::core::v3::ResourceName XdsResourceIdentifier::decodeUrn(absl::string_view r
     decodeQueryParams(path.substr(query_params_start), *decoded_resource_name.mutable_context());
     path = path.substr(0, query_params_start);
   }
-  decodePath(path, decoded_resource_name.mutable_resource_type(),
+  status = decodePath(path, decoded_resource_name.mutable_resource_type(),
              *decoded_resource_name.mutable_id());
+  if (!status.ok()) {
+    return status;
+  }
   return decoded_resource_name;
 }
 
@@ -181,7 +185,7 @@ xds::core::v3::ResourceLocator XdsResourceIdentifier::decodeUrl(absl::string_vie
   } else if (absl::StartsWith(resource_url, "file:")) {
     decoded_resource_locator.set_scheme(xds::core::v3::ResourceLocator::FILE);
     // File URLs only have a path and fragment.
-    decodePath(path, nullptr, *decoded_resource_locator.mutable_id());
+    THROW_IF_NOT_OK(decodePath(path, nullptr, *decoded_resource_locator.mutable_id()));
     return decoded_resource_locator;
   } else {
     throwEnvoyExceptionOrPanic(
@@ -194,8 +198,8 @@ xds::core::v3::ResourceLocator XdsResourceIdentifier::decodeUrl(absl::string_vie
                       *decoded_resource_locator.mutable_exact_context());
     path = path.substr(0, query_params_start);
   }
-  decodePath(path, decoded_resource_locator.mutable_resource_type(),
-             *decoded_resource_locator.mutable_id());
+  THROW_IF_NOT_OK(decodePath(path, decoded_resource_locator.mutable_resource_type(),
+             *decoded_resource_locator.mutable_id()));
   return decoded_resource_locator;
 }
 

source/common/config/xds_resource.h

@@ -51,7 +51,7 @@ class XdsResourceIdentifier {
    * @return xds::core::v3::ResourceName resource name message for resource_urn.
    * @throws EnvoyException when parsing fails.
    */
-  static xds::core::v3::ResourceName decodeUrn(absl::string_view resource_urn);
+  static absl::StatusOr<xds::core::v3::ResourceName> decodeUrn(absl::string_view resource_urn);
 
   /**
    * Decode a xdstp:// URL string to a xds::core::v3::ResourceLocator.