Migrate proto validation from protoc-gen-validate to protovalidate

Signed-off-by: Matthieu MOREL <[email protected]>

Author: mmorel-35

api/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.proto

@@ -87,7 +87,7 @@ message Config {
 
 message RouterPlugin {
   oneof override {
-    option (validate.required) = true;
+    option (buf.validate.oneof).required = true;
 
     // [#not-implemented-hide:]
     // Disable the filter for this particular vhost or route.

api/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.proto

@@ -51,18 +51,18 @@ message SXG {
   // Header that will be set if it is determined that the client can accept SXG (typically ``accept: application/signed-exchange;v=b3``)
   // If not set, filter will default to: ``x-client-can-accept-sxg``
   string client_can_accept_sxg_header = 7 [
-    (buf.validate.field).string = {well_known_regex: HTTP_HEADER_NAME strict: false ignore_empty: true}
+    (buf.validate.field).string = {well_known_regex: KNOWN_REGEX_HTTP_HEADER_NAME strict: false}
   ];
 
   // Header set by downstream service to signal that the response should be transformed to SXG If not set,
   // filter will default to: ``x-should-encode-sxg``
   string should_encode_sxg_header = 8 [
-    (buf.validate.field).string = {well_known_regex: HTTP_HEADER_NAME strict: false ignore_empty: true}
+    (buf.validate.field).string = {well_known_regex: KNOWN_REGEX_HTTP_HEADER_NAME strict: false}
   ];
 
   // Headers that will be stripped from the SXG document, by listing a prefix (i.e. ``x-custom-`` will cause
   // all headers prefixed by ``x-custom-`` to be omitted from the SXG document)
   repeated string header_prefix_filters = 9 [
-    (buf.validate.field).repeated = {items {string {well_known_regex: HTTP_HEADER_NAME strict: false}}}
+    (buf.validate.field).repeated = {items {string {well_known_regex: KNOWN_REGEX_HTTP_HEADER_NAME strict: false}}}
   ];
 }

api/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.proto

@@ -31,7 +31,7 @@ message ClientSSLAuth {
   // of principals. The service must support the expected :ref:`REST API
   // <config_network_filters_client_ssl_auth_rest_api>`.
   string auth_api_cluster = 1
-      [(buf.validate.field).string = {min_len: 1 well_known_regex: HTTP_HEADER_VALUE strict: false}];
+      [(buf.validate.field).string = {min_len: 1 well_known_regex: KNOWN_REGEX_HTTP_HEADER_VALUE strict: false}];
 
   // The prefix to use when emitting :ref:`statistics
   // <config_network_filters_client_ssl_auth_stats>`.

api/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/route.proto

@@ -32,7 +32,7 @@ message Route {
 
 message RouteMatch {
   oneof match_specifier {
-    option (validate.required) = true;
+    option (buf.validate.oneof).required = true;
 
     // The domain from Request URI or Route Header.
     string domain = 1;
@@ -47,7 +47,7 @@ message RouteMatch {
 
 message RouteAction {
   oneof cluster_specifier {
-    option (validate.required) = true;
+    option (buf.validate.oneof).required = true;
 
     // Indicates a single upstream cluster to which the request should be routed
     // to.

api/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.proto

@@ -38,8 +38,8 @@ message CryptoMbPrivateKeyMethodConfig {
   // already in the queue are processed, even if the queue is not full.
   // In effect, this value controls the balance between latency and
   // throughput. The duration needs to be set to a value greater than or equal to 1 millisecond.
-  google.protobuf.Duration poll_delay = 2 [(buf.validate.field).duration = {
-    required: true
-    gte {nanos: 1000000}
-  }];
+  google.protobuf.Duration poll_delay = 2 [
+    (buf.validate.field).required = true,
+    (buf.validate.field).duration = {gte {nanos: 1000000}}
+  ];
 }

api/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.proto

@@ -33,8 +33,8 @@ message QatPrivateKeyMethodConfig {
   // quicker answers from the hardware but causes more polling loop
   // spins, leading to potentially larger CPU usage. The duration needs
   // to be set to a value greater than or equal to 1 millisecond.
-  google.protobuf.Duration poll_delay = 2 [(buf.validate.field).duration = {
-    required: true
-    gte {nanos: 1000000}
-  }];
+  google.protobuf.Duration poll_delay = 2 [
+    (buf.validate.field).required = true,
+    (buf.validate.field).duration = {gte {nanos: 1000000}}
+  ];
 }

api/envoy/api/v2/cluster.proto

@@ -461,10 +461,10 @@ message Cluster {
     // Specifies the base interval between refreshes. This parameter is required and must be greater
     // than zero and less than
     // :ref:`max_interval <envoy_api_field_Cluster.RefreshRate.max_interval>`.
-    google.protobuf.Duration base_interval = 1 [(buf.validate.field).duration = {
-      required: true
-      gt {nanos: 1000000}
-    }];
+    google.protobuf.Duration base_interval = 1 [
+      (buf.validate.field).required = true,
+      (buf.validate.field).duration = {gt {nanos: 1000000}}
+    ];
 
     // Specifies the maximum interval between refreshes. This parameter is optional, but must be
     // greater than or equal to the

api/envoy/api/v2/core/address.proto

@@ -53,7 +53,7 @@ message SocketAddress {
   string address = 2 [(buf.validate.field).string = {min_bytes: 1}];
 
   oneof port_specifier {
-    option (validate.required) = true;
+    option (buf.validate.oneof).required = true;
 
     uint32 port_value = 3 [(buf.validate.field).uint32 = {lte: 65535}];
 
@@ -116,7 +116,7 @@ message BindConfig {
 // management servers.
 message Address {
   oneof address {
-    option (validate.required) = true;
+    option (buf.validate.oneof).required = true;
 
     SocketAddress socket_address = 1;
 

api/envoy/api/v2/core/backoff.proto

@@ -22,10 +22,10 @@ message BackoffStrategy {
   // The base interval to be used for the next back off computation. It should
   // be greater than zero and less than or equal to :ref:`max_interval
   // <envoy_api_field_core.BackoffStrategy.max_interval>`.
-  google.protobuf.Duration base_interval = 1 [(buf.validate.field).duration = {
-    required: true
-    gte {nanos: 1000000}
-  }];
+  google.protobuf.Duration base_interval = 1 [
+    (buf.validate.field).required = true,
+    (buf.validate.field).duration = {gte {nanos: 1000000}}
+  ];
 
   // Specifies the maximum interval between retries. This parameter is optional,
   // but must be greater than or equal to the :ref:`base_interval

api/envoy/api/v2/core/base.proto

@@ -257,15 +257,15 @@ message HeaderValue {
   // Header name.
   string key = 1
       [(buf.validate.field).string =
-           {min_bytes: 1 max_bytes: 16384 well_known_regex: HTTP_HEADER_NAME strict: false}];
+           {min_bytes: 1 max_bytes: 16384 well_known_regex: KNOWN_REGEX_HTTP_HEADER_NAME strict: false}];
 
   // Header value.
   //
   // The same :ref:`format specifier <config_access_log_format>` as used for
   // :ref:`HTTP access logging <config_access_log>` applies here, however
   // unknown header values are replaced with the empty string instead of `-`.
   string value = 2 [
-    (buf.validate.field).string = {max_bytes: 16384 well_known_regex: HTTP_HEADER_VALUE strict: false}
+    (buf.validate.field).string = {max_bytes: 16384 well_known_regex: KNOWN_REGEX_HTTP_HEADER_VALUE strict: false}
   ];
 }
 
@@ -287,7 +287,7 @@ message HeaderMap {
 // Data source consisting of either a file or an inline value.
 message DataSource {
   oneof specifier {
-    option (validate.required) = true;
+    option (buf.validate.oneof).required = true;
 
     // Local filesystem data source.
     string filename = 1 [(buf.validate.field).string = {min_bytes: 1}];
@@ -327,7 +327,7 @@ message RemoteDataSource {
 // Async data source which support async data fetch.
 message AsyncDataSource {
   oneof specifier {
-    option (validate.required) = true;
+    option (buf.validate.oneof).required = true;
 
     // Local async data source.
     DataSource local = 1;