From 78b398d8685911afe3136598a55944057634933f Mon Sep 17 00:00:00 2001 From: Felix Fernando Wijaya Date: Sat, 23 Jul 2022 17:49:23 +0700 Subject: [PATCH] Fix pacakge generated --- .gitignore | 1 + .vscode/configurationCache.log | 1 - .vscode/dryrun.log | 4 ---- .vscode/settings.json | 3 --- .vscode/targets.log | 4 ---- order/{ => gen}/get_order.pb.go | 5 +++-- order/{ => gen}/order_service.pb.go | 6 +++--- order/{ => gen}/order_service_grpc.pb.go | 2 +- order/protos/get_order.proto | 2 +- order/protos/order_service.proto | 2 +- user/{ => gen}/get_user.pb.go | 6 +++--- user/{ => gen}/user.pb.go | 6 +++--- user/{ => gen}/user_service.pb.go | 5 +++-- user/{ => gen}/user_service_grpc.pb.go | 2 +- user/protos/get_user.proto | 2 +- user/protos/user.proto | 2 +- user/protos/user_service.proto | 2 +- 17 files changed, 23 insertions(+), 32 deletions(-) create mode 100644 .gitignore delete mode 100644 .vscode/configurationCache.log delete mode 100644 .vscode/dryrun.log delete mode 100644 .vscode/settings.json delete mode 100644 .vscode/targets.log rename order/{ => gen}/get_order.pb.go (99%) rename order/{ => gen}/order_service.pb.go (96%) rename order/{ => gen}/order_service_grpc.pb.go (99%) rename user/{ => gen}/get_user.pb.go (97%) rename user/{ => gen}/user.pb.go (97%) rename user/{ => gen}/user_service.pb.go (95%) rename user/{ => gen}/user_service_grpc.pb.go (99%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..600d2d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode \ No newline at end of file diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log deleted file mode 100644 index bab9054..0000000 --- a/.vscode/configurationCache.log +++ /dev/null @@ -1 +0,0 @@ -{"buildTargets":[],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}} \ No newline at end of file diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log deleted file mode 100644 index ebf85ed..0000000 --- a/.vscode/dryrun.log +++ /dev/null @@ -1,4 +0,0 @@ -make.exe --dry-run --always-make --keep-going --print-directory -'make.exe' is not recognized as an internal or external command, -operable program or batch file. - diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 00efd3f..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "makefile.extensionOutputFolder": "./.vscode" -} \ No newline at end of file diff --git a/.vscode/targets.log b/.vscode/targets.log deleted file mode 100644 index 04f2128..0000000 --- a/.vscode/targets.log +++ /dev/null @@ -1,4 +0,0 @@ -make.exe all --print-data-base --no-builtin-variables --no-builtin-rules --question -'make.exe' is not recognized as an internal or external command, -operable program or batch file. - diff --git a/order/get_order.pb.go b/order/gen/get_order.pb.go similarity index 99% rename from order/get_order.pb.go rename to order/gen/get_order.pb.go index 631c2a0..cdcf944 100644 --- a/order/get_order.pb.go +++ b/order/gen/get_order.pb.go @@ -4,7 +4,7 @@ // protoc v3.20.0 // source: protos/get_order.proto -package __ +package gen import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -332,7 +332,8 @@ var file_protos_get_order_proto_rawDesc = []byte{ 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, - 0x61, 0x6c, 0x42, 0x03, 0x5a, 0x01, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6c, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x2f, 0x67, 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/order/order_service.pb.go b/order/gen/order_service.pb.go similarity index 96% rename from order/order_service.pb.go rename to order/gen/order_service.pb.go index 9bee18e..978d732 100644 --- a/order/order_service.pb.go +++ b/order/gen/order_service.pb.go @@ -4,7 +4,7 @@ // protoc v3.20.0 // source: protos/order_service.proto -package __ +package gen import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -30,8 +30,8 @@ var file_protos_order_service_proto_rawDesc = []byte{ 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x03, 0x5a, 0x01, 0x2f, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x2f, + 0x67, 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_protos_order_service_proto_goTypes = []interface{}{ diff --git a/order/order_service_grpc.pb.go b/order/gen/order_service_grpc.pb.go similarity index 99% rename from order/order_service_grpc.pb.go rename to order/gen/order_service_grpc.pb.go index b4a7a3b..c1f0d45 100644 --- a/order/order_service_grpc.pb.go +++ b/order/gen/order_service_grpc.pb.go @@ -4,7 +4,7 @@ // - protoc v3.20.0 // source: protos/order_service.proto -package __ +package gen import ( context "context" diff --git a/order/protos/get_order.proto b/order/protos/get_order.proto index fd2faf8..fca8676 100644 --- a/order/protos/get_order.proto +++ b/order/protos/get_order.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package order; -option go_package = "/"; +option go_package = "./gen"; // The request message containing the order. message GetOrderRequest { diff --git a/order/protos/order_service.proto b/order/protos/order_service.proto index 8d57af4..b9af595 100644 --- a/order/protos/order_service.proto +++ b/order/protos/order_service.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package order; -option go_package = "/"; +option go_package = "./gen"; import "protos/get_order.proto"; diff --git a/user/get_user.pb.go b/user/gen/get_user.pb.go similarity index 97% rename from user/get_user.pb.go rename to user/gen/get_user.pb.go index 5cc3738..5dcd6eb 100644 --- a/user/get_user.pb.go +++ b/user/gen/get_user.pb.go @@ -4,7 +4,7 @@ // protoc v3.20.0 // source: protos/get_user.proto -package __ +package gen import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -127,8 +127,8 @@ var file_protos_get_user_proto_rawDesc = []byte{ 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x75, - 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x42, 0x03, - 0x5a, 0x01, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x42, 0x07, + 0x5a, 0x05, 0x2e, 0x2f, 0x67, 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/user/user.pb.go b/user/gen/user.pb.go similarity index 97% rename from user/user.pb.go rename to user/gen/user.pb.go index f74906a..a58b205 100644 --- a/user/user.pb.go +++ b/user/gen/user.pb.go @@ -4,7 +4,7 @@ // protoc v3.20.0 // source: protos/user.proto -package __ +package gen import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -157,8 +157,8 @@ var file_protos_user_proto_rawDesc = []byte{ 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x7a, 0x69, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x7a, 0x69, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x72, 0x79, 0x42, 0x03, 0x5a, 0x01, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6e, 0x74, 0x72, 0x79, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x2f, 0x67, 0x65, 0x6e, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/user/user_service.pb.go b/user/gen/user_service.pb.go similarity index 95% rename from user/user_service.pb.go rename to user/gen/user_service.pb.go index 3156ca5..b4e242f 100644 --- a/user/user_service.pb.go +++ b/user/gen/user_service.pb.go @@ -4,7 +4,7 @@ // protoc v3.20.0 // source: protos/user_service.proto -package __ +package gen import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -30,7 +30,8 @@ var file_protos_user_service_proto_rawDesc = []byte{ 0x65, 0x72, 0x12, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x42, 0x03, 0x5a, 0x01, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x00, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x2f, 0x67, 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var file_protos_user_service_proto_goTypes = []interface{}{ diff --git a/user/user_service_grpc.pb.go b/user/gen/user_service_grpc.pb.go similarity index 99% rename from user/user_service_grpc.pb.go rename to user/gen/user_service_grpc.pb.go index 55964cd..c0f1fef 100644 --- a/user/user_service_grpc.pb.go +++ b/user/gen/user_service_grpc.pb.go @@ -4,7 +4,7 @@ // - protoc v3.20.0 // source: protos/user_service.proto -package __ +package gen import ( context "context" diff --git a/user/protos/get_user.proto b/user/protos/get_user.proto index 0411131..b1f1e1c 100644 --- a/user/protos/get_user.proto +++ b/user/protos/get_user.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package user; -option go_package = "/"; +option go_package = "./gen"; import "protos/user.proto"; diff --git a/user/protos/user.proto b/user/protos/user.proto index 0ed4ee7..3e36881 100644 --- a/user/protos/user.proto +++ b/user/protos/user.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package user; -option go_package = "/"; +option go_package = "./gen"; message User { int32 id = 1; diff --git a/user/protos/user_service.proto b/user/protos/user_service.proto index b055e6d..7d87d92 100644 --- a/user/protos/user_service.proto +++ b/user/protos/user_service.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package user; -option go_package = "/"; +option go_package = "./gen"; import "protos/get_user.proto";