Merge pull request #26 from TheThingsIndustries/fix/repeated

Fix handling of repeated fields in validators
TheThingsIndustries · Feb 28, 2019 · 08c4649 · 08c4649
2 parents cbc52bc + 95d6127
commit 08c4649
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 48 deletions.
diff --git a/go.sum b/go.sum
@@ -1,6 +1,6 @@
 github.com/TheThingsIndustries/protoc-gen-star v0.4.7-gogo h1:vtoerBb3MHbzeUM0+w/bBpIhzT+yCaD1QrDN1/p7F2A=
 github.com/TheThingsIndustries/protoc-gen-star v0.4.7-gogo/go.mod h1:lIqzPBz4CG/TSsK9fPQvo7iVfbxEWc+76AVxeiHMcT4=
-github.com/TheThingsIndustries/protoc-gen-validate v0.0.13-fieldmask h1:vIdGpbSKd0SJJoC+BEZc/17W+N3CKh6qjfpXKbyCw7g=
+github.com/TheThingsIndustries/protoc-gen-validate v0.0.13-fieldmask h1:ceerwKg0M/jOU1sdjzHx3k+KsFIZ2LyrNNT+EVXW/AI=
 github.com/TheThingsIndustries/protoc-gen-validate v0.0.13-fieldmask/go.mod h1:65OEzdQPsbLDokGIF3GQjCTWOuuVuHqxh7a08yYe0tw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

diff --git a/main_test.go b/main_test.go
@@ -154,6 +154,7 @@ func TestFieldMaskPaths(t *testing.T) {
 		"a.d",
 		"a.e",
 		"a.f",
+		"a.g",
 		"b",
 		"b.a",
 		"b.a.a",
@@ -173,6 +174,7 @@ func TestFieldMaskPaths(t *testing.T) {
 		"b.d",
 		"b.e",
 		"b.f",
+		"b.g",
 		"c",
 		"c.a",
 		"c.a.a",
@@ -192,6 +194,7 @@ func TestFieldMaskPaths(t *testing.T) {
 		"c.d",
 		"c.e",
 		"c.f",
+		"c.g",
 		"g",
 		"h",
 		"i",
@@ -229,6 +232,7 @@ func TestFieldMaskPaths(t *testing.T) {
 		"d",
 		"e",
 		"f",
+		"g",
 	})
 	a.So(testdata.Test_TestNestedFieldPathsTopLevel, should.Resemble, []string{
 		"a",
@@ -237,6 +241,7 @@ func TestFieldMaskPaths(t *testing.T) {
 		"d",
 		"e",
 		"f",
+		"g",
 	})
 
 	a.So(testdata.Test_TestNested_TestNestedNestedFieldPathsNested, should.Resemble, []string{

diff --git a/testdata/testdata.pb.go b/testdata/testdata.pb.go
diff --git a/testdata/testdata.pb.paths.fm.go b/testdata/testdata.pb.paths.fm.go
diff --git a/testdata/testdata.pb.setters.fm.go b/testdata/testdata.pb.setters.fm.go
diff --git a/testdata/testdata.pb.validate.go b/testdata/testdata.pb.validate.go
diff --git a/testdata/testdata.proto b/testdata/testdata.proto
@@ -54,6 +54,7 @@ message Test {
     google.protobuf.Timestamp d = 4 [(gogoproto.stdtime) = true];
     string e = 5 [(gogoproto.customtype) = "github.com/TheThingsIndustries/protoc-gen-fieldmask/testdata/testpackage.CustomType"];
     string f = 6 [(gogoproto.customtype) = "github.com/TheThingsIndustries/protoc-gen-fieldmask/testdata/testpackage.CustomType", (gogoproto.nullable) = false];
+    repeated TestNestedNested g = 7;
   }
   TestNested a = 1;
   TestNested b = 2 [(gogoproto.customname) = "CustomName"];
-Original file line number
+Diff line change
@@ Expand Up / @@ -154,6 +154,7 @@ func TestFieldMaskPaths(t *testing.T) { @@
     		"a.d",
     		"a.e",
     		"a.f",
+    		"a.g",
     		"b",
     		"b.a",
     		"b.a.a",
@@ Expand All / @@ -173,6 +174,7 @@ func TestFieldMaskPaths(t *testing.T) { @@
     		"b.d",
     		"b.e",
     		"b.f",
+    		"b.g",
     		"c",
     		"c.a",
     		"c.a.a",
@@ Expand All / @@ -192,6 +194,7 @@ func TestFieldMaskPaths(t *testing.T) { @@
     		"c.d",
     		"c.e",
     		"c.f",
+    		"c.g",
     		"g",
     		"h",
     		"i",
@@ Expand Down Expand Up / @@ -229,6 +232,7 @@ func TestFieldMaskPaths(t *testing.T) { @@
     		"d",
     		"e",
     		"f",
+    		"g",
     	})
     	a.So(testdata.Test_TestNestedFieldPathsTopLevel, should.Resemble, []string{
     		"a",
@@ Expand All / @@ -237,6 +241,7 @@ func TestFieldMaskPaths(t *testing.T) { @@
     		"d",
     		"e",
     		"f",
+    		"g",
     	})
     	a.So(testdata.Test_TestNested_TestNestedNestedFieldPathsNested, should.Resemble, []string{
@@ Expand Down @@