Skip to content
Snippets Groups Projects
Commit 7176a828 authored by Yuchen Zeng's avatar Yuchen Zeng
Browse files

Use --protofiles

parent c931305c
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ DEFINE_bool(remotedb, true, "Use server types to parse and format messages"); ...@@ -57,7 +57,7 @@ DEFINE_bool(remotedb, true, "Use server types to parse and format messages");
DEFINE_string(metadata, "", DEFINE_string(metadata, "",
"Metadata to send to server, in the form of key1:val1:key2:val2"); "Metadata to send to server, in the form of key1:val1:key2:val2");
DEFINE_string(proto_path, ".", "Path to look for the proto file."); DEFINE_string(proto_path, ".", "Path to look for the proto file.");
DEFINE_string(proto_file, "", "Name of the proto file."); DEFINE_string(protofiles, "", "Name of the proto file.");
DEFINE_bool(binary_input, false, "Input in binary format"); DEFINE_bool(binary_input, false, "Input in binary format");
DEFINE_bool(binary_output, false, "Output in binary format"); DEFINE_bool(binary_output, false, "Output in binary format");
DEFINE_string(infile, "", "Input file (default is stdin)"); DEFINE_string(infile, "", "Input file (default is stdin)");
...@@ -71,9 +71,9 @@ class GrpcTool { ...@@ -71,9 +71,9 @@ class GrpcTool {
explicit GrpcTool(); explicit GrpcTool();
virtual ~GrpcTool() {} virtual ~GrpcTool() {}
bool Help(int argc, const char** argv, CliCredentials cred, bool Help(int argc, const char** argv, const CliCredentials& cred,
GrpcToolOutputCallback callback); GrpcToolOutputCallback callback);
bool CallMethod(int argc, const char** argv, CliCredentials cred, bool CallMethod(int argc, const char** argv, const CliCredentials& cred,
GrpcToolOutputCallback callback); GrpcToolOutputCallback callback);
// TODO(zyc): implement the following methods // TODO(zyc): implement the following methods
// bool ListServices(int argc, const char** argv, GrpcToolOutputCallback // bool ListServices(int argc, const char** argv, GrpcToolOutputCallback
...@@ -101,7 +101,7 @@ class GrpcTool { ...@@ -101,7 +101,7 @@ class GrpcTool {
}; };
template <typename T> template <typename T>
std::function<bool(GrpcTool*, int, const char**, const CliCredentials, std::function<bool(GrpcTool*, int, const char**, const CliCredentials&,
GrpcToolOutputCallback)> GrpcToolOutputCallback)>
BindWith5Args(T&& func) { BindWith5Args(T&& func) {
return std::bind(std::forward<T>(func), std::placeholders::_1, return std::bind(std::forward<T>(func), std::placeholders::_1,
...@@ -156,7 +156,7 @@ void PrintMetadata(const T& m, const grpc::string& message) { ...@@ -156,7 +156,7 @@ void PrintMetadata(const T& m, const grpc::string& message) {
struct Command { struct Command {
const char* command; const char* command;
std::function<bool(GrpcTool*, int, const char**, const CliCredentials, std::function<bool(GrpcTool*, int, const char**, const CliCredentials&,
GrpcToolOutputCallback)> GrpcToolOutputCallback)>
function; function;
int min_args; int min_args;
...@@ -201,7 +201,7 @@ const Command* FindCommand(const grpc::string& name) { ...@@ -201,7 +201,7 @@ const Command* FindCommand(const grpc::string& name) {
} }
} // namespace } // namespace
int GrpcToolMainLib(int argc, const char** argv, const CliCredentials cred, int GrpcToolMainLib(int argc, const char** argv, const CliCredentials& cred,
GrpcToolOutputCallback callback) { GrpcToolOutputCallback callback) {
if (argc < 2) { if (argc < 2) {
Usage("No command specified"); Usage("No command specified");
...@@ -238,7 +238,7 @@ void GrpcTool::CommandUsage(const grpc::string& usage) const { ...@@ -238,7 +238,7 @@ void GrpcTool::CommandUsage(const grpc::string& usage) const {
} }
} }
bool GrpcTool::Help(int argc, const char** argv, const CliCredentials cred, bool GrpcTool::Help(int argc, const char** argv, const CliCredentials& cred,
GrpcToolOutputCallback callback) { GrpcToolOutputCallback callback) {
CommandUsage( CommandUsage(
"Print help\n" "Print help\n"
...@@ -258,7 +258,7 @@ bool GrpcTool::Help(int argc, const char** argv, const CliCredentials cred, ...@@ -258,7 +258,7 @@ bool GrpcTool::Help(int argc, const char** argv, const CliCredentials cred,
} }
bool GrpcTool::CallMethod(int argc, const char** argv, bool GrpcTool::CallMethod(int argc, const char** argv,
const CliCredentials cred, const CliCredentials& cred,
GrpcToolOutputCallback callback) { GrpcToolOutputCallback callback) {
CommandUsage( CommandUsage(
"Call method\n" "Call method\n"
...@@ -267,10 +267,10 @@ bool GrpcTool::CallMethod(int argc, const char** argv, ...@@ -267,10 +267,10 @@ bool GrpcTool::CallMethod(int argc, const char** argv,
" <service> ; Exported service name\n" " <service> ; Exported service name\n"
" <method> ; Method name\n" " <method> ; Method name\n"
" <request> ; Text protobuffer (overrides infile)\n" " <request> ; Text protobuffer (overrides infile)\n"
" --proto_file ; Comma separated proto files used as a" " --protofiles ; Comma separated proto files used as a"
" fallback when parsing request/response\n" " fallback when parsing request/response\n"
" --proto_path ; The search path of proto files, valid" " --proto_path ; The search path of proto files, valid"
" only when --proto_file is given\n" " only when --protofiles is given\n"
" --metadata ; The metadata to be sent to the server\n" " --metadata ; The metadata to be sent to the server\n"
" --infile ; Input filename (defaults to stdin)\n" " --infile ; Input filename (defaults to stdin)\n"
" --outfile ; Output filename (defaults to stdout)\n" " --outfile ; Output filename (defaults to stdout)\n"
...@@ -310,7 +310,7 @@ bool GrpcTool::CallMethod(int argc, const char** argv, ...@@ -310,7 +310,7 @@ bool GrpcTool::CallMethod(int argc, const char** argv,
if (!FLAGS_binary_input || !FLAGS_binary_output) { if (!FLAGS_binary_input || !FLAGS_binary_output) {
parser.reset( parser.reset(
new grpc::testing::ProtoFileParser(FLAGS_remotedb ? channel : nullptr, new grpc::testing::ProtoFileParser(FLAGS_remotedb ? channel : nullptr,
FLAGS_proto_path, FLAGS_proto_file)); FLAGS_proto_path, FLAGS_protofiles));
if (parser->HasError()) { if (parser->HasError()) {
return false; return false;
} }
......
...@@ -45,7 +45,7 @@ namespace testing { ...@@ -45,7 +45,7 @@ namespace testing {
typedef std::function<bool(const grpc::string &)> GrpcToolOutputCallback; typedef std::function<bool(const grpc::string &)> GrpcToolOutputCallback;
int GrpcToolMainLib(int argc, const char **argv, CliCredentials cred, int GrpcToolMainLib(int argc, const char **argv, const CliCredentials &cred,
GrpcToolOutputCallback callback); GrpcToolOutputCallback callback);
} // namespace testing } // namespace testing
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment