feat: valdate resource name upon unmarshalling

einride · Apr 11, 2024 · de5dc16 · de5dc16
1 parent d7df62c
commit de5dc16
Show file tree

Hide file tree

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

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