Skip to content

Remove support for deprecated options #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Feb 7, 2025
Merged

Remove support for deprecated options #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40140f9
Remove deprecated options
Jan 28, 2025
41294e3
Update protovalidate version to v0.10.0
Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COPYRIGHT_YEARS := 2023
LICENSE_IGNORE := -e internal/testdata/
LICENSE_HEADER_VERSION := 0294fdbe1ce8649ebaf5e87e8cdd588e33730bbb
# NOTE: Keep this version in sync with the version in `/bazel/deps.bzl`.
PROTOVALIDATE_VERSION ?= v0.9.0
PROTOVALIDATE_VERSION ?= v0.10.0

# Set to use a different compiler. For example, `GO=go1.18rc1 make test`.
GO ?= go
Expand Down
6 changes: 3 additions & 3 deletions bazel/deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ _dependencies = {
},
# NOTE: Keep Version in sync with `/Makefile`.
"com_github_bufbuild_protovalidate": {
"sha256": "fca6143d820e9575f3aec328918fa25acc8eeb6e706050127d3a36cfdede4610",
"strip_prefix": "protovalidate-0.9.0",
"sha256": "5879da3a72bcbd48e42f84b1eb0dfb45e3657fb68232b6b7c12c01bb937b659d",
"strip_prefix": "protovalidate-0.10.0",
"urls": [
"https://github.com/bufbuild/protovalidate/archive/v0.9.0.tar.gz",
"https://github.com/bufbuild/protovalidate/archive/v0.10.0.tar.gz",
],
},
}
Expand Down
1 change: 0 additions & 1 deletion buf/validate/internal/constraint_rules.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ struct ConstraintContext {
std::reverse(
violation.proto_.mutable_field()->mutable_elements()->begin(),
violation.proto_.mutable_field()->mutable_elements()->end());
*violation.proto_.mutable_field_path() = internal::fieldPathString(violation.proto().field());
}
if (violation.proto().has_rule()) {
std::reverse(
Expand Down
1 change: 0 additions & 1 deletion buf/validate/internal/constraints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ class FieldConstraintRules : public CelConstraintRules {
mapEntryField_(desc->containing_type()->options().map_entry()),
ignoreEmpty_(field.ignore() == IGNORE_IF_DEFAULT_VALUE ||
field.ignore() == IGNORE_IF_UNPOPULATED ||
field.ignore_empty() ||
(desc->has_presence() && !mapEntryField_)),
ignoreDefault_(field.ignore() == IGNORE_IF_DEFAULT_VALUE &&
(desc->has_presence() && !mapEntryField_)),
Expand Down
2 changes: 1 addition & 1 deletion buf/validate/internal/field_rules.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ absl::StatusOr<std::unique_ptr<FieldConstraintRules>> NewFieldRules(
google::api::expr::runtime::CelExpressionBuilder& builder,
const google::protobuf::FieldDescriptor* field,
const FieldConstraints& fieldLvl) {
if (fieldLvl.ignore() == IGNORE_ALWAYS || fieldLvl.skipped()) {
if (fieldLvl.ignore() == IGNORE_ALWAYS) {
return nullptr;
}
absl::StatusOr<std::unique_ptr<FieldConstraintRules>> rules_or;
Expand Down
10 changes: 3 additions & 7 deletions buf/validate/validator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,9 @@ absl::Status Validator::ValidateFields(
}
if (field->options().HasExtension(validate::field)) {
const auto& fieldExt = field->options().GetExtension(validate::field);
if (fieldExt.ignore() == IGNORE_ALWAYS || fieldExt.skipped() ||
(fieldExt.has_repeated() &&
(fieldExt.repeated().items().ignore() == IGNORE_ALWAYS ||
fieldExt.repeated().items().skipped())) ||
(fieldExt.has_map() &&
(fieldExt.map().values().ignore() == IGNORE_ALWAYS ||
fieldExt.map().values().skipped()))) {
if (fieldExt.ignore() == IGNORE_ALWAYS ||
(fieldExt.has_repeated() && (fieldExt.repeated().items().ignore() == IGNORE_ALWAYS)) ||
(fieldExt.has_map() && (fieldExt.map().values().ignore() == IGNORE_ALWAYS))) {
continue;
}
}
Expand Down
14 changes: 0 additions & 14 deletions buf/validate/validator_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ TEST(ValidatorTest, ValidateBool) {
auto violations_or = validator.Validate(bool_const_false);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
ASSERT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "bool.const");
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value must equal false");
}
Expand Down Expand Up @@ -141,7 +140,6 @@ TEST(ValidatorTest, ValidateRelativeURIFailure) {
auto violations_or = validator.Validate(str_uri);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.uri");
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value must be a valid URI");
EXPECT_THAT(
Expand Down Expand Up @@ -202,7 +200,6 @@ TEST(ValidatorTest, ValidateBadURIRefFailure) {
auto violations_or = validator.Validate(str_uri_ref);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.uri_ref");
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value must be a valid URI");
EXPECT_THAT(
Expand All @@ -225,7 +222,6 @@ TEST(ValidatorTest, ValidateStrRepeatedUniqueFailure) {
auto violations_or = validator.Validate(str_repeated);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "repeated.unique");
EXPECT_EQ(
violations_or.value().violations(0).proto().message(),
Expand All @@ -251,7 +247,6 @@ TEST(ValidatorTest, ValidateStringContainsFailure) {
auto violations_or = validator.Validate(str_contains);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.contains");
EXPECT_EQ(
violations_or.value().violations(0).proto().message(), "value does not contain substring `bar`");
Expand Down Expand Up @@ -281,7 +276,6 @@ TEST(ValidatorTest, ValidateBytesContainsFailure) {
auto violations_or = validator.Validate(bytes_contains);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "bytes.contains");
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value does not contain 626172");
}
Expand Down Expand Up @@ -310,7 +304,6 @@ TEST(ValidatorTest, ValidateStartsWithFailure) {
auto violations_or = validator.Validate(str_starts_with);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.prefix");
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value does not have prefix `foo`");
}
Expand Down Expand Up @@ -339,7 +332,6 @@ TEST(ValidatorTest, ValidateEndsWithFailure) {
auto violations_or = validator.Validate(str_ends_with);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.suffix");
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value does not have suffix `baz`");
}
Expand Down Expand Up @@ -368,7 +360,6 @@ TEST(ValidatorTest, ValidateGarbageHostnameFailure) {
auto violations_or = validator.Validate(str_hostname);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.hostname");
}

Expand All @@ -383,7 +374,6 @@ TEST(ValidatorTest, ValidateHostnameFailure) {
auto violations_or = validator.Validate(str_hostname);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.hostname");
}

Expand All @@ -398,7 +388,6 @@ TEST(ValidatorTest, ValidateHostnameDoubleDotFailure) {
auto violations_or = validator.Validate(str_hostname);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
EXPECT_EQ(violations_or.value().violations_size(), 1);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.hostname");
}

Expand Down Expand Up @@ -426,13 +415,10 @@ TEST(ValidatorTest, MessageConstraint) {
auto violations_or = validator.Validate(message_expressions);
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
ASSERT_EQ(violations_or.value().violations_size(), 3);
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "");
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "message_expression_scalar");
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "a must be less than b");
EXPECT_EQ(violations_or.value().violations(1).proto().field_path(), "");
EXPECT_EQ(violations_or.value().violations(1).proto().constraint_id(), "message_expression_enum");
EXPECT_EQ(violations_or.value().violations(1).proto().message(), "c must not equal d");
EXPECT_EQ(violations_or.value().violations(2).proto().field_path(), "e");
EXPECT_EQ(violations_or.value().violations(2).proto().constraint_id(), "message_expression_nested");
EXPECT_EQ(violations_or.value().violations(2).proto().message(), "a must be greater than b");
}
Expand Down
Loading