fix validation for alias (#233)

mercari · Aug 20, 2024 · bec3655 · bec3655
1 parent 739457f
commit bec3655
Show file tree

Hide file tree

Showing 8 changed files with 470 additions and 311 deletions.
diff --git a/_examples/06_alias/federation/federation.pb.go b/_examples/06_alias/federation/federation.pb.go
diff --git a/_examples/06_alias/federation/federation_grpc_federation.pb.go b/_examples/06_alias/federation/federation_grpc_federation.pb.go
diff --git a/_examples/06_alias/main_test.go b/_examples/06_alias/main_test.go
@@ -178,13 +178,15 @@ func TestFederation(t *testing.T) {
 					DupBody: "bodybody2",
 				},
 			},
+			M:    &post.M{X: "xxx"},
 			Type: federation.PostType_POST_TYPE_BAR,
 		},
 	}, cmpopts.IgnoreUnexported(
 		federation.GetPostResponse{},
 		federation.Post{},
 		federation.PostData{},
 		federation.PostContent{},
+		post.M{},
 	)); diff != "" {
 		t.Errorf("(-got, +want)\n%s", diff)
 	}

diff --git a/_examples/06_alias/post/post.pb.go b/_examples/06_alias/post/post.pb.go
diff --git a/_examples/06_alias/proto/federation/federation.proto b/_examples/06_alias/proto/federation/federation.proto
@@ -3,11 +3,12 @@ syntax = "proto3";
 package org.federation;
 
 import "grpc/federation/federation.proto";
+import "post/post.proto";
 
 option go_package = "example/federation;federation";
 
 option (grpc.federation.file)= {
-  import: ["post/post.proto", "post/v2/post.proto"]
+  import: ["post/v2/post.proto"]
 };
 
 service FederationService {
@@ -79,6 +80,7 @@ message Post {
   PostData data = 2;
   PostData data2 = 3 [(grpc.federation.field).by = "data2"];
   PostType type = 4 [(grpc.federation.field).by = "data_type2"];
+  org.post.M m = 5 [(grpc.federation.field).by = "M{x: 'xxx'}"];
 }
 
 enum PostType {
@@ -128,3 +130,9 @@ message PostContent {
   string dup_body = 4 [(grpc.federation.field).alias = "body"];
   map<int32, int32> counts = 5;
 }
+
+message M {
+  option (grpc.federation.message).alias = "org.post.M";
+
+  string x = 1;
+}
diff --git a/_examples/06_alias/proto/post/post.proto b/_examples/06_alias/proto/post/post.proto
@@ -55,3 +55,7 @@ message PostConditionA {
 }
 
 message PostConditionB {}
+
+message M {
+  string x = 1;
+}