Skip to content

Commit 69ac24e

Browse files
rodainerodaine
authored
Revert "Revert protovalidate-testing changes" (#256)
Reverts #254
1 parent 4b5f873 commit 69ac24e

31 files changed

+16700
-6301
lines changed

‎proto/protovalidate-testing/buf.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ deps:
44
- remote: buf.build
55
owner: bufbuild
66
repository: protovalidate
7-
commit: b983156c5e994cc9892e0ce3e64e17e0
8-
digest: shake256:fb47a62989d38c2529bcc5cd86ded43d800eb84cee82b42b9e8a9e815d4ee8134a0fb9d0ce8299b27c2d2bbb7d6ade0c4ad5a8a4d467e1e2c7ca619ae9f634e2
7+
commit: 5a7b106cbb87462d9a8c9ffecdbd2e38
8+
digest: shake256:2f7efa5a904668219f039d4f6eeb51e871f8f7f5966055a10663cba335bd65f76cac84da3fa758ab7b5dcb489ec599521390ce3951d119fb56df1fc2def16bb0

‎proto/protovalidate-testing/buf/validate/conformance/cases/bool.proto

+3
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ message BoolConstTrue {
2727
message BoolConstFalse {
2828
bool val = 1 [(buf.validate.field).bool.const = false];
2929
}
30+
message BoolExample {
31+
bool val = 1 [(buf.validate.field).bool.example = true];
32+
}

‎proto/protovalidate-testing/buf/validate/conformance/cases/bytes.proto

+12
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,27 @@ message BytesSuffix {
7676
message BytesIP {
7777
bytes val = 1 [(buf.validate.field).bytes.ip = true];
7878
}
79+
message BytesNotIP {
80+
bytes val = 1 [(buf.validate.field).bytes.ip = false];
81+
}
7982
message BytesIPv4 {
8083
bytes val = 1 [(buf.validate.field).bytes.ipv4 = true];
8184
}
85+
message BytesNotIPv4 {
86+
bytes val = 1 [(buf.validate.field).bytes.ipv4 = false];
87+
}
8288
message BytesIPv6 {
8389
bytes val = 1 [(buf.validate.field).bytes.ipv6 = true];
8490
}
91+
message BytesNotIPv6 {
92+
bytes val = 1 [(buf.validate.field).bytes.ipv6 = false];
93+
}
8594
message BytesIPv6Ignore {
8695
bytes val = 1 [
8796
(buf.validate.field).bytes.ipv6 = true,
8897
(buf.validate.field).ignore_empty = true
8998
];
9099
}
100+
message BytesExample {
101+
bytes val = 1 [(buf.validate.field).bytes.example = "\x99"];
102+
}

‎proto/protovalidate-testing/buf/validate/conformance/cases/enums.proto

+4
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,7 @@ message EnumInsideOneof {
121121
}];
122122
}
123123
}
124+
125+
message EnumExample {
126+
TestEnum val = 1 [(buf.validate.field).enum.example = 2];
127+
}

‎proto/protovalidate-testing/buf/validate/conformance/cases/numbers.proto

