Merge pull request #138 from mercari/fix-error-type

Move Error type definition to grpc/federation/cel package
mercari · Apr 2, 2024 · b97f66a · b97f66a
2 parents 53b12b2 + d24b4e8
commit b97f66a
Show file tree

Hide file tree

Showing 17 changed files with 93 additions and 72 deletions.
diff --git a/_examples/04_timeout/grpc/federation/federation.pb.go b/_examples/04_timeout/grpc/federation/federation.pb.go
diff --git a/_examples/05_async/grpc/federation/federation.pb.go b/_examples/05_async/grpc/federation/federation.pb.go
diff --git a/_examples/06_alias/grpc/federation/federation.pb.go b/_examples/06_alias/grpc/federation/federation.pb.go
diff --git a/_examples/09_multi_user/grpc/federation/federation.pb.go b/_examples/09_multi_user/grpc/federation/federation.pb.go
diff --git a/_examples/10_oneof/grpc/federation/federation.pb.go b/_examples/10_oneof/grpc/federation/federation.pb.go
diff --git a/_examples/11_multi_service/grpc/federation/federation.pb.go b/_examples/11_multi_service/grpc/federation/federation.pb.go
diff --git a/_examples/14_condition/grpc/federation/federation.pb.go b/_examples/14_condition/grpc/federation/federation.pb.go
diff --git a/_examples/17_error_handler/federation/federation.pb.go b/_examples/17_error_handler/federation/federation.pb.go
diff --git a/_examples/17_error_handler/federation/federation_grpc_federation.pb.go b/_examples/17_error_handler/federation/federation_grpc_federation.pb.go
diff --git a/_examples/17_error_handler/grpc/federation/federation.pb.go b/_examples/17_error_handler/grpc/federation/federation.pb.go
diff --git a/_examples/17_error_handler/proto/federation/federation.proto b/_examples/17_error_handler/proto/federation/federation.proto
@@ -48,7 +48,7 @@ message Post {
             message: "'this is custom error message'"
             details {
               def { name: "localized_msg" message { name: "LocalizedMessage" args { name: "value" by: "id" } } }
-              message { name: "CustomMessage" args { name: "msg" by: "id" } }
+              message { name: "CustomMessage" args { name: "error_info" by: "error" } }
               precondition_failure {
                 violations {
                   type: "'some-type'"
@@ -82,5 +82,5 @@ message LocalizedMessage {
 }
 
 message CustomMessage {
-  string msg = 1 [(grpc.federation.field).by = "'custom error message:' + $.msg"];
+  string msg = 1 [(grpc.federation.field).by = "'custom error message:' + $.error_info.message"];
 }
diff --git a/grpc/federation/cel.go b/grpc/federation/cel.go
@@ -559,7 +559,7 @@ func SetGRPCError(ctx context.Context, value localValue, err error) {
 	if !ok {
 		return
 	}
-	grpcErr := &Error{
+	grpcErr := &grpcfedcel.Error{
 		Code:    int32(stat.Code()),
 		Message: stat.Message(),
 	}