grpc 1.50.0 → 1.56.0

data/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c

@@ -0,0 +1,60 @@
+/* This file was generated by upbc (the upb compiler) from the input
+ * file:
+ *
+ *     xds/type/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/v3/cel.upbdefs.h"
+#include "xds/type/v3/cel.upb.h"
+
+extern _upb_DefPool_Init google_api_expr_v1alpha1_checked_proto_upbdefinit;
+extern _upb_DefPool_Init google_api_expr_v1alpha1_syntax_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[646] = {'\n', '\025', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'c', 'e', 'l', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 
+'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '&', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 
+'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 'c', 'h', 'e', 'c', 'k', 'e', 'd', '.', 'p', 'r', 'o', 't', 
+'o', '\032', '%', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 
+'a', '1', '/', 's', 'y', 'n', 't', 'a', 'x', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 
+'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'x', 
+'d', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', '.', 
+'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 
+'p', 'r', 'o', 't', 'o', '\"', '\273', '\001', '\n', '\r', 'C', 'e', 'l', 'E', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'G', 
+'\n', '\013', 'p', 'a', 'r', 's', 'e', 'd', '_', 'e', 'x', 'p', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'P', 'a', 'r', 
+'s', 'e', 'd', 'E', 'x', 'p', 'r', 'H', '\000', 'R', '\n', 'p', 'a', 'r', 's', 'e', 'd', 'E', 'x', 'p', 'r', '\022', 'J', '\n', '\014', 
+'c', 'h', 'e', 'c', 'k', 'e', 'd', '_', 'e', 'x', 'p', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'h', 'e', 'c', 
+'k', 'e', 'd', 'E', 'x', 'p', 'r', 'H', '\000', 'R', '\013', 'c', 'h', 'e', 'c', 'k', 'e', 'd', 'E', 'x', 'p', 'r', 'B', '\025', '\n', 
+'\016', 'e', 'x', 'p', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\236', '\001', '\n', '\020', 
+'C', 'e', 'l', 'E', 'x', 't', 'r', 'a', 'c', 't', 'S', 't', 'r', 'i', 'n', 'g', '\022', 'G', '\n', '\014', 'e', 'x', 'p', 'r', '_', 
+'e', 'x', 't', 'r', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
+'v', '3', '.', 'C', 'e', 'l', 'E', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', 
+'\001', 'R', '\013', 'e', 'x', 'p', 'r', 'E', 'x', 't', 'r', 'a', 'c', 't', '\022', 'A', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', 
+'_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 
+'t', 'V', 'a', 'l', 'u', 'e', 'B', 'P', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 
+'t', 'y', 'p', 'e', '.', 'v', '3', 'B', '\010', 'C', 'e', 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 
+'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 
+'p', 'e', '/', 'v', '3', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[6] = {
+  &google_api_expr_v1alpha1_checked_proto_upbdefinit,
+  &google_api_expr_v1alpha1_syntax_proto_upbdefinit,
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &xds_annotations_v3_status_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit = {
+  deps,
+  &xds_type_v3_cel_proto_upb_file_layout,
+  "xds/type/v3/cel.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 646)
+};

data/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h

@@ -0,0 +1,41 @@
+/* This file was generated by upbc (the upb compiler) from the input
+ * file:
+ *
+ *     xds/type/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
+#define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_CelExpression_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_cel_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.CelExpression");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_CelExtractString_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_cel_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.CelExtractString");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c

@@ -0,0 +1,36 @@
+/* This file was generated by upbc (the upb compiler) from the input
+ * file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/v3/range.upbdefs.h"
+#include "xds/type/v3/range.upb.h"
+
+static const char descriptor[285] = {'\n', '\027', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', 
+'\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\"', '4', '\n', '\n', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 
+'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', 
+'\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\003', 'R', '\003', 'e', 'n', 'd', '\"', '4', '\n', '\n', 'I', 'n', 't', '3', 
+'2', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 
+'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '5', '\n', '\013', 
+'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', 
+'\001', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\001', 'R', '\003', 'e', 'n', 
+'d', 'B', 'J', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
+'v', '3', 'B', '\n', 'R', 'a', 'n', 'g', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 
+'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 
+'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[1] = {
+  NULL
+};
+
+_upb_DefPool_Init xds_type_v3_range_proto_upbdefinit = {
+  deps,
+  &xds_type_v3_range_proto_upb_file_layout,
+  "xds/type/v3/range.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 285)
+};

data/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h

@@ -0,0 +1,46 @@
+/* This file was generated by upbc (the upb compiler) from the input
+ * file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_v3_range_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_Int64Range_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.Int64Range");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_Int32Range_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.Int32Range");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_DoubleRange_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.DoubleRange");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c

@@ -6,15 +6,13 @@
  * Do not edit -- your changes will be discarded when the file is
  * regenerated. */
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 #include "xds/type/v3/typed_struct.upbdefs.h"
 #include "xds/type/v3/typed_struct.upb.h"
 
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
-static const char descriptor[279] = {'\n', '\036', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 't', 'y', 'p', 'e', 'd', '_', 's', 't', 'r', 'u', 'c', 
-'t', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '\027', 'v', 'a', 'l', 
-'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 
+static const char descriptor[254] = {'\n', '\036', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 't', 'y', 'p', 'e', 'd', '_', 's', 't', 'r', 'u', 'c', 
+'t', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '\034', 'g', 'o', 'o', 
 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', 
 '\"', 'W', '\n', '\013', 'T', 'y', 'p', 'e', 'd', 'S', 't', 'r', 'u', 'c', 't', '\022', '\031', '\n', '\010', 't', 'y', 'p', 'e', '_', 'u', 
 'r', 'l', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '-', '\n', '\005', 'v', 'a', 'l', 'u', 
@@ -26,8 +24,7 @@ static const char descriptor[279] = {'\n', '\036', 'x', 'd', 's', '/', 't', 'y',
 'o', 't', 'o', '3', 
 };
 
-static _upb_DefPool_Init *deps[3] = {
-  &validate_validate_proto_upbdefinit,
+static _upb_DefPool_Init *deps[2] = {
   &google_protobuf_struct_proto_upbdefinit,
   NULL
 };
@@ -36,5 +33,5 @@ _upb_DefPool_Init xds_type_v3_typed_struct_proto_upbdefinit = {
   deps,
   &xds_type_v3_typed_struct_proto_upb_file_layout,
   "xds/type/v3/typed_struct.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 279)
+  UPB_STRINGVIEW_INIT(descriptor, 254)
 };

data/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h

@@ -9,15 +9,16 @@
 #ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
 #define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
 
-#include "upb/def.h"
-#include "upb/port_def.inc"
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 extern _upb_DefPool_Init xds_type_v3_typed_struct_proto_upbdefinit;
 
@@ -30,6 +31,6 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_TypedStruct_getmsgdef(upb_DefPool *
 }  /* extern "C" */
 #endif
 
-#include "upb/port_undef.inc"
+#include "upb/port/undef.inc"
 
 #endif  /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ */

data/src/core/ext/xds/certificate_provider_store.cc

@@ -22,10 +22,10 @@
 
 #include "absl/strings/str_cat.h"
 
+#include <grpc/support/json.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 
 namespace grpc_core {
@@ -44,7 +44,7 @@ CertificateProviderStore::PluginDefinition::JsonLoader(const JsonArgs&) {
 }
 
 void CertificateProviderStore::PluginDefinition::JsonPostLoad(
-    const Json& json, const JsonArgs&, ValidationErrors* errors) {
+    const Json& json, const JsonArgs& args, ValidationErrors* errors) {
   // Check that plugin is supported.
   CertificateProviderFactory* factory = nullptr;
   if (!plugin_name.empty()) {
@@ -60,27 +60,22 @@ void CertificateProviderStore::PluginDefinition::JsonPostLoad(
   // Parse the config field.
   {
     ValidationErrors::ScopedField field(errors, ".config");
-    auto it = json.object_value().find("config");
+    auto it = json.object().find("config");
     // The config field is optional; if not present, we use an empty JSON
     // object.
     Json::Object config_json;
-    if (it != json.object_value().end()) {
-      if (it->second.type() != Json::Type::OBJECT) {
+    if (it != json.object().end()) {
+      if (it->second.type() != Json::Type::kObject) {
         errors->AddError("is not an object");
         return;  // No point parsing config.
       } else {
-        config_json = it->second.object_value();
+        config_json = it->second.object();
       }
     }
     if (factory == nullptr) return;
     // Use plugin to validate and parse config.
-    grpc_error_handle parse_error = GRPC_ERROR_NONE;
-    config =
-        factory->CreateCertificateProviderConfig(config_json, &parse_error);
-    if (!GRPC_ERROR_IS_NONE(parse_error)) {
-      errors->AddError(grpc_error_std_string(parse_error));
-      GRPC_ERROR_UNREF(parse_error);
-    }
+    config = factory->CreateCertificateProviderConfig(
+        Json::FromObject(std::move(config_json)), args, errors);
   }
 }
 

data/src/core/ext/xds/certificate_provider_store.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
-#define GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
+#define GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -55,7 +55,7 @@ class CertificateProviderStore
     RefCountedPtr<CertificateProviderFactory::Config> config;
 
     static const JsonLoaderInterface* JsonLoader(const JsonArgs&);
-    void JsonPostLoad(const Json& json, const JsonArgs&,
+    void JsonPostLoad(const Json& json, const JsonArgs& args,
                       ValidationErrors* errors);
   };
 
@@ -135,4 +135,4 @@ class CertificateProviderStore
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H

data/src/core/ext/xds/file_watcher_certificate_provider_factory.cc

@@ -21,10 +21,11 @@
 #include "src/core/ext/xds/file_watcher_certificate_provider_factory.h"
 
 #include <algorithm>
+#include <initializer_list>
+#include <map>
 #include <memory>
 #include <vector>
 
-#include "absl/memory/memory.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
@@ -32,15 +33,13 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/json/json_util.h"
-#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
 namespace grpc_core {
 
 namespace {
 
-const char* kFileWatcherPlugin = "file_watcher";
+constexpr absl::string_view kFileWatcherPlugin = "file_watcher";
 
 }  // namespace
 
@@ -48,7 +47,7 @@ const char* kFileWatcherPlugin = "file_watcher";
 // FileWatcherCertificateProviderFactory::Config
 //
 
-const char* FileWatcherCertificateProviderFactory::Config::name() const {
+absl::string_view FileWatcherCertificateProviderFactory::Config::name() const {
   return kFileWatcherPlugin;
 }
 
@@ -72,59 +71,46 @@ std::string FileWatcherCertificateProviderFactory::Config::ToString() const {
   return absl::StrJoin(parts, "");
 }
 
-RefCountedPtr<FileWatcherCertificateProviderFactory::Config>
-FileWatcherCertificateProviderFactory::Config::Parse(const Json& config_json,
-                                                     grpc_error_handle* error) {
-  auto config = MakeRefCounted<FileWatcherCertificateProviderFactory::Config>();
-  if (config_json.type() != Json::Type::OBJECT) {
-    *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "error:config type should be OBJECT.");
-    return nullptr;
-  }
-  std::vector<grpc_error_handle> error_list;
-  ParseJsonObjectField(config_json.object_value(), "certificate_file",
-                       &config->identity_cert_file_, &error_list, false);
-  ParseJsonObjectField(config_json.object_value(), "private_key_file",
-                       &config->private_key_file_, &error_list, false);
-  if (config->identity_cert_file_.empty() !=
-      config->private_key_file_.empty()) {
-    error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+const JsonLoaderInterface*
+FileWatcherCertificateProviderFactory::Config::JsonLoader(const JsonArgs&) {
+  static const auto* loader =
+      JsonObjectLoader<Config>()
+          .OptionalField("certificate_file", &Config::identity_cert_file_)
+          .OptionalField("private_key_file", &Config::private_key_file_)
+          .OptionalField("ca_certificate_file", &Config::root_cert_file_)
+          .OptionalField("refresh_interval", &Config::refresh_interval_)
+          .Finish();
+  return loader;
+}
+
+void FileWatcherCertificateProviderFactory::Config::JsonPostLoad(
+    const Json& json, const JsonArgs& /*args*/, ValidationErrors* errors) {
+  if ((json.object().find("certificate_file") == json.object().end()) !=
+      (json.object().find("private_key_file") == json.object().end())) {
+    errors->AddError(
         "fields \"certificate_file\" and \"private_key_file\" must be both set "
-        "or both unset."));
+        "or both unset");
   }
-  ParseJsonObjectField(config_json.object_value(), "ca_certificate_file",
-                       &config->root_cert_file_, &error_list, false);
-  if (config->identity_cert_file_.empty() && config->root_cert_file_.empty()) {
-    error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "At least one of \"certificate_file\" and \"ca_certificate_file\" must "
-        "be specified."));
-  }
-  if (!ParseJsonObjectFieldAsDuration(
-          config_json.object_value(), "refresh_interval",
-          &config->refresh_interval_, &error_list, false)) {
-    config->refresh_interval_ = Duration::Minutes(10);  // 10 minutes default
-  }
-  if (!error_list.empty()) {
-    *error = GRPC_ERROR_CREATE_FROM_VECTOR(
-        "Error parsing file watcher certificate provider config", &error_list);
-    return nullptr;
+  if ((json.object().find("certificate_file") == json.object().end()) &&
+      (json.object().find("ca_certificate_file") == json.object().end())) {
+    errors->AddError(
+        "at least one of \"certificate_file\" and \"ca_certificate_file\" must "
+        "be specified");
   }
-  return config;
 }
 
 //
 // FileWatcherCertificateProviderFactory
 //
 
-const char* FileWatcherCertificateProviderFactory::name() const {
+absl::string_view FileWatcherCertificateProviderFactory::name() const {
   return kFileWatcherPlugin;
 }
 
 RefCountedPtr<CertificateProviderFactory::Config>
 FileWatcherCertificateProviderFactory::CreateCertificateProviderConfig(
-    const Json& config_json, grpc_error_handle* error) {
-  return FileWatcherCertificateProviderFactory::Config::Parse(config_json,
-                                                              error);
+    const Json& config_json, const JsonArgs& args, ValidationErrors* errors) {
+  return LoadFromJson<RefCountedPtr<Config>>(config_json, args, errors);
 }
 
 RefCountedPtr<grpc_tls_certificate_provider>
@@ -132,7 +118,7 @@ FileWatcherCertificateProviderFactory::CreateCertificateProvider(
     RefCountedPtr<CertificateProviderFactory::Config> config) {
   if (config->name() != name()) {
     gpr_log(GPR_ERROR, "Wrong config type Actual:%s vs Expected:%s",
-            config->name(), name());
+            std::string(config->name()).c_str(), std::string(name()).c_str());
     return nullptr;
   }
   auto* file_watcher_config =
@@ -147,7 +133,7 @@ FileWatcherCertificateProviderFactory::CreateCertificateProvider(
 void RegisterFileWatcherCertificateProvider(
     CoreConfiguration::Builder* builder) {
   builder->certificate_provider_registry()->RegisterCertificateProviderFactory(
-      absl::make_unique<FileWatcherCertificateProviderFactory>());
+      std::make_unique<FileWatcherCertificateProviderFactory>());
 }
 
 }  // namespace grpc_core

data/src/core/ext/xds/file_watcher_certificate_provider_factory.h

@@ -16,19 +16,23 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
-#define GRPC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
+#define GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
 
 #include <grpc/support/port_platform.h>
 
 #include <string>
 
+#include "absl/strings/string_view.h"
+
 #include <grpc/grpc_security.h>
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"
+#include "src/core/lib/json/json_args.h"
+#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 
 namespace grpc_core {
@@ -38,10 +42,7 @@ class FileWatcherCertificateProviderFactory
  public:
   class Config : public CertificateProviderFactory::Config {
    public:
-    static RefCountedPtr<Config> Parse(const Json& config_json,
-                                       grpc_error_handle* error);
-
-    const char* name() const override;
+    absl::string_view name() const override;
 
     std::string ToString() const override;
 
@@ -55,18 +56,22 @@ class FileWatcherCertificateProviderFactory
 
     Duration refresh_interval() const { return refresh_interval_; }
 
+    static const JsonLoaderInterface* JsonLoader(const JsonArgs& args);
+    void JsonPostLoad(const Json& json, const JsonArgs& args,
+                      ValidationErrors* errors);
+
    private:
     std::string identity_cert_file_;
     std::string private_key_file_;
     std::string root_cert_file_;
-    Duration refresh_interval_;
+    Duration refresh_interval_ = Duration::Minutes(10);
   };
 
-  const char* name() const override;
+  absl::string_view name() const override;
 
   RefCountedPtr<CertificateProviderFactory::Config>
-  CreateCertificateProviderConfig(const Json& config_json,
-                                  grpc_error_handle* error) override;
+  CreateCertificateProviderConfig(const Json& config_json, const JsonArgs& args,
+                                  ValidationErrors* errors) override;
 
   RefCountedPtr<grpc_tls_certificate_provider> CreateCertificateProvider(
       RefCountedPtr<CertificateProviderFactory::Config> config) override;
@@ -74,4 +79,4 @@ class FileWatcherCertificateProviderFactory
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H

data/src/core/ext/xds/upb_utils.h

@@ -14,15 +14,15 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_UPB_UTILS_H
-#define GRPC_CORE_EXT_XDS_UPB_UTILS_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
+#define GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
 
 #include <grpc/support/port_platform.h>
 
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "upb/upb.h"
+#include "upb/base/string_view.h"
 
 namespace grpc_core {
 
@@ -42,4 +42,4 @@ inline std::string UpbStringToStdString(const upb_StringView& str) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_UPB_UTILS_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H