Skip to content

Commit 8aca2ac

Browse files
esindrilesindril
committed
PROT: Bring in sync the probuf definitions between eos and eos-grpc-gateway
1 parent c0e633f commit 8aca2ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+107
-12
lines changed

‎mgm/proc/admin/FsckCmd.cc

+3
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ FsckCmd::ProcessRequest() noexcept
162162
return reply;
163163
}
164164

165+
#ifdef EOS_GRPC_GATEWAY
165166
//------------------------------------------------------------------------------
166167
// Method implementing the specific behaviour of the command executed and
167168
// streaming the response via the grpc::ServerWriter
@@ -310,4 +311,6 @@ FsckCmd::ProcessRequest(grpc::ServerWriter<eos::console::ReplyProto>* writer)
310311
}
311312
}
312313

314+
#endif
315+
313316
EOSMGMNAMESPACE_END

‎proto/common/cli_proto/Access.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message AccessProto {
1012

1113
message LsProto {

‎proto/common/cli_proto/Acl.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message AclProto {
57
enum OpType {
68
NONE = 0;

‎proto/common/cli_proto/Archive.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message ArchiveProto {
1012
string command = 1;
1113
string path = 2;

‎proto/common/cli_proto/Attr.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ package eos.console;
88

99
import "Metadata.proto";
1010

11+
option go_package = "eos.rest.gateway.service";
12+
1113
enum AttrCmd {
1214
ATTR_LS = 0;
1315
ATTR_SET = 1;
@@ -25,4 +27,4 @@ message AttrProto {
2527
bytes value = 4;
2628
bool recursive = 5;
2729
bytes link = 6;
28-
}
30+
}

‎proto/common/cli_proto/Authentication.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ syntax="proto3";
66

77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message RoleId {
1012
uint64 uid = 1;
1113
uint64 gid = 2;
@@ -16,4 +18,4 @@ message RoleId {
1618
message AuthProto {
1719
string authkey = 1;
1820
RoleId role = 2;
19-
}
21+
}

‎proto/common/cli_proto/Backup.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message BackupProto {
1012
string src_url = 1;
1113
string dst_url = 2;

‎proto/common/cli_proto/ChangeMode.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ package eos.console;
99

1010
import "Metadata.proto";
1111

12+
option go_package = "eos.rest.gateway.service";
13+
1214
message ChmodProto {
1315
Metadata md = 1;
1416
int64 mode = 2;
1517
bool recursive = 3;
16-
}
18+
}

‎proto/common/cli_proto/Config.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message ConfigProto {
1012

1113
message LsProto {

‎proto/common/cli_proto/ConsoleReply.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
//------------------------------------------------------------------------------
57
// Reply message sent to the client
68
//------------------------------------------------------------------------------

‎proto/common/cli_proto/Convert.proto

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message ConvertProto {
57
message IdentifierProto {
68
oneof Identifier {
@@ -46,11 +48,11 @@ message ConvertProto {
4648
}
4749

4850
message ListProto {
49-
51+
string type = 1;
5052
}
5153

5254
message ClearProto {
53-
55+
string type = 1;
5456
}
5557

5658
oneof subcmd {

‎proto/common/cli_proto/Cp.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ syntax="proto3";
66

77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message CpProto {
1012
message ChecksumProto {
1113
string path = 1;

‎proto/common/cli_proto/Debug.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message DebugProto {
1012

1113
message SetProto {

‎proto/common/cli_proto/Evict.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message EvictProto {
57
message FileProto {
68
oneof File {

‎proto/common/cli_proto/File.proto

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ package eos.console;
99
import "Metadata.proto";
1010
import "Authentication.proto";
1111

12+
option go_package = "eos.rest.gateway.service";
13+
1214
message FileProto {
1315
Metadata md = 1;
1416
oneof FileCommand {

‎proto/common/cli_proto/Fileinfo.proto

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ package eos.console;
88

99
import "Metadata.proto";
1010

11+
option go_package = "eos.rest.gateway.service";
12+
1113
message FileinfoProto {
1214
Metadata md = 1;
1315
bool path = 2;

‎proto/common/cli_proto/Find.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message FindProto {
57
bool Files = 1;
68
bool Directories = 2;

‎proto/common/cli_proto/Fs.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message FsProto {
57
message AddProto {
68
bool Manual = 1;

‎proto/common/cli_proto/Fsck.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message FsckProto {
57
message ConfigProto {
68
string key = 1;

‎proto/common/cli_proto/Geosched.proto

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
syntax="proto3";
88
package eos.console;
99

10+
option go_package = "eos.rest.gateway.service";
11+
1012
message GeoschedProto {
1113
message AccessProto {
1214
string subcmd = 1;

‎proto/common/cli_proto/Group.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message GroupProto {
1012

1113
message LsProto {

‎proto/common/cli_proto/Health.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message HealthProto {
1012
bool all_info = 1;
1113
bool monitoring = 2;

‎proto/common/cli_proto/Io.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message IoProto {
1012

1113
message StatProto {

‎proto/common/cli_proto/Ls.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ syntax="proto3";
66

77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
import "Metadata.proto";
1012

1113
message LsProto {
@@ -18,6 +20,6 @@ message LsProto {
1820
bool num_ids = 7; // -n
1921
bool append_dir_ind = 8; // -F
2022
bool silent = 9; // -s
21-
bool noglobbing = 11; // --no-globbing
2223
bool wnc = 10; // for EOS-wnc
24+
bool noglobbing = 11; // --no-globbing
2325
}

‎proto/common/cli_proto/MakeDirectory.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ package eos.console;
99

1010
import "Metadata.proto";
1111

12+
option go_package = "eos.rest.gateway.service";
13+
1214
message MkdirProto {
1315
Metadata md = 1;
1416
bool parents = 2;
1517
int64 mode = 3;
16-
}
18+
}

‎proto/common/cli_proto/Map.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message MapProto {
1012
string command = 1;
1113
string src_path = 2;

‎proto/common/cli_proto/Member.proto

+3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message MemberProto {
1012
string egroup = 1;
1113
bool update = 2;
1214
}
15+

‎proto/common/cli_proto/Metadata.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ syntax="proto3";
66

77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
enum TYPE {
1012
FILE = 0;
1113
CONTAINER = 1;
@@ -17,4 +19,4 @@ message Metadata {
1719
fixed64 id = 2;
1820
fixed64 ino = 3;
1921
TYPE type = 4;
20-
}
22+
}

‎proto/common/cli_proto/Move.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ package eos.console;
88

99
import "Metadata.proto";
1010

11+
option go_package = "eos.rest.gateway.service";
12+
1113
message MoveProto {
1214
Metadata md = 1;
1315
bytes target = 2;
14-
}
16+
}

‎proto/common/cli_proto/Node.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message NodeProto {
1012

1113
message LsProto {

‎proto/common/cli_proto/Ns.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message NsProto {
57
message StatProto {
68
bool Groupids = 1;
@@ -129,7 +131,7 @@ message NsProto {
129131
string name = 2;
130132
string value = 3;
131133
}
132-
134+
133135
oneof subcmd {
134136
StatProto stat = 1;
135137
MutexProto mutex = 2;

‎proto/common/cli_proto/QoS.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message QoSProto {
57
message IdentifierProto {
68
oneof Identifier {

‎proto/common/cli_proto/Quota.proto

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
syntax="proto3";
77
package eos.console;
88

9+
option go_package = "eos.rest.gateway.service";
10+
911
message QuotaProto {
1012

1113
message LsuserProto {

‎proto/common/cli_proto/Recycle.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message RecycleProto {
57
message LsProto {
68
bool FullDetails = 1;

‎proto/common/cli_proto/Rm.proto

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
syntax="proto3";
22
package eos.console;
33

4+
option go_package = "eos.rest.gateway.service";
5+
46
message RmProto {
57
bool Recursive = 1;
68
bool BypassRecycle = 2;

‎proto/common/cli_proto/Rmdir.proto

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ package eos.console;
88

99
import "Metadata.proto";
1010

11+
option go_package = "eos.rest.gateway.service";
12+
1113
message RmdirProto {
1214
Metadata md = 1;
13-
}
15+
}

0 commit comments

Comments
 (0)