fix validation error for message that message argument is unresolved

mercari · Aug 5, 2024 · 9308d18 · 9308d18
1 parent 73eadce
commit 9308d18
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 108 deletions.
diff --git a/_examples/02_simple/federation/federation_grpc_federation.pb.go b/_examples/02_simple/federation/federation_grpc_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/08_literal/federation/federation_grpc_federation.pb.go b/_examples/08_literal/federation/federation_grpc_federation.pb.go
diff --git a/_examples/10_oneof/federation/federation_grpc_federation.pb.go b/_examples/10_oneof/federation/federation_grpc_federation.pb.go
diff --git a/generator/testdata/expected_alias.go b/generator/testdata/expected_alias.go
diff --git a/generator/testdata/expected_create_post.go b/generator/testdata/expected_create_post.go
diff --git a/generator/testdata/expected_ref_env.go b/generator/testdata/expected_ref_env.go
diff --git a/generator/testdata/expected_simple_aggregation.go b/generator/testdata/expected_simple_aggregation.go
diff --git a/resolver/resolver.go b/resolver/resolver.go
@@ -1132,6 +1132,11 @@ func (r *Resolver) validateMessageFields(ctx *context, msg *Message, builder *so
 	if msg.Rule == nil {
 		return
 	}
+	if msg.Rule.MessageArgument == nil {
+		// message argument does not exist because this message is not used from anywhere.
+		// In this case, validation step is skipped.
+		return
+	}
 	for _, field := range msg.Fields {
 		builder := builder.WithField(field.Name)
 		if !field.HasRule() {
@@ -2798,23 +2803,23 @@ func (r *Resolver) resolveMessageArgument(ctx *context, files []*File) {
 	}
 
 	for _, root := range graph.Roots {
-		resMsg := root.Message
-
-		var msgArg *Message
-		if resMsg.Rule.MessageArgument != nil {
-			msgArg = resMsg.Rule.MessageArgument
-		} else {
-			msgArg = newMessageArgument(resMsg)
-			resMsg.Rule.MessageArgument = msgArg
-		}
+		rootMsg := root.Message
 
 		// The message argument of the response message is the request message.
 		// Therefore, the request message is retrieved from the response message.
-		reqMsg := r.lookupRequestMessageFromResponseMessage(resMsg)
+		reqMsg := r.lookupRequestMessageFromResponseMessage(rootMsg)
 		if reqMsg == nil {
 			continue
 		}
 
+		var msgArg *Message
+		if rootMsg.Rule.MessageArgument != nil {
+			msgArg = rootMsg.Rule.MessageArgument
+		} else {
+			msgArg = newMessageArgument(rootMsg)
+			rootMsg.Rule.MessageArgument = msgArg
+		}
+
 		msgArg.Fields = append(msgArg.Fields, reqMsg.Fields...)
 		r.cachedMessageMap[msgArg.FQDN()] = msgArg
 		r.resolveMessageArgumentRecursive(ctx, root, svcMsgSet)

diff --git a/resolver/resolver_test.go b/resolver/resolver_test.go
@@ -129,7 +129,6 @@ func TestSimpleAggregation(t *testing.T) {
 						AddFieldWithAlias("foo", resolver.StringType, ref.Field(t, "org.user", "User.AttrA", "foo")).
 						SetRule(
 							testutil.NewMessageRuleBuilder().
-								SetMessageArgument(ref.Message(t, "org.federation", "User_AttrAArgument")).
 								SetAlias(ref.Message(t, "org.user", "User.AttrA")).
 								Build(t),
 						).
@@ -140,7 +139,6 @@ func TestSimpleAggregation(t *testing.T) {
 						AddFieldWithAlias("bar", resolver.BoolType, ref.Field(t, "org.user", "User.AttrB", "bar")).
 						SetRule(
 							testutil.NewMessageRuleBuilder().
-								SetMessageArgument(ref.Message(t, "org.federation", "User_AttrBArgument")).
 								SetAlias(ref.Message(t, "org.user", "User.AttrB")).
 								Build(t),
 						).
@@ -1605,10 +1603,6 @@ func TestAlias(t *testing.T) {
 						SetRule(
 							testutil.NewMessageRuleBuilder().
 								SetAlias(ref.Message(t, "org.post", "PostConditionA")).
-								SetMessageArgument(
-									testutil.NewMessageBuilder("GetPostRequest_ConditionAArgument").
-										Build(t),
-								).
 								Build(t),
 						).
 						Build(t),
@@ -1618,10 +1612,6 @@ func TestAlias(t *testing.T) {
 						SetRule(
 							testutil.NewMessageRuleBuilder().
 								SetAlias(ref.Message(t, "org.post", "PostConditionB")).
-								SetMessageArgument(
-									testutil.NewMessageBuilder("GetPostRequest_ConditionBArgument").
-										Build(t),
-								).
 								Build(t),
 						).
 						Build(t),