protobuf: Switch to protovalidate

Signed-off-by: Ryan Northey <ryan@synca.io>

Author: phlax

bazel/api_build_system.bzl

@@ -1,6 +1,6 @@
-load("@com_envoyproxy_protoc_gen_validate//bazel:pgv_proto_library.bzl", "pgv_cc_proto_library")
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("@com_github_grpc_grpc//bazel:python_rules.bzl", _py_proto_library = "py_proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
 load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library")
@@ -27,7 +27,7 @@ _COMMON_PROTO_DEPS = [
     "@com_google_protobuf//:wrappers_proto",
     "@com_google_googleapis//google/api:http_proto",
     "@com_google_googleapis//google/rpc:status_proto",
-    "@com_envoyproxy_protoc_gen_validate//validate:validate_proto",
+    "@protovalidate//proto/protovalidate/buf/validate:validate_proto",
 ]
 
 def _proto_mapping(dep, proto_dep_map, proto_suffix):
@@ -68,14 +68,8 @@ def _xds_cc_py_proto_library(
         visibility = visibility,
     )
     cc_proto_library_name = name + _CC_PROTO_SUFFIX
-    pgv_cc_proto_library(
+    cc_proto_library(
         name = cc_proto_library_name,
-        linkstatic = linkstatic,
-        cc_deps = [_cc_proto_mapping(dep) for dep in deps] + [
-            "@com_google_googleapis//google/api:http_cc_proto",
-            "@com_google_googleapis//google/api:httpbody_cc_proto",
-            "@com_google_googleapis//google/rpc:status_cc_proto",
-        ],
         deps = [relative_name],
         visibility = ["//visibility:public"],
     )
@@ -113,9 +107,9 @@ def xds_proto_package(
         has_services = has_services,
     )
 
-    compilers = ["@io_bazel_rules_go//proto:go_proto", "@com_envoyproxy_protoc_gen_validate//bazel/go:pgv_plugin_go"]
+    compilers = ["@io_bazel_rules_go//proto:go_proto"]
     if has_services:
-        compilers = ["@io_bazel_rules_go//proto:go_proto", "@io_bazel_rules_go//proto:go_grpc_v2", "@com_envoyproxy_protoc_gen_validate//bazel/go:pgv_plugin_go"]
+        compilers = ["@io_bazel_rules_go//proto:go_proto", "@io_bazel_rules_go//proto:go_grpc_v2"]
 
     # Because RBAC proro depends on googleapis syntax.proto and checked.proto,
     # which share the same go proto library, it causes duplicative dependencies.
@@ -127,12 +121,12 @@ def xds_proto_package(
         proto = name,
         visibility = ["//visibility:public"],
         deps = depset([_go_proto_mapping(dep) for dep in deps] + [
-            "@com_envoyproxy_protoc_gen_validate//validate:go_default_library",
             "@org_golang_google_protobuf//types/known/anypb:go_default_library",
             "@org_golang_google_protobuf//types/known/durationpb:go_default_library",
             "@org_golang_google_protobuf//types/known/structpb:go_default_library",
             "@org_golang_google_protobuf//types/known/timestamppb:go_default_library",
             "@org_golang_google_protobuf//types/known/wrapperspb:go_default_library",
+            "@protovalidate_go_gen//buf/validate",
         ]).to_list(),
     )
 

udpa/data/orca/v1/orca_load_report.proto

@@ -11,19 +11,19 @@ option java_multiple_files = true;
 option java_package = "com.github.udpa.udpa.data.orca.v1";
 option go_package = "github.com/cncf/xds/go/udpa/data/orca/v1";
 
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 
 // See section `ORCA load report format` of the design document in
 // :ref:`https://github.com/envoyproxy/envoy/issues/6614`.
 
 message OrcaLoadReport {
   // CPU utilization expressed as a fraction of available CPU resources. This
   // should be derived from the latest sample or measurement.
-  double cpu_utilization = 1 [(validate.rules).double.gte = 0, (validate.rules).double.lte = 1];
+  double cpu_utilization = 1 [(buf.validate.field).double.gte = 0, (buf.validate.field).double.lte = 1];
 
   // Memory utilization expressed as a fraction of available memory
   // resources. This should be derived from the latest sample or measurement.
-  double mem_utilization = 2 [(validate.rules).double.gte = 0, (validate.rules).double.lte = 1];
+  double mem_utilization = 2 [(buf.validate.field).double.gte = 0, (buf.validate.field).double.lte = 1];
 
   // Total RPS being served by an endpoint. This should cover all services that an endpoint is
   // responsible for.
@@ -36,5 +36,5 @@ message OrcaLoadReport {
   // Resource utilization values. Each value is expressed as a fraction of total resources
   // available, derived from the latest sample or measurement.
   map<string, double> utilization = 5
-      [(validate.rules).map.values.double.gte = 0, (validate.rules).map.values.double.lte = 1];
+      [(buf.validate.field).map.values.double.gte = 0, (buf.validate.field).map.values.double.lte = 1];
 }

xds/core/v3/authority.proto

@@ -4,7 +4,7 @@ package xds.core.v3;
 
 import "xds/annotations/v3/status.proto";
 
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 
 option java_outer_classname = "AuthorityProto";
 option java_multiple_files = true;
@@ -15,7 +15,7 @@ option (xds.annotations.v3.file_status).work_in_progress = true;
 
 // xDS authority information.
 message Authority {
-  string name = 1 [(validate.rules).string = {min_len: 1}];
+  string name = 1 [(buf.validate.field).string = {min_len: 1}];
 
   // .. space reserved for additional authority addressing information, e.g. for
   // resource signing, items such as CA trust chain, cert pinning may be added.

xds/core/v3/cidr.proto

@@ -5,7 +5,7 @@ package xds.core.v3;
 import "xds/annotations/v3/status.proto";
 import "google/protobuf/wrappers.proto";
 
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 
 option java_outer_classname = "CidrRangeProto";
 option java_multiple_files = true;
@@ -16,8 +16,8 @@ option go_package = "github.com/cncf/xds/go/xds/core/v3";
 // the subnet mask for a `CIDR <https://tools.ietf.org/html/rfc4632>`_ range.
 message CidrRange {
   // IPv4 or IPv6 address, e.g. ``192.0.0.0`` or ``2001:db8::``.
-  string address_prefix = 1 [(validate.rules).string = {min_len: 1}];
+  string address_prefix = 1 [(buf.validate.field).string = {min_len: 1}];
 
   // Length of prefix, e.g. 0, 32. Defaults to 0 when unset.
-  google.protobuf.UInt32Value prefix_len = 2 [(validate.rules).uint32 = {lte: 128}];
+  google.protobuf.UInt32Value prefix_len = 2 [(buf.validate.field).uint32 = {lte: 128}];
 }

xds/core/v3/collection_entry.proto

@@ -7,7 +7,7 @@ import "google/protobuf/any.proto";
 import "xds/annotations/v3/status.proto";
 import "xds/core/v3/resource_locator.proto";
 
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 
 option java_outer_classname = "CollectionEntryProto";
 option java_multiple_files = true;
@@ -33,7 +33,7 @@ message CollectionEntry {
     // ``[a-zA-Z0-9_-\./]+`` (TODO(htuch): turn this into a PGV constraint once
     // finalized, probably should be a RFC3986 pchar). This name allows
     // reference via the #entry directive in ResourceLocator.
-    string name = 1 [(validate.rules).string.pattern = "^[0-9a-zA-Z_\\-\\.~:]+$"];
+    string name = 1 [(buf.validate.field).string.pattern = "^[0-9a-zA-Z_\\-\\.~:]+$"];
 
     // The resource's logical version. It is illegal to have the same named xDS
     // resource name at a given version with different resource payloads.
@@ -44,7 +44,7 @@ message CollectionEntry {
   }
 
   oneof resource_specifier {
-    option (validate.required) = true;
+    option (buf.validate.oneof).required = true;
 
     // A resource locator describing how the member resource is to be located.
     ResourceLocator locator = 1;

xds/core/v3/extension.proto

@@ -7,20 +7,20 @@ option java_multiple_files = true;
 option java_package = "com.github.xds.core.v3";
 option go_package = "github.com/cncf/xds/go/xds/core/v3";
 
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 import "google/protobuf/any.proto";
 
 // Message type for extension configuration.
 message TypedExtensionConfig {
   // The name of an extension. This is not used to select the extension, instead
   // it serves the role of an opaque identifier.
-  string name = 1 [(validate.rules).string = {min_len: 1}];
+  string name = 1 [(buf.validate.field).string = {min_len: 1}];
 
   // The typed config for the extension. The type URL will be used to identify
   // the extension. In the case that the type URL is *xds.type.v3.TypedStruct*
   // (or, for historical reasons, *udpa.type.v1.TypedStruct*), the inner type
   // URL of *TypedStruct* will be utilized. See the
   // :ref:`extension configuration overview
   // <config_overview_extension_configuration>` for further details.
-  google.protobuf.Any typed_config = 2 [(validate.rules).any = {required: true}];
+  google.protobuf.Any typed_config = 2 [(buf.validate.field).required = true];
 }

xds/core/v3/resource_locator.proto

@@ -5,7 +5,7 @@ package xds.core.v3;
 import "xds/annotations/v3/status.proto";
 import "xds/core/v3/context_params.proto";
 
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 
 option java_outer_classname = "ResourceLocatorProto";
 option java_multiple_files = true;
@@ -39,7 +39,7 @@ message ResourceLocator {
   }
 
   // URI scheme.
-  Scheme scheme = 1 [(validate.rules).enum = {defined_only: true}];
+  Scheme scheme = 1 [(buf.validate.field).enum = {defined_only: true}];
 
   // Opaque identifier for the resource. Any '/' will not be escaped during URI
   // encoding and will form part of the URI path. This may end
@@ -54,7 +54,7 @@ message ResourceLocator {
 
   // Fully qualified resource type (as in type URL without types.googleapis.com/
   // prefix).
-  string resource_type = 4 [(validate.rules).string = {min_len: 1}];
+  string resource_type = 4 [(buf.validate.field).string = {min_len: 1}];
 
   oneof context_param_specifier {
     // Additional parameters that can be used to select resource variants.
@@ -89,7 +89,7 @@ message ResourceLocator {
   // and reserved characters.
   message Directive {
     oneof directive {
-      option (validate.required) = true;
+      option (buf.validate.oneof).required = true;
 
       // An alternative resource locator for fallback if the resource is
       // unavailable. For example, take the resource locator:
@@ -106,7 +106,7 @@ message ResourceLocator {
       // field specified. When specified, the entry directive allows
       // ResourceLocator to directly reference these inlined resources, e.g.
       // xdstp://.../foo#entry=bar.
-      string entry = 2 [(validate.rules).string = {min_len: 1, pattern: "^[0-9a-zA-Z_\\-\\./~:]+$"}];
+      string entry = 2 [(buf.validate.field).string = {min_len: 1, pattern: "^[0-9a-zA-Z_\\-\\./~:]+$"}];
     }
   }
 

xds/core/v3/resource_name.proto

@@ -5,7 +5,7 @@ package xds.core.v3;
 import "xds/annotations/v3/status.proto";
 import "xds/core/v3/context_params.proto";
 
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 
 option java_outer_classname = "ResourceNameProto";
 option java_multiple_files = true;
@@ -35,7 +35,7 @@ message ResourceName {
 
   // Fully qualified resource type (as in type URL without types.googleapis.com/
   // prefix).
-  string resource_type = 3 [(validate.rules).string = {min_len: 1}];
+  string resource_type = 3 [(buf.validate.field).string = {min_len: 1}];
 
   // Additional parameters that can be used to select resource variants.
   ContextParams context = 4;

xds/data/orca/v3/orca_load_report.proto

@@ -7,7 +7,7 @@ option java_multiple_files = true;
 option java_package = "com.github.xds.data.orca.v3";
 option go_package = "github.com/cncf/xds/go/xds/data/orca/v3";
 
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 
 // See section `ORCA load report format` of the design document in
 // https://github.com/envoyproxy/envoy/issues/6614.
@@ -17,11 +17,11 @@ message OrcaLoadReport {
   // should be derived from the latest sample or measurement. The value may be
   // larger than 1.0 when the usage exceeds the reporter dependent notion of
   // soft limits.
-  double cpu_utilization = 1 [(validate.rules).double.gte = 0];
+  double cpu_utilization = 1 [(buf.validate.field).double.gte = 0];
 
   // Memory utilization expressed as a fraction of available memory
   // resources. This should be derived from the latest sample or measurement.
-  double mem_utilization = 2 [(validate.rules).double.gte = 0, (validate.rules).double.lte = 1];
+  double mem_utilization = 2 [(buf.validate.field).double.gte = 0, (buf.validate.field).double.lte = 1];
 
   // Total RPS being served by an endpoint. This should cover all services that an endpoint is
   // responsible for.
@@ -35,15 +35,15 @@ message OrcaLoadReport {
   // Resource utilization values. Each value is expressed as a fraction of total resources
   // available, derived from the latest sample or measurement.
   map<string, double> utilization = 5
-      [(validate.rules).map.values.double.gte = 0, (validate.rules).map.values.double.lte = 1];
+      [(buf.validate.field).map.values.double.gte = 0, (buf.validate.field).map.values.double.lte = 1];
 
   // Total RPS being served by an endpoint. This should cover all services that an endpoint is
   // responsible for.
-  double rps_fractional = 6 [(validate.rules).double.gte = 0];
+  double rps_fractional = 6 [(buf.validate.field).double.gte = 0];
 
   // Total EPS (errors/second) being served by an endpoint. This should cover
   // all services that an endpoint is responsible for.
-  double eps = 7 [(validate.rules).double.gte = 0];
+  double eps = 7 [(buf.validate.field).double.gte = 0];
 
   // Application specific opaque metrics.
   map<string, double> named_metrics = 8;
@@ -54,5 +54,5 @@ message OrcaLoadReport {
   // This should be derived from the latest sample or measurement.
   // The value may be larger than 1.0 when the usage exceeds the reporter
   // dependent notion of soft limits.
-  double application_utilization = 9 [(validate.rules).double.gte = 0];
+  double application_utilization = 9 [(buf.validate.field).double.gte = 0];
 }

xds/type/matcher/v3/cel.proto

@@ -3,7 +3,7 @@ syntax = "proto3";
 package xds.type.matcher.v3;
 
 import "xds/type/v3/cel.proto";
-import "validate/validate.proto";
+import "buf/validate/validate.proto";
 
 option java_package = "com.github.xds.type.matcher.v3";
 option java_outer_classname = "CelProto";
@@ -29,7 +29,7 @@ option go_package = "github.com/cncf/xds/go/xds/type/matcher/v3";
 // [#comment: envoy.matching.matchers.cel_matcher]
 message CelMatcher {
   // Either parsed or checked representation of the CEL program.
-  type.v3.CelExpression expr_match = 1 [(validate.rules).message = {required: true}];
+  type.v3.CelExpression expr_match = 1 [(buf.validate.field).required = true];
 
   // Free-form description of the CEL AST, e.g. the original expression text, to be
   // used for debugging assistance.