Skip to content

Commit

Permalink
Add more conformance tests for predefined rules
Browse files Browse the repository at this point in the history
  • Loading branch information
@jchadwick-buf
jchadwick-buf committed Oct 1, 2024
1 parent 69ac24e commit e41b4a0
Show file tree
Hide file tree
Showing 9 changed files with 4,057 additions and 1,691 deletions.
71 changes: 54 additions & 17 deletions proto/protovalidate-testing/buf/validate/conformance/cases/predefined_rules_proto2.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package buf.validate.conformance.cases;
import "buf/validate/validate.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";

extend buf.validate.FloatRules {
optional float float_abs_range_proto2 = 1161 [(buf.validate.predefined).cel = {
Expand All @@ -37,18 +38,18 @@ extend buf.validate.DoubleRules {
}

extend buf.validate.Int32Rules {
optional bool int32_even_proto2 = 1161 [(buf.validate.predefined).cel = {
id: "int32.even.proto2"
expression: "this % 2 == 0"
message: "int32 value is not even"
repeated int32 int32_abs_in_proto2 = 1161 [(buf.validate.predefined).cel = {
id: "int32.abs_in.proto2"
expression: "this in rule || this in rule.map(n, -n)"
message: "value must be in absolute value of list"
}];
}

extend buf.validate.Int64Rules {
optional bool int64_even_proto2 = 1161 [(buf.validate.predefined).cel = {
id: "int64.even.proto2"
expression: "this % 2 == 0"
message: "int64 value is not even"
repeated google.protobuf.Int64Value int64_abs_in_proto2 = 1161 [(buf.validate.predefined).cel = {
id: "int64.abs_in.proto2"
expression: "this in rule || this in rule.map(n, -n)"
message: "value must be in absolute value of list"
}];
}

Expand Down Expand Up @@ -179,11 +180,11 @@ message PredefinedDoubleRuleProto2 {
}

message PredefinedInt32RuleProto2 {
optional int32 val = 1 [(buf.validate.field).int32.(int32_even_proto2) = true];
optional int32 val = 1 [(buf.validate.field).int32.(int32_abs_in_proto2) = -2];
}

message PredefinedInt64RuleProto2 {
optional int64 val = 1 [(buf.validate.field).int64.(int64_even_proto2) = true];
optional int64 val = 1 [(buf.validate.field).int64.(int64_abs_in_proto2) = {value: -2}];
}

message PredefinedUInt32RuleProto2 {
Expand Down Expand Up @@ -250,13 +251,49 @@ message PredefinedTimestampRuleProto2 {
optional google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.(timestamp_in_range_proto2) = true];
}

message PredefinedWrappedFloatRuleProto2 {
optional google.protobuf.FloatValue val = 1 [(buf.validate.field).float.(float_abs_range_proto2) = 1.0];
}

message PredefinedWrappedDoubleRuleProto2 {
optional google.protobuf.DoubleValue val = 1 [(buf.validate.field).double.(double_abs_range_proto2) = 1.0];
}

message PredefinedWrappedInt32RuleProto2 {
optional google.protobuf.Int32Value val = 1 [(buf.validate.field).int32.(int32_abs_in_proto2) = -2];
}

message PredefinedWrappedInt64RuleProto2 {
optional google.protobuf.Int64Value val = 1 [(buf.validate.field).int64.(int64_abs_in_proto2) = {value: -2}];
}

message PredefinedWrappedUInt32RuleProto2 {
optional google.protobuf.UInt32Value val = 1 [(buf.validate.field).uint32.(uint32_even_proto2) = true];
}

message PredefinedWrappedUInt64RuleProto2 {
optional google.protobuf.UInt64Value val = 1 [(buf.validate.field).uint64.(uint64_even_proto2) = true];
}

message PredefinedWrappedBoolRuleProto2 {
optional google.protobuf.BoolValue val = 1 [(buf.validate.field).bool.(bool_false_proto2) = true];
}

message PredefinedWrappedStringRuleProto2 {
optional google.protobuf.StringValue val = 1 [(buf.validate.field).string.(string_valid_path_proto2) = true];
}

message PredefinedWrappedBytesRuleProto2 {
optional google.protobuf.BytesValue val = 1 [(buf.validate.field).bytes.(bytes_valid_path_proto2) = true];
}

message PredefinedAndCustomRuleProto2 {
optional int32 a = 1 [
optional sint32 a = 1 [
(field).cel = {
id: "predefined_and_custom_rule_scalar_proto2"
expression: "this > 24 ? '' : 'a must be greater than 24'"
},
(field).int32.(int32_even_proto2) = true
(field).sint32.(sint32_even_proto2) = true
];

optional Nested b = 2 [(field).cel = {
Expand All @@ -266,20 +303,20 @@ message PredefinedAndCustomRuleProto2 {
}];

message Nested {
optional int32 c = 1 [
optional sint32 c = 1 [
(field).cel = {
id: "predefined_and_custom_rule_nested_proto2"
expression: "this > 0 ? '' : 'c must be positive'"
},
(field).int32.(int32_even_proto2) = true
(field).sint32.(sint32_even_proto2) = true
];
}
}

message StandardPredefinedAndCustomRuleProto2 {
optional int32 a = 1 [
(field).int32.lt = 28,
(field).int32.(int32_even_proto2) = true,
optional sint32 a = 1 [
(field).sint32.lt = 28,
(field).sint32.(sint32_even_proto2) = true,
(field).cel = {
id: "standard_predefined_and_custom_rule_scalar_proto2"
expression: "this > 24 ? '' : 'a must be greater than 24'"
Expand Down
55 changes: 46 additions & 9 deletions proto/protovalidate-testing/buf/validate/conformance/cases/predefined_rules_proto3.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import "buf/validate/conformance/cases/predefined_rules_proto_editions.proto";
import "buf/validate/validate.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";

message PredefinedFloatRuleProto3 {
float val = 1 [(buf.validate.field).float.(float_abs_range_proto2) = 1.0];
Expand All @@ -31,11 +32,11 @@ message PredefinedDoubleRuleProto3 {
}

message PredefinedInt32RuleProto3 {
int32 val = 1 [(buf.validate.field).int32.(int32_even_proto2) = true];
int32 val = 1 [(buf.validate.field).int32.(int32_abs_in_proto2) = -2];
}

message PredefinedInt64RuleProto3 {
int64 val = 1 [(buf.validate.field).int64.(int64_even_proto2) = true];
int64 val = 1 [(buf.validate.field).int64.(int64_abs_in_edition_2023) = {value: -2}];
}

message PredefinedUInt32RuleProto3 {
Expand Down Expand Up @@ -106,13 +107,49 @@ message PredefinedTimestampRuleProto3 {
google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.(timestamp_in_range_proto2) = true];
}

message PredefinedWrappedFloatRuleProto3 {
google.protobuf.FloatValue val = 1 [(buf.validate.field).float.(float_abs_range_proto2) = 1.0];
}

message PredefinedWrappedDoubleRuleProto3 {
google.protobuf.DoubleValue val = 1 [(buf.validate.field).double.(double_abs_range_proto2) = 1.0];
}

message PredefinedWrappedInt32RuleProto3 {
google.protobuf.Int32Value val = 1 [(buf.validate.field).int32.(int32_abs_in_proto2) = -2];
}

message PredefinedWrappedInt64RuleProto3 {
google.protobuf.Int64Value val = 1 [(buf.validate.field).int64.(int64_abs_in_proto2) = {value: -2}];
}

message PredefinedWrappedUInt32RuleProto3 {
google.protobuf.UInt32Value val = 1 [(buf.validate.field).uint32.(uint32_even_proto2) = true];
}

message PredefinedWrappedUInt64RuleProto3 {
google.protobuf.UInt64Value val = 1 [(buf.validate.field).uint64.(uint64_even_proto2) = true];
}

message PredefinedWrappedBoolRuleProto3 {
google.protobuf.BoolValue val = 1 [(buf.validate.field).bool.(bool_false_proto2) = true];
}

message PredefinedWrappedStringRuleProto3 {
google.protobuf.StringValue val = 1 [(buf.validate.field).string.(string_valid_path_proto2) = true];
}

message PredefinedWrappedBytesRuleProto3 {
google.protobuf.BytesValue val = 1 [(buf.validate.field).bytes.(bytes_valid_path_proto2) = true];
}

message PredefinedAndCustomRuleProto3 {
int32 a = 1 [
sint32 a = 1 [
(field).cel = {
id: "predefined_and_custom_rule_scalar_proto3"
expression: "this > 24 ? '' : 'a must be greater than 24'"
},
(field).int32.(int32_even_edition_2023) = true
(field).sint32.(sint32_even_edition_2023) = true
];

optional Nested b = 2 [(field).cel = {
Expand All @@ -122,20 +159,20 @@ message PredefinedAndCustomRuleProto3 {
}];

message Nested {
int32 c = 1 [
sint32 c = 1 [
(field).cel = {
id: "predefined_and_custom_rule_nested_proto3"
expression: "this > 0 ? '' : 'c must be positive'"
},
(field).int32.(int32_even_edition_2023) = true
(field).sint32.(sint32_even_edition_2023) = true
];
}
}

message StandardPredefinedAndCustomRuleProto3 {
int32 a = 1 [
(field).int32.lt = 28,
(field).int32.(int32_even_proto2) = true,
sint32 a = 1 [
(field).sint32.lt = 28,
(field).sint32.(sint32_even_proto2) = true,
(field).cel = {
id: "standard_predefined_and_custom_rule_scalar_proto3"
expression: "this > 24 ? '' : 'a must be greater than 24'"
Expand Down
71 changes: 54 additions & 17 deletions ...rotovalidate-testing/buf/validate/conformance/cases/predefined_rules_proto_editions.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package buf.validate.conformance.cases;
import "buf/validate/validate.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";

extend buf.validate.FloatRules {
float float_abs_range_edition_2023 = 1162 [(buf.validate.predefined).cel = {
Expand All @@ -37,18 +38,18 @@ extend buf.validate.DoubleRules {
}

extend buf.validate.Int32Rules {
bool int32_even_edition_2023 = 1162 [(buf.validate.predefined).cel = {
id: "int32.even.edition_2023"
expression: "this % 2 == 0"
message: "int32 value is not even"
repeated int32 int32_abs_in_edition_2023 = 1162 [(buf.validate.predefined).cel = {
id: "int32.abs_in.edition_2023"
expression: "this in rule || this in rule.map(n, -n)"
message: "value must be in absolute value of list"
}];
}

extend buf.validate.Int64Rules {
bool int64_even_edition_2023 = 1162 [(buf.validate.predefined).cel = {
id: "int64.even.edition_2023"
expression: "this % 2 == 0"
message: "int64 value is not even"
repeated google.protobuf.Int64Value int64_abs_in_edition_2023 = 1162 [(buf.validate.predefined).cel = {
id: "int64.abs_in.edition_2023"
expression: "this in rule || this in rule.map(n, -n)"
message: "value must be in absolute value of list"
}];
}

Expand Down Expand Up @@ -187,11 +188,11 @@ message PredefinedDoubleRuleEdition2023 {
}

message PredefinedInt32RuleEdition2023 {
int32 val = 1 [(buf.validate.field).int32.(int32_even_edition_2023) = true];
int32 val = 1 [(buf.validate.field).int32.(int32_abs_in_edition_2023) = -2];
}

message PredefinedInt64RuleEdition2023 {
int64 val = 1 [(buf.validate.field).int64.(int64_even_edition_2023) = true];
int64 val = 1 [(buf.validate.field).int64.(int64_abs_in_edition_2023) = {value: -2}];
}

message PredefinedUInt32RuleEdition2023 {
Expand Down Expand Up @@ -262,13 +263,49 @@ message PredefinedTimestampRuleEdition2023 {
google.protobuf.Timestamp val = 1 [(buf.validate.field).timestamp.(timestamp_in_range_edition_2023) = true];
}

message PredefinedWrappedFloatRuleEdition2023 {
google.protobuf.FloatValue val = 1 [(buf.validate.field).float.(float_abs_range_edition_2023) = 1.0];
}

message PredefinedWrappedDoubleRuleEdition2023 {
google.protobuf.DoubleValue val = 1 [(buf.validate.field).double.(double_abs_range_edition_2023) = 1.0];
}

message PredefinedWrappedInt32RuleEdition2023 {
google.protobuf.Int32Value val = 1 [(buf.validate.field).int32.(int32_abs_in_edition_2023) = -2];
}

message PredefinedWrappedInt64RuleEdition2023 {
google.protobuf.Int64Value val = 1 [(buf.validate.field).int64.(int64_abs_in_edition_2023) = {value: -2}];
}

message PredefinedWrappedUInt32RuleEdition2023 {
google.protobuf.UInt32Value val = 1 [(buf.validate.field).uint32.(uint32_even_edition_2023) = true];
}

message PredefinedWrappedUInt64RuleEdition2023 {
google.protobuf.UInt64Value val = 1 [(buf.validate.field).uint64.(uint64_even_edition_2023) = true];
}

message PredefinedWrappedBoolRuleEdition2023 {
google.protobuf.BoolValue val = 1 [(buf.validate.field).bool.(bool_false_edition_2023) = true];
}

message PredefinedWrappedStringRuleEdition2023 {
google.protobuf.StringValue val = 1 [(buf.validate.field).string.(string_valid_path_edition_2023) = true];
}

message PredefinedWrappedBytesRuleEdition2023 {
google.protobuf.BytesValue val = 1 [(buf.validate.field).bytes.(bytes_valid_path_edition_2023) = true];
}

message PredefinedAndCustomRuleEdition2023 {
int32 a = 1 [
sint32 a = 1 [
(field).cel = {
id: "predefined_and_custom_rule_scalar_edition_2023"
expression: "this > 24 ? '' : 'a must be greater than 24'"
},
(field).int32.(int32_even_edition_2023) = true
(field).sint32.(sint32_even_edition_2023) = true
];

Nested b = 2 [(field).cel = {
Expand All @@ -278,20 +315,20 @@ message PredefinedAndCustomRuleEdition2023 {
}];

message Nested {
int32 c = 1 [
sint32 c = 1 [
(field).cel = {
id: "predefined_and_custom_rule_nested_edition_2023"
expression: "this > 0 ? '' : 'c must be positive'"
},
(field).int32.(int32_even_edition_2023) = true
(field).sint32.(sint32_even_edition_2023) = true
];
}
}

message StandardPredefinedAndCustomRuleEdition2023 {
int32 a = 1 [
(field).int32.lt = 28,
(field).int32.(int32_even_edition_2023) = true,
sint32 a = 1 [
(field).sint32.lt = 28,
(field).sint32.(sint32_even_edition_2023) = true,
(field).cel = {
id: "standard_predefined_and_custom_rule_scalar_edition_2023"
expression: "this > 24 ? '' : 'a must be greater than 24'"
Expand Down
Loading

0 comments on commit e41b4a0

Please sign in to comment.