feat: call validate on unmarshal

TRA-1296
einride · Apr 10, 2024 · 9a702a7 · 9a702a7
1 parent d7df62c
commit 9a702a7
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 0 deletions.
diff --git a/cmd/protoc-gen-go-aip/internal/genaip/resourcename.go b/cmd/protoc-gen-go-aip/internal/genaip/resourcename.go
@@ -329,6 +329,9 @@ func (r resourceNameCodeGenerator) generateUnmarshalStringMethod(
 	})
 	g.P()
 	g.P("func (n *", typeName, ") UnmarshalString(name string) error {")
+	g.P("if err := n.Validate(); err != nil {")
+	g.P("return err")
+	g.P("}")
 	g.P("return ", resourcenameSscan, "(")
 	g.P("name,")
 	g.P(strconv.Quote(pattern), ",")

diff --git a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/multipattern/testdata_aip.go b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/multipattern/testdata_aip.go
diff --git a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/originallysinglepattern/testdata_aip.go b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/originallysinglepattern/testdata_aip.go
diff --git a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/single/testdata_aip.go b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/single/testdata_aip.go
diff --git a/proto/gen/einride/example/freight/v1/shipment_aip.go b/proto/gen/einride/example/freight/v1/shipment_aip.go
diff --git a/proto/gen/einride/example/freight/v1/shipper_aip.go b/proto/gen/einride/example/freight/v1/shipper_aip.go
diff --git a/proto/gen/einride/example/freight/v1/site_aip.go b/proto/gen/einride/example/freight/v1/site_aip.go