Skip to content

Commit 890c8ea

Browse files
author
jchadwick-buf
authored
Remove support for deprecated options (#69)
Related protovalidate change: bufbuild/protovalidate#297
1 parent 2705742 commit 890c8ea

File tree

7 files changed

+8
-28
lines changed

7 files changed

+8
-28
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ COPYRIGHT_YEARS := 2023
1111
LICENSE_IGNORE := -e internal/testdata/
1212
LICENSE_HEADER_VERSION := 0294fdbe1ce8649ebaf5e87e8cdd588e33730bbb
1313
# NOTE: Keep this version in sync with the version in `/bazel/deps.bzl`.
14-
PROTOVALIDATE_VERSION ?= v0.9.0
14+
PROTOVALIDATE_VERSION ?= v0.10.0
1515

1616
# Set to use a different compiler. For example, `GO=go1.18rc1 make test`.
1717
GO ?= go

‎bazel/deps.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ _dependencies = {
8383
},
8484
# NOTE: Keep Version in sync with `/Makefile`.
8585
"com_github_bufbuild_protovalidate": {
86-
"sha256": "fca6143d820e9575f3aec328918fa25acc8eeb6e706050127d3a36cfdede4610",
87-
"strip_prefix": "protovalidate-0.9.0",
86+
"sha256": "5879da3a72bcbd48e42f84b1eb0dfb45e3657fb68232b6b7c12c01bb937b659d",
87+
"strip_prefix": "protovalidate-0.10.0",
8888
"urls": [
89-
"https://github.com/bufbuild/protovalidate/archive/v0.9.0.tar.gz",
89+
"https://github.com/bufbuild/protovalidate/archive/v0.10.0.tar.gz",
9090
],
9191
},
9292
}

