chore: add package name to news.proto (tailcallhq#1087)

pi600 · Feb 3, 2024 · f3cf2f1 · f3cf2f1
1 parent 6256d6f
commit f3cf2f1
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 29 deletions.
diff --git a/examples/grpc.graphql b/examples/grpc.graphql
@@ -6,12 +6,12 @@ schema
 }
 
 type Query {
-  news: NewsData! @grpc(service: "NewsService", method: "GetAllNews", protoPath: "src/grpc/tests/news.proto")
+  news: NewsData! @grpc(service: "news.NewsService", method: "GetAllNews", protoPath: "src/grpc/tests/news.proto")
   newsById(news: NewsInput!): News!
-    @grpc(service: "NewsService", method: "GetNews", body: "{{args.news}}", protoPath: "src/grpc/tests/news.proto")
+    @grpc(service: "news.NewsService", method: "GetNews", body: "{{args.news}}", protoPath: "src/grpc/tests/news.proto")
   newsByIdBatch(news: NewsInput!): News!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetMultipleNews"
       body: "{{args.news}}"
       protoPath: "src/grpc/tests/news.proto"

diff --git a/src/grpc/protobuf.rs b/src/grpc/protobuf.rs
@@ -333,7 +333,7 @@ mod tests {
     #[tokio::test]
     async fn news_proto_file() -> Result<()> {
         let file = ProtobufSet::from_proto_file(&get_proto_file("news.proto").await?)?;
-        let service = file.find_service("NewsService")?;
+        let service = file.find_service("news.NewsService")?;
         let operation = service.find_operation("GetNews")?;
 
         let input = operation.convert_input(r#"{ "id": 1 }"#)?;
@@ -357,7 +357,7 @@ mod tests {
     #[tokio::test]
     async fn news_proto_file_multiple_messages() -> Result<()> {
         let file = ProtobufSet::from_proto_file(&get_proto_file("news.proto").await?)?;
-        let service = file.find_service("NewsService")?;
+        let service = file.find_service("news.NewsService")?;
         let multiple_operation = service.find_operation("GetMultipleNews")?;
 
         let child_messages = vec![r#"{ "id": 3 }"#, r#"{ "id": 5 }"#, r#"{ "id": 1 }"#];

diff --git a/src/grpc/tests/news.proto b/src/grpc/tests/news.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 import "google/protobuf/empty.proto";
 
+package news;
+
 message News {
     int32 id = 1;
     string title = 2;
@@ -27,5 +29,5 @@ message MultipleNewsId {
 }
 
 message NewsList {
-   repeated News news = 1;
+    repeated News news = 1;
 }
diff --git a/tests/graphql/errors/proto/news.proto b/tests/graphql/errors/proto/news.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 import "google/protobuf/empty.proto";
 
+package news;
+
 message News {
     int32 id = 1;
     string title = 2;
@@ -28,4 +30,4 @@ message MultipleNewsId {
 
 message NewsList {
     repeated News news = 1;
-}
+}
diff --git a/tests/graphql/errors/test-grpc-group-by.graphql b/tests/graphql/errors/test-grpc-group-by.graphql
@@ -6,7 +6,7 @@ schema @server(port: 8000, graphiql: true) @upstream(httpCache: true, batch: {de
 type Query {
   newsById(news: NewsInput!): News!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetMultipleNews"
       baseURL: "http://localhost:50051"
       body: "{{args.news}}"

diff --git a/tests/graphql/errors/test-grpc-missing-fields.graphql b/tests/graphql/errors/test-grpc-missing-fields.graphql
@@ -6,7 +6,7 @@ schema {
 type Query {
   news: NewsData!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetAllNews"
       baseURL: "http://localhost:4000"
       protoPath: "tests/graphql/errors/proto/news.proto"

diff --git a/tests/graphql/errors/test-grpc-nested-data.graphql b/tests/graphql/errors/test-grpc-nested-data.graphql
@@ -6,14 +6,14 @@ schema @server(port: 8000, graphiql: true) @upstream(httpCache: true, batch: {de
 type Query {
   news: NewsData!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetAllNews"
       baseURL: "http://localhost:50051"
       protoPath: "src/grpc/tests/news.proto"
     )
   newsById(news: NewsInput!): [News]!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetNews"
       baseURL: "http://localhost:50051"
       body: "{{args.news}}"

diff --git a/tests/graphql/errors/test-grpc-nested-optional.graphql b/tests/graphql/errors/test-grpc-nested-optional.graphql
@@ -6,7 +6,7 @@ schema {
 type Query {
   news: NewsData!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetAllNews"
       baseURL: "http://localhost:4000"
       protoPath: "tests/graphql/errors/proto/news.proto"

diff --git a/tests/graphql/errors/test-grpc-optional.graphql b/tests/graphql/errors/test-grpc-optional.graphql
@@ -6,7 +6,7 @@ schema {
 type Query {
   news: NewsData
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetAllNews"
       baseURL: "http://localhost:4000"
       protoPath: "tests/graphql/errors/proto/news.proto"

diff --git a/tests/graphql/errors/test-grpc-proto-path.graphql b/tests/graphql/errors/test-grpc-proto-path.graphql
@@ -6,7 +6,7 @@ schema {
 type Query {
   news: NewsData
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetAllNews"
       baseURL: "http://localhost:4000"
       protoPath: "tailcall/src/grpcnews.proto"

diff --git a/tests/graphql/errors/test-grpc-service-method.graphql b/tests/graphql/errors/test-grpc-service-method.graphql
@@ -6,7 +6,7 @@ schema {
 type Query {
   news: NewsData
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "X"
       baseURL: "http://localhost:4000"
       protoPath: "tests/graphql/errors/proto/news.proto"

diff --git a/tests/graphql/errors/test-missing-argument-on-all-resolvers.graphql b/tests/graphql/errors/test-missing-argument-on-all-resolvers.graphql
@@ -26,13 +26,23 @@ type Query {
     @grpc(
       method: "GetAllNews"
       protoPath: "src/grpc/tests/news.proto"
-      service: "NewsService"
+      service: "news.NewsService"
       headers: [{key: "id", value: "{{args.id}}"}]
     )
   newsGrpcUrl: NewsData!
-    @grpc(method: "GetAllNews", protoPath: "src/grpc/tests/news.proto", service: "NewsService", baseURL: "{{args.url}}")
+    @grpc(
+      method: "GetAllNews"
+      protoPath: "src/grpc/tests/news.proto"
+      service: "news.NewsService"
+      baseURL: "{{args.url}}"
+    )
   newsGrpcBody: NewsData!
-    @grpc(method: "GetAllNews", protoPath: "src/grpc/tests/news.proto", service: "NewsService", body: "{{args.id}}")
+    @grpc(
+      method: "GetAllNews"
+      protoPath: "src/grpc/tests/news.proto"
+      service: "news.NewsService"
+      body: "{{args.id}}"
+    )
 }
 
 type User {

diff --git a/tests/graphql/test-expr-success.graphql b/tests/graphql/test-expr-success.graphql
@@ -25,7 +25,7 @@ type Post {
 type Query {
   cond: Post @expr(body: {if: {cond: {const: true}, else: {http: {path: "/posts/1"}}, then: {http: {path: "/posts/2"}}}})
   greeting: String @expr(body: {const: "hello from server"})
-  news(news: NewsInput!): News! @expr(body: {grpc: {body: "{{args.news}}", groupBy: ["news", "id"], method: "GetMultipleNews", protoPath: "src/grpc/tests/news.proto", service: "NewsService"}})
+  news(news: NewsInput!): News! @expr(body: {grpc: {body: "{{args.news}}", groupBy: ["news", "id"], method: "GetMultipleNews", protoPath: "src/grpc/tests/news.proto", service: "news.NewsService"}})
   post(id: Int!): Post @expr(body: {http: {baseURL: "http://jsonplacheholder.typicode.com", path: "/posts/{{args.id}}"}})
 }
 

diff --git a/tests/graphql/test-grpc.graphql b/tests/graphql/test-grpc.graphql
@@ -22,9 +22,9 @@ type NewsData {
 }
 
 type Query {
-  news: NewsData! @grpc(method: "GetAllNews", protoPath: "src/grpc/tests/news.proto", service: "NewsService")
-  newsById(news: NewsInput!): News! @grpc(body: "{{args.news}}", method: "GetNews", protoPath: "src/grpc/tests/news.proto", service: "NewsService")
-  newsByIdBatch(news: NewsInput!): News! @grpc(body: "{{args.news}}", groupBy: ["news", "id"], method: "GetMultipleNews", protoPath: "src/grpc/tests/news.proto", service: "NewsService")
+  news: NewsData! @grpc(method: "GetAllNews", protoPath: "src/grpc/tests/news.proto", service: "news.NewsService")
+  newsById(news: NewsInput!): News! @grpc(body: "{{args.news}}", method: "GetNews", protoPath: "src/grpc/tests/news.proto", service: "news.NewsService")
+  newsByIdBatch(news: NewsInput!): News! @grpc(body: "{{args.news}}", groupBy: ["news", "id"], method: "GetMultipleNews", protoPath: "src/grpc/tests/news.proto", service: "news.NewsService")
 }
 
 #> client-sdl

diff --git a/tests/http/config/grpc-batch.graphql b/tests/http/config/grpc-batch.graphql
@@ -5,14 +5,14 @@ schema @server(port: 8000, graphiql: true) @upstream(httpCache: true, batch: {de
 type Query {
   news: NewsData!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetAllNews"
       baseURL: "http://localhost:50051"
       protoPath: "src/grpc/tests/news.proto"
     )
   newsById(news: NewsInput!): News!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetMultipleNews"
       baseURL: "http://localhost:50051"
       body: "{{args.news}}"

diff --git a/tests/http/config/grpc.graphql b/tests/http/config/grpc.graphql
@@ -5,14 +5,14 @@ schema @server(port: 8000, graphiql: true) @upstream(httpCache: true, batch: {de
 type Query {
   news: NewsData!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetAllNews"
       baseURL: "http://localhost:50051"
       protoPath: "src/grpc/tests/news.proto"
     )
   newsById(news: NewsInput!): News!
     @grpc(
-      service: "NewsService"
+      service: "news.NewsService"
       method: "GetNews"
       baseURL: "http://localhost:50051"
       body: "{{args.news}}"

diff --git a/tests/http/grpc-batch.yml b/tests/http/grpc-batch.yml
@@ -2,13 +2,13 @@ config: !file tests/http/config/grpc-batch.graphql
 name: Grpc datasource with batching
 mock:
   - request:
-      url: http://localhost:50051/NewsService/GetMultipleNews
+      url: http://localhost:50051/news.NewsService/GetMultipleNews
       method: POST
       body: \0\0\0\0\n\x02\x08\x02\n\x02\x08\x03
     response:
       body: \0\0\0\0t\n#\x08\x02\x12\x06Note 2\x1a\tContent 2\"\x0cPost image 2\n#\x08\x03\x12\x06Note 3\x1a\tContent 3\"\x0cPost image 3
   - request:
-      url: http://localhost:50051/NewsService/GetMultipleNews
+      url: http://localhost:50051/news.NewsService/GetMultipleNews
       method: POST
       body: \0\0\0\0\n\x02\x08\x03\n\x02\x08\x02
     response:

diff --git a/tests/http/grpc-simple.yml b/tests/http/grpc-simple.yml
@@ -2,7 +2,7 @@ config: !file tests/http/config/grpc.graphql
 name: Grpc datasource
 mock:
   - request:
-      url: http://localhost:50051/NewsService/GetAllNews
+      url: http://localhost:50051/news.NewsService/GetAllNews
       method: POST
     response:
       body: \0\0\0\0t\n#\x08\x01\x12\x06Note 1\x1a\tContent 1\"\x0cPost image 1\n#\x08\x02\x12\x06Note 2\x1a\tContent 2\"\x0cPost image 2