diff --git a/internal/api/runme/runner/v1/runner.proto b/internal/api/runme/runner/v1/runner.proto index 793795ee6..cca9370e1 100644 --- a/internal/api/runme/runner/v1/runner.proto +++ b/internal/api/runme/runner/v1/runner.proto @@ -187,7 +187,7 @@ message ExecuteResponse { ProcessPID pid = 4; } -message ResolveEnvRequest { +message ResolveVarsRequest { oneof source { // commands are commands to be executed by the program. // The commands are joined and executed as a script. @@ -221,7 +221,7 @@ message ResolveEnvRequest { } } -message ResolveEnvResult { +message ResolveVarsResult { // name is the name of the environment variable. string name = 1; @@ -236,8 +236,8 @@ message ResolveEnvResult { string resolved_value = 3; } -message ResolveEnvResponse { - repeated ResolveEnvResult items = 1; +message ResolveVarsResponse { + repeated ResolveVarsResult items = 1; } service RunnerService { @@ -255,10 +255,9 @@ service RunnerService { // other fields will be ignored. rpc Execute(stream ExecuteRequest) returns (stream ExecuteResponse) {} - // ResolveEnv resolves environment variables from a script or a list of commands + // ResolveVars resolves variables from a script or a list of commands // using the provided sources, which can be a list of environment variables, // a session, or a project. - // The result contains all found environment variables. If the env is in any source, - // it is considered resolved. Otherwise, it is marked as unresolved. - rpc ResolveEnv(ResolveEnvRequest) returns (ResolveEnvResponse) {} + // For now, the resolved variables are only the exported ones using `export`. + rpc ResolveVars(ResolveVarsRequest) returns (ResolveVarsResponse) {} } diff --git a/internal/api/runme/runner/v2alpha1/runner.proto b/internal/api/runme/runner/v2alpha1/runner.proto index e7cf94bc3..f0057c660 100644 --- a/internal/api/runme/runner/v2alpha1/runner.proto +++ b/internal/api/runme/runner/v2alpha1/runner.proto @@ -159,7 +159,7 @@ message ExecuteResponse { google.protobuf.UInt32Value pid = 4; } -message ResolveEnvRequest { +message ResolveVarsRequest { oneof source { // commands are commands to be executed by the program. // The commands are joined and executed as a script. @@ -193,7 +193,7 @@ message ResolveEnvRequest { } } -message ResolveEnvResult { +message ResolveVarsResult { // name is the name of the environment variable. string name = 1; @@ -208,8 +208,8 @@ message ResolveEnvResult { string resolved_value = 3; } -message ResolveEnvResponse { - repeated ResolveEnvResult items = 1; +message ResolveVarsResponse { + repeated ResolveVarsResult items = 1; } service RunnerService { @@ -228,10 +228,9 @@ service RunnerService { // other fields will be ignored. rpc Execute(stream ExecuteRequest) returns (stream ExecuteResponse) {} - // ResolveEnv resolves environment variables from a script or a list of commands + // ResolveVars resolves variables from a script or a list of commands // using the provided sources, which can be a list of environment variables, // a session, or a project. - // The result contains all found environment variables. If the env is in any source, - // it is considered resolved. Otherwise, it is marked as unresolved. - rpc ResolveEnv(ResolveEnvRequest) returns (ResolveEnvResponse) {} + // For now, the resolved variables are only the exported ones using `export`. + rpc ResolveVars(ResolveVarsRequest) returns (ResolveVarsResponse) {} } diff --git a/internal/gen/proto/go/runme/runner/v1/runner.pb.go b/internal/gen/proto/go/runme/runner/v1/runner.pb.go index 4823482fa..c77693d42 100644 --- a/internal/gen/proto/go/runme/runner/v1/runner.pb.go +++ b/internal/gen/proto/go/runme/runner/v1/runner.pb.go @@ -1088,16 +1088,16 @@ func (x *ExecuteResponse) GetPid() *ProcessPID { return nil } -type ResolveEnvRequest struct { +type ResolveVarsRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields // Types that are assignable to Source: // - // *ResolveEnvRequest_Commands - // *ResolveEnvRequest_Script - Source isResolveEnvRequest_Source `protobuf_oneof:"source"` + // *ResolveVarsRequest_Commands + // *ResolveVarsRequest_Script + Source isResolveVarsRequest_Source `protobuf_oneof:"source"` // env is a list of environment variables that will be used // to resolve the environment variables found in the source. Env []string `protobuf:"bytes,3,rep,name=env,proto3" json:"env,omitempty"` @@ -1111,8 +1111,8 @@ type ResolveEnvRequest struct { Project *Project `protobuf:"bytes,6,opt,name=project,proto3,oneof" json:"project,omitempty"` } -func (x *ResolveEnvRequest) Reset() { - *x = ResolveEnvRequest{} +func (x *ResolveVarsRequest) Reset() { + *x = ResolveVarsRequest{} if protoimpl.UnsafeEnabled { mi := &file_runme_runner_v1_runner_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1120,13 +1120,13 @@ func (x *ResolveEnvRequest) Reset() { } } -func (x *ResolveEnvRequest) String() string { +func (x *ResolveVarsRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ResolveEnvRequest) ProtoMessage() {} +func (*ResolveVarsRequest) ProtoMessage() {} -func (x *ResolveEnvRequest) ProtoReflect() protoreflect.Message { +func (x *ResolveVarsRequest) ProtoReflect() protoreflect.Message { mi := &file_runme_runner_v1_runner_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1138,81 +1138,81 @@ func (x *ResolveEnvRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ResolveEnvRequest.ProtoReflect.Descriptor instead. -func (*ResolveEnvRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use ResolveVarsRequest.ProtoReflect.Descriptor instead. +func (*ResolveVarsRequest) Descriptor() ([]byte, []int) { return file_runme_runner_v1_runner_proto_rawDescGZIP(), []int{14} } -func (m *ResolveEnvRequest) GetSource() isResolveEnvRequest_Source { +func (m *ResolveVarsRequest) GetSource() isResolveVarsRequest_Source { if m != nil { return m.Source } return nil } -func (x *ResolveEnvRequest) GetCommands() *ResolveEnvRequest_CommandList { - if x, ok := x.GetSource().(*ResolveEnvRequest_Commands); ok { +func (x *ResolveVarsRequest) GetCommands() *ResolveVarsRequest_CommandList { + if x, ok := x.GetSource().(*ResolveVarsRequest_Commands); ok { return x.Commands } return nil } -func (x *ResolveEnvRequest) GetScript() string { - if x, ok := x.GetSource().(*ResolveEnvRequest_Script); ok { +func (x *ResolveVarsRequest) GetScript() string { + if x, ok := x.GetSource().(*ResolveVarsRequest_Script); ok { return x.Script } return "" } -func (x *ResolveEnvRequest) GetEnv() []string { +func (x *ResolveVarsRequest) GetEnv() []string { if x != nil { return x.Env } return nil } -func (x *ResolveEnvRequest) GetSessionId() string { +func (x *ResolveVarsRequest) GetSessionId() string { if x != nil { return x.SessionId } return "" } -func (x *ResolveEnvRequest) GetSessionStrategy() SessionStrategy { +func (x *ResolveVarsRequest) GetSessionStrategy() SessionStrategy { if x != nil { return x.SessionStrategy } return SessionStrategy_SESSION_STRATEGY_UNSPECIFIED } -func (x *ResolveEnvRequest) GetProject() *Project { +func (x *ResolveVarsRequest) GetProject() *Project { if x != nil { return x.Project } return nil } -type isResolveEnvRequest_Source interface { - isResolveEnvRequest_Source() +type isResolveVarsRequest_Source interface { + isResolveVarsRequest_Source() } -type ResolveEnvRequest_Commands struct { +type ResolveVarsRequest_Commands struct { // commands are commands to be executed by the program. // The commands are joined and executed as a script. - Commands *ResolveEnvRequest_CommandList `protobuf:"bytes,1,opt,name=commands,proto3,oneof"` + Commands *ResolveVarsRequest_CommandList `protobuf:"bytes,1,opt,name=commands,proto3,oneof"` } -type ResolveEnvRequest_Script struct { +type ResolveVarsRequest_Script struct { // script is code to be executed by the program. // Individual lines are joined with the new line character. Script string `protobuf:"bytes,2,opt,name=script,proto3,oneof"` } -func (*ResolveEnvRequest_Commands) isResolveEnvRequest_Source() {} +func (*ResolveVarsRequest_Commands) isResolveVarsRequest_Source() {} -func (*ResolveEnvRequest_Script) isResolveEnvRequest_Source() {} +func (*ResolveVarsRequest_Script) isResolveVarsRequest_Source() {} -type ResolveEnvResult struct { +type ResolveVarsResult struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1229,8 +1229,8 @@ type ResolveEnvResult struct { ResolvedValue string `protobuf:"bytes,3,opt,name=resolved_value,json=resolvedValue,proto3" json:"resolved_value,omitempty"` } -func (x *ResolveEnvResult) Reset() { - *x = ResolveEnvResult{} +func (x *ResolveVarsResult) Reset() { + *x = ResolveVarsResult{} if protoimpl.UnsafeEnabled { mi := &file_runme_runner_v1_runner_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1238,13 +1238,13 @@ func (x *ResolveEnvResult) Reset() { } } -func (x *ResolveEnvResult) String() string { +func (x *ResolveVarsResult) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ResolveEnvResult) ProtoMessage() {} +func (*ResolveVarsResult) ProtoMessage() {} -func (x *ResolveEnvResult) ProtoReflect() protoreflect.Message { +func (x *ResolveVarsResult) ProtoReflect() protoreflect.Message { mi := &file_runme_runner_v1_runner_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1256,42 +1256,42 @@ func (x *ResolveEnvResult) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ResolveEnvResult.ProtoReflect.Descriptor instead. -func (*ResolveEnvResult) Descriptor() ([]byte, []int) { +// Deprecated: Use ResolveVarsResult.ProtoReflect.Descriptor instead. +func (*ResolveVarsResult) Descriptor() ([]byte, []int) { return file_runme_runner_v1_runner_proto_rawDescGZIP(), []int{15} } -func (x *ResolveEnvResult) GetName() string { +func (x *ResolveVarsResult) GetName() string { if x != nil { return x.Name } return "" } -func (x *ResolveEnvResult) GetOriginalValue() string { +func (x *ResolveVarsResult) GetOriginalValue() string { if x != nil { return x.OriginalValue } return "" } -func (x *ResolveEnvResult) GetResolvedValue() string { +func (x *ResolveVarsResult) GetResolvedValue() string { if x != nil { return x.ResolvedValue } return "" } -type ResolveEnvResponse struct { +type ResolveVarsResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Items []*ResolveEnvResult `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"` + Items []*ResolveVarsResult `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"` } -func (x *ResolveEnvResponse) Reset() { - *x = ResolveEnvResponse{} +func (x *ResolveVarsResponse) Reset() { + *x = ResolveVarsResponse{} if protoimpl.UnsafeEnabled { mi := &file_runme_runner_v1_runner_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1299,13 +1299,13 @@ func (x *ResolveEnvResponse) Reset() { } } -func (x *ResolveEnvResponse) String() string { +func (x *ResolveVarsResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ResolveEnvResponse) ProtoMessage() {} +func (*ResolveVarsResponse) ProtoMessage() {} -func (x *ResolveEnvResponse) ProtoReflect() protoreflect.Message { +func (x *ResolveVarsResponse) ProtoReflect() protoreflect.Message { mi := &file_runme_runner_v1_runner_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1317,19 +1317,19 @@ func (x *ResolveEnvResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ResolveEnvResponse.ProtoReflect.Descriptor instead. -func (*ResolveEnvResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use ResolveVarsResponse.ProtoReflect.Descriptor instead. +func (*ResolveVarsResponse) Descriptor() ([]byte, []int) { return file_runme_runner_v1_runner_proto_rawDescGZIP(), []int{16} } -func (x *ResolveEnvResponse) GetItems() []*ResolveEnvResult { +func (x *ResolveVarsResponse) GetItems() []*ResolveVarsResult { if x != nil { return x.Items } return nil } -type ResolveEnvRequest_CommandList struct { +type ResolveVarsRequest_CommandList struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1340,8 +1340,8 @@ type ResolveEnvRequest_CommandList struct { Items []string `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"` } -func (x *ResolveEnvRequest_CommandList) Reset() { - *x = ResolveEnvRequest_CommandList{} +func (x *ResolveVarsRequest_CommandList) Reset() { + *x = ResolveVarsRequest_CommandList{} if protoimpl.UnsafeEnabled { mi := &file_runme_runner_v1_runner_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1349,13 +1349,13 @@ func (x *ResolveEnvRequest_CommandList) Reset() { } } -func (x *ResolveEnvRequest_CommandList) String() string { +func (x *ResolveVarsRequest_CommandList) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ResolveEnvRequest_CommandList) ProtoMessage() {} +func (*ResolveVarsRequest_CommandList) ProtoMessage() {} -func (x *ResolveEnvRequest_CommandList) ProtoReflect() protoreflect.Message { +func (x *ResolveVarsRequest_CommandList) ProtoReflect() protoreflect.Message { mi := &file_runme_runner_v1_runner_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1367,12 +1367,12 @@ func (x *ResolveEnvRequest_CommandList) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ResolveEnvRequest_CommandList.ProtoReflect.Descriptor instead. -func (*ResolveEnvRequest_CommandList) Descriptor() ([]byte, []int) { +// Deprecated: Use ResolveVarsRequest_CommandList.ProtoReflect.Descriptor instead. +func (*ResolveVarsRequest_CommandList) Descriptor() ([]byte, []int) { return file_runme_runner_v1_runner_proto_rawDescGZIP(), []int{14, 0} } -func (x *ResolveEnvRequest_CommandList) GetItems() []string { +func (x *ResolveVarsRequest_CommandList) GetItems() []string { if x != nil { return x.Items } @@ -1505,102 +1505,102 @@ var file_runme_runner_v1_runner_proto_rawDesc = []byte{ 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2d, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x50, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x49, 0x44, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0xed, - 0x02, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x4c, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, - 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, - 0x45, 0x6e, 0x76, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, - 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, - 0x64, 0x73, 0x12, 0x18, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x10, 0x0a, 0x03, - 0x65, 0x6e, 0x76, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x1d, - 0x0a, 0x0a, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x4b, 0x0a, - 0x10, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, - 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, - 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x52, 0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x37, 0x0a, 0x07, 0x70, 0x72, - 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x75, - 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, - 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x48, 0x01, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, - 0x88, 0x01, 0x01, 0x1a, 0x23, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x4c, 0x69, - 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x08, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x74, - 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x52, 0x65, 0x73, 0x75, - 0x6c, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, - 0x61, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, - 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0x4d, 0x0a, 0x12, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, - 0x6e, 0x76, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x05, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x75, 0x6e, 0x6d, - 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, - 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x05, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x2a, 0x5e, 0x0a, 0x0b, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x53, 0x74, - 0x6f, 0x70, 0x12, 0x1c, 0x0a, 0x18, 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, - 0x4f, 0x50, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, - 0x12, 0x1a, 0x0a, 0x16, 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x50, - 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x52, 0x55, 0x50, 0x54, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, - 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x4b, 0x49, 0x4c, - 0x4c, 0x10, 0x02, 0x2a, 0x66, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x4d, 0x6f, - 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4d, 0x4f, - 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, - 0x12, 0x1d, 0x0a, 0x19, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4d, 0x4f, 0x44, 0x45, - 0x5f, 0x49, 0x4e, 0x4c, 0x49, 0x4e, 0x45, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x10, 0x01, 0x12, - 0x1a, 0x0a, 0x16, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, - 0x54, 0x45, 0x4d, 0x50, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x02, 0x2a, 0x55, 0x0a, 0x0f, 0x53, - 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x20, - 0x0a, 0x1c, 0x53, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x52, 0x41, 0x54, 0x45, - 0x47, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, - 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x52, 0x41, - 0x54, 0x45, 0x47, 0x59, 0x5f, 0x4d, 0x4f, 0x53, 0x54, 0x5f, 0x52, 0x45, 0x43, 0x45, 0x4e, 0x54, - 0x10, 0x01, 0x32, 0xb8, 0x04, 0x0a, 0x0d, 0x52, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, - 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, - 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x53, 0x65, 0x73, - 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, - 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, - 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, - 0x5d, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, - 0x24, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, - 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, - 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x60, - 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, - 0x25, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, - 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, - 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, - 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x52, 0x0a, 0x07, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x12, 0x1f, 0x2e, 0x72, 0x75, - 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x72, - 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x45, - 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x28, 0x01, 0x30, 0x01, 0x12, 0x57, 0x0a, 0x0a, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, - 0x6e, 0x76, 0x12, 0x22, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, - 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, - 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, - 0x45, 0x6e, 0x76, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x4a, 0x5a, - 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x61, 0x74, - 0x65, 0x66, 0x75, 0x6c, 0x2f, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, - 0x2f, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2f, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x31, - 0x3b, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x49, 0x44, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0xef, + 0x02, 0x0a, 0x12, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4d, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, + 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, + 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, + 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x43, 0x6f, 0x6d, + 0x6d, 0x61, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, + 0x61, 0x6e, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x10, + 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x65, 0x6e, 0x76, + 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, + 0x4b, 0x0a, 0x10, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x61, 0x74, + 0x65, 0x67, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x72, 0x75, 0x6e, 0x6d, + 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x52, 0x0f, 0x73, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x37, 0x0a, 0x07, + 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, + 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, + 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x48, 0x01, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, + 0x63, 0x74, 0x88, 0x01, 0x01, 0x1a, 0x23, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, + 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x08, 0x0a, 0x06, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, + 0x22, 0x75, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x6f, 0x72, 0x69, + 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, + 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x5f, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, + 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x4f, 0x0a, 0x13, 0x52, 0x65, 0x73, 0x6f, 0x6c, + 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, + 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, + 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, + 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x73, 0x75, 0x6c, + 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2a, 0x5e, 0x0a, 0x0b, 0x45, 0x78, 0x65, 0x63, + 0x75, 0x74, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x12, 0x1c, 0x0a, 0x18, 0x45, 0x58, 0x45, 0x43, 0x55, + 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, + 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, + 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x52, 0x55, 0x50, 0x54, 0x10, + 0x01, 0x12, 0x15, 0x0a, 0x11, 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, + 0x50, 0x5f, 0x4b, 0x49, 0x4c, 0x4c, 0x10, 0x02, 0x2a, 0x66, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, + 0x61, 0x6e, 0x64, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x4d, 0x4d, 0x41, + 0x4e, 0x44, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, + 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, + 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x4c, 0x49, 0x4e, 0x45, 0x5f, 0x53, 0x48, 0x45, + 0x4c, 0x4c, 0x10, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, + 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x45, 0x4d, 0x50, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x02, + 0x2a, 0x55, 0x0a, 0x0f, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, + 0x65, 0x67, 0x79, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, + 0x54, 0x52, 0x41, 0x54, 0x45, 0x47, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, + 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, + 0x5f, 0x53, 0x54, 0x52, 0x41, 0x54, 0x45, 0x47, 0x59, 0x5f, 0x4d, 0x4f, 0x53, 0x54, 0x5f, 0x52, + 0x45, 0x43, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x32, 0xbb, 0x04, 0x0a, 0x0d, 0x52, 0x75, 0x6e, 0x6e, + 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x60, 0x0a, 0x0d, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x2e, 0x72, 0x75, 0x6e, + 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, + 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x0a, 0x47, + 0x65, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x2e, 0x72, 0x75, 0x6e, 0x6d, + 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x53, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, + 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, + 0x47, 0x65, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x24, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, + 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x72, 0x75, 0x6e, + 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, + 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x75, + 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x07, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, + 0x12, 0x1f, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, + 0x76, 0x31, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x20, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, + 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x5a, 0x0a, 0x0b, 0x52, 0x65, 0x73, + 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x12, 0x23, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, + 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, + 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, + 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, + 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x4a, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c, 0x2f, 0x72, 0x75, 0x6e, + 0x6d, 0x65, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2f, 0x72, + 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x76, + 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1618,30 +1618,30 @@ func file_runme_runner_v1_runner_proto_rawDescGZIP() []byte { var file_runme_runner_v1_runner_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_runme_runner_v1_runner_proto_msgTypes = make([]protoimpl.MessageInfo, 20) var file_runme_runner_v1_runner_proto_goTypes = []interface{}{ - (ExecuteStop)(0), // 0: runme.runner.v1.ExecuteStop - (CommandMode)(0), // 1: runme.runner.v1.CommandMode - (SessionStrategy)(0), // 2: runme.runner.v1.SessionStrategy - (*Session)(nil), // 3: runme.runner.v1.Session - (*CreateSessionRequest)(nil), // 4: runme.runner.v1.CreateSessionRequest - (*CreateSessionResponse)(nil), // 5: runme.runner.v1.CreateSessionResponse - (*GetSessionRequest)(nil), // 6: runme.runner.v1.GetSessionRequest - (*GetSessionResponse)(nil), // 7: runme.runner.v1.GetSessionResponse - (*ListSessionsRequest)(nil), // 8: runme.runner.v1.ListSessionsRequest - (*ListSessionsResponse)(nil), // 9: runme.runner.v1.ListSessionsResponse - (*DeleteSessionRequest)(nil), // 10: runme.runner.v1.DeleteSessionRequest - (*DeleteSessionResponse)(nil), // 11: runme.runner.v1.DeleteSessionResponse - (*Project)(nil), // 12: runme.runner.v1.Project - (*Winsize)(nil), // 13: runme.runner.v1.Winsize - (*ExecuteRequest)(nil), // 14: runme.runner.v1.ExecuteRequest - (*ProcessPID)(nil), // 15: runme.runner.v1.ProcessPID - (*ExecuteResponse)(nil), // 16: runme.runner.v1.ExecuteResponse - (*ResolveEnvRequest)(nil), // 17: runme.runner.v1.ResolveEnvRequest - (*ResolveEnvResult)(nil), // 18: runme.runner.v1.ResolveEnvResult - (*ResolveEnvResponse)(nil), // 19: runme.runner.v1.ResolveEnvResponse - nil, // 20: runme.runner.v1.Session.MetadataEntry - nil, // 21: runme.runner.v1.CreateSessionRequest.MetadataEntry - (*ResolveEnvRequest_CommandList)(nil), // 22: runme.runner.v1.ResolveEnvRequest.CommandList - (*wrapperspb.UInt32Value)(nil), // 23: google.protobuf.UInt32Value + (ExecuteStop)(0), // 0: runme.runner.v1.ExecuteStop + (CommandMode)(0), // 1: runme.runner.v1.CommandMode + (SessionStrategy)(0), // 2: runme.runner.v1.SessionStrategy + (*Session)(nil), // 3: runme.runner.v1.Session + (*CreateSessionRequest)(nil), // 4: runme.runner.v1.CreateSessionRequest + (*CreateSessionResponse)(nil), // 5: runme.runner.v1.CreateSessionResponse + (*GetSessionRequest)(nil), // 6: runme.runner.v1.GetSessionRequest + (*GetSessionResponse)(nil), // 7: runme.runner.v1.GetSessionResponse + (*ListSessionsRequest)(nil), // 8: runme.runner.v1.ListSessionsRequest + (*ListSessionsResponse)(nil), // 9: runme.runner.v1.ListSessionsResponse + (*DeleteSessionRequest)(nil), // 10: runme.runner.v1.DeleteSessionRequest + (*DeleteSessionResponse)(nil), // 11: runme.runner.v1.DeleteSessionResponse + (*Project)(nil), // 12: runme.runner.v1.Project + (*Winsize)(nil), // 13: runme.runner.v1.Winsize + (*ExecuteRequest)(nil), // 14: runme.runner.v1.ExecuteRequest + (*ProcessPID)(nil), // 15: runme.runner.v1.ProcessPID + (*ExecuteResponse)(nil), // 16: runme.runner.v1.ExecuteResponse + (*ResolveVarsRequest)(nil), // 17: runme.runner.v1.ResolveVarsRequest + (*ResolveVarsResult)(nil), // 18: runme.runner.v1.ResolveVarsResult + (*ResolveVarsResponse)(nil), // 19: runme.runner.v1.ResolveVarsResponse + nil, // 20: runme.runner.v1.Session.MetadataEntry + nil, // 21: runme.runner.v1.CreateSessionRequest.MetadataEntry + (*ResolveVarsRequest_CommandList)(nil), // 22: runme.runner.v1.ResolveVarsRequest.CommandList + (*wrapperspb.UInt32Value)(nil), // 23: google.protobuf.UInt32Value } var file_runme_runner_v1_runner_proto_depIdxs = []int32{ 20, // 0: runme.runner.v1.Session.metadata:type_name -> runme.runner.v1.Session.MetadataEntry @@ -1657,22 +1657,22 @@ var file_runme_runner_v1_runner_proto_depIdxs = []int32{ 1, // 10: runme.runner.v1.ExecuteRequest.command_mode:type_name -> runme.runner.v1.CommandMode 23, // 11: runme.runner.v1.ExecuteResponse.exit_code:type_name -> google.protobuf.UInt32Value 15, // 12: runme.runner.v1.ExecuteResponse.pid:type_name -> runme.runner.v1.ProcessPID - 22, // 13: runme.runner.v1.ResolveEnvRequest.commands:type_name -> runme.runner.v1.ResolveEnvRequest.CommandList - 2, // 14: runme.runner.v1.ResolveEnvRequest.session_strategy:type_name -> runme.runner.v1.SessionStrategy - 12, // 15: runme.runner.v1.ResolveEnvRequest.project:type_name -> runme.runner.v1.Project - 18, // 16: runme.runner.v1.ResolveEnvResponse.items:type_name -> runme.runner.v1.ResolveEnvResult + 22, // 13: runme.runner.v1.ResolveVarsRequest.commands:type_name -> runme.runner.v1.ResolveVarsRequest.CommandList + 2, // 14: runme.runner.v1.ResolveVarsRequest.session_strategy:type_name -> runme.runner.v1.SessionStrategy + 12, // 15: runme.runner.v1.ResolveVarsRequest.project:type_name -> runme.runner.v1.Project + 18, // 16: runme.runner.v1.ResolveVarsResponse.items:type_name -> runme.runner.v1.ResolveVarsResult 4, // 17: runme.runner.v1.RunnerService.CreateSession:input_type -> runme.runner.v1.CreateSessionRequest 6, // 18: runme.runner.v1.RunnerService.GetSession:input_type -> runme.runner.v1.GetSessionRequest 8, // 19: runme.runner.v1.RunnerService.ListSessions:input_type -> runme.runner.v1.ListSessionsRequest 10, // 20: runme.runner.v1.RunnerService.DeleteSession:input_type -> runme.runner.v1.DeleteSessionRequest 14, // 21: runme.runner.v1.RunnerService.Execute:input_type -> runme.runner.v1.ExecuteRequest - 17, // 22: runme.runner.v1.RunnerService.ResolveEnv:input_type -> runme.runner.v1.ResolveEnvRequest + 17, // 22: runme.runner.v1.RunnerService.ResolveVars:input_type -> runme.runner.v1.ResolveVarsRequest 5, // 23: runme.runner.v1.RunnerService.CreateSession:output_type -> runme.runner.v1.CreateSessionResponse 7, // 24: runme.runner.v1.RunnerService.GetSession:output_type -> runme.runner.v1.GetSessionResponse 9, // 25: runme.runner.v1.RunnerService.ListSessions:output_type -> runme.runner.v1.ListSessionsResponse 11, // 26: runme.runner.v1.RunnerService.DeleteSession:output_type -> runme.runner.v1.DeleteSessionResponse 16, // 27: runme.runner.v1.RunnerService.Execute:output_type -> runme.runner.v1.ExecuteResponse - 19, // 28: runme.runner.v1.RunnerService.ResolveEnv:output_type -> runme.runner.v1.ResolveEnvResponse + 19, // 28: runme.runner.v1.RunnerService.ResolveVars:output_type -> runme.runner.v1.ResolveVarsResponse 23, // [23:29] is the sub-list for method output_type 17, // [17:23] is the sub-list for method input_type 17, // [17:17] is the sub-list for extension type_name @@ -1855,7 +1855,7 @@ func file_runme_runner_v1_runner_proto_init() { } } file_runme_runner_v1_runner_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolveEnvRequest); i { + switch v := v.(*ResolveVarsRequest); i { case 0: return &v.state case 1: @@ -1867,7 +1867,7 @@ func file_runme_runner_v1_runner_proto_init() { } } file_runme_runner_v1_runner_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolveEnvResult); i { + switch v := v.(*ResolveVarsResult); i { case 0: return &v.state case 1: @@ -1879,7 +1879,7 @@ func file_runme_runner_v1_runner_proto_init() { } } file_runme_runner_v1_runner_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolveEnvResponse); i { + switch v := v.(*ResolveVarsResponse); i { case 0: return &v.state case 1: @@ -1891,7 +1891,7 @@ func file_runme_runner_v1_runner_proto_init() { } } file_runme_runner_v1_runner_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolveEnvRequest_CommandList); i { + switch v := v.(*ResolveVarsRequest_CommandList); i { case 0: return &v.state case 1: @@ -1906,8 +1906,8 @@ func file_runme_runner_v1_runner_proto_init() { file_runme_runner_v1_runner_proto_msgTypes[1].OneofWrappers = []interface{}{} file_runme_runner_v1_runner_proto_msgTypes[11].OneofWrappers = []interface{}{} file_runme_runner_v1_runner_proto_msgTypes[14].OneofWrappers = []interface{}{ - (*ResolveEnvRequest_Commands)(nil), - (*ResolveEnvRequest_Script)(nil), + (*ResolveVarsRequest_Commands)(nil), + (*ResolveVarsRequest_Script)(nil), } type x struct{} out := protoimpl.TypeBuilder{ diff --git a/internal/gen/proto/go/runme/runner/v1/runner_grpc.pb.go b/internal/gen/proto/go/runme/runner/v1/runner_grpc.pb.go index 4b1cb8036..2bf6dff58 100644 --- a/internal/gen/proto/go/runme/runner/v1/runner_grpc.pb.go +++ b/internal/gen/proto/go/runme/runner/v1/runner_grpc.pb.go @@ -24,7 +24,7 @@ const ( RunnerService_ListSessions_FullMethodName = "/runme.runner.v1.RunnerService/ListSessions" RunnerService_DeleteSession_FullMethodName = "/runme.runner.v1.RunnerService/DeleteSession" RunnerService_Execute_FullMethodName = "/runme.runner.v1.RunnerService/Execute" - RunnerService_ResolveEnv_FullMethodName = "/runme.runner.v1.RunnerService/ResolveEnv" + RunnerService_ResolveVars_FullMethodName = "/runme.runner.v1.RunnerService/ResolveVars" ) // RunnerServiceClient is the client API for RunnerService service. @@ -43,12 +43,11 @@ type RunnerServiceClient interface { // Subsequent "ExecuteRequest" should only contain "input_data" as // other fields will be ignored. Execute(ctx context.Context, opts ...grpc.CallOption) (RunnerService_ExecuteClient, error) - // ResolveEnv resolves environment variables from a script or a list of commands + // ResolveVars resolves variables from a script or a list of commands // using the provided sources, which can be a list of environment variables, // a session, or a project. - // The result contains all found environment variables. If the env is in any source, - // it is considered resolved. Otherwise, it is marked as unresolved. - ResolveEnv(ctx context.Context, in *ResolveEnvRequest, opts ...grpc.CallOption) (*ResolveEnvResponse, error) + // For now, the resolved variables are only the exported ones using `export`. + ResolveVars(ctx context.Context, in *ResolveVarsRequest, opts ...grpc.CallOption) (*ResolveVarsResponse, error) } type runnerServiceClient struct { @@ -126,9 +125,9 @@ func (x *runnerServiceExecuteClient) Recv() (*ExecuteResponse, error) { return m, nil } -func (c *runnerServiceClient) ResolveEnv(ctx context.Context, in *ResolveEnvRequest, opts ...grpc.CallOption) (*ResolveEnvResponse, error) { - out := new(ResolveEnvResponse) - err := c.cc.Invoke(ctx, RunnerService_ResolveEnv_FullMethodName, in, out, opts...) +func (c *runnerServiceClient) ResolveVars(ctx context.Context, in *ResolveVarsRequest, opts ...grpc.CallOption) (*ResolveVarsResponse, error) { + out := new(ResolveVarsResponse) + err := c.cc.Invoke(ctx, RunnerService_ResolveVars_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -151,12 +150,11 @@ type RunnerServiceServer interface { // Subsequent "ExecuteRequest" should only contain "input_data" as // other fields will be ignored. Execute(RunnerService_ExecuteServer) error - // ResolveEnv resolves environment variables from a script or a list of commands + // ResolveVars resolves variables from a script or a list of commands // using the provided sources, which can be a list of environment variables, // a session, or a project. - // The result contains all found environment variables. If the env is in any source, - // it is considered resolved. Otherwise, it is marked as unresolved. - ResolveEnv(context.Context, *ResolveEnvRequest) (*ResolveEnvResponse, error) + // For now, the resolved variables are only the exported ones using `export`. + ResolveVars(context.Context, *ResolveVarsRequest) (*ResolveVarsResponse, error) mustEmbedUnimplementedRunnerServiceServer() } @@ -179,8 +177,8 @@ func (UnimplementedRunnerServiceServer) DeleteSession(context.Context, *DeleteSe func (UnimplementedRunnerServiceServer) Execute(RunnerService_ExecuteServer) error { return status.Errorf(codes.Unimplemented, "method Execute not implemented") } -func (UnimplementedRunnerServiceServer) ResolveEnv(context.Context, *ResolveEnvRequest) (*ResolveEnvResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ResolveEnv not implemented") +func (UnimplementedRunnerServiceServer) ResolveVars(context.Context, *ResolveVarsRequest) (*ResolveVarsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ResolveVars not implemented") } func (UnimplementedRunnerServiceServer) mustEmbedUnimplementedRunnerServiceServer() {} @@ -293,20 +291,20 @@ func (x *runnerServiceExecuteServer) Recv() (*ExecuteRequest, error) { return m, nil } -func _RunnerService_ResolveEnv_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ResolveEnvRequest) +func _RunnerService_ResolveVars_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ResolveVarsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(RunnerServiceServer).ResolveEnv(ctx, in) + return srv.(RunnerServiceServer).ResolveVars(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RunnerService_ResolveEnv_FullMethodName, + FullMethod: RunnerService_ResolveVars_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RunnerServiceServer).ResolveEnv(ctx, req.(*ResolveEnvRequest)) + return srv.(RunnerServiceServer).ResolveVars(ctx, req.(*ResolveVarsRequest)) } return interceptor(ctx, in, info, handler) } @@ -335,8 +333,8 @@ var RunnerService_ServiceDesc = grpc.ServiceDesc{ Handler: _RunnerService_DeleteSession_Handler, }, { - MethodName: "ResolveEnv", - Handler: _RunnerService_ResolveEnv_Handler, + MethodName: "ResolveVars", + Handler: _RunnerService_ResolveVars_Handler, }, }, Streams: []grpc.StreamDesc{ diff --git a/internal/gen/proto/go/runme/runner/v2alpha1/runner.pb.go b/internal/gen/proto/go/runme/runner/v2alpha1/runner.pb.go index ace28f4e4..3f8cce748 100644 --- a/internal/gen/proto/go/runme/runner/v2alpha1/runner.pb.go +++ b/internal/gen/proto/go/runme/runner/v2alpha1/runner.pb.go @@ -1017,16 +1017,16 @@ func (x *ExecuteResponse) GetPid() *wrapperspb.UInt32Value { return nil } -type ResolveEnvRequest struct { +type ResolveVarsRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields // Types that are assignable to Source: // - // *ResolveEnvRequest_Commands - // *ResolveEnvRequest_Script - Source isResolveEnvRequest_Source `protobuf_oneof:"source"` + // *ResolveVarsRequest_Commands + // *ResolveVarsRequest_Script + Source isResolveVarsRequest_Source `protobuf_oneof:"source"` // env is a list of environment variables that will be used // to resolve the environment variables found in the source. Env []string `protobuf:"bytes,3,rep,name=env,proto3" json:"env,omitempty"` @@ -1040,8 +1040,8 @@ type ResolveEnvRequest struct { Project *Project `protobuf:"bytes,6,opt,name=project,proto3,oneof" json:"project,omitempty"` } -func (x *ResolveEnvRequest) Reset() { - *x = ResolveEnvRequest{} +func (x *ResolveVarsRequest) Reset() { + *x = ResolveVarsRequest{} if protoimpl.UnsafeEnabled { mi := &file_runme_runner_v2alpha1_runner_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1049,13 +1049,13 @@ func (x *ResolveEnvRequest) Reset() { } } -func (x *ResolveEnvRequest) String() string { +func (x *ResolveVarsRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ResolveEnvRequest) ProtoMessage() {} +func (*ResolveVarsRequest) ProtoMessage() {} -func (x *ResolveEnvRequest) ProtoReflect() protoreflect.Message { +func (x *ResolveVarsRequest) ProtoReflect() protoreflect.Message { mi := &file_runme_runner_v2alpha1_runner_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1067,81 +1067,81 @@ func (x *ResolveEnvRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ResolveEnvRequest.ProtoReflect.Descriptor instead. -func (*ResolveEnvRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use ResolveVarsRequest.ProtoReflect.Descriptor instead. +func (*ResolveVarsRequest) Descriptor() ([]byte, []int) { return file_runme_runner_v2alpha1_runner_proto_rawDescGZIP(), []int{15} } -func (m *ResolveEnvRequest) GetSource() isResolveEnvRequest_Source { +func (m *ResolveVarsRequest) GetSource() isResolveVarsRequest_Source { if m != nil { return m.Source } return nil } -func (x *ResolveEnvRequest) GetCommands() *ResolveEnvRequest_CommandList { - if x, ok := x.GetSource().(*ResolveEnvRequest_Commands); ok { +func (x *ResolveVarsRequest) GetCommands() *ResolveVarsRequest_CommandList { + if x, ok := x.GetSource().(*ResolveVarsRequest_Commands); ok { return x.Commands } return nil } -func (x *ResolveEnvRequest) GetScript() string { - if x, ok := x.GetSource().(*ResolveEnvRequest_Script); ok { +func (x *ResolveVarsRequest) GetScript() string { + if x, ok := x.GetSource().(*ResolveVarsRequest_Script); ok { return x.Script } return "" } -func (x *ResolveEnvRequest) GetEnv() []string { +func (x *ResolveVarsRequest) GetEnv() []string { if x != nil { return x.Env } return nil } -func (x *ResolveEnvRequest) GetSessionId() string { +func (x *ResolveVarsRequest) GetSessionId() string { if x != nil { return x.SessionId } return "" } -func (x *ResolveEnvRequest) GetSessionStrategy() SessionStrategy { +func (x *ResolveVarsRequest) GetSessionStrategy() SessionStrategy { if x != nil { return x.SessionStrategy } return SessionStrategy_SESSION_STRATEGY_UNSPECIFIED } -func (x *ResolveEnvRequest) GetProject() *Project { +func (x *ResolveVarsRequest) GetProject() *Project { if x != nil { return x.Project } return nil } -type isResolveEnvRequest_Source interface { - isResolveEnvRequest_Source() +type isResolveVarsRequest_Source interface { + isResolveVarsRequest_Source() } -type ResolveEnvRequest_Commands struct { +type ResolveVarsRequest_Commands struct { // commands are commands to be executed by the program. // The commands are joined and executed as a script. - Commands *ResolveEnvRequest_CommandList `protobuf:"bytes,1,opt,name=commands,proto3,oneof"` + Commands *ResolveVarsRequest_CommandList `protobuf:"bytes,1,opt,name=commands,proto3,oneof"` } -type ResolveEnvRequest_Script struct { +type ResolveVarsRequest_Script struct { // script is code to be executed by the program. // Individual lines are joined with the new line character. Script string `protobuf:"bytes,2,opt,name=script,proto3,oneof"` } -func (*ResolveEnvRequest_Commands) isResolveEnvRequest_Source() {} +func (*ResolveVarsRequest_Commands) isResolveVarsRequest_Source() {} -func (*ResolveEnvRequest_Script) isResolveEnvRequest_Source() {} +func (*ResolveVarsRequest_Script) isResolveVarsRequest_Source() {} -type ResolveEnvResult struct { +type ResolveVarsResult struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1158,8 +1158,8 @@ type ResolveEnvResult struct { ResolvedValue string `protobuf:"bytes,3,opt,name=resolved_value,json=resolvedValue,proto3" json:"resolved_value,omitempty"` } -func (x *ResolveEnvResult) Reset() { - *x = ResolveEnvResult{} +func (x *ResolveVarsResult) Reset() { + *x = ResolveVarsResult{} if protoimpl.UnsafeEnabled { mi := &file_runme_runner_v2alpha1_runner_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1167,13 +1167,13 @@ func (x *ResolveEnvResult) Reset() { } } -func (x *ResolveEnvResult) String() string { +func (x *ResolveVarsResult) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ResolveEnvResult) ProtoMessage() {} +func (*ResolveVarsResult) ProtoMessage() {} -func (x *ResolveEnvResult) ProtoReflect() protoreflect.Message { +func (x *ResolveVarsResult) ProtoReflect() protoreflect.Message { mi := &file_runme_runner_v2alpha1_runner_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1185,42 +1185,42 @@ func (x *ResolveEnvResult) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ResolveEnvResult.ProtoReflect.Descriptor instead. -func (*ResolveEnvResult) Descriptor() ([]byte, []int) { +// Deprecated: Use ResolveVarsResult.ProtoReflect.Descriptor instead. +func (*ResolveVarsResult) Descriptor() ([]byte, []int) { return file_runme_runner_v2alpha1_runner_proto_rawDescGZIP(), []int{16} } -func (x *ResolveEnvResult) GetName() string { +func (x *ResolveVarsResult) GetName() string { if x != nil { return x.Name } return "" } -func (x *ResolveEnvResult) GetOriginalValue() string { +func (x *ResolveVarsResult) GetOriginalValue() string { if x != nil { return x.OriginalValue } return "" } -func (x *ResolveEnvResult) GetResolvedValue() string { +func (x *ResolveVarsResult) GetResolvedValue() string { if x != nil { return x.ResolvedValue } return "" } -type ResolveEnvResponse struct { +type ResolveVarsResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Items []*ResolveEnvResult `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"` + Items []*ResolveVarsResult `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"` } -func (x *ResolveEnvResponse) Reset() { - *x = ResolveEnvResponse{} +func (x *ResolveVarsResponse) Reset() { + *x = ResolveVarsResponse{} if protoimpl.UnsafeEnabled { mi := &file_runme_runner_v2alpha1_runner_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1228,13 +1228,13 @@ func (x *ResolveEnvResponse) Reset() { } } -func (x *ResolveEnvResponse) String() string { +func (x *ResolveVarsResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ResolveEnvResponse) ProtoMessage() {} +func (*ResolveVarsResponse) ProtoMessage() {} -func (x *ResolveEnvResponse) ProtoReflect() protoreflect.Message { +func (x *ResolveVarsResponse) ProtoReflect() protoreflect.Message { mi := &file_runme_runner_v2alpha1_runner_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1246,19 +1246,19 @@ func (x *ResolveEnvResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ResolveEnvResponse.ProtoReflect.Descriptor instead. -func (*ResolveEnvResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use ResolveVarsResponse.ProtoReflect.Descriptor instead. +func (*ResolveVarsResponse) Descriptor() ([]byte, []int) { return file_runme_runner_v2alpha1_runner_proto_rawDescGZIP(), []int{17} } -func (x *ResolveEnvResponse) GetItems() []*ResolveEnvResult { +func (x *ResolveVarsResponse) GetItems() []*ResolveVarsResult { if x != nil { return x.Items } return nil } -type ResolveEnvRequest_CommandList struct { +type ResolveVarsRequest_CommandList struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1269,8 +1269,8 @@ type ResolveEnvRequest_CommandList struct { Items []string `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"` } -func (x *ResolveEnvRequest_CommandList) Reset() { - *x = ResolveEnvRequest_CommandList{} +func (x *ResolveVarsRequest_CommandList) Reset() { + *x = ResolveVarsRequest_CommandList{} if protoimpl.UnsafeEnabled { mi := &file_runme_runner_v2alpha1_runner_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1278,13 +1278,13 @@ func (x *ResolveEnvRequest_CommandList) Reset() { } } -func (x *ResolveEnvRequest_CommandList) String() string { +func (x *ResolveVarsRequest_CommandList) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ResolveEnvRequest_CommandList) ProtoMessage() {} +func (*ResolveVarsRequest_CommandList) ProtoMessage() {} -func (x *ResolveEnvRequest_CommandList) ProtoReflect() protoreflect.Message { +func (x *ResolveVarsRequest_CommandList) ProtoReflect() protoreflect.Message { mi := &file_runme_runner_v2alpha1_runner_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1296,12 +1296,12 @@ func (x *ResolveEnvRequest_CommandList) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ResolveEnvRequest_CommandList.ProtoReflect.Descriptor instead. -func (*ResolveEnvRequest_CommandList) Descriptor() ([]byte, []int) { +// Deprecated: Use ResolveVarsRequest_CommandList.ProtoReflect.Descriptor instead. +func (*ResolveVarsRequest_CommandList) Descriptor() ([]byte, []int) { return file_runme_runner_v2alpha1_runner_proto_rawDescGZIP(), []int{15, 0} } -func (x *ResolveEnvRequest_CommandList) GetItems() []string { +func (x *ResolveVarsRequest_CommandList) GetItems() []string { if x != nil { return x.Items } @@ -1444,108 +1444,108 @@ var file_runme_runner_v2alpha1_runner_proto_rawDesc = []byte{ 0x12, 0x2e, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x03, 0x70, 0x69, 0x64, - 0x22, 0xff, 0x02, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x52, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, - 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, - 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, - 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, - 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x06, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x51, 0x0a, 0x10, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x5f, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x26, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, - 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, - 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x52, 0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x3d, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6a, - 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x75, 0x6e, 0x6d, + 0x22, 0x81, 0x03, 0x0a, 0x12, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x53, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x61, + 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, - 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x48, 0x01, 0x52, 0x07, 0x70, 0x72, 0x6f, - 0x6a, 0x65, 0x63, 0x74, 0x88, 0x01, 0x01, 0x1a, 0x23, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x61, - 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x08, 0x0a, 0x06, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, - 0x63, 0x74, 0x22, 0x74, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, - 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x6f, 0x72, - 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0d, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x5f, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x6c, - 0x76, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x53, 0x0a, 0x12, 0x52, 0x65, 0x73, 0x6f, - 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, - 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, - 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, - 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, - 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2a, 0x5e, 0x0a, - 0x0b, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x12, 0x1c, 0x0a, 0x18, - 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x55, 0x4e, 0x53, - 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x45, 0x58, - 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, - 0x52, 0x55, 0x50, 0x54, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, - 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x4b, 0x49, 0x4c, 0x4c, 0x10, 0x02, 0x2a, 0x55, 0x0a, - 0x0f, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, - 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x52, 0x41, - 0x54, 0x45, 0x47, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, - 0x10, 0x00, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, - 0x52, 0x41, 0x54, 0x45, 0x47, 0x59, 0x5f, 0x4d, 0x4f, 0x53, 0x54, 0x5f, 0x52, 0x45, 0x43, 0x45, - 0x4e, 0x54, 0x10, 0x01, 0x32, 0xee, 0x05, 0x0a, 0x0d, 0x52, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x53, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6c, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, - 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, - 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x12, 0x28, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, - 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, + 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, + 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x06, + 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, + 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x03, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x51, 0x0a, 0x10, 0x73, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x26, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, + 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x52, 0x0f, 0x73, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x3d, 0x0a, 0x07, 0x70, 0x72, + 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x75, + 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, + 0x68, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x48, 0x01, 0x52, 0x07, 0x70, + 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x88, 0x01, 0x01, 0x1a, 0x23, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, + 0x6d, 0x61, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x08, + 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x72, 0x6f, + 0x6a, 0x65, 0x63, 0x74, 0x22, 0x75, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, + 0x61, 0x72, 0x73, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, + 0x0e, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, + 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, + 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x55, 0x0a, 0x13, 0x52, + 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x3e, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x28, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, + 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, + 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x2a, 0x5e, 0x0a, 0x0b, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x53, 0x74, 0x6f, + 0x70, 0x12, 0x1c, 0x0a, 0x18, 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, + 0x50, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, + 0x1a, 0x0a, 0x16, 0x45, 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x5f, + 0x49, 0x4e, 0x54, 0x45, 0x52, 0x52, 0x55, 0x50, 0x54, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x45, + 0x58, 0x45, 0x43, 0x55, 0x54, 0x45, 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x4b, 0x49, 0x4c, 0x4c, + 0x10, 0x02, 0x2a, 0x55, 0x0a, 0x0f, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x72, + 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, + 0x5f, 0x53, 0x54, 0x52, 0x41, 0x54, 0x45, 0x47, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, + 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x53, 0x53, 0x49, + 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x52, 0x41, 0x54, 0x45, 0x47, 0x59, 0x5f, 0x4d, 0x4f, 0x53, 0x54, + 0x5f, 0x52, 0x45, 0x43, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x32, 0xf1, 0x05, 0x0a, 0x0d, 0x52, 0x75, + 0x6e, 0x6e, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6c, 0x0a, 0x0d, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, - 0x70, 0x68, 0x61, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x69, 0x0a, 0x0c, 0x4c, 0x69, 0x73, - 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2a, 0x2e, 0x72, 0x75, 0x6e, 0x6d, + 0x70, 0x68, 0x61, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, - 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, - 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, - 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, - 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, - 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x2c, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, - 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, - 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x5e, 0x0a, 0x07, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x12, 0x25, 0x2e, 0x72, 0x75, - 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, - 0x68, 0x61, 0x31, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, - 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, - 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, - 0x12, 0x63, 0x0a, 0x0a, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x12, 0x28, + 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0a, 0x47, 0x65, 0x74, + 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, + 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, + 0x47, 0x65, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, + 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x69, + 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2a, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, - 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, - 0x76, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, + 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x72, 0x75, 0x6e, + 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, + 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x72, 0x75, 0x6e, + 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, + 0x61, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, + 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, - 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x45, 0x6e, 0x76, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x56, 0x5a, 0x54, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c, 0x2f, 0x72, 0x75, 0x6e, - 0x6d, 0x65, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2f, 0x72, - 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x72, - 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, + 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x07, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, + 0x12, 0x25, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, + 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, + 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, + 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x66, 0x0a, 0x0b, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, + 0x56, 0x61, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, + 0x6e, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x52, 0x65, 0x73, + 0x6f, 0x6c, 0x76, 0x65, 0x56, 0x61, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x2a, 0x2e, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x76, + 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x56, + 0x61, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x56, 0x5a, + 0x54, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x66, 0x75, 0x6c, 0x2f, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x2f, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x2f, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x2f, 0x76, 0x32, + 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x72, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x76, 0x32, 0x61, + 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1563,32 +1563,32 @@ func file_runme_runner_v2alpha1_runner_proto_rawDescGZIP() []byte { var file_runme_runner_v2alpha1_runner_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_runme_runner_v2alpha1_runner_proto_msgTypes = make([]protoimpl.MessageInfo, 22) var file_runme_runner_v2alpha1_runner_proto_goTypes = []interface{}{ - (ExecuteStop)(0), // 0: runme.runner.v2alpha1.ExecuteStop - (SessionStrategy)(0), // 1: runme.runner.v2alpha1.SessionStrategy - (*Project)(nil), // 2: runme.runner.v2alpha1.Project - (*Session)(nil), // 3: runme.runner.v2alpha1.Session - (*CreateSessionRequest)(nil), // 4: runme.runner.v2alpha1.CreateSessionRequest - (*CreateSessionResponse)(nil), // 5: runme.runner.v2alpha1.CreateSessionResponse - (*GetSessionRequest)(nil), // 6: runme.runner.v2alpha1.GetSessionRequest - (*GetSessionResponse)(nil), // 7: runme.runner.v2alpha1.GetSessionResponse - (*ListSessionsRequest)(nil), // 8: runme.runner.v2alpha1.ListSessionsRequest - (*ListSessionsResponse)(nil), // 9: runme.runner.v2alpha1.ListSessionsResponse - (*UpdateSessionRequest)(nil), // 10: runme.runner.v2alpha1.UpdateSessionRequest - (*UpdateSessionResponse)(nil), // 11: runme.runner.v2alpha1.UpdateSessionResponse - (*DeleteSessionRequest)(nil), // 12: runme.runner.v2alpha1.DeleteSessionRequest - (*DeleteSessionResponse)(nil), // 13: runme.runner.v2alpha1.DeleteSessionResponse - (*Winsize)(nil), // 14: runme.runner.v2alpha1.Winsize - (*ExecuteRequest)(nil), // 15: runme.runner.v2alpha1.ExecuteRequest - (*ExecuteResponse)(nil), // 16: runme.runner.v2alpha1.ExecuteResponse - (*ResolveEnvRequest)(nil), // 17: runme.runner.v2alpha1.ResolveEnvRequest - (*ResolveEnvResult)(nil), // 18: runme.runner.v2alpha1.ResolveEnvResult - (*ResolveEnvResponse)(nil), // 19: runme.runner.v2alpha1.ResolveEnvResponse - nil, // 20: runme.runner.v2alpha1.Session.MetadataEntry - nil, // 21: runme.runner.v2alpha1.CreateSessionRequest.MetadataEntry - nil, // 22: runme.runner.v2alpha1.UpdateSessionRequest.MetadataEntry - (*ResolveEnvRequest_CommandList)(nil), // 23: runme.runner.v2alpha1.ResolveEnvRequest.CommandList - (*ProgramConfig)(nil), // 24: runme.runner.v2alpha1.ProgramConfig - (*wrapperspb.UInt32Value)(nil), // 25: google.protobuf.UInt32Value + (ExecuteStop)(0), // 0: runme.runner.v2alpha1.ExecuteStop + (SessionStrategy)(0), // 1: runme.runner.v2alpha1.SessionStrategy + (*Project)(nil), // 2: runme.runner.v2alpha1.Project + (*Session)(nil), // 3: runme.runner.v2alpha1.Session + (*CreateSessionRequest)(nil), // 4: runme.runner.v2alpha1.CreateSessionRequest + (*CreateSessionResponse)(nil), // 5: runme.runner.v2alpha1.CreateSessionResponse + (*GetSessionRequest)(nil), // 6: runme.runner.v2alpha1.GetSessionRequest + (*GetSessionResponse)(nil), // 7: runme.runner.v2alpha1.GetSessionResponse + (*ListSessionsRequest)(nil), // 8: runme.runner.v2alpha1.ListSessionsRequest + (*ListSessionsResponse)(nil), // 9: runme.runner.v2alpha1.ListSessionsResponse + (*UpdateSessionRequest)(nil), // 10: runme.runner.v2alpha1.UpdateSessionRequest + (*UpdateSessionResponse)(nil), // 11: runme.runner.v2alpha1.UpdateSessionResponse + (*DeleteSessionRequest)(nil), // 12: runme.runner.v2alpha1.DeleteSessionRequest + (*DeleteSessionResponse)(nil), // 13: runme.runner.v2alpha1.DeleteSessionResponse + (*Winsize)(nil), // 14: runme.runner.v2alpha1.Winsize + (*ExecuteRequest)(nil), // 15: runme.runner.v2alpha1.ExecuteRequest + (*ExecuteResponse)(nil), // 16: runme.runner.v2alpha1.ExecuteResponse + (*ResolveVarsRequest)(nil), // 17: runme.runner.v2alpha1.ResolveVarsRequest + (*ResolveVarsResult)(nil), // 18: runme.runner.v2alpha1.ResolveVarsResult + (*ResolveVarsResponse)(nil), // 19: runme.runner.v2alpha1.ResolveVarsResponse + nil, // 20: runme.runner.v2alpha1.Session.MetadataEntry + nil, // 21: runme.runner.v2alpha1.CreateSessionRequest.MetadataEntry + nil, // 22: runme.runner.v2alpha1.UpdateSessionRequest.MetadataEntry + (*ResolveVarsRequest_CommandList)(nil), // 23: runme.runner.v2alpha1.ResolveVarsRequest.CommandList + (*ProgramConfig)(nil), // 24: runme.runner.v2alpha1.ProgramConfig + (*wrapperspb.UInt32Value)(nil), // 25: google.protobuf.UInt32Value } var file_runme_runner_v2alpha1_runner_proto_depIdxs = []int32{ 20, // 0: runme.runner.v2alpha1.Session.metadata:type_name -> runme.runner.v2alpha1.Session.MetadataEntry @@ -1607,24 +1607,24 @@ var file_runme_runner_v2alpha1_runner_proto_depIdxs = []int32{ 2, // 13: runme.runner.v2alpha1.ExecuteRequest.project:type_name -> runme.runner.v2alpha1.Project 25, // 14: runme.runner.v2alpha1.ExecuteResponse.exit_code:type_name -> google.protobuf.UInt32Value 25, // 15: runme.runner.v2alpha1.ExecuteResponse.pid:type_name -> google.protobuf.UInt32Value - 23, // 16: runme.runner.v2alpha1.ResolveEnvRequest.commands:type_name -> runme.runner.v2alpha1.ResolveEnvRequest.CommandList - 1, // 17: runme.runner.v2alpha1.ResolveEnvRequest.session_strategy:type_name -> runme.runner.v2alpha1.SessionStrategy - 2, // 18: runme.runner.v2alpha1.ResolveEnvRequest.project:type_name -> runme.runner.v2alpha1.Project - 18, // 19: runme.runner.v2alpha1.ResolveEnvResponse.items:type_name -> runme.runner.v2alpha1.ResolveEnvResult + 23, // 16: runme.runner.v2alpha1.ResolveVarsRequest.commands:type_name -> runme.runner.v2alpha1.ResolveVarsRequest.CommandList + 1, // 17: runme.runner.v2alpha1.ResolveVarsRequest.session_strategy:type_name -> runme.runner.v2alpha1.SessionStrategy + 2, // 18: runme.runner.v2alpha1.ResolveVarsRequest.project:type_name -> runme.runner.v2alpha1.Project + 18, // 19: runme.runner.v2alpha1.ResolveVarsResponse.items:type_name -> runme.runner.v2alpha1.ResolveVarsResult 4, // 20: runme.runner.v2alpha1.RunnerService.CreateSession:input_type -> runme.runner.v2alpha1.CreateSessionRequest 6, // 21: runme.runner.v2alpha1.RunnerService.GetSession:input_type -> runme.runner.v2alpha1.GetSessionRequest 8, // 22: runme.runner.v2alpha1.RunnerService.ListSessions:input_type -> runme.runner.v2alpha1.ListSessionsRequest 10, // 23: runme.runner.v2alpha1.RunnerService.UpdateSession:input_type -> runme.runner.v2alpha1.UpdateSessionRequest 12, // 24: runme.runner.v2alpha1.RunnerService.DeleteSession:input_type -> runme.runner.v2alpha1.DeleteSessionRequest 15, // 25: runme.runner.v2alpha1.RunnerService.Execute:input_type -> runme.runner.v2alpha1.ExecuteRequest - 17, // 26: runme.runner.v2alpha1.RunnerService.ResolveEnv:input_type -> runme.runner.v2alpha1.ResolveEnvRequest + 17, // 26: runme.runner.v2alpha1.RunnerService.ResolveVars:input_type -> runme.runner.v2alpha1.ResolveVarsRequest 5, // 27: runme.runner.v2alpha1.RunnerService.CreateSession:output_type -> runme.runner.v2alpha1.CreateSessionResponse 7, // 28: runme.runner.v2alpha1.RunnerService.GetSession:output_type -> runme.runner.v2alpha1.GetSessionResponse 9, // 29: runme.runner.v2alpha1.RunnerService.ListSessions:output_type -> runme.runner.v2alpha1.ListSessionsResponse 11, // 30: runme.runner.v2alpha1.RunnerService.UpdateSession:output_type -> runme.runner.v2alpha1.UpdateSessionResponse 13, // 31: runme.runner.v2alpha1.RunnerService.DeleteSession:output_type -> runme.runner.v2alpha1.DeleteSessionResponse 16, // 32: runme.runner.v2alpha1.RunnerService.Execute:output_type -> runme.runner.v2alpha1.ExecuteResponse - 19, // 33: runme.runner.v2alpha1.RunnerService.ResolveEnv:output_type -> runme.runner.v2alpha1.ResolveEnvResponse + 19, // 33: runme.runner.v2alpha1.RunnerService.ResolveVars:output_type -> runme.runner.v2alpha1.ResolveVarsResponse 27, // [27:34] is the sub-list for method output_type 20, // [20:27] is the sub-list for method input_type 20, // [20:20] is the sub-list for extension type_name @@ -1820,7 +1820,7 @@ func file_runme_runner_v2alpha1_runner_proto_init() { } } file_runme_runner_v2alpha1_runner_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolveEnvRequest); i { + switch v := v.(*ResolveVarsRequest); i { case 0: return &v.state case 1: @@ -1832,7 +1832,7 @@ func file_runme_runner_v2alpha1_runner_proto_init() { } } file_runme_runner_v2alpha1_runner_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolveEnvResult); i { + switch v := v.(*ResolveVarsResult); i { case 0: return &v.state case 1: @@ -1844,7 +1844,7 @@ func file_runme_runner_v2alpha1_runner_proto_init() { } } file_runme_runner_v2alpha1_runner_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolveEnvResponse); i { + switch v := v.(*ResolveVarsResponse); i { case 0: return &v.state case 1: @@ -1856,7 +1856,7 @@ func file_runme_runner_v2alpha1_runner_proto_init() { } } file_runme_runner_v2alpha1_runner_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolveEnvRequest_CommandList); i { + switch v := v.(*ResolveVarsRequest_CommandList); i { case 0: return &v.state case 1: @@ -1872,8 +1872,8 @@ func file_runme_runner_v2alpha1_runner_proto_init() { file_runme_runner_v2alpha1_runner_proto_msgTypes[8].OneofWrappers = []interface{}{} file_runme_runner_v2alpha1_runner_proto_msgTypes[13].OneofWrappers = []interface{}{} file_runme_runner_v2alpha1_runner_proto_msgTypes[15].OneofWrappers = []interface{}{ - (*ResolveEnvRequest_Commands)(nil), - (*ResolveEnvRequest_Script)(nil), + (*ResolveVarsRequest_Commands)(nil), + (*ResolveVarsRequest_Script)(nil), } type x struct{} out := protoimpl.TypeBuilder{ diff --git a/internal/gen/proto/go/runme/runner/v2alpha1/runner_grpc.pb.go b/internal/gen/proto/go/runme/runner/v2alpha1/runner_grpc.pb.go index 32b2fac63..ec296a237 100644 --- a/internal/gen/proto/go/runme/runner/v2alpha1/runner_grpc.pb.go +++ b/internal/gen/proto/go/runme/runner/v2alpha1/runner_grpc.pb.go @@ -25,7 +25,7 @@ const ( RunnerService_UpdateSession_FullMethodName = "/runme.runner.v2alpha1.RunnerService/UpdateSession" RunnerService_DeleteSession_FullMethodName = "/runme.runner.v2alpha1.RunnerService/DeleteSession" RunnerService_Execute_FullMethodName = "/runme.runner.v2alpha1.RunnerService/Execute" - RunnerService_ResolveEnv_FullMethodName = "/runme.runner.v2alpha1.RunnerService/ResolveEnv" + RunnerService_ResolveVars_FullMethodName = "/runme.runner.v2alpha1.RunnerService/ResolveVars" ) // RunnerServiceClient is the client API for RunnerService service. @@ -45,12 +45,11 @@ type RunnerServiceClient interface { // Subsequent "ExecuteRequest" should only contain "input_data" as // other fields will be ignored. Execute(ctx context.Context, opts ...grpc.CallOption) (RunnerService_ExecuteClient, error) - // ResolveEnv resolves environment variables from a script or a list of commands + // ResolveVars resolves variables from a script or a list of commands // using the provided sources, which can be a list of environment variables, // a session, or a project. - // The result contains all found environment variables. If the env is in any source, - // it is considered resolved. Otherwise, it is marked as unresolved. - ResolveEnv(ctx context.Context, in *ResolveEnvRequest, opts ...grpc.CallOption) (*ResolveEnvResponse, error) + // For now, the resolved variables are only the exported ones using `export`. + ResolveVars(ctx context.Context, in *ResolveVarsRequest, opts ...grpc.CallOption) (*ResolveVarsResponse, error) } type runnerServiceClient struct { @@ -137,9 +136,9 @@ func (x *runnerServiceExecuteClient) Recv() (*ExecuteResponse, error) { return m, nil } -func (c *runnerServiceClient) ResolveEnv(ctx context.Context, in *ResolveEnvRequest, opts ...grpc.CallOption) (*ResolveEnvResponse, error) { - out := new(ResolveEnvResponse) - err := c.cc.Invoke(ctx, RunnerService_ResolveEnv_FullMethodName, in, out, opts...) +func (c *runnerServiceClient) ResolveVars(ctx context.Context, in *ResolveVarsRequest, opts ...grpc.CallOption) (*ResolveVarsResponse, error) { + out := new(ResolveVarsResponse) + err := c.cc.Invoke(ctx, RunnerService_ResolveVars_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -163,12 +162,11 @@ type RunnerServiceServer interface { // Subsequent "ExecuteRequest" should only contain "input_data" as // other fields will be ignored. Execute(RunnerService_ExecuteServer) error - // ResolveEnv resolves environment variables from a script or a list of commands + // ResolveVars resolves variables from a script or a list of commands // using the provided sources, which can be a list of environment variables, // a session, or a project. - // The result contains all found environment variables. If the env is in any source, - // it is considered resolved. Otherwise, it is marked as unresolved. - ResolveEnv(context.Context, *ResolveEnvRequest) (*ResolveEnvResponse, error) + // For now, the resolved variables are only the exported ones using `export`. + ResolveVars(context.Context, *ResolveVarsRequest) (*ResolveVarsResponse, error) mustEmbedUnimplementedRunnerServiceServer() } @@ -194,8 +192,8 @@ func (UnimplementedRunnerServiceServer) DeleteSession(context.Context, *DeleteSe func (UnimplementedRunnerServiceServer) Execute(RunnerService_ExecuteServer) error { return status.Errorf(codes.Unimplemented, "method Execute not implemented") } -func (UnimplementedRunnerServiceServer) ResolveEnv(context.Context, *ResolveEnvRequest) (*ResolveEnvResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ResolveEnv not implemented") +func (UnimplementedRunnerServiceServer) ResolveVars(context.Context, *ResolveVarsRequest) (*ResolveVarsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ResolveVars not implemented") } func (UnimplementedRunnerServiceServer) mustEmbedUnimplementedRunnerServiceServer() {} @@ -326,20 +324,20 @@ func (x *runnerServiceExecuteServer) Recv() (*ExecuteRequest, error) { return m, nil } -func _RunnerService_ResolveEnv_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ResolveEnvRequest) +func _RunnerService_ResolveVars_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ResolveVarsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(RunnerServiceServer).ResolveEnv(ctx, in) + return srv.(RunnerServiceServer).ResolveVars(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RunnerService_ResolveEnv_FullMethodName, + FullMethod: RunnerService_ResolveVars_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RunnerServiceServer).ResolveEnv(ctx, req.(*ResolveEnvRequest)) + return srv.(RunnerServiceServer).ResolveVars(ctx, req.(*ResolveVarsRequest)) } return interceptor(ctx, in, info, handler) } @@ -372,8 +370,8 @@ var RunnerService_ServiceDesc = grpc.ServiceDesc{ Handler: _RunnerService_DeleteSession_Handler, }, { - MethodName: "ResolveEnv", - Handler: _RunnerService_ResolveEnv_Handler, + MethodName: "ResolveVars", + Handler: _RunnerService_ResolveVars_Handler, }, }, Streams: []grpc.StreamDesc{ diff --git a/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.d.ts b/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.d.ts index 1148b7a7c..8eb7db3db 100644 --- a/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.d.ts +++ b/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.d.ts @@ -5,8 +5,8 @@ // @ts-nocheck import type { RpcTransport } from "@protobuf-ts/runtime-rpc"; import type { ServiceInfo } from "@protobuf-ts/runtime-rpc"; -import type { ResolveEnvResponse } from "./runner_pb"; -import type { ResolveEnvRequest } from "./runner_pb"; +import type { ResolveVarsResponse } from "./runner_pb"; +import type { ResolveVarsRequest } from "./runner_pb"; import type { ExecuteResponse } from "./runner_pb"; import type { ExecuteRequest } from "./runner_pb"; import type { DuplexStreamingCall } from "@protobuf-ts/runtime-rpc"; @@ -53,15 +53,14 @@ export interface IRunnerServiceClient { */ execute(options?: RpcOptions): DuplexStreamingCall; /** - * ResolveEnv resolves environment variables from a script or a list of commands + * ResolveVars resolves variables from a script or a list of commands * using the provided sources, which can be a list of environment variables, * a session, or a project. - * The result contains all found environment variables. If the env is in any source, - * it is considered resolved. Otherwise, it is marked as unresolved. + * For now, the resolved variables are only the exported ones using `export`. * - * @generated from protobuf rpc: ResolveEnv(runme.runner.v1.ResolveEnvRequest) returns (runme.runner.v1.ResolveEnvResponse); + * @generated from protobuf rpc: ResolveVars(runme.runner.v1.ResolveVarsRequest) returns (runme.runner.v1.ResolveVarsResponse); */ - resolveEnv(input: ResolveEnvRequest, options?: RpcOptions): UnaryCall; + resolveVars(input: ResolveVarsRequest, options?: RpcOptions): UnaryCall; } /** * @generated from protobuf service runme.runner.v1.RunnerService @@ -101,13 +100,12 @@ export declare class RunnerServiceClient implements IRunnerServiceClient, Servic */ execute(options?: RpcOptions): DuplexStreamingCall; /** - * ResolveEnv resolves environment variables from a script or a list of commands + * ResolveVars resolves variables from a script or a list of commands * using the provided sources, which can be a list of environment variables, * a session, or a project. - * The result contains all found environment variables. If the env is in any source, - * it is considered resolved. Otherwise, it is marked as unresolved. + * For now, the resolved variables are only the exported ones using `export`. * - * @generated from protobuf rpc: ResolveEnv(runme.runner.v1.ResolveEnvRequest) returns (runme.runner.v1.ResolveEnvResponse); + * @generated from protobuf rpc: ResolveVars(runme.runner.v1.ResolveVarsRequest) returns (runme.runner.v1.ResolveVarsResponse); */ - resolveEnv(input: ResolveEnvRequest, options?: RpcOptions): UnaryCall; + resolveVars(input: ResolveVarsRequest, options?: RpcOptions): UnaryCall; } diff --git a/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.js b/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.js index 06b6e5c13..8953d1e44 100644 --- a/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.js +++ b/internal/gen/proto/ts/runme/runner/v1/runner_pb.client.js @@ -59,15 +59,14 @@ export class RunnerServiceClient { return stackIntercept("duplex", this._transport, method, opt); } /** - * ResolveEnv resolves environment variables from a script or a list of commands + * ResolveVars resolves variables from a script or a list of commands * using the provided sources, which can be a list of environment variables, * a session, or a project. - * The result contains all found environment variables. If the env is in any source, - * it is considered resolved. Otherwise, it is marked as unresolved. + * For now, the resolved variables are only the exported ones using `export`. * - * @generated from protobuf rpc: ResolveEnv(runme.runner.v1.ResolveEnvRequest) returns (runme.runner.v1.ResolveEnvResponse); + * @generated from protobuf rpc: ResolveVars(runme.runner.v1.ResolveVarsRequest) returns (runme.runner.v1.ResolveVarsResponse); */ - resolveEnv(input, options) { + resolveVars(input, options) { const method = this.methods[5], opt = this._transport.mergeOptions(options); return stackIntercept("unary", this._transport, method, opt, input); } diff --git a/internal/gen/proto/ts/runme/runner/v1/runner_pb.d.ts b/internal/gen/proto/ts/runme/runner/v1/runner_pb.d.ts index 66231d7b2..20f2fe18d 100644 --- a/internal/gen/proto/ts/runme/runner/v1/runner_pb.d.ts +++ b/internal/gen/proto/ts/runme/runner/v1/runner_pb.d.ts @@ -326,9 +326,9 @@ export interface ExecuteResponse { pid?: ProcessPID; } /** - * @generated from protobuf message runme.runner.v1.ResolveEnvRequest + * @generated from protobuf message runme.runner.v1.ResolveVarsRequest */ -export interface ResolveEnvRequest { +export interface ResolveVarsRequest { /** * @generated from protobuf oneof: source */ @@ -338,9 +338,9 @@ export interface ResolveEnvRequest { * commands are commands to be executed by the program. * The commands are joined and executed as a script. * - * @generated from protobuf field: runme.runner.v1.ResolveEnvRequest.CommandList commands = 1; + * @generated from protobuf field: runme.runner.v1.ResolveVarsRequest.CommandList commands = 1; */ - commands: ResolveEnvRequest_CommandList; + commands: ResolveVarsRequest_CommandList; } | { oneofKind: "script"; /** @@ -382,9 +382,9 @@ export interface ResolveEnvRequest { project?: Project; } /** - * @generated from protobuf message runme.runner.v1.ResolveEnvRequest.CommandList + * @generated from protobuf message runme.runner.v1.ResolveVarsRequest.CommandList */ -export interface ResolveEnvRequest_CommandList { +export interface ResolveVarsRequest_CommandList { /** * commands are commands to be executed by the program. * The commands are joined and executed as a script. @@ -395,9 +395,9 @@ export interface ResolveEnvRequest_CommandList { items: string[]; } /** - * @generated from protobuf message runme.runner.v1.ResolveEnvResult + * @generated from protobuf message runme.runner.v1.ResolveVarsResult */ -export interface ResolveEnvResult { +export interface ResolveVarsResult { /** * name is the name of the environment variable. * @@ -422,13 +422,13 @@ export interface ResolveEnvResult { resolvedValue: string; } /** - * @generated from protobuf message runme.runner.v1.ResolveEnvResponse + * @generated from protobuf message runme.runner.v1.ResolveVarsResponse */ -export interface ResolveEnvResponse { +export interface ResolveVarsResponse { /** - * @generated from protobuf field: repeated runme.runner.v1.ResolveEnvResult items = 1; + * @generated from protobuf field: repeated runme.runner.v1.ResolveVarsResult items = 1; */ - items: ResolveEnvResult[]; + items: ResolveVarsResult[]; } /** * @generated from protobuf enum runme.runner.v1.ExecuteStop @@ -583,34 +583,34 @@ declare class ExecuteResponse$Type extends MessageType { * @generated MessageType for protobuf message runme.runner.v1.ExecuteResponse */ export declare const ExecuteResponse: ExecuteResponse$Type; -declare class ResolveEnvRequest$Type extends MessageType { +declare class ResolveVarsRequest$Type extends MessageType { constructor(); } /** - * @generated MessageType for protobuf message runme.runner.v1.ResolveEnvRequest + * @generated MessageType for protobuf message runme.runner.v1.ResolveVarsRequest */ -export declare const ResolveEnvRequest: ResolveEnvRequest$Type; -declare class ResolveEnvRequest_CommandList$Type extends MessageType { +export declare const ResolveVarsRequest: ResolveVarsRequest$Type; +declare class ResolveVarsRequest_CommandList$Type extends MessageType { constructor(); } /** - * @generated MessageType for protobuf message runme.runner.v1.ResolveEnvRequest.CommandList + * @generated MessageType for protobuf message runme.runner.v1.ResolveVarsRequest.CommandList */ -export declare const ResolveEnvRequest_CommandList: ResolveEnvRequest_CommandList$Type; -declare class ResolveEnvResult$Type extends MessageType { +export declare const ResolveVarsRequest_CommandList: ResolveVarsRequest_CommandList$Type; +declare class ResolveVarsResult$Type extends MessageType { constructor(); } /** - * @generated MessageType for protobuf message runme.runner.v1.ResolveEnvResult + * @generated MessageType for protobuf message runme.runner.v1.ResolveVarsResult */ -export declare const ResolveEnvResult: ResolveEnvResult$Type; -declare class ResolveEnvResponse$Type extends MessageType { +export declare const ResolveVarsResult: ResolveVarsResult$Type; +declare class ResolveVarsResponse$Type extends MessageType { constructor(); } /** - * @generated MessageType for protobuf message runme.runner.v1.ResolveEnvResponse + * @generated MessageType for protobuf message runme.runner.v1.ResolveVarsResponse */ -export declare const ResolveEnvResponse: ResolveEnvResponse$Type; +export declare const ResolveVarsResponse: ResolveVarsResponse$Type; /** * @generated ServiceType for protobuf service runme.runner.v1.RunnerService */ diff --git a/internal/gen/proto/ts/runme/runner/v1/runner_pb.js b/internal/gen/proto/ts/runme/runner/v1/runner_pb.js index 9f2be1d3d..0f61df931 100644 --- a/internal/gen/proto/ts/runme/runner/v1/runner_pb.js +++ b/internal/gen/proto/ts/runme/runner/v1/runner_pb.js @@ -262,10 +262,10 @@ class ExecuteResponse$Type extends MessageType { */ export const ExecuteResponse = new ExecuteResponse$Type(); // @generated message type with reflection information, may provide speed optimized methods -class ResolveEnvRequest$Type extends MessageType { +class ResolveVarsRequest$Type extends MessageType { constructor() { - super("runme.runner.v1.ResolveEnvRequest", [ - { no: 1, name: "commands", kind: "message", oneof: "source", T: () => ResolveEnvRequest_CommandList }, + super("runme.runner.v1.ResolveVarsRequest", [ + { no: 1, name: "commands", kind: "message", oneof: "source", T: () => ResolveVarsRequest_CommandList }, { no: 2, name: "script", kind: "scalar", oneof: "source", T: 9 /*ScalarType.STRING*/ }, { no: 3, name: "env", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ }, { no: 4, name: "session_id", kind: "scalar", T: 9 /*ScalarType.STRING*/ }, @@ -275,25 +275,25 @@ class ResolveEnvRequest$Type extends MessageType { } } /** - * @generated MessageType for protobuf message runme.runner.v1.ResolveEnvRequest + * @generated MessageType for protobuf message runme.runner.v1.ResolveVarsRequest */ -export const ResolveEnvRequest = new ResolveEnvRequest$Type(); +export const ResolveVarsRequest = new ResolveVarsRequest$Type(); // @generated message type with reflection information, may provide speed optimized methods -class ResolveEnvRequest_CommandList$Type extends MessageType { +class ResolveVarsRequest_CommandList$Type extends MessageType { constructor() { - super("runme.runner.v1.ResolveEnvRequest.CommandList", [ + super("runme.runner.v1.ResolveVarsRequest.CommandList", [ { no: 1, name: "items", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ } ]); } } /** - * @generated MessageType for protobuf message runme.runner.v1.ResolveEnvRequest.CommandList + * @generated MessageType for protobuf message runme.runner.v1.ResolveVarsRequest.CommandList */ -export const ResolveEnvRequest_CommandList = new ResolveEnvRequest_CommandList$Type(); +export const ResolveVarsRequest_CommandList = new ResolveVarsRequest_CommandList$Type(); // @generated message type with reflection information, may provide speed optimized methods -class ResolveEnvResult$Type extends MessageType { +class ResolveVarsResult$Type extends MessageType { constructor() { - super("runme.runner.v1.ResolveEnvResult", [ + super("runme.runner.v1.ResolveVarsResult", [ { no: 1, name: "name", kind: "scalar", T: 9 /*ScalarType.STRING*/ }, { no: 2, name: "original_value", kind: "scalar", T: 9 /*ScalarType.STRING*/ }, { no: 3, name: "resolved_value", kind: "scalar", T: 9 /*ScalarType.STRING*/ } @@ -301,21 +301,21 @@ class ResolveEnvResult$Type extends MessageType { } } /** - * @generated MessageType for protobuf message runme.runner.v1.ResolveEnvResult + * @generated MessageType for protobuf message runme.runner.v1.ResolveVarsResult */ -export const ResolveEnvResult = new ResolveEnvResult$Type(); +export const ResolveVarsResult = new ResolveVarsResult$Type(); // @generated message type with reflection information, may provide speed optimized methods -class ResolveEnvResponse$Type extends MessageType { +class ResolveVarsResponse$Type extends MessageType { constructor() { - super("runme.runner.v1.ResolveEnvResponse", [ - { no: 1, name: "items", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => ResolveEnvResult } + super("runme.runner.v1.ResolveVarsResponse", [ + { no: 1, name: "items", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => ResolveVarsResult } ]); } } /** - * @generated MessageType for protobuf message runme.runner.v1.ResolveEnvResponse + * @generated MessageType for protobuf message runme.runner.v1.ResolveVarsResponse */ -export const ResolveEnvResponse = new ResolveEnvResponse$Type(); +export const ResolveVarsResponse = new ResolveVarsResponse$Type(); /** * @generated ServiceType for protobuf service runme.runner.v1.RunnerService */ @@ -325,5 +325,5 @@ export const RunnerService = new ServiceType("runme.runner.v1.RunnerService", [ { name: "ListSessions", options: {}, I: ListSessionsRequest, O: ListSessionsResponse }, { name: "DeleteSession", options: {}, I: DeleteSessionRequest, O: DeleteSessionResponse }, { name: "Execute", serverStreaming: true, clientStreaming: true, options: {}, I: ExecuteRequest, O: ExecuteResponse }, - { name: "ResolveEnv", options: {}, I: ResolveEnvRequest, O: ResolveEnvResponse } + { name: "ResolveVars", options: {}, I: ResolveVarsRequest, O: ResolveVarsResponse } ]); diff --git a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.d.ts b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.d.ts index 92197ba7f..250f128d7 100644 --- a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.d.ts +++ b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.d.ts @@ -5,8 +5,8 @@ // @ts-nocheck import type { RpcTransport } from "@protobuf-ts/runtime-rpc"; import type { ServiceInfo } from "@protobuf-ts/runtime-rpc"; -import type { ResolveEnvResponse } from "./runner_pb"; -import type { ResolveEnvRequest } from "./runner_pb"; +import type { ResolveVarsResponse } from "./runner_pb"; +import type { ResolveVarsRequest } from "./runner_pb"; import type { ExecuteResponse } from "./runner_pb"; import type { ExecuteRequest } from "./runner_pb"; import type { DuplexStreamingCall } from "@protobuf-ts/runtime-rpc"; @@ -59,15 +59,14 @@ export interface IRunnerServiceClient { */ execute(options?: RpcOptions): DuplexStreamingCall; /** - * ResolveEnv resolves environment variables from a script or a list of commands + * ResolveVars resolves variables from a script or a list of commands * using the provided sources, which can be a list of environment variables, * a session, or a project. - * The result contains all found environment variables. If the env is in any source, - * it is considered resolved. Otherwise, it is marked as unresolved. + * For now, the resolved variables are only the exported ones using `export`. * - * @generated from protobuf rpc: ResolveEnv(runme.runner.v2alpha1.ResolveEnvRequest) returns (runme.runner.v2alpha1.ResolveEnvResponse); + * @generated from protobuf rpc: ResolveVars(runme.runner.v2alpha1.ResolveVarsRequest) returns (runme.runner.v2alpha1.ResolveVarsResponse); */ - resolveEnv(input: ResolveEnvRequest, options?: RpcOptions): UnaryCall; + resolveVars(input: ResolveVarsRequest, options?: RpcOptions): UnaryCall; } /** * @generated from protobuf service runme.runner.v2alpha1.RunnerService @@ -111,13 +110,12 @@ export declare class RunnerServiceClient implements IRunnerServiceClient, Servic */ execute(options?: RpcOptions): DuplexStreamingCall; /** - * ResolveEnv resolves environment variables from a script or a list of commands + * ResolveVars resolves variables from a script or a list of commands * using the provided sources, which can be a list of environment variables, * a session, or a project. - * The result contains all found environment variables. If the env is in any source, - * it is considered resolved. Otherwise, it is marked as unresolved. + * For now, the resolved variables are only the exported ones using `export`. * - * @generated from protobuf rpc: ResolveEnv(runme.runner.v2alpha1.ResolveEnvRequest) returns (runme.runner.v2alpha1.ResolveEnvResponse); + * @generated from protobuf rpc: ResolveVars(runme.runner.v2alpha1.ResolveVarsRequest) returns (runme.runner.v2alpha1.ResolveVarsResponse); */ - resolveEnv(input: ResolveEnvRequest, options?: RpcOptions): UnaryCall; + resolveVars(input: ResolveVarsRequest, options?: RpcOptions): UnaryCall; } diff --git a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.js b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.js index 853e9901b..939963088 100644 --- a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.js +++ b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.client.js @@ -66,15 +66,14 @@ export class RunnerServiceClient { return stackIntercept("duplex", this._transport, method, opt); } /** - * ResolveEnv resolves environment variables from a script or a list of commands + * ResolveVars resolves variables from a script or a list of commands * using the provided sources, which can be a list of environment variables, * a session, or a project. - * The result contains all found environment variables. If the env is in any source, - * it is considered resolved. Otherwise, it is marked as unresolved. + * For now, the resolved variables are only the exported ones using `export`. * - * @generated from protobuf rpc: ResolveEnv(runme.runner.v2alpha1.ResolveEnvRequest) returns (runme.runner.v2alpha1.ResolveEnvResponse); + * @generated from protobuf rpc: ResolveVars(runme.runner.v2alpha1.ResolveVarsRequest) returns (runme.runner.v2alpha1.ResolveVarsResponse); */ - resolveEnv(input, options) { + resolveVars(input, options) { const method = this.methods[6], opt = this._transport.mergeOptions(options); return stackIntercept("unary", this._transport, method, opt, input); } diff --git a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.d.ts b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.d.ts index 2fc8ed1d8..7c176bb0b 100644 --- a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.d.ts +++ b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.d.ts @@ -285,9 +285,9 @@ export interface ExecuteResponse { pid?: UInt32Value; } /** - * @generated from protobuf message runme.runner.v2alpha1.ResolveEnvRequest + * @generated from protobuf message runme.runner.v2alpha1.ResolveVarsRequest */ -export interface ResolveEnvRequest { +export interface ResolveVarsRequest { /** * @generated from protobuf oneof: source */ @@ -297,9 +297,9 @@ export interface ResolveEnvRequest { * commands are commands to be executed by the program. * The commands are joined and executed as a script. * - * @generated from protobuf field: runme.runner.v2alpha1.ResolveEnvRequest.CommandList commands = 1; + * @generated from protobuf field: runme.runner.v2alpha1.ResolveVarsRequest.CommandList commands = 1; */ - commands: ResolveEnvRequest_CommandList; + commands: ResolveVarsRequest_CommandList; } | { oneofKind: "script"; /** @@ -341,9 +341,9 @@ export interface ResolveEnvRequest { project?: Project; } /** - * @generated from protobuf message runme.runner.v2alpha1.ResolveEnvRequest.CommandList + * @generated from protobuf message runme.runner.v2alpha1.ResolveVarsRequest.CommandList */ -export interface ResolveEnvRequest_CommandList { +export interface ResolveVarsRequest_CommandList { /** * commands are commands to be executed by the program. * The commands are joined and executed as a script. @@ -354,9 +354,9 @@ export interface ResolveEnvRequest_CommandList { items: string[]; } /** - * @generated from protobuf message runme.runner.v2alpha1.ResolveEnvResult + * @generated from protobuf message runme.runner.v2alpha1.ResolveVarsResult */ -export interface ResolveEnvResult { +export interface ResolveVarsResult { /** * name is the name of the environment variable. * @@ -381,13 +381,13 @@ export interface ResolveEnvResult { resolvedValue: string; } /** - * @generated from protobuf message runme.runner.v2alpha1.ResolveEnvResponse + * @generated from protobuf message runme.runner.v2alpha1.ResolveVarsResponse */ -export interface ResolveEnvResponse { +export interface ResolveVarsResponse { /** - * @generated from protobuf field: repeated runme.runner.v2alpha1.ResolveEnvResult items = 1; + * @generated from protobuf field: repeated runme.runner.v2alpha1.ResolveVarsResult items = 1; */ - items: ResolveEnvResult[]; + items: ResolveVarsResult[]; } /** * @generated from protobuf enum runme.runner.v2alpha1.ExecuteStop @@ -533,34 +533,34 @@ declare class ExecuteResponse$Type extends MessageType { * @generated MessageType for protobuf message runme.runner.v2alpha1.ExecuteResponse */ export declare const ExecuteResponse: ExecuteResponse$Type; -declare class ResolveEnvRequest$Type extends MessageType { +declare class ResolveVarsRequest$Type extends MessageType { constructor(); } /** - * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveEnvRequest + * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveVarsRequest */ -export declare const ResolveEnvRequest: ResolveEnvRequest$Type; -declare class ResolveEnvRequest_CommandList$Type extends MessageType { +export declare const ResolveVarsRequest: ResolveVarsRequest$Type; +declare class ResolveVarsRequest_CommandList$Type extends MessageType { constructor(); } /** - * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveEnvRequest.CommandList + * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveVarsRequest.CommandList */ -export declare const ResolveEnvRequest_CommandList: ResolveEnvRequest_CommandList$Type; -declare class ResolveEnvResult$Type extends MessageType { +export declare const ResolveVarsRequest_CommandList: ResolveVarsRequest_CommandList$Type; +declare class ResolveVarsResult$Type extends MessageType { constructor(); } /** - * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveEnvResult + * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveVarsResult */ -export declare const ResolveEnvResult: ResolveEnvResult$Type; -declare class ResolveEnvResponse$Type extends MessageType { +export declare const ResolveVarsResult: ResolveVarsResult$Type; +declare class ResolveVarsResponse$Type extends MessageType { constructor(); } /** - * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveEnvResponse + * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveVarsResponse */ -export declare const ResolveEnvResponse: ResolveEnvResponse$Type; +export declare const ResolveVarsResponse: ResolveVarsResponse$Type; /** * @generated ServiceType for protobuf service runme.runner.v2alpha1.RunnerService */ diff --git a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.js b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.js index 0385c4dbe..02e0ba81b 100644 --- a/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.js +++ b/internal/gen/proto/ts/runme/runner/v2alpha1/runner_pb.js @@ -251,10 +251,10 @@ class ExecuteResponse$Type extends MessageType { */ export const ExecuteResponse = new ExecuteResponse$Type(); // @generated message type with reflection information, may provide speed optimized methods -class ResolveEnvRequest$Type extends MessageType { +class ResolveVarsRequest$Type extends MessageType { constructor() { - super("runme.runner.v2alpha1.ResolveEnvRequest", [ - { no: 1, name: "commands", kind: "message", oneof: "source", T: () => ResolveEnvRequest_CommandList }, + super("runme.runner.v2alpha1.ResolveVarsRequest", [ + { no: 1, name: "commands", kind: "message", oneof: "source", T: () => ResolveVarsRequest_CommandList }, { no: 2, name: "script", kind: "scalar", oneof: "source", T: 9 /*ScalarType.STRING*/ }, { no: 3, name: "env", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ }, { no: 4, name: "session_id", kind: "scalar", T: 9 /*ScalarType.STRING*/ }, @@ -264,25 +264,25 @@ class ResolveEnvRequest$Type extends MessageType { } } /** - * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveEnvRequest + * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveVarsRequest */ -export const ResolveEnvRequest = new ResolveEnvRequest$Type(); +export const ResolveVarsRequest = new ResolveVarsRequest$Type(); // @generated message type with reflection information, may provide speed optimized methods -class ResolveEnvRequest_CommandList$Type extends MessageType { +class ResolveVarsRequest_CommandList$Type extends MessageType { constructor() { - super("runme.runner.v2alpha1.ResolveEnvRequest.CommandList", [ + super("runme.runner.v2alpha1.ResolveVarsRequest.CommandList", [ { no: 1, name: "items", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ } ]); } } /** - * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveEnvRequest.CommandList + * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveVarsRequest.CommandList */ -export const ResolveEnvRequest_CommandList = new ResolveEnvRequest_CommandList$Type(); +export const ResolveVarsRequest_CommandList = new ResolveVarsRequest_CommandList$Type(); // @generated message type with reflection information, may provide speed optimized methods -class ResolveEnvResult$Type extends MessageType { +class ResolveVarsResult$Type extends MessageType { constructor() { - super("runme.runner.v2alpha1.ResolveEnvResult", [ + super("runme.runner.v2alpha1.ResolveVarsResult", [ { no: 1, name: "name", kind: "scalar", T: 9 /*ScalarType.STRING*/ }, { no: 2, name: "original_value", kind: "scalar", T: 9 /*ScalarType.STRING*/ }, { no: 3, name: "resolved_value", kind: "scalar", T: 9 /*ScalarType.STRING*/ } @@ -290,21 +290,21 @@ class ResolveEnvResult$Type extends MessageType { } } /** - * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveEnvResult + * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveVarsResult */ -export const ResolveEnvResult = new ResolveEnvResult$Type(); +export const ResolveVarsResult = new ResolveVarsResult$Type(); // @generated message type with reflection information, may provide speed optimized methods -class ResolveEnvResponse$Type extends MessageType { +class ResolveVarsResponse$Type extends MessageType { constructor() { - super("runme.runner.v2alpha1.ResolveEnvResponse", [ - { no: 1, name: "items", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => ResolveEnvResult } + super("runme.runner.v2alpha1.ResolveVarsResponse", [ + { no: 1, name: "items", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => ResolveVarsResult } ]); } } /** - * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveEnvResponse + * @generated MessageType for protobuf message runme.runner.v2alpha1.ResolveVarsResponse */ -export const ResolveEnvResponse = new ResolveEnvResponse$Type(); +export const ResolveVarsResponse = new ResolveVarsResponse$Type(); /** * @generated ServiceType for protobuf service runme.runner.v2alpha1.RunnerService */ @@ -315,5 +315,5 @@ export const RunnerService = new ServiceType("runme.runner.v2alpha1.RunnerServic { name: "UpdateSession", options: {}, I: UpdateSessionRequest, O: UpdateSessionResponse }, { name: "DeleteSession", options: {}, I: DeleteSessionRequest, O: DeleteSessionResponse }, { name: "Execute", serverStreaming: true, clientStreaming: true, options: {}, I: ExecuteRequest, O: ExecuteResponse }, - { name: "ResolveEnv", options: {}, I: ResolveEnvRequest, O: ResolveEnvResponse } + { name: "ResolveVars", options: {}, I: ResolveVarsRequest, O: ResolveVarsResponse } ]); diff --git a/internal/runner/service.go b/internal/runner/service.go index bba812726..9bb75f180 100644 --- a/internal/runner/service.go +++ b/internal/runner/service.go @@ -577,7 +577,7 @@ func runnerWinsizeToPty(winsize *runnerv1.Winsize) *pty.Winsize { } } -func (r *runnerService) ResolveEnv(ctx context.Context, req *runnerv1.ResolveEnvRequest) (*runnerv1.ResolveEnvResponse, error) { +func (r *runnerService) ResolveVars(ctx context.Context, req *runnerv1.ResolveVarsRequest) (*runnerv1.ResolveVarsResponse, error) { // Add explicitly passed env as a source. sources := []commandpkg.EnvResolverSource{ commandpkg.EnvResolverSourceFunc(req.Env), @@ -621,10 +621,10 @@ func (r *runnerService) ResolveEnv(ctx context.Context, req *runnerv1.ResolveEnv return nil, err } - response := &runnerv1.ResolveEnvResponse{} + response := &runnerv1.ResolveVarsResponse{} for _, item := range result { - response.Items = append(response.Items, &runnerv1.ResolveEnvResult{ + response.Items = append(response.Items, &runnerv1.ResolveVarsResult{ Name: item.Name, OriginalValue: item.OriginalValue, ResolvedValue: item.Value, diff --git a/internal/runnerv2service/service_resolve_env.go b/internal/runnerv2service/service_resolve_env.go index 6da2e2e6e..4734fdfb0 100644 --- a/internal/runnerv2service/service_resolve_env.go +++ b/internal/runnerv2service/service_resolve_env.go @@ -12,7 +12,7 @@ import ( runnerv2alpha1 "github.com/stateful/runme/internal/gen/proto/go/runme/runner/v2alpha1" ) -func (r *runnerService) ResolveEnv(ctx context.Context, req *runnerv2alpha1.ResolveEnvRequest) (*runnerv2alpha1.ResolveEnvResponse, error) { +func (r *runnerService) ResolveVars(ctx context.Context, req *runnerv2alpha1.ResolveVarsRequest) (*runnerv2alpha1.ResolveVarsResponse, error) { // Add explicitly passed env as a source. sources := []command.EnvResolverSource{ command.EnvResolverSourceFunc(req.Env), @@ -56,10 +56,10 @@ func (r *runnerService) ResolveEnv(ctx context.Context, req *runnerv2alpha1.Reso return nil, err } - response := &runnerv2alpha1.ResolveEnvResponse{} + response := &runnerv2alpha1.ResolveVarsResponse{} for _, item := range result { - response.Items = append(response.Items, &runnerv2alpha1.ResolveEnvResult{ + response.Items = append(response.Items, &runnerv2alpha1.ResolveVarsResult{ Name: item.Name, OriginalValue: item.OriginalValue, ResolvedValue: item.Value, diff --git a/internal/runnerv2service/service_resolve_env_test.go b/internal/runnerv2service/service_resolve_env_test.go index fd6600b4e..7a3e98e95 100644 --- a/internal/runnerv2service/service_resolve_env_test.go +++ b/internal/runnerv2service/service_resolve_env_test.go @@ -11,30 +11,30 @@ import ( runnerv2alpha1 "github.com/stateful/runme/internal/gen/proto/go/runme/runner/v2alpha1" ) -func TestRunnerServiceResolveEnv(t *testing.T) { +func TestRunnerServiceResolveVars(t *testing.T) { lis, stop := testStartRunnerServiceServer(t) t.Cleanup(stop) _, client := testCreateRunnerServiceClient(t, lis) testCases := []struct { name string - request *runnerv2alpha1.ResolveEnvRequest + request *runnerv2alpha1.ResolveVarsRequest }{ { name: "WithScript", - request: &runnerv2alpha1.ResolveEnvRequest{ + request: &runnerv2alpha1.ResolveVarsRequest{ Env: []string{"TEST_RESOLVED=value"}, - Source: &runnerv2alpha1.ResolveEnvRequest_Script{ + Source: &runnerv2alpha1.ResolveVarsRequest_Script{ Script: "export TEST_RESOLVED=default\nexport TEST_UNRESOLVED", }, }, }, { name: "WithCommands", - request: &runnerv2alpha1.ResolveEnvRequest{ + request: &runnerv2alpha1.ResolveVarsRequest{ Env: []string{"TEST_RESOLVED=value"}, - Source: &runnerv2alpha1.ResolveEnvRequest_Commands{ - Commands: &runnerv2alpha1.ResolveEnvRequest_CommandList{ + Source: &runnerv2alpha1.ResolveVarsRequest_Commands{ + Commands: &runnerv2alpha1.ResolveVarsRequest_CommandList{ Items: []string{"export TEST_RESOLVED=default", "export TEST_UNRESOLVED"}, }, }, @@ -42,10 +42,10 @@ func TestRunnerServiceResolveEnv(t *testing.T) { }, { name: "WithAdditionalEnv", - request: &runnerv2alpha1.ResolveEnvRequest{ + request: &runnerv2alpha1.ResolveVarsRequest{ Env: []string{"TEST_RESOLVED=value", "TEST_EXTRA=value"}, - Source: &runnerv2alpha1.ResolveEnvRequest_Commands{ - Commands: &runnerv2alpha1.ResolveEnvRequest_CommandList{ + Source: &runnerv2alpha1.ResolveVarsRequest_Commands{ + Commands: &runnerv2alpha1.ResolveVarsRequest_CommandList{ Items: []string{"export TEST_RESOLVED=default", "export TEST_UNRESOLVED"}, }, }, @@ -55,12 +55,12 @@ func TestRunnerServiceResolveEnv(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - resp, err := client.ResolveEnv(context.Background(), tc.request) + resp, err := client.ResolveVars(context.Background(), tc.request) require.NoError(t, err) require.Len(t, resp.Items, 2) require.EqualValues( t, - &runnerv2alpha1.ResolveEnvResult{ + &runnerv2alpha1.ResolveVarsResult{ Name: "TEST_RESOLVED", OriginalValue: "default", ResolvedValue: "value", @@ -69,7 +69,7 @@ func TestRunnerServiceResolveEnv(t *testing.T) { ) require.EqualValues( t, - &runnerv2alpha1.ResolveEnvResult{ + &runnerv2alpha1.ResolveVarsResult{ Name: "TEST_UNRESOLVED", }, resp.Items[1],