‎buf/validate/internal/constraint_rules.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ struct ConstraintContext {
9797
std::reverse(
9898
violation.proto_.mutable_field()->mutable_elements()->begin(),
9999
violation.proto_.mutable_field()->mutable_elements()->end());
100-
*violation.proto_.mutable_field_path() = internal::fieldPathString(violation.proto().field());
101100
}
102101
if (violation.proto().has_rule()) {
103102
std::reverse(

‎buf/validate/internal/constraints.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class FieldConstraintRules : public CelConstraintRules {
4545
mapEntryField_(desc->containing_type()->options().map_entry()),
4646
ignoreEmpty_(field.ignore() == IGNORE_IF_DEFAULT_VALUE ||
4747
field.ignore() == IGNORE_IF_UNPOPULATED ||
48-
field.ignore_empty() ||
4948
(desc->has_presence() && !mapEntryField_)),
5049
ignoreDefault_(field.ignore() == IGNORE_IF_DEFAULT_VALUE &&
5150
(desc->has_presence() && !mapEntryField_)),

‎buf/validate/internal/field_rules.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ absl::StatusOr<std::unique_ptr<FieldConstraintRules>> NewFieldRules(
2525
google::api::expr::runtime::CelExpressionBuilder& builder,
2626
const google::protobuf::FieldDescriptor* field,
2727
const FieldConstraints& fieldLvl) {
28-
if (fieldLvl.ignore() == IGNORE_ALWAYS || fieldLvl.skipped()) {
28+
if (fieldLvl.ignore() == IGNORE_ALWAYS) {
2929
return nullptr;
3030
}
3131
absl::StatusOr<std::unique_ptr<FieldConstraintRules>> rules_or;

‎buf/validate/validator.cc‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,9 @@ absl::Status Validator::ValidateFields(
4646
}
4747
if (field->options().HasExtension(validate::field)) {
4848
const auto& fieldExt = field->options().GetExtension(validate::field);
49-
if (fieldExt.ignore() == IGNORE_ALWAYS || fieldExt.skipped() ||
50-
(fieldExt.has_repeated() &&
51-
(fieldExt.repeated().items().ignore() == IGNORE_ALWAYS ||
52-
fieldExt.repeated().items().skipped())) ||
53-
(fieldExt.has_map() &&
54-
(fieldExt.map().values().ignore() == IGNORE_ALWAYS ||
55-
fieldExt.map().values().skipped()))) {
49+
if (fieldExt.ignore() == IGNORE_ALWAYS ||
50+
(fieldExt.has_repeated() && (fieldExt.repeated().items().ignore() == IGNORE_ALWAYS)) ||
51+
(fieldExt.has_map() && (fieldExt.map().values().ignore() == IGNORE_ALWAYS))) {
5652
continue;
5753
}
5854
}

‎buf/validate/validator_test.cc‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ TEST(ValidatorTest, ValidateBool) {
7979
auto violations_or = validator.Validate(bool_const_false);
8080
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
8181
ASSERT_EQ(violations_or.value().violations_size(), 1);
82-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
8382
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "bool.const");
8483
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value must equal false");
8584
}
@@ -141,7 +140,6 @@ TEST(ValidatorTest, ValidateRelativeURIFailure) {
141140
auto violations_or = validator.Validate(str_uri);
142141
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
143142
EXPECT_EQ(violations_or.value().violations_size(), 1);
144-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
145143
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.uri");
146144
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value must be a valid URI");
147145
EXPECT_THAT(
@@ -202,7 +200,6 @@ TEST(ValidatorTest, ValidateBadURIRefFailure) {
202200
auto violations_or = validator.Validate(str_uri_ref);
203201
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
204202
EXPECT_EQ(violations_or.value().violations_size(), 1);
205-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
206203
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.uri_ref");
207204
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value must be a valid URI");
208205
EXPECT_THAT(
@@ -225,7 +222,6 @@ TEST(ValidatorTest, ValidateStrRepeatedUniqueFailure) {
225222
auto violations_or = validator.Validate(str_repeated);
226223
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
227224
EXPECT_EQ(violations_or.value().violations_size(), 1);
228-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
229225
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "repeated.unique");
230226
EXPECT_EQ(
231227
violations_or.value().violations(0).proto().message(),
@@ -251,7 +247,6 @@ TEST(ValidatorTest, ValidateStringContainsFailure) {
251247
auto violations_or = validator.Validate(str_contains);
252248
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
253249
EXPECT_EQ(violations_or.value().violations_size(), 1);
254-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
255250
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.contains");
256251
EXPECT_EQ(
257252
violations_or.value().violations(0).proto().message(), "value does not contain substring `bar`");
@@ -281,7 +276,6 @@ TEST(ValidatorTest, ValidateBytesContainsFailure) {
281276
auto violations_or = validator.Validate(bytes_contains);
282277
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
283278
EXPECT_EQ(violations_or.value().violations_size(), 1);
284-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
285279
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "bytes.contains");
286280
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value does not contain 626172");
287281
}
@@ -310,7 +304,6 @@ TEST(ValidatorTest, ValidateStartsWithFailure) {
310304
auto violations_or = validator.Validate(str_starts_with);
311305
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
312306
EXPECT_EQ(violations_or.value().violations_size(), 1);
313-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
314307
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.prefix");
315308
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value does not have prefix `foo`");
316309
}
@@ -339,7 +332,6 @@ TEST(ValidatorTest, ValidateEndsWithFailure) {
339332
auto violations_or = validator.Validate(str_ends_with);
340333
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
341334
EXPECT_EQ(violations_or.value().violations_size(), 1);
342-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
343335
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.suffix");
344336
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "value does not have suffix `baz`");
345337
}
@@ -368,7 +360,6 @@ TEST(ValidatorTest, ValidateGarbageHostnameFailure) {
368360
auto violations_or = validator.Validate(str_hostname);
369361
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
370362
EXPECT_EQ(violations_or.value().violations_size(), 1);
371-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "val");
372363
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "string.hostname");
373364
}
374365

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

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

@@ -426,13 +415,10 @@ TEST(ValidatorTest, MessageConstraint) {
426415
auto violations_or = validator.Validate(message_expressions);
427416
ASSERT_TRUE(violations_or.ok()) << violations_or.status();
428417
ASSERT_EQ(violations_or.value().violations_size(), 3);
429-
EXPECT_EQ(violations_or.value().violations(0).proto().field_path(), "");
430418
EXPECT_EQ(violations_or.value().violations(0).proto().constraint_id(), "message_expression_scalar");
431419
EXPECT_EQ(violations_or.value().violations(0).proto().message(), "a must be less than b");
432-
EXPECT_EQ(violations_or.value().violations(1).proto().field_path(), "");
433420
EXPECT_EQ(violations_or.value().violations(1).proto().constraint_id(), "message_expression_enum");
434421
EXPECT_EQ(violations_or.value().violations(1).proto().message(), "c must not equal d");
435-
EXPECT_EQ(violations_or.value().violations(2).proto().field_path(), "e");
436422
EXPECT_EQ(violations_or.value().violations(2).proto().constraint_id(), "message_expression_nested");
437423
EXPECT_EQ(violations_or.value().violations(2).proto().message(), "a must be greater than b");
438424
}

0 commit comments

Comments
 (0)