From 9e93121ca2e44ad7a685d669327e530ac9d9e252 Mon Sep 17 00:00:00 2001 From: Robert Kopaczewski Date: Tue, 2 Jun 2020 17:31:16 +0200 Subject: [PATCH] feat: delete rpc (#3) * feat: delete rpc * ignore lines starting with / --- .circleci/config.yml | 4 +- gen/go/syncano/codebox/broker/v1/broker.pb.go | 91 ++++-- gen/go/syncano/codebox/filerepo/v1/repo.pb.go | 2 +- gen/go/syncano/codebox/lb/v1/runner.pb.go | 83 ++++- gen/go/syncano/codebox/lb/v1/workerplug.pb.go | 2 +- gen/go/syncano/codebox/script/v1/script.pb.go | 293 +++++++++++++++--- .../syncano/codebox/broker/v1/broker_pb2.py | 13 +- .../codebox/broker/v1/broker_pb2_grpc.py | 33 ++ .../syncano/codebox/lb/v1/runner_pb2.py | 15 +- .../syncano/codebox/lb/v1/runner_pb2_grpc.py | 33 ++ .../syncano/codebox/script/v1/script_pb2.py | 137 ++++++-- .../codebox/script/v1/script_pb2_grpc.py | 33 ++ syncano/codebox/broker/v1/broker.proto | 2 + syncano/codebox/lb/v1/runner.proto | 2 + syncano/codebox/script/v1/script.proto | 14 +- 15 files changed, 641 insertions(+), 116 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e55f0b..654bb22 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ commands: parameters: version: type: string - default: "3.12.1" + default: "3.12.2" steps: - run: name: Install protoc @@ -33,7 +33,7 @@ commands: - run: name: Verify if all files are clean command: | - git diff --exit-code + git diff -G'^[^\/]' --exit-code jobs: diff --git a/gen/go/syncano/codebox/broker/v1/broker.pb.go b/gen/go/syncano/codebox/broker/v1/broker.pb.go index 890bcc7..c69325e 100644 --- a/gen/go/syncano/codebox/broker/v1/broker.pb.go +++ b/gen/go/syncano/codebox/broker/v1/broker.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.24.0-devel -// protoc v3.12.1 +// protoc v3.12.2 // source: syncano/codebox/broker/v1/broker.proto package broker @@ -342,7 +342,7 @@ var file_syncano_codebox_broker_v1_broker_proto_rawDesc = []byte{ 0x0b, 0x32, 0x22, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0a, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x4d, 0x65, 0x74, - 0x61, 0x32, 0xcc, 0x01, 0x0a, 0x0c, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x75, 0x6e, 0x6e, + 0x61, 0x32, 0xab, 0x02, 0x0a, 0x0c, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x58, 0x0a, 0x03, 0x52, 0x75, 0x6e, 0x12, 0x25, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, @@ -355,12 +355,18 @@ var file_syncano_codebox_broker_v1_broker_proto_rawDesc = []byte{ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, - 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x53, - 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x61, 0x70, - 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, - 0x6f, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2f, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, - 0x2f, 0x76, 0x31, 0x3b, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x12, 0x5d, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x28, 0x2e, 0x73, 0x79, 0x6e, + 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, + 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, + 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x53, 0x79, + 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x61, 0x70, 0x69, + 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, + 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2f, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x2f, + 0x76, 0x31, 0x3b, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -377,14 +383,16 @@ func file_syncano_codebox_broker_v1_broker_proto_rawDescGZIP() []byte { var file_syncano_codebox_broker_v1_broker_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_syncano_codebox_broker_v1_broker_proto_goTypes = []interface{}{ - (*RunMeta)(nil), // 0: syncano.codebox.broker.v1.RunMeta - (*RunRequest)(nil), // 1: syncano.codebox.broker.v1.RunRequest - (*SimpleRunRequest)(nil), // 2: syncano.codebox.broker.v1.SimpleRunRequest - nil, // 3: syncano.codebox.broker.v1.RunMeta.FilesEntry - (*v1.RunMeta)(nil), // 4: syncano.codebox.lb.v1.RunMeta - (*v11.RunMeta)(nil), // 5: syncano.codebox.script.v1.RunMeta - (*v11.RunChunk)(nil), // 6: syncano.codebox.script.v1.RunChunk - (*v11.RunResponse)(nil), // 7: syncano.codebox.script.v1.RunResponse + (*RunMeta)(nil), // 0: syncano.codebox.broker.v1.RunMeta + (*RunRequest)(nil), // 1: syncano.codebox.broker.v1.RunRequest + (*SimpleRunRequest)(nil), // 2: syncano.codebox.broker.v1.SimpleRunRequest + nil, // 3: syncano.codebox.broker.v1.RunMeta.FilesEntry + (*v1.RunMeta)(nil), // 4: syncano.codebox.lb.v1.RunMeta + (*v11.RunMeta)(nil), // 5: syncano.codebox.script.v1.RunMeta + (*v11.RunChunk)(nil), // 6: syncano.codebox.script.v1.RunChunk + (*v11.DeleteRequest)(nil), // 7: syncano.codebox.script.v1.DeleteRequest + (*v11.RunResponse)(nil), // 8: syncano.codebox.script.v1.RunResponse + (*v11.DeleteResponse)(nil), // 9: syncano.codebox.script.v1.DeleteResponse } var file_syncano_codebox_broker_v1_broker_proto_depIdxs = []int32{ 3, // 0: syncano.codebox.broker.v1.RunMeta.files:type_name -> syncano.codebox.broker.v1.RunMeta.FilesEntry @@ -397,10 +405,12 @@ var file_syncano_codebox_broker_v1_broker_proto_depIdxs = []int32{ 5, // 7: syncano.codebox.broker.v1.SimpleRunRequest.script_meta:type_name -> syncano.codebox.script.v1.RunMeta 1, // 8: syncano.codebox.broker.v1.ScriptRunner.Run:input_type -> syncano.codebox.broker.v1.RunRequest 2, // 9: syncano.codebox.broker.v1.ScriptRunner.SimpleRun:input_type -> syncano.codebox.broker.v1.SimpleRunRequest - 7, // 10: syncano.codebox.broker.v1.ScriptRunner.Run:output_type -> syncano.codebox.script.v1.RunResponse - 7, // 11: syncano.codebox.broker.v1.ScriptRunner.SimpleRun:output_type -> syncano.codebox.script.v1.RunResponse - 10, // [10:12] is the sub-list for method output_type - 8, // [8:10] is the sub-list for method input_type + 7, // 10: syncano.codebox.broker.v1.ScriptRunner.Delete:input_type -> syncano.codebox.script.v1.DeleteRequest + 8, // 11: syncano.codebox.broker.v1.ScriptRunner.Run:output_type -> syncano.codebox.script.v1.RunResponse + 8, // 12: syncano.codebox.broker.v1.ScriptRunner.SimpleRun:output_type -> syncano.codebox.script.v1.RunResponse + 9, // 13: syncano.codebox.broker.v1.ScriptRunner.Delete:output_type -> syncano.codebox.script.v1.DeleteResponse + 11, // [11:14] is the sub-list for method output_type + 8, // [8:11] is the sub-list for method input_type 8, // [8:8] is the sub-list for extension type_name 8, // [8:8] is the sub-list for extension extendee 0, // [0:8] is the sub-list for field type_name @@ -492,6 +502,8 @@ type ScriptRunnerClient interface { // SimpleRun is a simpler alternative to Run that does not require streaming request. // As such, it is only usable for small payloads and does not support chunks. SimpleRun(ctx context.Context, in *SimpleRunRequest, opts ...grpc.CallOption) (ScriptRunner_SimpleRunClient, error) + // Delete deletes all containers for specified script index. + Delete(ctx context.Context, in *v11.DeleteRequest, opts ...grpc.CallOption) (*v11.DeleteResponse, error) } type scriptRunnerClient struct { @@ -565,6 +577,15 @@ func (x *scriptRunnerSimpleRunClient) Recv() (*v11.RunResponse, error) { return m, nil } +func (c *scriptRunnerClient) Delete(ctx context.Context, in *v11.DeleteRequest, opts ...grpc.CallOption) (*v11.DeleteResponse, error) { + out := new(v11.DeleteResponse) + err := c.cc.Invoke(ctx, "/syncano.codebox.broker.v1.ScriptRunner/Delete", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ScriptRunnerServer is the server API for ScriptRunner service. type ScriptRunnerServer interface { // Run runs script in secure environment. @@ -572,6 +593,8 @@ type ScriptRunnerServer interface { // SimpleRun is a simpler alternative to Run that does not require streaming request. // As such, it is only usable for small payloads and does not support chunks. SimpleRun(*SimpleRunRequest, ScriptRunner_SimpleRunServer) error + // Delete deletes all containers for specified script index. + Delete(context.Context, *v11.DeleteRequest) (*v11.DeleteResponse, error) } // UnimplementedScriptRunnerServer can be embedded to have forward compatible implementations. @@ -584,6 +607,9 @@ func (*UnimplementedScriptRunnerServer) Run(ScriptRunner_RunServer) error { func (*UnimplementedScriptRunnerServer) SimpleRun(*SimpleRunRequest, ScriptRunner_SimpleRunServer) error { return status.Errorf(codes.Unimplemented, "method SimpleRun not implemented") } +func (*UnimplementedScriptRunnerServer) Delete(context.Context, *v11.DeleteRequest) (*v11.DeleteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") +} func RegisterScriptRunnerServer(s *grpc.Server, srv ScriptRunnerServer) { s.RegisterService(&_ScriptRunner_serviceDesc, srv) @@ -636,10 +662,33 @@ func (x *scriptRunnerSimpleRunServer) Send(m *v11.RunResponse) error { return x.ServerStream.SendMsg(m) } +func _ScriptRunner_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(v11.DeleteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ScriptRunnerServer).Delete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/syncano.codebox.broker.v1.ScriptRunner/Delete", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ScriptRunnerServer).Delete(ctx, req.(*v11.DeleteRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _ScriptRunner_serviceDesc = grpc.ServiceDesc{ ServiceName: "syncano.codebox.broker.v1.ScriptRunner", HandlerType: (*ScriptRunnerServer)(nil), - Methods: []grpc.MethodDesc{}, + Methods: []grpc.MethodDesc{ + { + MethodName: "Delete", + Handler: _ScriptRunner_Delete_Handler, + }, + }, Streams: []grpc.StreamDesc{ { StreamName: "Run", diff --git a/gen/go/syncano/codebox/filerepo/v1/repo.pb.go b/gen/go/syncano/codebox/filerepo/v1/repo.pb.go index 5d73da3..3562ef3 100644 --- a/gen/go/syncano/codebox/filerepo/v1/repo.pb.go +++ b/gen/go/syncano/codebox/filerepo/v1/repo.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.24.0-devel -// protoc v3.12.1 +// protoc v3.12.2 // source: syncano/codebox/filerepo/v1/repo.proto package filerepo diff --git a/gen/go/syncano/codebox/lb/v1/runner.pb.go b/gen/go/syncano/codebox/lb/v1/runner.pb.go index 5bc86ab..46f307b 100644 --- a/gen/go/syncano/codebox/lb/v1/runner.pb.go +++ b/gen/go/syncano/codebox/lb/v1/runner.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.24.0-devel -// protoc v3.12.1 +// protoc v3.12.2 // source: syncano/codebox/lb/v1/runner.proto package lb @@ -211,13 +211,19 @@ var file_syncano_codebox_lb_v1_runner_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x32, 0x64, 0x0a, 0x0c, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x75, 0x6e, - 0x6e, 0x65, 0x72, 0x12, 0x54, 0x0a, 0x03, 0x52, 0x75, 0x6e, 0x12, 0x21, 0x2e, 0x73, 0x79, 0x6e, - 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x6c, 0x62, 0x2e, - 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, - 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, - 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x40, 0x5a, 0x3e, 0x67, 0x69, 0x74, + 0x6c, 0x75, 0x65, 0x32, 0xc3, 0x01, 0x0a, 0x0c, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x75, + 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x54, 0x0a, 0x03, 0x52, 0x75, 0x6e, 0x12, 0x21, 0x2e, 0x73, 0x79, + 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x6c, 0x62, + 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, + 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, + 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x12, 0x5d, 0x0a, 0x06, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x12, 0x28, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, + 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, + 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, + 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x40, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x53, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x62, @@ -239,20 +245,24 @@ func file_syncano_codebox_lb_v1_runner_proto_rawDescGZIP() []byte { var file_syncano_codebox_lb_v1_runner_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_syncano_codebox_lb_v1_runner_proto_goTypes = []interface{}{ - (*RunMeta)(nil), // 0: syncano.codebox.lb.v1.RunMeta - (*RunRequest)(nil), // 1: syncano.codebox.lb.v1.RunRequest - (*v1.RunMeta)(nil), // 2: syncano.codebox.script.v1.RunMeta - (*v1.RunChunk)(nil), // 3: syncano.codebox.script.v1.RunChunk - (*v1.RunResponse)(nil), // 4: syncano.codebox.script.v1.RunResponse + (*RunMeta)(nil), // 0: syncano.codebox.lb.v1.RunMeta + (*RunRequest)(nil), // 1: syncano.codebox.lb.v1.RunRequest + (*v1.RunMeta)(nil), // 2: syncano.codebox.script.v1.RunMeta + (*v1.RunChunk)(nil), // 3: syncano.codebox.script.v1.RunChunk + (*v1.DeleteRequest)(nil), // 4: syncano.codebox.script.v1.DeleteRequest + (*v1.RunResponse)(nil), // 5: syncano.codebox.script.v1.RunResponse + (*v1.DeleteResponse)(nil), // 6: syncano.codebox.script.v1.DeleteResponse } var file_syncano_codebox_lb_v1_runner_proto_depIdxs = []int32{ 0, // 0: syncano.codebox.lb.v1.RunRequest.meta:type_name -> syncano.codebox.lb.v1.RunMeta 2, // 1: syncano.codebox.lb.v1.RunRequest.script_meta:type_name -> syncano.codebox.script.v1.RunMeta 3, // 2: syncano.codebox.lb.v1.RunRequest.script_chunk:type_name -> syncano.codebox.script.v1.RunChunk 1, // 3: syncano.codebox.lb.v1.ScriptRunner.Run:input_type -> syncano.codebox.lb.v1.RunRequest - 4, // 4: syncano.codebox.lb.v1.ScriptRunner.Run:output_type -> syncano.codebox.script.v1.RunResponse - 4, // [4:5] is the sub-list for method output_type - 3, // [3:4] is the sub-list for method input_type + 4, // 4: syncano.codebox.lb.v1.ScriptRunner.Delete:input_type -> syncano.codebox.script.v1.DeleteRequest + 5, // 5: syncano.codebox.lb.v1.ScriptRunner.Run:output_type -> syncano.codebox.script.v1.RunResponse + 6, // 6: syncano.codebox.lb.v1.ScriptRunner.Delete:output_type -> syncano.codebox.script.v1.DeleteResponse + 5, // [5:7] is the sub-list for method output_type + 3, // [3:5] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name 3, // [3:3] is the sub-list for extension extendee 0, // [0:3] is the sub-list for field type_name @@ -328,6 +338,8 @@ const _ = grpc.SupportPackageIsVersion6 type ScriptRunnerClient interface { // Run runs script in secure environment of worker. Run(ctx context.Context, opts ...grpc.CallOption) (ScriptRunner_RunClient, error) + // Delete deletes all containers for specified script index. + Delete(ctx context.Context, in *v1.DeleteRequest, opts ...grpc.CallOption) (*v1.DeleteResponse, error) } type scriptRunnerClient struct { @@ -369,10 +381,21 @@ func (x *scriptRunnerRunClient) Recv() (*v1.RunResponse, error) { return m, nil } +func (c *scriptRunnerClient) Delete(ctx context.Context, in *v1.DeleteRequest, opts ...grpc.CallOption) (*v1.DeleteResponse, error) { + out := new(v1.DeleteResponse) + err := c.cc.Invoke(ctx, "/syncano.codebox.lb.v1.ScriptRunner/Delete", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ScriptRunnerServer is the server API for ScriptRunner service. type ScriptRunnerServer interface { // Run runs script in secure environment of worker. Run(ScriptRunner_RunServer) error + // Delete deletes all containers for specified script index. + Delete(context.Context, *v1.DeleteRequest) (*v1.DeleteResponse, error) } // UnimplementedScriptRunnerServer can be embedded to have forward compatible implementations. @@ -382,6 +405,9 @@ type UnimplementedScriptRunnerServer struct { func (*UnimplementedScriptRunnerServer) Run(ScriptRunner_RunServer) error { return status.Errorf(codes.Unimplemented, "method Run not implemented") } +func (*UnimplementedScriptRunnerServer) Delete(context.Context, *v1.DeleteRequest) (*v1.DeleteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") +} func RegisterScriptRunnerServer(s *grpc.Server, srv ScriptRunnerServer) { s.RegisterService(&_ScriptRunner_serviceDesc, srv) @@ -413,10 +439,33 @@ func (x *scriptRunnerRunServer) Recv() (*RunRequest, error) { return m, nil } +func _ScriptRunner_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(v1.DeleteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ScriptRunnerServer).Delete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/syncano.codebox.lb.v1.ScriptRunner/Delete", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ScriptRunnerServer).Delete(ctx, req.(*v1.DeleteRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _ScriptRunner_serviceDesc = grpc.ServiceDesc{ ServiceName: "syncano.codebox.lb.v1.ScriptRunner", HandlerType: (*ScriptRunnerServer)(nil), - Methods: []grpc.MethodDesc{}, + Methods: []grpc.MethodDesc{ + { + MethodName: "Delete", + Handler: _ScriptRunner_Delete_Handler, + }, + }, Streams: []grpc.StreamDesc{ { StreamName: "Run", diff --git a/gen/go/syncano/codebox/lb/v1/workerplug.pb.go b/gen/go/syncano/codebox/lb/v1/workerplug.pb.go index c36db34..0d4d30c 100644 --- a/gen/go/syncano/codebox/lb/v1/workerplug.pb.go +++ b/gen/go/syncano/codebox/lb/v1/workerplug.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.24.0-devel -// protoc v3.12.1 +// protoc v3.12.2 // source: syncano/codebox/lb/v1/workerplug.proto package lb diff --git a/gen/go/syncano/codebox/script/v1/script.pb.go b/gen/go/syncano/codebox/script/v1/script.pb.go index d61a0cd..9fd3d03 100644 --- a/gen/go/syncano/codebox/script/v1/script.pb.go +++ b/gen/go/syncano/codebox/script/v1/script.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.24.0-devel -// protoc v3.12.1 +// protoc v3.12.2 // source: syncano/codebox/script/v1/script.proto package script @@ -392,7 +392,6 @@ type RunResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ContainerId string `protobuf:"bytes,9,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` Stdout []byte `protobuf:"bytes,2,opt,name=stdout,proto3" json:"stdout,omitempty"` Stderr []byte `protobuf:"bytes,3,opt,name=stderr,proto3" json:"stderr,omitempty"` @@ -401,6 +400,7 @@ type RunResponse struct { Cached bool `protobuf:"varint,6,opt,name=cached,proto3" json:"cached,omitempty"` Time int64 `protobuf:"varint,7,opt,name=time,proto3" json:"time,omitempty"` Weight uint32 `protobuf:"varint,8,opt,name=weight,proto3" json:"weight,omitempty"` + ContainerId string `protobuf:"bytes,9,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` } func (x *RunResponse) Reset() { @@ -435,13 +435,6 @@ func (*RunResponse) Descriptor() ([]byte, []int) { return file_syncano_codebox_script_v1_script_proto_rawDescGZIP(), []int{4} } -func (x *RunResponse) GetContainerId() string { - if x != nil { - return x.ContainerId - } - return "" -} - func (x *RunResponse) GetCode() int32 { if x != nil { return x.Code @@ -498,6 +491,123 @@ func (x *RunResponse) GetWeight() uint32 { return 0 } +func (x *RunResponse) GetContainerId() string { + if x != nil { + return x.ContainerId + } + return "" +} + +type DeleteRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Runtime string `protobuf:"bytes,1,opt,name=runtime,proto3" json:"runtime,omitempty"` + SourceHash string `protobuf:"bytes,2,opt,name=source_hash,json=sourceHash,proto3" json:"source_hash,omitempty"` + UserId string `protobuf:"bytes,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` +} + +func (x *DeleteRequest) Reset() { + *x = DeleteRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_syncano_codebox_script_v1_script_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DeleteRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteRequest) ProtoMessage() {} + +func (x *DeleteRequest) ProtoReflect() protoreflect.Message { + mi := &file_syncano_codebox_script_v1_script_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteRequest.ProtoReflect.Descriptor instead. +func (*DeleteRequest) Descriptor() ([]byte, []int) { + return file_syncano_codebox_script_v1_script_proto_rawDescGZIP(), []int{5} +} + +func (x *DeleteRequest) GetRuntime() string { + if x != nil { + return x.Runtime + } + return "" +} + +func (x *DeleteRequest) GetSourceHash() string { + if x != nil { + return x.SourceHash + } + return "" +} + +func (x *DeleteRequest) GetUserId() string { + if x != nil { + return x.UserId + } + return "" +} + +type DeleteResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ContainerIds []string `protobuf:"bytes,1,rep,name=container_ids,json=containerIds,proto3" json:"container_ids,omitempty"` +} + +func (x *DeleteResponse) Reset() { + *x = DeleteResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_syncano_codebox_script_v1_script_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DeleteResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteResponse) ProtoMessage() {} + +func (x *DeleteResponse) ProtoReflect() protoreflect.Message { + mi := &file_syncano_codebox_script_v1_script_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteResponse.ProtoReflect.Descriptor instead. +func (*DeleteResponse) Descriptor() ([]byte, []int) { + return file_syncano_codebox_script_v1_script_proto_rawDescGZIP(), []int{6} +} + +func (x *DeleteResponse) GetContainerIds() []string { + if x != nil { + return x.ContainerIds + } + return nil +} + type RunMeta_Options struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -517,7 +627,7 @@ type RunMeta_Options struct { func (x *RunMeta_Options) Reset() { *x = RunMeta_Options{} if protoimpl.UnsafeEnabled { - mi := &file_syncano_codebox_script_v1_script_proto_msgTypes[5] + mi := &file_syncano_codebox_script_v1_script_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -530,7 +640,7 @@ func (x *RunMeta_Options) String() string { func (*RunMeta_Options) ProtoMessage() {} func (x *RunMeta_Options) ProtoReflect() protoreflect.Message { - mi := &file_syncano_codebox_script_v1_script_proto_msgTypes[5] + mi := &file_syncano_codebox_script_v1_script_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -673,35 +783,51 @@ var file_syncano_codebox_script_v1_script_proto_rawDesc = []byte{ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x91, 0x02, 0x0a, 0x0b, 0x52, 0x75, - 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, - 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, - 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x06, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x64, 0x65, - 0x72, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, - 0x12, 0x43, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, - 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x48, - 0x54, 0x54, 0x50, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x6f, 0x6f, 0x6b, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x6f, 0x6f, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x63, - 0x68, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x61, 0x63, 0x68, 0x65, - 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x32, 0x68, 0x0a, - 0x0c, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x58, 0x0a, - 0x03, 0x52, 0x75, 0x6e, 0x12, 0x25, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, - 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, - 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x73, 0x79, - 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x53, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2f, 0x73, 0x79, - 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, - 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, - 0x2f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, + 0x74, 0x64, 0x6f, 0x75, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, 0x12, 0x43, 0x0a, + 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x27, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, + 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x6f, 0x6f, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x04, 0x74, 0x6f, 0x6f, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, + 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x22, 0x63, 0x0a, + 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, + 0x0a, 0x07, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65, + 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, + 0x49, 0x64, 0x22, 0x35, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, + 0x72, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6e, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x73, 0x32, 0xc7, 0x01, 0x0a, 0x0c, 0x53, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x52, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x58, 0x0a, 0x03, 0x52, 0x75, + 0x6e, 0x12, 0x25, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, + 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, + 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, + 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x28, 0x01, 0x30, 0x01, 0x12, 0x5d, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x28, + 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, + 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x73, 0x79, 0x6e, 0x63, 0x61, + 0x6e, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x53, 0x79, 0x6e, 0x63, 0x61, 0x6e, 0x6f, 0x2f, 0x73, 0x79, 0x6e, 0x63, 0x61, 0x6e, + 0x6f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x73, 0x79, 0x6e, + 0x63, 0x61, 0x6e, 0x6f, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x62, 0x6f, 0x78, 0x2f, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -717,7 +843,7 @@ func file_syncano_codebox_script_v1_script_proto_rawDescGZIP() []byte { } var file_syncano_codebox_script_v1_script_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_syncano_codebox_script_v1_script_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_syncano_codebox_script_v1_script_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_syncano_codebox_script_v1_script_proto_goTypes = []interface{}{ (RunChunk_Type)(0), // 0: syncano.codebox.script.v1.RunChunk.Type (*RunMeta)(nil), // 1: syncano.codebox.script.v1.RunMeta @@ -725,20 +851,24 @@ var file_syncano_codebox_script_v1_script_proto_goTypes = []interface{}{ (*RunRequest)(nil), // 3: syncano.codebox.script.v1.RunRequest (*HTTPResponse)(nil), // 4: syncano.codebox.script.v1.HTTPResponse (*RunResponse)(nil), // 5: syncano.codebox.script.v1.RunResponse - (*RunMeta_Options)(nil), // 6: syncano.codebox.script.v1.RunMeta.Options - nil, // 7: syncano.codebox.script.v1.HTTPResponse.HeadersEntry + (*DeleteRequest)(nil), // 6: syncano.codebox.script.v1.DeleteRequest + (*DeleteResponse)(nil), // 7: syncano.codebox.script.v1.DeleteResponse + (*RunMeta_Options)(nil), // 8: syncano.codebox.script.v1.RunMeta.Options + nil, // 9: syncano.codebox.script.v1.HTTPResponse.HeadersEntry } var file_syncano_codebox_script_v1_script_proto_depIdxs = []int32{ - 6, // 0: syncano.codebox.script.v1.RunMeta.options:type_name -> syncano.codebox.script.v1.RunMeta.Options + 8, // 0: syncano.codebox.script.v1.RunMeta.options:type_name -> syncano.codebox.script.v1.RunMeta.Options 0, // 1: syncano.codebox.script.v1.RunChunk.type:type_name -> syncano.codebox.script.v1.RunChunk.Type 1, // 2: syncano.codebox.script.v1.RunRequest.meta:type_name -> syncano.codebox.script.v1.RunMeta 2, // 3: syncano.codebox.script.v1.RunRequest.chunk:type_name -> syncano.codebox.script.v1.RunChunk - 7, // 4: syncano.codebox.script.v1.HTTPResponse.headers:type_name -> syncano.codebox.script.v1.HTTPResponse.HeadersEntry + 9, // 4: syncano.codebox.script.v1.HTTPResponse.headers:type_name -> syncano.codebox.script.v1.HTTPResponse.HeadersEntry 4, // 5: syncano.codebox.script.v1.RunResponse.response:type_name -> syncano.codebox.script.v1.HTTPResponse 3, // 6: syncano.codebox.script.v1.ScriptRunner.Run:input_type -> syncano.codebox.script.v1.RunRequest - 5, // 7: syncano.codebox.script.v1.ScriptRunner.Run:output_type -> syncano.codebox.script.v1.RunResponse - 7, // [7:8] is the sub-list for method output_type - 6, // [6:7] is the sub-list for method input_type + 6, // 7: syncano.codebox.script.v1.ScriptRunner.Delete:input_type -> syncano.codebox.script.v1.DeleteRequest + 5, // 8: syncano.codebox.script.v1.ScriptRunner.Run:output_type -> syncano.codebox.script.v1.RunResponse + 7, // 9: syncano.codebox.script.v1.ScriptRunner.Delete:output_type -> syncano.codebox.script.v1.DeleteResponse + 8, // [8:10] is the sub-list for method output_type + 6, // [6:8] is the sub-list for method input_type 6, // [6:6] is the sub-list for extension type_name 6, // [6:6] is the sub-list for extension extendee 0, // [0:6] is the sub-list for field type_name @@ -811,6 +941,30 @@ func file_syncano_codebox_script_v1_script_proto_init() { } } file_syncano_codebox_script_v1_script_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DeleteRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_syncano_codebox_script_v1_script_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DeleteResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_syncano_codebox_script_v1_script_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RunMeta_Options); i { case 0: return &v.state @@ -833,7 +987,7 @@ func file_syncano_codebox_script_v1_script_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_syncano_codebox_script_v1_script_proto_rawDesc, NumEnums: 1, - NumMessages: 7, + NumMessages: 9, NumExtensions: 0, NumServices: 1, }, @@ -862,6 +1016,8 @@ const _ = grpc.SupportPackageIsVersion6 type ScriptRunnerClient interface { // Run runs script in secure environment of worker. Run(ctx context.Context, opts ...grpc.CallOption) (ScriptRunner_RunClient, error) + // Delete deletes all containers for specified script index. + Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) } type scriptRunnerClient struct { @@ -903,10 +1059,21 @@ func (x *scriptRunnerRunClient) Recv() (*RunResponse, error) { return m, nil } +func (c *scriptRunnerClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { + out := new(DeleteResponse) + err := c.cc.Invoke(ctx, "/syncano.codebox.script.v1.ScriptRunner/Delete", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ScriptRunnerServer is the server API for ScriptRunner service. type ScriptRunnerServer interface { // Run runs script in secure environment of worker. Run(ScriptRunner_RunServer) error + // Delete deletes all containers for specified script index. + Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) } // UnimplementedScriptRunnerServer can be embedded to have forward compatible implementations. @@ -916,6 +1083,9 @@ type UnimplementedScriptRunnerServer struct { func (*UnimplementedScriptRunnerServer) Run(ScriptRunner_RunServer) error { return status.Errorf(codes.Unimplemented, "method Run not implemented") } +func (*UnimplementedScriptRunnerServer) Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") +} func RegisterScriptRunnerServer(s *grpc.Server, srv ScriptRunnerServer) { s.RegisterService(&_ScriptRunner_serviceDesc, srv) @@ -947,10 +1117,33 @@ func (x *scriptRunnerRunServer) Recv() (*RunRequest, error) { return m, nil } +func _ScriptRunner_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ScriptRunnerServer).Delete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/syncano.codebox.script.v1.ScriptRunner/Delete", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ScriptRunnerServer).Delete(ctx, req.(*DeleteRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _ScriptRunner_serviceDesc = grpc.ServiceDesc{ ServiceName: "syncano.codebox.script.v1.ScriptRunner", HandlerType: (*ScriptRunnerServer)(nil), - Methods: []grpc.MethodDesc{}, + Methods: []grpc.MethodDesc{ + { + MethodName: "Delete", + Handler: _ScriptRunner_Delete_Handler, + }, + }, Streams: []grpc.StreamDesc{ { StreamName: "Run", diff --git a/gen/python/syncano/codebox/broker/v1/broker_pb2.py b/gen/python/syncano/codebox/broker/v1/broker_pb2.py index 49a9dda..d0473e6 100644 --- a/gen/python/syncano/codebox/broker/v1/broker_pb2.py +++ b/gen/python/syncano/codebox/broker/v1/broker_pb2.py @@ -20,7 +20,7 @@ package='syncano.codebox.broker.v1', syntax='proto3', serialized_options=b'ZFgithub.com/Syncano/syncanoapis/gen/go/syncano/codebox/broker/v1;broker', - serialized_pb=b'\n&syncano/codebox/broker/v1/broker.proto\x12\x19syncano.codebox.broker.v1\x1a\"syncano/codebox/lb/v1/runner.proto\x1a&syncano/codebox/script/v1/script.proto\"\xbd\x01\n\x07RunMeta\x12<\n\x05\x66iles\x18\x01 \x03(\x0b\x32-.syncano.codebox.broker.v1.RunMeta.FilesEntry\x12\x17\n\x0f\x65nvironment_url\x18\x02 \x01(\t\x12\r\n\x05trace\x18\x03 \x01(\x0c\x12\x10\n\x08trace_id\x18\x04 \x01(\x04\x12\x0c\n\x04sync\x18\x05 \x01(\x08\x1a,\n\nFilesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xf4\x01\n\nRunRequest\x12\x32\n\x04meta\x18\x01 \x01(\x0b\x32\".syncano.codebox.broker.v1.RunMetaH\x00\x12\x31\n\x07lb_meta\x18\x02 \x01(\x0b\x32\x1e.syncano.codebox.lb.v1.RunMetaH\x00\x12\x39\n\x0bscript_meta\x18\x03 \x01(\x0b\x32\".syncano.codebox.script.v1.RunMetaH\x00\x12;\n\x0cscript_chunk\x18\x04 \x01(\x0b\x32#.syncano.codebox.script.v1.RunChunkH\x00\x42\x07\n\x05value\"\xae\x01\n\x10SimpleRunRequest\x12\x30\n\x04meta\x18\x01 \x01(\x0b\x32\".syncano.codebox.broker.v1.RunMeta\x12/\n\x07lb_meta\x18\x02 \x01(\x0b\x32\x1e.syncano.codebox.lb.v1.RunMeta\x12\x37\n\x0bscript_meta\x18\x03 \x01(\x0b\x32\".syncano.codebox.script.v1.RunMeta2\xcc\x01\n\x0cScriptRunner\x12X\n\x03Run\x12%.syncano.codebox.broker.v1.RunRequest\x1a&.syncano.codebox.script.v1.RunResponse(\x01\x30\x01\x12\x62\n\tSimpleRun\x12+.syncano.codebox.broker.v1.SimpleRunRequest\x1a&.syncano.codebox.script.v1.RunResponse0\x01\x42HZFgithub.com/Syncano/syncanoapis/gen/go/syncano/codebox/broker/v1;brokerb\x06proto3' + serialized_pb=b'\n&syncano/codebox/broker/v1/broker.proto\x12\x19syncano.codebox.broker.v1\x1a\"syncano/codebox/lb/v1/runner.proto\x1a&syncano/codebox/script/v1/script.proto\"\xbd\x01\n\x07RunMeta\x12<\n\x05\x66iles\x18\x01 \x03(\x0b\x32-.syncano.codebox.broker.v1.RunMeta.FilesEntry\x12\x17\n\x0f\x65nvironment_url\x18\x02 \x01(\t\x12\r\n\x05trace\x18\x03 \x01(\x0c\x12\x10\n\x08trace_id\x18\x04 \x01(\x04\x12\x0c\n\x04sync\x18\x05 \x01(\x08\x1a,\n\nFilesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xf4\x01\n\nRunRequest\x12\x32\n\x04meta\x18\x01 \x01(\x0b\x32\".syncano.codebox.broker.v1.RunMetaH\x00\x12\x31\n\x07lb_meta\x18\x02 \x01(\x0b\x32\x1e.syncano.codebox.lb.v1.RunMetaH\x00\x12\x39\n\x0bscript_meta\x18\x03 \x01(\x0b\x32\".syncano.codebox.script.v1.RunMetaH\x00\x12;\n\x0cscript_chunk\x18\x04 \x01(\x0b\x32#.syncano.codebox.script.v1.RunChunkH\x00\x42\x07\n\x05value\"\xae\x01\n\x10SimpleRunRequest\x12\x30\n\x04meta\x18\x01 \x01(\x0b\x32\".syncano.codebox.broker.v1.RunMeta\x12/\n\x07lb_meta\x18\x02 \x01(\x0b\x32\x1e.syncano.codebox.lb.v1.RunMeta\x12\x37\n\x0bscript_meta\x18\x03 \x01(\x0b\x32\".syncano.codebox.script.v1.RunMeta2\xab\x02\n\x0cScriptRunner\x12X\n\x03Run\x12%.syncano.codebox.broker.v1.RunRequest\x1a&.syncano.codebox.script.v1.RunResponse(\x01\x30\x01\x12\x62\n\tSimpleRun\x12+.syncano.codebox.broker.v1.SimpleRunRequest\x1a&.syncano.codebox.script.v1.RunResponse0\x01\x12]\n\x06\x44\x65lete\x12(.syncano.codebox.script.v1.DeleteRequest\x1a).syncano.codebox.script.v1.DeleteResponseBHZFgithub.com/Syncano/syncanoapis/gen/go/syncano/codebox/broker/v1;brokerb\x06proto3' , dependencies=[syncano_dot_codebox_dot_lb_dot_v1_dot_runner__pb2.DESCRIPTOR,syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DESCRIPTOR,]) @@ -288,7 +288,7 @@ index=0, serialized_options=None, serialized_start=762, - serialized_end=966, + serialized_end=1061, methods=[ _descriptor.MethodDescriptor( name='Run', @@ -308,6 +308,15 @@ output_type=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2._RUNRESPONSE, serialized_options=None, ), + _descriptor.MethodDescriptor( + name='Delete', + full_name='syncano.codebox.broker.v1.ScriptRunner.Delete', + index=2, + containing_service=None, + input_type=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2._DELETEREQUEST, + output_type=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2._DELETERESPONSE, + serialized_options=None, + ), ]) _sym_db.RegisterServiceDescriptor(_SCRIPTRUNNER) diff --git a/gen/python/syncano/codebox/broker/v1/broker_pb2_grpc.py b/gen/python/syncano/codebox/broker/v1/broker_pb2_grpc.py index e94b1c7..05ef341 100644 --- a/gen/python/syncano/codebox/broker/v1/broker_pb2_grpc.py +++ b/gen/python/syncano/codebox/broker/v1/broker_pb2_grpc.py @@ -24,6 +24,11 @@ def __init__(self, channel): request_serializer=syncano_dot_codebox_dot_broker_dot_v1_dot_broker__pb2.SimpleRunRequest.SerializeToString, response_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.FromString, ) + self.Delete = channel.unary_unary( + '/syncano.codebox.broker.v1.ScriptRunner/Delete', + request_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.SerializeToString, + response_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.FromString, + ) class ScriptRunnerServicer(object): @@ -44,6 +49,13 @@ def SimpleRun(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def Delete(self, request, context): + """Delete deletes all containers for specified script index. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def add_ScriptRunnerServicer_to_server(servicer, server): rpc_method_handlers = { @@ -57,6 +69,11 @@ def add_ScriptRunnerServicer_to_server(servicer, server): request_deserializer=syncano_dot_codebox_dot_broker_dot_v1_dot_broker__pb2.SimpleRunRequest.FromString, response_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.SerializeToString, ), + 'Delete': grpc.unary_unary_rpc_method_handler( + servicer.Delete, + request_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.FromString, + response_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.SerializeToString, + ), } generic_handler = grpc.method_handlers_generic_handler( 'syncano.codebox.broker.v1.ScriptRunner', rpc_method_handlers) @@ -98,3 +115,19 @@ def SimpleRun(request, syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.FromString, options, channel_credentials, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def Delete(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/syncano.codebox.broker.v1.ScriptRunner/Delete', + syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.SerializeToString, + syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.FromString, + options, channel_credentials, + call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/gen/python/syncano/codebox/lb/v1/runner_pb2.py b/gen/python/syncano/codebox/lb/v1/runner_pb2.py index b344db5..1e6f2e7 100644 --- a/gen/python/syncano/codebox/lb/v1/runner_pb2.py +++ b/gen/python/syncano/codebox/lb/v1/runner_pb2.py @@ -19,7 +19,7 @@ package='syncano.codebox.lb.v1', syntax='proto3', serialized_options=b'Z>github.com/Syncano/syncanoapis/gen/go/syncano/codebox/lb/v1;lb', - serialized_pb=b'\n\"syncano/codebox/lb/v1/runner.proto\x12\x15syncano.codebox.lb.v1\x1a&syncano/codebox/script/v1/script.proto\"=\n\x07RunMeta\x12\x17\n\x0f\x63oncurrency_key\x18\x01 \x01(\t\x12\x19\n\x11\x63oncurrency_limit\x18\x02 \x01(\x05\"\xbd\x01\n\nRunRequest\x12.\n\x04meta\x18\x01 \x01(\x0b\x32\x1e.syncano.codebox.lb.v1.RunMetaH\x00\x12\x39\n\x0bscript_meta\x18\x02 \x01(\x0b\x32\".syncano.codebox.script.v1.RunMetaH\x00\x12;\n\x0cscript_chunk\x18\x03 \x01(\x0b\x32#.syncano.codebox.script.v1.RunChunkH\x00\x42\x07\n\x05value2d\n\x0cScriptRunner\x12T\n\x03Run\x12!.syncano.codebox.lb.v1.RunRequest\x1a&.syncano.codebox.script.v1.RunResponse(\x01\x30\x01\x42@Z>github.com/Syncano/syncanoapis/gen/go/syncano/codebox/lb/v1;lbb\x06proto3' + serialized_pb=b'\n\"syncano/codebox/lb/v1/runner.proto\x12\x15syncano.codebox.lb.v1\x1a&syncano/codebox/script/v1/script.proto\"=\n\x07RunMeta\x12\x17\n\x0f\x63oncurrency_key\x18\x01 \x01(\t\x12\x19\n\x11\x63oncurrency_limit\x18\x02 \x01(\x05\"\xbd\x01\n\nRunRequest\x12.\n\x04meta\x18\x01 \x01(\x0b\x32\x1e.syncano.codebox.lb.v1.RunMetaH\x00\x12\x39\n\x0bscript_meta\x18\x02 \x01(\x0b\x32\".syncano.codebox.script.v1.RunMetaH\x00\x12;\n\x0cscript_chunk\x18\x03 \x01(\x0b\x32#.syncano.codebox.script.v1.RunChunkH\x00\x42\x07\n\x05value2\xc3\x01\n\x0cScriptRunner\x12T\n\x03Run\x12!.syncano.codebox.lb.v1.RunRequest\x1a&.syncano.codebox.script.v1.RunResponse(\x01\x30\x01\x12]\n\x06\x44\x65lete\x12(.syncano.codebox.script.v1.DeleteRequest\x1a).syncano.codebox.script.v1.DeleteResponseB@Z>github.com/Syncano/syncanoapis/gen/go/syncano/codebox/lb/v1;lbb\x06proto3' , dependencies=[syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DESCRIPTOR,]) @@ -150,8 +150,8 @@ file=DESCRIPTOR, index=0, serialized_options=None, - serialized_start=356, - serialized_end=456, + serialized_start=357, + serialized_end=552, methods=[ _descriptor.MethodDescriptor( name='Run', @@ -162,6 +162,15 @@ output_type=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2._RUNRESPONSE, serialized_options=None, ), + _descriptor.MethodDescriptor( + name='Delete', + full_name='syncano.codebox.lb.v1.ScriptRunner.Delete', + index=1, + containing_service=None, + input_type=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2._DELETEREQUEST, + output_type=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2._DELETERESPONSE, + serialized_options=None, + ), ]) _sym_db.RegisterServiceDescriptor(_SCRIPTRUNNER) diff --git a/gen/python/syncano/codebox/lb/v1/runner_pb2_grpc.py b/gen/python/syncano/codebox/lb/v1/runner_pb2_grpc.py index 90ec924..b87836d 100644 --- a/gen/python/syncano/codebox/lb/v1/runner_pb2_grpc.py +++ b/gen/python/syncano/codebox/lb/v1/runner_pb2_grpc.py @@ -19,6 +19,11 @@ def __init__(self, channel): request_serializer=syncano_dot_codebox_dot_lb_dot_v1_dot_runner__pb2.RunRequest.SerializeToString, response_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.FromString, ) + self.Delete = channel.unary_unary( + '/syncano.codebox.lb.v1.ScriptRunner/Delete', + request_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.SerializeToString, + response_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.FromString, + ) class ScriptRunnerServicer(object): @@ -31,6 +36,13 @@ def Run(self, request_iterator, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def Delete(self, request, context): + """Delete deletes all containers for specified script index. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def add_ScriptRunnerServicer_to_server(servicer, server): rpc_method_handlers = { @@ -39,6 +51,11 @@ def add_ScriptRunnerServicer_to_server(servicer, server): request_deserializer=syncano_dot_codebox_dot_lb_dot_v1_dot_runner__pb2.RunRequest.FromString, response_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.SerializeToString, ), + 'Delete': grpc.unary_unary_rpc_method_handler( + servicer.Delete, + request_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.FromString, + response_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.SerializeToString, + ), } generic_handler = grpc.method_handlers_generic_handler( 'syncano.codebox.lb.v1.ScriptRunner', rpc_method_handlers) @@ -64,3 +81,19 @@ def Run(request_iterator, syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.FromString, options, channel_credentials, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def Delete(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/syncano.codebox.lb.v1.ScriptRunner/Delete', + syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.SerializeToString, + syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.FromString, + options, channel_credentials, + call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/gen/python/syncano/codebox/script/v1/script_pb2.py b/gen/python/syncano/codebox/script/v1/script_pb2.py index 3508ff0..5d0f949 100644 --- a/gen/python/syncano/codebox/script/v1/script_pb2.py +++ b/gen/python/syncano/codebox/script/v1/script_pb2.py @@ -18,7 +18,7 @@ package='syncano.codebox.script.v1', syntax='proto3', serialized_options=b'ZFgithub.com/Syncano/syncanoapis/gen/go/syncano/codebox/script/v1;script', - serialized_pb=b'\n&syncano/codebox/script/v1/script.proto\x12\x19syncano.codebox.script.v1\"\xa2\x02\n\x07RunMeta\x12;\n\x07options\x18\x01 \x01(\x0b\x32*.syncano.codebox.script.v1.RunMeta.Options\x12\x0f\n\x07runtime\x18\x02 \x01(\t\x12\x13\n\x0bsource_hash\x18\x03 \x01(\t\x12\x0f\n\x07user_id\x18\x04 \x01(\t\x12\x13\n\x0b\x65nvironment\x18\x05 \x01(\t\x1a\x8d\x01\n\x07Options\x12\x12\n\nentrypoint\x18\x01 \x01(\t\x12\x14\n\x0coutput_limit\x18\x02 \x01(\r\x12\x0f\n\x07timeout\x18\x03 \x01(\x03\x12\x0c\n\x04mcpu\x18\x04 \x01(\r\x12\r\n\x05\x61sync\x18\x05 \x01(\r\x12\x0c\n\x04\x61rgs\x18\x06 \x01(\x0c\x12\x0e\n\x06\x63onfig\x18\x07 \x01(\x0c\x12\x0c\n\x04meta\x18\x08 \x01(\x0c\"\xa5\x01\n\x08RunChunk\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x66ilename\x18\x02 \x01(\t\x12\x14\n\x0c\x63ontent_type\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\x36\n\x04type\x18\x05 \x01(\x0e\x32(.syncano.codebox.script.v1.RunChunk.Type\"\x1d\n\x04Type\x12\x0b\n\x07GENERIC\x10\x00\x12\x08\n\x04\x41RGS\x10\x01\"\x7f\n\nRunRequest\x12\x32\n\x04meta\x18\x01 \x01(\x0b\x32\".syncano.codebox.script.v1.RunMetaH\x00\x12\x34\n\x05\x63hunk\x18\x02 \x01(\x0b\x32#.syncano.codebox.script.v1.RunChunkH\x00\x42\x07\n\x05value\"\xc1\x01\n\x0cHTTPResponse\x12\x13\n\x0bstatus_code\x18\x01 \x01(\x05\x12\x14\n\x0c\x63ontent_type\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\x0c\x12\x45\n\x07headers\x18\x04 \x03(\x0b\x32\x34.syncano.codebox.script.v1.HTTPResponse.HeadersEntry\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xc8\x01\n\x0bRunResponse\x12\x14\n\x0c\x63ontainer_id\x18\t \x01(\t\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0e\n\x06stdout\x18\x02 \x01(\x0c\x12\x0e\n\x06stderr\x18\x03 \x01(\x0c\x12\x39\n\x08response\x18\x04 \x01(\x0b\x32\'.syncano.codebox.script.v1.HTTPResponse\x12\x0c\n\x04took\x18\x05 \x01(\x03\x12\x0e\n\x06\x63\x61\x63hed\x18\x06 \x01(\x08\x12\x0c\n\x04time\x18\x07 \x01(\x03\x12\x0e\n\x06weight\x18\x08 \x01(\r2h\n\x0cScriptRunner\x12X\n\x03Run\x12%.syncano.codebox.script.v1.RunRequest\x1a&.syncano.codebox.script.v1.RunResponse(\x01\x30\x01\x42HZFgithub.com/Syncano/syncanoapis/gen/go/syncano/codebox/script/v1;scriptb\x06proto3' + serialized_pb=b'\n&syncano/codebox/script/v1/script.proto\x12\x19syncano.codebox.script.v1\"\xa2\x02\n\x07RunMeta\x12;\n\x07options\x18\x01 \x01(\x0b\x32*.syncano.codebox.script.v1.RunMeta.Options\x12\x0f\n\x07runtime\x18\x02 \x01(\t\x12\x13\n\x0bsource_hash\x18\x03 \x01(\t\x12\x0f\n\x07user_id\x18\x04 \x01(\t\x12\x13\n\x0b\x65nvironment\x18\x05 \x01(\t\x1a\x8d\x01\n\x07Options\x12\x12\n\nentrypoint\x18\x01 \x01(\t\x12\x14\n\x0coutput_limit\x18\x02 \x01(\r\x12\x0f\n\x07timeout\x18\x03 \x01(\x03\x12\x0c\n\x04mcpu\x18\x04 \x01(\r\x12\r\n\x05\x61sync\x18\x05 \x01(\r\x12\x0c\n\x04\x61rgs\x18\x06 \x01(\x0c\x12\x0e\n\x06\x63onfig\x18\x07 \x01(\x0c\x12\x0c\n\x04meta\x18\x08 \x01(\x0c\"\xa5\x01\n\x08RunChunk\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x66ilename\x18\x02 \x01(\t\x12\x14\n\x0c\x63ontent_type\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\x36\n\x04type\x18\x05 \x01(\x0e\x32(.syncano.codebox.script.v1.RunChunk.Type\"\x1d\n\x04Type\x12\x0b\n\x07GENERIC\x10\x00\x12\x08\n\x04\x41RGS\x10\x01\"\x7f\n\nRunRequest\x12\x32\n\x04meta\x18\x01 \x01(\x0b\x32\".syncano.codebox.script.v1.RunMetaH\x00\x12\x34\n\x05\x63hunk\x18\x02 \x01(\x0b\x32#.syncano.codebox.script.v1.RunChunkH\x00\x42\x07\n\x05value\"\xc1\x01\n\x0cHTTPResponse\x12\x13\n\x0bstatus_code\x18\x01 \x01(\x05\x12\x14\n\x0c\x63ontent_type\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\x0c\x12\x45\n\x07headers\x18\x04 \x03(\x0b\x32\x34.syncano.codebox.script.v1.HTTPResponse.HeadersEntry\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xc8\x01\n\x0bRunResponse\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0e\n\x06stdout\x18\x02 \x01(\x0c\x12\x0e\n\x06stderr\x18\x03 \x01(\x0c\x12\x39\n\x08response\x18\x04 \x01(\x0b\x32\'.syncano.codebox.script.v1.HTTPResponse\x12\x0c\n\x04took\x18\x05 \x01(\x03\x12\x0e\n\x06\x63\x61\x63hed\x18\x06 \x01(\x08\x12\x0c\n\x04time\x18\x07 \x01(\x03\x12\x0e\n\x06weight\x18\x08 \x01(\r\x12\x14\n\x0c\x63ontainer_id\x18\t \x01(\t\"F\n\rDeleteRequest\x12\x0f\n\x07runtime\x18\x01 \x01(\t\x12\x13\n\x0bsource_hash\x18\x02 \x01(\t\x12\x0f\n\x07user_id\x18\x03 \x01(\t\"\'\n\x0e\x44\x65leteResponse\x12\x15\n\rcontainer_ids\x18\x01 \x03(\t2\xc7\x01\n\x0cScriptRunner\x12X\n\x03Run\x12%.syncano.codebox.script.v1.RunRequest\x1a&.syncano.codebox.script.v1.RunResponse(\x01\x30\x01\x12]\n\x06\x44\x65lete\x12(.syncano.codebox.script.v1.DeleteRequest\x1a).syncano.codebox.script.v1.DeleteResponseBHZFgithub.com/Syncano/syncanoapis/gen/go/syncano/codebox/script/v1;scriptb\x06proto3' ) @@ -382,68 +382,68 @@ containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='container_id', full_name='syncano.codebox.script.v1.RunResponse.container_id', index=0, - number=9, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='code', full_name='syncano.codebox.script.v1.RunResponse.code', index=1, + name='code', full_name='syncano.codebox.script.v1.RunResponse.code', index=0, number=1, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='stdout', full_name='syncano.codebox.script.v1.RunResponse.stdout', index=2, + name='stdout', full_name='syncano.codebox.script.v1.RunResponse.stdout', index=1, number=2, type=12, cpp_type=9, label=1, has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='stderr', full_name='syncano.codebox.script.v1.RunResponse.stderr', index=3, + name='stderr', full_name='syncano.codebox.script.v1.RunResponse.stderr', index=2, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='response', full_name='syncano.codebox.script.v1.RunResponse.response', index=4, + name='response', full_name='syncano.codebox.script.v1.RunResponse.response', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='took', full_name='syncano.codebox.script.v1.RunResponse.took', index=5, + name='took', full_name='syncano.codebox.script.v1.RunResponse.took', index=4, number=5, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='cached', full_name='syncano.codebox.script.v1.RunResponse.cached', index=6, + name='cached', full_name='syncano.codebox.script.v1.RunResponse.cached', index=5, number=6, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='time', full_name='syncano.codebox.script.v1.RunResponse.time', index=7, + name='time', full_name='syncano.codebox.script.v1.RunResponse.time', index=6, number=7, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='weight', full_name='syncano.codebox.script.v1.RunResponse.weight', index=8, + name='weight', full_name='syncano.codebox.script.v1.RunResponse.weight', index=7, number=8, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='container_id', full_name='syncano.codebox.script.v1.RunResponse.container_id', index=8, + number=9, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -460,6 +460,82 @@ serialized_end=1056, ) + +_DELETEREQUEST = _descriptor.Descriptor( + name='DeleteRequest', + full_name='syncano.codebox.script.v1.DeleteRequest', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='runtime', full_name='syncano.codebox.script.v1.DeleteRequest.runtime', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='source_hash', full_name='syncano.codebox.script.v1.DeleteRequest.source_hash', index=1, + number=2, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='user_id', full_name='syncano.codebox.script.v1.DeleteRequest.user_id', index=2, + number=3, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=1058, + serialized_end=1128, +) + + +_DELETERESPONSE = _descriptor.Descriptor( + name='DeleteResponse', + full_name='syncano.codebox.script.v1.DeleteResponse', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='container_ids', full_name='syncano.codebox.script.v1.DeleteResponse.container_ids', index=0, + number=1, type=9, cpp_type=9, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=1130, + serialized_end=1169, +) + _RUNMETA_OPTIONS.containing_type = _RUNMETA _RUNMETA.fields_by_name['options'].message_type = _RUNMETA_OPTIONS _RUNCHUNK.fields_by_name['type'].enum_type = _RUNCHUNK_TYPE @@ -480,6 +556,8 @@ DESCRIPTOR.message_types_by_name['RunRequest'] = _RUNREQUEST DESCRIPTOR.message_types_by_name['HTTPResponse'] = _HTTPRESPONSE DESCRIPTOR.message_types_by_name['RunResponse'] = _RUNRESPONSE +DESCRIPTOR.message_types_by_name['DeleteRequest'] = _DELETEREQUEST +DESCRIPTOR.message_types_by_name['DeleteResponse'] = _DELETERESPONSE _sym_db.RegisterFileDescriptor(DESCRIPTOR) RunMeta = _reflection.GeneratedProtocolMessageType('RunMeta', (_message.Message,), { @@ -533,6 +611,20 @@ }) _sym_db.RegisterMessage(RunResponse) +DeleteRequest = _reflection.GeneratedProtocolMessageType('DeleteRequest', (_message.Message,), { + 'DESCRIPTOR' : _DELETEREQUEST, + '__module__' : 'syncano.codebox.script.v1.script_pb2' + # @@protoc_insertion_point(class_scope:syncano.codebox.script.v1.DeleteRequest) + }) +_sym_db.RegisterMessage(DeleteRequest) + +DeleteResponse = _reflection.GeneratedProtocolMessageType('DeleteResponse', (_message.Message,), { + 'DESCRIPTOR' : _DELETERESPONSE, + '__module__' : 'syncano.codebox.script.v1.script_pb2' + # @@protoc_insertion_point(class_scope:syncano.codebox.script.v1.DeleteResponse) + }) +_sym_db.RegisterMessage(DeleteResponse) + DESCRIPTOR._options = None _HTTPRESPONSE_HEADERSENTRY._options = None @@ -543,8 +635,8 @@ file=DESCRIPTOR, index=0, serialized_options=None, - serialized_start=1058, - serialized_end=1162, + serialized_start=1172, + serialized_end=1371, methods=[ _descriptor.MethodDescriptor( name='Run', @@ -555,6 +647,15 @@ output_type=_RUNRESPONSE, serialized_options=None, ), + _descriptor.MethodDescriptor( + name='Delete', + full_name='syncano.codebox.script.v1.ScriptRunner.Delete', + index=1, + containing_service=None, + input_type=_DELETEREQUEST, + output_type=_DELETERESPONSE, + serialized_options=None, + ), ]) _sym_db.RegisterServiceDescriptor(_SCRIPTRUNNER) diff --git a/gen/python/syncano/codebox/script/v1/script_pb2_grpc.py b/gen/python/syncano/codebox/script/v1/script_pb2_grpc.py index ebf9813..2e13cd4 100644 --- a/gen/python/syncano/codebox/script/v1/script_pb2_grpc.py +++ b/gen/python/syncano/codebox/script/v1/script_pb2_grpc.py @@ -18,6 +18,11 @@ def __init__(self, channel): request_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunRequest.SerializeToString, response_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.FromString, ) + self.Delete = channel.unary_unary( + '/syncano.codebox.script.v1.ScriptRunner/Delete', + request_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.SerializeToString, + response_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.FromString, + ) class ScriptRunnerServicer(object): @@ -30,6 +35,13 @@ def Run(self, request_iterator, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def Delete(self, request, context): + """Delete deletes all containers for specified script index. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def add_ScriptRunnerServicer_to_server(servicer, server): rpc_method_handlers = { @@ -38,6 +50,11 @@ def add_ScriptRunnerServicer_to_server(servicer, server): request_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunRequest.FromString, response_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.SerializeToString, ), + 'Delete': grpc.unary_unary_rpc_method_handler( + servicer.Delete, + request_deserializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.FromString, + response_serializer=syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.SerializeToString, + ), } generic_handler = grpc.method_handlers_generic_handler( 'syncano.codebox.script.v1.ScriptRunner', rpc_method_handlers) @@ -63,3 +80,19 @@ def Run(request_iterator, syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.RunResponse.FromString, options, channel_credentials, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def Delete(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/syncano.codebox.script.v1.ScriptRunner/Delete', + syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteRequest.SerializeToString, + syncano_dot_codebox_dot_script_dot_v1_dot_script__pb2.DeleteResponse.FromString, + options, channel_credentials, + call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/syncano/codebox/broker/v1/broker.proto b/syncano/codebox/broker/v1/broker.proto index 793c013..4047edc 100644 --- a/syncano/codebox/broker/v1/broker.proto +++ b/syncano/codebox/broker/v1/broker.proto @@ -11,6 +11,8 @@ service ScriptRunner { // SimpleRun is a simpler alternative to Run that does not require streaming request. // As such, it is only usable for small payloads and does not support chunks. rpc SimpleRun (SimpleRunRequest) returns (stream script.v1.RunResponse); + // Delete deletes all containers for specified script index. + rpc Delete (script.v1.DeleteRequest) returns (script.v1.DeleteResponse); } // Meta message specifies fields to describe what is being run. diff --git a/syncano/codebox/lb/v1/runner.proto b/syncano/codebox/lb/v1/runner.proto index b08b61c..c3dc683 100644 --- a/syncano/codebox/lb/v1/runner.proto +++ b/syncano/codebox/lb/v1/runner.proto @@ -7,6 +7,8 @@ import "syncano/codebox/script/v1/script.proto"; service ScriptRunner { // Run runs script in secure environment of worker. rpc Run (stream RunRequest) returns (stream script.v1.RunResponse); + // Delete deletes all containers for specified script index. + rpc Delete (script.v1.DeleteRequest) returns (script.v1.DeleteResponse); } // Meta message specifies fields to describe what is being run. diff --git a/syncano/codebox/script/v1/script.proto b/syncano/codebox/script/v1/script.proto index e3a019b..9374fc6 100644 --- a/syncano/codebox/script/v1/script.proto +++ b/syncano/codebox/script/v1/script.proto @@ -5,6 +5,8 @@ option go_package = "github.com/Syncano/syncanoapis/gen/go/syncano/codebox/scrip service ScriptRunner { // Run runs script in secure environment of worker. rpc Run (stream RunRequest) returns (stream RunResponse); + // Delete deletes all containers for specified script index. + rpc Delete (DeleteRequest) returns (DeleteResponse); } // Meta message specifies fields to describe what is being run. @@ -59,7 +61,6 @@ message HTTPResponse { } message RunResponse { - string container_id = 9; int32 code = 1; bytes stdout = 2; bytes stderr = 3; @@ -68,4 +69,15 @@ message RunResponse { bool cached = 6; int64 time = 7; uint32 weight = 8; + string container_id = 9; +} + +message DeleteRequest { + string runtime = 1; + string source_hash = 2; + string user_id = 3; +} + +message DeleteResponse { + repeated string container_ids = 1; }