Allow google.protobuf.Timestamp field to be named time (uber#336)

Minish144 · Feb 12, 2019 · b9ce670 · b9ce670
1 parent ad3cc20
commit b9ce670
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/cmd/testdata/lint/wktsuffix/foo/foo.proto b/internal/cmd/testdata/lint/wktsuffix/foo/foo.proto
@@ -17,4 +17,6 @@ message Bar {
     google.protobuf.Timestamp three = 3;
     google.protobuf.Duration four = 4;
   }
+  // Make sure this is allowed.
+  google.protobuf.Timestamp time = 5;
 }
diff --git a/internal/lint/check_wkt_timestamp_suffix.go b/internal/lint/check_wkt_timestamp_suffix.go
@@ -62,7 +62,7 @@ func (v wktTimestampSuffixVisitor) VisitOneofField(field *proto.OneOfField) {
 }
 
 func (v wktTimestampSuffixVisitor) visitField(field *proto.Field) {
-	if field.Type == "google.protobuf.Timestamp" && !strings.HasSuffix(field.Name, "_time") {
-		v.AddFailuref(field.Position, `Field %q of type "google.protobuf.Timestamp" must end in "_time".`, field.Name)
+	if field.Type == "google.protobuf.Timestamp" && !(field.Name == "time" || strings.HasSuffix(field.Name, "_time")) {
+		v.AddFailuref(field.Position, `Field %q of type "google.protobuf.Timestamp" must be "time" or end in "_time".`, field.Name)
 	}
 }