+54
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ message FloatExGTELTE {
7676
message FloatFinite {
7777
float val = 1 [(buf.validate.field).float.finite = true];
7878
}
79+
message FloatNotFinite {
80+
float val = 1 [(buf.validate.field).float.finite = false];
81+
}
7982
message FloatIgnore {
8083
float val = 1 [
8184
(buf.validate.field).float = {
@@ -90,6 +93,10 @@ message FloatIncorrectType {
9093
float val = 1 [(buf.validate.field).double.gt = 0];
9194
}
9295

96+
message FloatExample {
97+
float val = 1 [(buf.validate.field).float.example = 8];
98+
}
99+
93100
message DoubleNone {
94101
double val = 1;
95102
}
@@ -148,6 +155,9 @@ message DoubleExGTELTE {
148155
message DoubleFinite {
149156
double val = 1 [(buf.validate.field).double.finite = true];
150157
}
158+
message DoubleNotFinite {
159+
double val = 1 [(buf.validate.field).double.finite = false];
160+
}
151161
message DoubleIgnore {
152162
double val = 1 [
153163
(buf.validate.field).double = {
@@ -162,6 +172,10 @@ message DoubleIncorrectType {
162172
double val = 1 [(buf.validate.field).float.gt = 0];
163173
}
164174

175+
message DoubleExample {
176+
double val = 1 [(buf.validate.field).double.example = 0];
177+
}
178+
165179
message Int32None {
166180
int32 val = 1;
167181
}
@@ -231,6 +245,10 @@ message Int32IncorrectType {
231245
int32 val = 1 [(buf.validate.field).float.gt = 0];
232246
}
233247

248+
message Int32Example {
249+
int32 val = 1 [(buf.validate.field).int32.example = 10];
250+
}
251+
234252
message Int64None {
235253
int64 val = 1;
236254
}
@@ -325,6 +343,10 @@ message Int64IncorrectType {
325343
int64 val = 1 [(buf.validate.field).float.gt = 0];
326344
}
327345

346+
message Int64Example {
347+
int64 val = 1 [(buf.validate.field).int64.example = 10];
348+
}
349+
328350
message UInt32None {
329351
uint32 val = 1;
330352
}
@@ -394,6 +416,10 @@ message UInt32IncorrectType {
394416
uint32 val = 1 [(buf.validate.field).float.gt = 0];
395417
}
396418

419+
message UInt32Example {
420+
uint32 val = 1 [(buf.validate.field).uint32.example = 0];
421+
}
422+
397423
message UInt64None {
398424
uint64 val = 1;
399425
}
@@ -463,6 +489,10 @@ message UInt64IncorrectType {
463489
uint64 val = 1 [(buf.validate.field).float.gt = 0];
464490
}
465491

492+
message UInt64Example {
493+
uint64 val = 1 [(buf.validate.field).uint64.example = 0];
494+
}
495+
466496
message SInt32None {
467497
sint32 val = 1;
468498
}
@@ -532,6 +562,10 @@ message SInt32IncorrectType {
532562
sint32 val = 1 [(buf.validate.field).float.gt = 0];
533563
}
534564

565+
message SInt32Example {
566+
sint32 val = 1 [(buf.validate.field).sint32.example = 0];
567+
}
568+
535569
message SInt64None {
536570
sint64 val = 1;
537571
}
@@ -600,6 +634,10 @@ message SInt64IncorrectType {
600634
sint64 val = 1 [(buf.validate.field).float.gt = 0];
601635
}
602636

637+
message SInt64Example {
638+
sint64 val = 1 [(buf.validate.field).sint64.example = 0];
639+
}
640+
603641
message Fixed32None {
604642
fixed32 val = 1;
605643
}
@@ -669,6 +707,10 @@ message Fixed32IncorrectType {
669707
fixed32 val = 1 [(buf.validate.field).float.gt = 0];
670708
}
671709

710+
message Fixed32Example {
711+
fixed32 val = 1 [(buf.validate.field).fixed32.example = 0];
712+
}
713+
672714
message Fixed64None {
673715
fixed64 val = 1;
674716
}
@@ -738,6 +780,10 @@ message Fixed64IncorrectType {
738780
fixed64 val = 1 [(buf.validate.field).float.gt = 0];
739781
}
740782

783+
message Fixed64Example {
784+
fixed64 val = 1 [(buf.validate.field).fixed64.example = 0];
785+
}
786+
741787
message SFixed32None {
742788
sfixed32 val = 1;
743789
}
@@ -807,6 +853,10 @@ message SFixed32IncorrectType {
807853
sfixed32 val = 1 [(buf.validate.field).float.gt = 0];
808854
}
809855

856+
message SFixed32Example {
857+
sfixed32 val = 1 [(buf.validate.field).sfixed32.example = 0];
858+
}
859+
810860
message SFixed64None {
811861
sfixed64 val = 1;
812862
}
@@ -876,6 +926,10 @@ message SFixed64IncorrectType {
876926
sfixed64 val = 1 [(buf.validate.field).float.gt = 0];
877927
}
878928

929+
message SFixed64Example {
930+
sfixed64 val = 1 [(buf.validate.field).sfixed64.example = 0];
931+
}
932+
879933
message Int64LTEOptional {
880934
optional int64 val = 1 [(buf.validate.field).int64.lte = 64];
881935
}

‎proto/protovalidate-testing/buf/validate/conformance/cases/repeated.proto

+3
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ message RepeatedExact {
6060
message RepeatedUnique {
6161
repeated string val = 1 [(buf.validate.field).repeated.unique = true];
6262
}
63+
message RepeatedNotUnique {
64+
repeated string val = 1 [(buf.validate.field).repeated.unique = false];
65+
}
6366
message RepeatedMultipleUnique {
6467
repeated string a = 1 [(buf.validate.field).repeated.unique = true];
6568
repeated int32 b = 2 [(buf.validate.field).repeated.unique = true];

‎proto/protovalidate-testing/buf/validate/conformance/cases/strings.proto

+52
Original file line numberDiff line numberDiff line change
@@ -103,51 +103,99 @@ message StringSuffix {
103103
message StringEmail {
104104
string val = 1 [(buf.validate.field).string.email = true];
105105
}
106+
message StringNotEmail {
107+
string val = 1 [(buf.validate.field).string.email = false];
108+
}
106109
message StringAddress {
107110
string val = 1 [(buf.validate.field).string.address = true];
108111
}
112+
message StringNotAddress {
113+
string val = 1 [(buf.validate.field).string.address = false];
114+
}
109115
message StringHostname {
110116
string val = 1 [(buf.validate.field).string.hostname = true];
111117
}
118+
message StringNotHostname {
119+
string val = 1 [(buf.validate.field).string.hostname = false];
120+
}
112121
message StringIP {
113122
string val = 1 [(buf.validate.field).string.ip = true];
114123
}
124+
message StringNotIP {
125+
string val = 1 [(buf.validate.field).string.ip = false];
126+
}
115127
message StringIPv4 {
116128
string val = 1 [(buf.validate.field).string.ipv4 = true];
117129
}
130+
message StringNotIPv4 {
131+
string val = 1 [(buf.validate.field).string.ipv4 = false];
132+
}
118133
message StringIPv6 {
119134
string val = 1 [(buf.validate.field).string.ipv6 = true];
120135
}
136+
message StringNotIPv6 {
137+
string val = 1 [(buf.validate.field).string.ipv6 = false];
138+
}
121139
message StringIPWithPrefixLen {
122140
string val = 1 [(buf.validate.field).string.ip_with_prefixlen = true];
123141
}
142+
message StringNotIPWithPrefixLen {
143+
string val = 1 [(buf.validate.field).string.ip_with_prefixlen = false];
144+
}
124145
message StringIPv4WithPrefixLen {
125146
string val = 1 [(buf.validate.field).string.ipv4_with_prefixlen = true];
126147
}
148+
message StringNotIPv4WithPrefixLen {
149+
string val = 1 [(buf.validate.field).string.ipv4_with_prefixlen = false];
150+
}
127151
message StringIPv6WithPrefixLen {
128152
string val = 1 [(buf.validate.field).string.ipv6_with_prefixlen = true];
129153
}
154+
message StringNotIPv6WithPrefixLen {
155+
string val = 1 [(buf.validate.field).string.ipv6_with_prefixlen = false];
156+
}
130157
message StringIPPrefix {
131158
string val = 1 [(buf.validate.field).string.ip_prefix = true];
132159
}
160+
message StringNotIPPrefix {
161+
string val = 1 [(buf.validate.field).string.ip_prefix = false];
162+
}
133163
message StringIPv4Prefix {
134164
string val = 1 [(buf.validate.field).string.ipv4_prefix = true];
135165
}
166+
message StringNotIPv4Prefix {
167+
string val = 1 [(buf.validate.field).string.ipv4_prefix = false];
168+
}
136169
message StringIPv6Prefix {
137170
string val = 1 [(buf.validate.field).string.ipv6_prefix = true];
138171
}
172+
message StringNotIPv6Prefix {
173+
string val = 1 [(buf.validate.field).string.ipv6_prefix = false];
174+
}
139175
message StringURI {
140176
string val = 1 [(buf.validate.field).string.uri = true];
141177
}
178+
message StringNotURI {
179+
string val = 1 [(buf.validate.field).string.uri = false];
180+
}
142181
message StringURIRef {
143182
string val = 1 [(buf.validate.field).string.uri_ref = true];
144183
}
184+
message StringNotURIRef {
185+
string val = 1 [(buf.validate.field).string.uri_ref = false];
186+
}
145187
message StringUUID {
146188
string val = 1 [(buf.validate.field).string.uuid = true];
147189
}
190+
message StringNotUUID {
191+
string val = 1 [(buf.validate.field).string.uuid = false];
192+
}
148193
message StringTUUID {
149194
string val = 1 [(buf.validate.field).string.tuuid = true];
150195
}
196+
message StringNotTUUID {
197+
string val = 1 [(buf.validate.field).string.tuuid = false];
198+
}
151199
message StringHttpHeaderName {
152200
string val = 1 [(buf.validate.field).string.well_known_regex = KNOWN_REGEX_HTTP_HEADER_NAME];
153201
}
@@ -195,3 +243,7 @@ message StringHostAndOptionalPort {
195243
expression: "this.isHostAndPort(false)"
196244
}];
197245
}
246+
247+
message StringExample {
248+
string val = 1 [(buf.validate.field).string.example = "foo"];
249+
}

‎proto/protovalidate-testing/buf/validate/conformance/cases/wkt_duration.proto

+5-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ message DurationIn {
4141
message DurationNotIn {
4242
google.protobuf.Duration val = 1 [(buf.validate.field).duration = {
4343
not_in: [
44-
{}
45-
]
44+
{}]
4645
}];
4746
}
4847

@@ -89,3 +88,7 @@ message DurationFieldWithOtherFields {
8988
google.protobuf.Duration duration_val = 1 [(buf.validate.field).duration.lte = {seconds: 1}];
9089
int32 int_val = 2 [(buf.validate.field).int32.gt = 16];
9190
}
91+
92+
message DurationExample {
93+
google.protobuf.Duration val = 1 [(buf.validate.field).duration.example = {seconds: 3}];
94+
}

‎proto/protovalidate-testing/buf/validate/conformance/cases/wkt_timestamp.proto

+10
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,15 @@ message TimestampExGTELTE {
6969
message TimestampLTNow {
7070
google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.lt_now = true];
7171
}
72+
message TimestampNotLTNow {
73+
google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.lt_now = false];
74+
}
7275
message TimestampGTNow {
7376
google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.gt_now = true];
7477
}
78+
message TimestampNotGTNow {
79+
google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.gt_now = false];
80+
}
7581

7682
message TimestampWithin {
7783
google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.within.seconds = 3600];
@@ -89,3 +95,7 @@ message TimestampGTNowWithin {
8995
within: {seconds: 3600}
9096
}];
9197
}
98+
99+
message TimestampExample {
100+
google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.example = {seconds: 3}];
101+
}

‎proto/protovalidate-testing/buf/validate/conformance/harness/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ proto_library(
2424
strip_import_prefix = "/proto/protovalidate-testing",
2525
visibility = ["//visibility:public"],
2626
deps = [
27-
"@buf_deps_proto_protovalidate-testing//buf/validate:validate_proto",
27+
"//proto/protovalidate/buf/validate:validate_proto",
2828
"@com_google_protobuf//:any_proto",
2929
"@com_google_protobuf//:descriptor_proto",
3030
],

‎proto/protovalidate-testing/buf/validate/conformance/harness/harness.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ syntax = "proto3";
1616

1717
package buf.validate.conformance.harness;
1818

19-
import "buf/validate/expression.proto";
19+
import "buf/validate/validate.proto";
2020
import "google/protobuf/any.proto";
2121
import "google/protobuf/descriptor.proto";
2222

0 commit comments

Comments
 (0)