From db7a34ed6935a10b7f1889392506068f5b534197 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Fri, 1 Dec 2023 09:11:29 +0800 Subject: [PATCH 01/47] proto Signed-off-by: Future Outlier --- .../admin/mocks/AgentMetadataServiceClient.go | 114 + .../admin/mocks/AgentMetadataServiceServer.go | 98 + .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 2143 ++++++- flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 1277 +++- .../pb-cpp/flyteidl/service/agent.grpc.pb.cc | 103 + .../pb-cpp/flyteidl/service/agent.grpc.pb.h | 379 +- .../gen/pb-cpp/flyteidl/service/agent.pb.cc | 34 +- .../gen/pb-cpp/flyteidl/service/agent.pb.h | 1 + flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 368 +- .../pb-go/flyteidl/admin/agent.pb.validate.go | 378 ++ .../gen/pb-go/flyteidl/service/agent.pb.go | 150 +- .../gen/pb-go/flyteidl/service/agent.pb.gw.go | 159 + .../pb-go/flyteidl/service/agent.swagger.json | 127 +- .../{Agent.java => AgentOuterClass.java} | 5333 +++++++++++++++-- .../gen/pb-java/flyteidl/service/Agent.java | 38 +- flyteidl/gen/pb-js/flyteidl.d.ts | 350 ++ flyteidl/gen/pb-js/flyteidl.js | 763 ++- .../gen/pb_python/flyteidl/admin/agent_pb2.py | 65 +- .../pb_python/flyteidl/admin/agent_pb2.pyi | 56 +- .../pb_python/flyteidl/service/agent_pb2.py | 13 +- .../pb_python/flyteidl/service/agent_pb2.pyi | 1 + .../flyteidl/service/agent_pb2_grpc.py | 108 +- flyteidl/gen/pb_rust/flyteidl.admin.rs | 52 + flyteidl/protos/flyteidl/admin/agent.proto | 40 +- flyteidl/protos/flyteidl/service/agent.proto | 22 +- 25 files changed, 11472 insertions(+), 700 deletions(-) create mode 100644 flyteidl/clients/go/admin/mocks/AgentMetadataServiceClient.go create mode 100644 flyteidl/clients/go/admin/mocks/AgentMetadataServiceServer.go create mode 100644 flyteidl/gen/pb-go/flyteidl/service/agent.pb.gw.go rename flyteidl/gen/pb-java/flyteidl/admin/{Agent.java => AgentOuterClass.java} (55%) diff --git a/flyteidl/clients/go/admin/mocks/AgentMetadataServiceClient.go b/flyteidl/clients/go/admin/mocks/AgentMetadataServiceClient.go new file mode 100644 index 0000000000..51b5d175b4 --- /dev/null +++ b/flyteidl/clients/go/admin/mocks/AgentMetadataServiceClient.go @@ -0,0 +1,114 @@ +// Code generated by mockery v1.0.1. DO NOT EDIT. + +package mocks + +import ( + context "context" + + admin "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + + grpc "google.golang.org/grpc" + + mock "github.com/stretchr/testify/mock" +) + +// AgentMetadataServiceClient is an autogenerated mock type for the AgentMetadataServiceClient type +type AgentMetadataServiceClient struct { + mock.Mock +} + +type AgentMetadataServiceClient_GetAgent struct { + *mock.Call +} + +func (_m AgentMetadataServiceClient_GetAgent) Return(_a0 *admin.GetAgentResponse, _a1 error) *AgentMetadataServiceClient_GetAgent { + return &AgentMetadataServiceClient_GetAgent{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *AgentMetadataServiceClient) OnGetAgent(ctx context.Context, in *admin.GetAgentRequest, opts ...grpc.CallOption) *AgentMetadataServiceClient_GetAgent { + c_call := _m.On("GetAgent", ctx, in, opts) + return &AgentMetadataServiceClient_GetAgent{Call: c_call} +} + +func (_m *AgentMetadataServiceClient) OnGetAgentMatch(matchers ...interface{}) *AgentMetadataServiceClient_GetAgent { + c_call := _m.On("GetAgent", matchers...) + return &AgentMetadataServiceClient_GetAgent{Call: c_call} +} + +// GetAgent provides a mock function with given fields: ctx, in, opts +func (_m *AgentMetadataServiceClient) GetAgent(ctx context.Context, in *admin.GetAgentRequest, opts ...grpc.CallOption) (*admin.GetAgentResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *admin.GetAgentResponse + if rf, ok := ret.Get(0).(func(context.Context, *admin.GetAgentRequest, ...grpc.CallOption) *admin.GetAgentResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*admin.GetAgentResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *admin.GetAgentRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type AgentMetadataServiceClient_ListAgent struct { + *mock.Call +} + +func (_m AgentMetadataServiceClient_ListAgent) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceClient_ListAgent { + return &AgentMetadataServiceClient_ListAgent{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *AgentMetadataServiceClient) OnListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) *AgentMetadataServiceClient_ListAgent { + c_call := _m.On("ListAgent", ctx, in, opts) + return &AgentMetadataServiceClient_ListAgent{Call: c_call} +} + +func (_m *AgentMetadataServiceClient) OnListAgentMatch(matchers ...interface{}) *AgentMetadataServiceClient_ListAgent { + c_call := _m.On("ListAgent", matchers...) + return &AgentMetadataServiceClient_ListAgent{Call: c_call} +} + +// ListAgent provides a mock function with given fields: ctx, in, opts +func (_m *AgentMetadataServiceClient) ListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *admin.ListAgentsResponse + if rf, ok := ret.Get(0).(func(context.Context, *admin.ListAgentsRequest, ...grpc.CallOption) *admin.ListAgentsResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*admin.ListAgentsResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *admin.ListAgentsRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/flyteidl/clients/go/admin/mocks/AgentMetadataServiceServer.go b/flyteidl/clients/go/admin/mocks/AgentMetadataServiceServer.go new file mode 100644 index 0000000000..6a3aa6448e --- /dev/null +++ b/flyteidl/clients/go/admin/mocks/AgentMetadataServiceServer.go @@ -0,0 +1,98 @@ +// Code generated by mockery v1.0.1. DO NOT EDIT. + +package mocks + +import ( + context "context" + + admin "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + + mock "github.com/stretchr/testify/mock" +) + +// AgentMetadataServiceServer is an autogenerated mock type for the AgentMetadataServiceServer type +type AgentMetadataServiceServer struct { + mock.Mock +} + +type AgentMetadataServiceServer_GetAgent struct { + *mock.Call +} + +func (_m AgentMetadataServiceServer_GetAgent) Return(_a0 *admin.GetAgentResponse, _a1 error) *AgentMetadataServiceServer_GetAgent { + return &AgentMetadataServiceServer_GetAgent{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *AgentMetadataServiceServer) OnGetAgent(_a0 context.Context, _a1 *admin.GetAgentRequest) *AgentMetadataServiceServer_GetAgent { + c_call := _m.On("GetAgent", _a0, _a1) + return &AgentMetadataServiceServer_GetAgent{Call: c_call} +} + +func (_m *AgentMetadataServiceServer) OnGetAgentMatch(matchers ...interface{}) *AgentMetadataServiceServer_GetAgent { + c_call := _m.On("GetAgent", matchers...) + return &AgentMetadataServiceServer_GetAgent{Call: c_call} +} + +// GetAgent provides a mock function with given fields: _a0, _a1 +func (_m *AgentMetadataServiceServer) GetAgent(_a0 context.Context, _a1 *admin.GetAgentRequest) (*admin.GetAgentResponse, error) { + ret := _m.Called(_a0, _a1) + + var r0 *admin.GetAgentResponse + if rf, ok := ret.Get(0).(func(context.Context, *admin.GetAgentRequest) *admin.GetAgentResponse); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*admin.GetAgentResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *admin.GetAgentRequest) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type AgentMetadataServiceServer_ListAgent struct { + *mock.Call +} + +func (_m AgentMetadataServiceServer_ListAgent) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceServer_ListAgent { + return &AgentMetadataServiceServer_ListAgent{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *AgentMetadataServiceServer) OnListAgent(_a0 context.Context, _a1 *admin.ListAgentsRequest) *AgentMetadataServiceServer_ListAgent { + c_call := _m.On("ListAgent", _a0, _a1) + return &AgentMetadataServiceServer_ListAgent{Call: c_call} +} + +func (_m *AgentMetadataServiceServer) OnListAgentMatch(matchers ...interface{}) *AgentMetadataServiceServer_ListAgent { + c_call := _m.On("ListAgent", matchers...) + return &AgentMetadataServiceServer_ListAgent{Call: c_call} +} + +// ListAgent provides a mock function with given fields: _a0, _a1 +func (_m *AgentMetadataServiceServer) ListAgent(_a0 context.Context, _a1 *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) { + ret := _m.Called(_a0, _a1) + + var r0 *admin.ListAgentsResponse + if rf, ok := ret.Get(0).(func(context.Context, *admin.ListAgentsRequest) *admin.ListAgentsResponse); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*admin.ListAgentsResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *admin.ListAgentsRequest) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index e4e12e3543..4bcfcb1fd4 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -16,11 +16,14 @@ // @@protoc_insertion_point(includes) #include +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_CreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_LabelsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Resource_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<4> scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fexecution_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_TaskLog_flyteidl_2fcore_2fexecution_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fliterals_2eproto ::google::protobuf::internal::SCCInfo<9> scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ftasks_2eproto ::google::protobuf::internal::SCCInfo<10> scc_info_TaskTemplate_flyteidl_2fcore_2ftasks_2eproto; @@ -42,6 +45,10 @@ class TaskExecutionMetadataDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _TaskExecutionMetadata_default_instance_; +class CreateTaskRequest_SecretEntry_DoNotUseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _CreateTaskRequest_SecretEntry_DoNotUse_default_instance_; class CreateTaskRequestDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -70,6 +77,26 @@ class DeleteTaskResponseDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _DeleteTaskResponse_default_instance_; +class AgentDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _Agent_default_instance_; +class GetAgentRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _GetAgentRequest_default_instance_; +class GetAgentResponseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _GetAgentResponse_default_instance_; +class ListAgentsRequestDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _ListAgentsRequest_default_instance_; +class ListAgentsResponseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _ListAgentsResponse_default_instance_; } // namespace admin } // namespace flyteidl static void InitDefaultsTaskExecutionMetadata_LabelsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto() { @@ -129,6 +156,19 @@ ::google::protobuf::internal::SCCInfo<4> scc_info_TaskExecutionMetadata_flyteidl &scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base, &scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base,}}; +static void InitDefaultsCreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::admin::_CreateTaskRequest_SecretEntry_DoNotUse_default_instance_; + new (ptr) ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse(); + } + ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<0> scc_info_CreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto}, {}}; + static void InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -140,11 +180,12 @@ static void InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto() { ::flyteidl::admin::CreateTaskRequest::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<3> scc_info_CreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto}, { +::google::protobuf::internal::SCCInfo<4> scc_info_CreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 4, InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto}, { &scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto.base, &scc_info_TaskTemplate_flyteidl_2fcore_2ftasks_2eproto.base, - &scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto.base,}}; + &scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto.base, + &scc_info_CreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base,}}; static void InitDefaultsCreateTaskResponse_flyteidl_2fadmin_2fagent_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -185,9 +226,10 @@ static void InitDefaultsGetTaskResponse_flyteidl_2fadmin_2fagent_2eproto() { ::flyteidl::admin::GetTaskResponse::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<1> scc_info_GetTaskResponse_flyteidl_2fadmin_2fagent_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGetTaskResponse_flyteidl_2fadmin_2fagent_2eproto}, { - &scc_info_Resource_flyteidl_2fadmin_2fagent_2eproto.base,}}; +::google::protobuf::internal::SCCInfo<2> scc_info_GetTaskResponse_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsGetTaskResponse_flyteidl_2fadmin_2fagent_2eproto}, { + &scc_info_Resource_flyteidl_2fadmin_2fagent_2eproto.base, + &scc_info_TaskLog_flyteidl_2fcore_2fexecution_2eproto.base,}}; static void InitDefaultsResource_flyteidl_2fadmin_2fagent_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -232,11 +274,84 @@ static void InitDefaultsDeleteTaskResponse_flyteidl_2fadmin_2fagent_2eproto() { ::google::protobuf::internal::SCCInfo<0> scc_info_DeleteTaskResponse_flyteidl_2fadmin_2fagent_2eproto = {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsDeleteTaskResponse_flyteidl_2fadmin_2fagent_2eproto}, {}}; +static void InitDefaultsAgent_flyteidl_2fadmin_2fagent_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::admin::_Agent_default_instance_; + new (ptr) ::flyteidl::admin::Agent(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::admin::Agent::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<0> scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsAgent_flyteidl_2fadmin_2fagent_2eproto}, {}}; + +static void InitDefaultsGetAgentRequest_flyteidl_2fadmin_2fagent_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::admin::_GetAgentRequest_default_instance_; + new (ptr) ::flyteidl::admin::GetAgentRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::admin::GetAgentRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<0> scc_info_GetAgentRequest_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGetAgentRequest_flyteidl_2fadmin_2fagent_2eproto}, {}}; + +static void InitDefaultsGetAgentResponse_flyteidl_2fadmin_2fagent_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::admin::_GetAgentResponse_default_instance_; + new (ptr) ::flyteidl::admin::GetAgentResponse(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::admin::GetAgentResponse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_GetAgentResponse_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGetAgentResponse_flyteidl_2fadmin_2fagent_2eproto}, { + &scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base,}}; + +static void InitDefaultsListAgentsRequest_flyteidl_2fadmin_2fagent_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::admin::_ListAgentsRequest_default_instance_; + new (ptr) ::flyteidl::admin::ListAgentsRequest(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::admin::ListAgentsRequest::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<0> scc_info_ListAgentsRequest_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsListAgentsRequest_flyteidl_2fadmin_2fagent_2eproto}, {}}; + +static void InitDefaultsListAgentsResponse_flyteidl_2fadmin_2fagent_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::admin::_ListAgentsResponse_default_instance_; + new (ptr) ::flyteidl::admin::ListAgentsResponse(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::flyteidl::admin::ListAgentsResponse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<1> scc_info_ListAgentsResponse_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsListAgentsResponse_flyteidl_2fadmin_2fagent_2eproto}, { + &scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base,}}; + void InitDefaults_flyteidl_2fadmin_2fagent_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_LabelsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskResponse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_GetTaskRequest_flyteidl_2fadmin_2fagent_2eproto.base); @@ -244,9 +359,14 @@ void InitDefaults_flyteidl_2fadmin_2fagent_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_Resource_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_DeleteTaskRequest_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_DeleteTaskResponse_flyteidl_2fadmin_2fagent_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GetAgentRequest_flyteidl_2fadmin_2fagent_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GetAgentResponse_flyteidl_2fadmin_2fagent_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_ListAgentsRequest_flyteidl_2fadmin_2fagent_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_ListAgentsResponse_flyteidl_2fadmin_2fagent_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[11]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[17]; const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_flyteidl_2fadmin_2fagent_2eproto[1]; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fadmin_2fagent_2eproto = nullptr; @@ -289,6 +409,15 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, annotations_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, k8s_service_account_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, environment_variables_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse, value_), + 0, + 1, ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, _internal_metadata_), ~0u, // no _extensions_ @@ -298,6 +427,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, template__), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, output_prefix_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, task_execution_metadata_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, secret_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskResponse, _internal_metadata_), ~0u, // no _extensions_ @@ -317,6 +447,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskResponse, resource_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskResponse, logs_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, _internal_metadata_), ~0u, // no _extensions_ @@ -337,19 +468,57 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, name_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, secret_name_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_type_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, is_sync_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetAgentRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetAgentRequest, name_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetAgentResponse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetAgentResponse, agent_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ListAgentsRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ListAgentsResponse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::ListAgentsResponse, agents_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, 7, sizeof(::flyteidl::admin::TaskExecutionMetadata_LabelsEntry_DoNotUse)}, { 9, 16, sizeof(::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse)}, { 18, 25, sizeof(::flyteidl::admin::TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse)}, { 27, -1, sizeof(::flyteidl::admin::TaskExecutionMetadata)}, - { 38, -1, sizeof(::flyteidl::admin::CreateTaskRequest)}, - { 47, -1, sizeof(::flyteidl::admin::CreateTaskResponse)}, - { 53, -1, sizeof(::flyteidl::admin::GetTaskRequest)}, - { 60, -1, sizeof(::flyteidl::admin::GetTaskResponse)}, - { 66, -1, sizeof(::flyteidl::admin::Resource)}, - { 74, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, - { 81, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, + { 38, 45, sizeof(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse)}, + { 47, -1, sizeof(::flyteidl::admin::CreateTaskRequest)}, + { 57, -1, sizeof(::flyteidl::admin::CreateTaskResponse)}, + { 63, -1, sizeof(::flyteidl::admin::GetTaskRequest)}, + { 70, -1, sizeof(::flyteidl::admin::GetTaskResponse)}, + { 77, -1, sizeof(::flyteidl::admin::Resource)}, + { 85, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, + { 92, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, + { 97, -1, sizeof(::flyteidl::admin::Agent)}, + { 106, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, + { 112, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, + { 118, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, + { 123, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -357,6 +526,7 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_default_instance_), + reinterpret_cast(&::flyteidl::admin::_CreateTaskRequest_SecretEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_CreateTaskRequest_default_instance_), reinterpret_cast(&::flyteidl::admin::_CreateTaskResponse_default_instance_), reinterpret_cast(&::flyteidl::admin::_GetTaskRequest_default_instance_), @@ -364,12 +534,17 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::admin::_Resource_default_instance_), reinterpret_cast(&::flyteidl::admin::_DeleteTaskRequest_default_instance_), reinterpret_cast(&::flyteidl::admin::_DeleteTaskResponse_default_instance_), + reinterpret_cast(&::flyteidl::admin::_Agent_default_instance_), + reinterpret_cast(&::flyteidl::admin::_GetAgentRequest_default_instance_), + reinterpret_cast(&::flyteidl::admin::_GetAgentResponse_default_instance_), + reinterpret_cast(&::flyteidl::admin::_ListAgentsRequest_default_instance_), + reinterpret_cast(&::flyteidl::admin::_ListAgentsResponse_default_instance_), }; ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto = { {}, AddDescriptors_flyteidl_2fadmin_2fagent_2eproto, "flyteidl/admin/agent.proto", schemas, file_default_instances, TableStruct_flyteidl_2fadmin_2fagent_2eproto::offsets, - file_level_metadata_flyteidl_2fadmin_2fagent_2eproto, 11, file_level_enum_descriptors_flyteidl_2fadmin_2fagent_2eproto, file_level_service_descriptors_flyteidl_2fadmin_2fagent_2eproto, + file_level_metadata_flyteidl_2fadmin_2fagent_2eproto, 17, file_level_enum_descriptors_flyteidl_2fadmin_2fagent_2eproto, file_level_service_descriptors_flyteidl_2fadmin_2fagent_2eproto, }; const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = @@ -377,55 +552,67 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "dmin\032\034flyteidl/core/literals.proto\032\031flyt" "eidl/core/tasks.proto\032\035flyteidl/core/int" "erface.proto\032\036flyteidl/core/identifier.p" - "roto\"\232\004\n\025TaskExecutionMetadata\022A\n\021task_e" - "xecution_id\030\001 \001(\0132&.flyteidl.core.TaskEx" - "ecutionIdentifier\022\021\n\tnamespace\030\002 \001(\t\022A\n\006" - "labels\030\003 \003(\01321.flyteidl.admin.TaskExecut" - "ionMetadata.LabelsEntry\022K\n\013annotations\030\004" - " \003(\01326.flyteidl.admin.TaskExecutionMetad" - "ata.AnnotationsEntry\022\033\n\023k8s_service_acco" - "unt\030\005 \001(\t\022^\n\025environment_variables\030\006 \003(\013" - "2\?.flyteidl.admin.TaskExecutionMetadata." - "EnvironmentVariablesEntry\032-\n\013LabelsEntry" - "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020Anno" - "tationsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t" - ":\0028\001\032;\n\031EnvironmentVariablesEntry\022\013\n\003key" - "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\314\001\n\021CreateTask" - "Request\022)\n\006inputs\030\001 \001(\0132\031.flyteidl.core." - "LiteralMap\022-\n\010template\030\002 \001(\0132\033.flyteidl." - "core.TaskTemplate\022\025\n\routput_prefix\030\003 \001(\t" - "\022F\n\027task_execution_metadata\030\004 \001(\0132%.flyt" - "eidl.admin.TaskExecutionMetadata\"+\n\022Crea" - "teTaskResponse\022\025\n\rresource_meta\030\001 \001(\014\":\n" - "\016GetTaskRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rre" - "source_meta\030\002 \001(\014\"=\n\017GetTaskResponse\022*\n\010" - "resource\030\001 \001(\0132\030.flyteidl.admin.Resource" - "\"m\n\010Resource\022$\n\005state\030\001 \001(\0162\025.flyteidl.a" - "dmin.State\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.c" - "ore.LiteralMap\022\017\n\007message\030\003 \001(\t\"=\n\021Delet" - "eTaskRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresou" - "rce_meta\030\002 \001(\014\"\024\n\022DeleteTaskResponse*^\n\005" - "State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANEN" - "T_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n" - "\tSUCCEEDED\020\004B=Z;github.com/flyteorg/flyt" - "e/flyteidl/gen/pb-go/flyteidl/adminb\006pro" - "to3" + "roto\032\035flyteidl/core/execution.proto\"\232\004\n\025" + "TaskExecutionMetadata\022A\n\021task_execution_" + "id\030\001 \001(\0132&.flyteidl.core.TaskExecutionId" + "entifier\022\021\n\tnamespace\030\002 \001(\t\022A\n\006labels\030\003 " + "\003(\01321.flyteidl.admin.TaskExecutionMetada" + "ta.LabelsEntry\022K\n\013annotations\030\004 \003(\01326.fl" + "yteidl.admin.TaskExecutionMetadata.Annot" + "ationsEntry\022\033\n\023k8s_service_account\030\005 \001(\t" + "\022^\n\025environment_variables\030\006 \003(\0132\?.flytei" + "dl.admin.TaskExecutionMetadata.Environme" + "ntVariablesEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001" + " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" + "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\t:\0028\001\"\272\002\n\021CreateTaskRequest\022)" + "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" + "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" + "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" + "execution_metadata\030\004 \001(\0132%.flyteidl.admi" + "n.TaskExecutionMetadata\022=\n\006secret\030\005 \003(\0132" + "-.flyteidl.admin.CreateTaskRequest.Secre" + "tEntry\032-\n\013SecretEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" + "lue\030\002 \001(\t:\0028\001\"+\n\022CreateTaskResponse\022\025\n\rr" + "esource_meta\030\001 \001(\014\":\n\016GetTaskRequest\022\021\n\t" + "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"c" + "\n\017GetTaskResponse\022*\n\010resource\030\001 \001(\0132\030.fl" + "yteidl.admin.Resource\022$\n\004logs\030\002 \003(\0132\026.fl" + "yteidl.core.TaskLog\"m\n\010Resource\022$\n\005state" + "\030\001 \001(\0162\025.flyteidl.admin.State\022*\n\007outputs" + "\030\002 \001(\0132\031.flyteidl.core.LiteralMap\022\017\n\007mes" + "sage\030\003 \001(\t\"=\n\021DeleteTaskRequest\022\021\n\ttask_" + "type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022Del" + "eteTaskResponse\"X\n\005Agent\022\014\n\004name\030\001 \001(\t\022\023" + "\n\013secret_name\030\002 \003(\t\022\033\n\023supported_task_ty" + "pe\030\003 \001(\t\022\017\n\007is_sync\030\004 \001(\010\"\037\n\017GetAgentReq" + "uest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$" + "\n\005agent\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021" + "ListAgentsRequest\";\n\022ListAgentsResponse\022" + "%\n\006agents\030\001 \003(\0132\025.flyteidl.admin.Agent*^" + "\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMAN" + "ENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022" + "\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteorg/fl" + "yte/flyteidl/gen/pb-go/flyteidl/adminb\006p" + "roto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1443, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1885, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[4] = + static constexpr ::google::protobuf::internal::InitFunc deps[5] = { ::AddDescriptors_flyteidl_2fcore_2fliterals_2eproto, ::AddDescriptors_flyteidl_2fcore_2ftasks_2eproto, ::AddDescriptors_flyteidl_2fcore_2finterface_2eproto, ::AddDescriptors_flyteidl_2fcore_2fidentifier_2eproto, + ::AddDescriptors_flyteidl_2fcore_2fexecution_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2fagent_2eproto, deps, 4); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fadmin_2fagent_2eproto, deps, 5); } // Force running AddDescriptors() at dynamic initialization time. @@ -1502,6 +1689,47 @@ ::google::protobuf::Metadata TaskExecutionMetadata::GetMetadata() const { } +// =================================================================== + +CreateTaskRequest_SecretEntry_DoNotUse::CreateTaskRequest_SecretEntry_DoNotUse() {} +CreateTaskRequest_SecretEntry_DoNotUse::CreateTaskRequest_SecretEntry_DoNotUse(::google::protobuf::Arena* arena) + : SuperType(arena) {} +void CreateTaskRequest_SecretEntry_DoNotUse::MergeFrom(const CreateTaskRequest_SecretEntry_DoNotUse& other) { + MergeFromInternal(other); +} +::google::protobuf::Metadata CreateTaskRequest_SecretEntry_DoNotUse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto); + return ::file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[4]; +} +void CreateTaskRequest_SecretEntry_DoNotUse::MergeFrom( + const ::google::protobuf::Message& other) { + ::google::protobuf::Message::MergeFrom(other); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool CreateTaskRequest_SecretEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { + using MF = ::google::protobuf::internal::MapField< + CreateTaskRequest_SecretEntry_DoNotUse, EntryKeyType, EntryValueType, + kEntryKeyFieldType, kEntryValueFieldType, + kEntryDefaultEnumValue>; + auto mf = static_cast(object); + Parser> parser(mf); +#define DO_(x) if (!(x)) return false + DO_(parser.ParseMap(begin, end)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.CreateTaskRequest.SecretEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.CreateTaskRequest.SecretEntry.value")); +#undef DO_ + return true; +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + + // =================================================================== void CreateTaskRequest::InitAsDefaultInstance() { @@ -1548,6 +1776,7 @@ const int CreateTaskRequest::kInputsFieldNumber; const int CreateTaskRequest::kTemplateFieldNumber; const int CreateTaskRequest::kOutputPrefixFieldNumber; const int CreateTaskRequest::kTaskExecutionMetadataFieldNumber; +const int CreateTaskRequest::kSecretFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 CreateTaskRequest::CreateTaskRequest() @@ -1559,6 +1788,7 @@ CreateTaskRequest::CreateTaskRequest(const CreateTaskRequest& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); + secret_.MergeFrom(from.secret_); output_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.output_prefix().size() > 0) { output_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_prefix_); @@ -1617,6 +1847,7 @@ void CreateTaskRequest::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + secret_.Clear(); output_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (GetArenaNoVirtual() == nullptr && inputs_ != nullptr) { delete inputs_; @@ -1701,6 +1932,25 @@ const char* CreateTaskRequest::_InternalParse(const char* begin, const char* end {parser_till_end, object}, ptr - size, ptr)); break; } + // map secret = 5; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; + auto parse_map = ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse::_ParseMap; + ctx->extra_parse_data().payload.clear(); + ctx->extra_parse_data().parse_map = parse_map; + object = &msg->secret_; + if (size > end - ptr) goto len_delim_till_end; + auto newend = ptr + size; + GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); + ptr = newend; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 42 && (ptr += 1)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -1783,6 +2033,32 @@ bool CreateTaskRequest::MergePartialFromCodedStream( break; } + // map secret = 5; + case 5: { + if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { + CreateTaskRequest_SecretEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< + CreateTaskRequest_SecretEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 >, + ::google::protobuf::Map< ::std::string, ::std::string > > parser(&secret_); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, &parser)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.CreateTaskRequest.SecretEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.CreateTaskRequest.SecretEntry.value")); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -1838,6 +2114,55 @@ void CreateTaskRequest::SerializeWithCachedSizes( 4, HasBitSetters::task_execution_metadata(this), output); } + // map secret = 5; + if (!this->secret().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.CreateTaskRequest.SecretEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.CreateTaskRequest.SecretEntry.value"); + } + }; + + if (output->IsSerializationDeterministic() && + this->secret().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->secret().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->secret().begin(); + it != this->secret().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(secret_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(5, *entry, output); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->secret().begin(); + it != this->secret().end(); ++it) { + entry.reset(secret_.NewEntryWrapper(it->first, it->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(5, *entry, output); + Utf8Check::Check(&(*it)); + } + } + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -1883,6 +2208,55 @@ ::google::protobuf::uint8* CreateTaskRequest::InternalSerializeWithCachedSizesTo 4, HasBitSetters::task_execution_metadata(this), target); } + // map secret = 5; + if (!this->secret().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.CreateTaskRequest.SecretEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.CreateTaskRequest.SecretEntry.value"); + } + }; + + if (false && + this->secret().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->secret().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->secret().begin(); + it != this->secret().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(secret_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(5, *entry, target); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->secret().begin(); + it != this->secret().end(); ++it) { + entry.reset(secret_.NewEntryWrapper(it->first, it->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(5, *entry, target); + Utf8Check::Check(&(*it)); + } + } + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -1904,6 +2278,20 @@ size_t CreateTaskRequest::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + // map secret = 5; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->secret_size()); + { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->secret().begin(); + it != this->secret().end(); ++it) { + entry.reset(secret_.NewEntryWrapper(it->first, it->second)); + total_size += ::google::protobuf::internal::WireFormatLite:: + MessageSizeNoVirtual(*entry); + } + } + // string output_prefix = 3; if (this->output_prefix().size() > 0) { total_size += 1 + @@ -1959,6 +2347,7 @@ void CreateTaskRequest::MergeFrom(const CreateTaskRequest& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + secret_.MergeFrom(from.secret_); if (from.output_prefix().size() > 0) { output_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_prefix_); @@ -1999,6 +2388,7 @@ void CreateTaskRequest::Swap(CreateTaskRequest* other) { void CreateTaskRequest::InternalSwap(CreateTaskRequest* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); + secret_.Swap(&other->secret_); output_prefix_.Swap(&other->output_prefix_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(inputs_, other->inputs_); @@ -2668,8 +3058,12 @@ const ::flyteidl::admin::Resource& GetTaskResponse::HasBitSetters::resource(const GetTaskResponse* msg) { return *msg->resource_; } +void GetTaskResponse::clear_logs() { + logs_.Clear(); +} #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GetTaskResponse::kResourceFieldNumber; +const int GetTaskResponse::kLogsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GetTaskResponse::GetTaskResponse() @@ -2679,7 +3073,8 @@ GetTaskResponse::GetTaskResponse() } GetTaskResponse::GetTaskResponse(const GetTaskResponse& from) : ::google::protobuf::Message(), - _internal_metadata_(nullptr) { + _internal_metadata_(nullptr), + logs_(from.logs_) { _internal_metadata_.MergeFrom(from._internal_metadata_); if (from.has_resource()) { resource_ = new ::flyteidl::admin::Resource(*from.resource_); @@ -2719,6 +3114,7 @@ void GetTaskResponse::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + logs_.Clear(); if (GetArenaNoVirtual() == nullptr && resource_ != nullptr) { delete resource_; } @@ -2752,6 +3148,22 @@ const char* GetTaskResponse::_InternalParse(const char* begin, const char* end, {parser_till_end, object}, ptr - size, ptr)); break; } + // repeated .flyteidl.core.TaskLog logs = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::TaskLog::_InternalParse; + object = msg->add_logs(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 18 && (ptr += 1)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -2793,6 +3205,17 @@ bool GetTaskResponse::MergePartialFromCodedStream( break; } + // repeated .flyteidl.core.TaskLog logs = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_logs())); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -2826,6 +3249,15 @@ void GetTaskResponse::SerializeWithCachedSizes( 1, HasBitSetters::resource(this), output); } + // repeated .flyteidl.core.TaskLog logs = 2; + for (unsigned int i = 0, + n = static_cast(this->logs_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, + this->logs(static_cast(i)), + output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -2846,6 +3278,14 @@ ::google::protobuf::uint8* GetTaskResponse::InternalSerializeWithCachedSizesToAr 1, HasBitSetters::resource(this), target); } + // repeated .flyteidl.core.TaskLog logs = 2; + for (unsigned int i = 0, + n = static_cast(this->logs_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 2, this->logs(static_cast(i)), target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -2867,6 +3307,17 @@ size_t GetTaskResponse::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + // repeated .flyteidl.core.TaskLog logs = 2; + { + unsigned int count = static_cast(this->logs_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->logs(static_cast(i))); + } + } + // .flyteidl.admin.Resource resource = 1; if (this->has_resource()) { total_size += 1 + @@ -2901,6 +3352,7 @@ void GetTaskResponse::MergeFrom(const GetTaskResponse& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + logs_.MergeFrom(from.logs_); if (from.has_resource()) { mutable_resource()->::flyteidl::admin::Resource::MergeFrom(from.resource()); } @@ -2931,6 +3383,7 @@ void GetTaskResponse::Swap(GetTaskResponse* other) { void GetTaskResponse::InternalSwap(GetTaskResponse* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); + CastToBase(&logs_)->InternalSwap(CastToBase(&other->logs_)); swap(resource_, other->resource_); } @@ -3925,13 +4378,1567 @@ ::google::protobuf::Metadata DeleteTaskResponse::GetMetadata() const { } -// @@protoc_insertion_point(namespace_scope) -} // namespace admin -} // namespace flyteidl -namespace google { -namespace protobuf { -template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata_LabelsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionMetadata_LabelsEntry_DoNotUse >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionMetadata_LabelsEntry_DoNotUse >(arena); +// =================================================================== + +void Agent::InitAsDefaultInstance() { +} +class Agent::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int Agent::kNameFieldNumber; +const int Agent::kSecretNameFieldNumber; +const int Agent::kSupportedTaskTypeFieldNumber; +const int Agent::kIsSyncFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +Agent::Agent() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.admin.Agent) +} +Agent::Agent(const Agent& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr), + secret_name_(from.secret_name_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.name().size() > 0) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + supported_task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.supported_task_type().size() > 0) { + supported_task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_type_); + } + is_sync_ = from.is_sync_; + // @@protoc_insertion_point(copy_constructor:flyteidl.admin.Agent) +} + +void Agent::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + is_sync_ = false; +} + +Agent::~Agent() { + // @@protoc_insertion_point(destructor:flyteidl.admin.Agent) + SharedDtor(); +} + +void Agent::SharedDtor() { + name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} + +void Agent::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const Agent& Agent::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base); + return *internal_default_instance(); +} + + +void Agent::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.admin.Agent) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + secret_name_.Clear(); + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + is_sync_ = false; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* Agent::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string name = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.name"); + object = msg->mutable_name(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // repeated string secret_name = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.secret_name"); + object = msg->add_secret_name(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 18 && (ptr += 1)); + break; + } + // string supported_task_type = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.supported_task_type"); + object = msg->mutable_supported_task_type(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // bool is_sync = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 32) goto handle_unusual; + msg->set_is_sync(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool Agent::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.admin.Agent) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string name = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_name())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.Agent.name")); + } else { + goto handle_unusual; + } + break; + } + + // repeated string secret_name = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->add_secret_name())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->secret_name(this->secret_name_size() - 1).data(), + static_cast(this->secret_name(this->secret_name_size() - 1).length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.Agent.secret_name")); + } else { + goto handle_unusual; + } + break; + } + + // string supported_task_type = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_supported_task_type())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->supported_task_type().data(), static_cast(this->supported_task_type().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.Agent.supported_task_type")); + } else { + goto handle_unusual; + } + break; + } + + // bool is_sync = 4; + case 4: { + if (static_cast< ::google::protobuf::uint8>(tag) == (32 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &is_sync_))); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.admin.Agent) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.admin.Agent) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void Agent::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.admin.Agent) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string name = 1; + if (this->name().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.Agent.name"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->name(), output); + } + + // repeated string secret_name = 2; + for (int i = 0, n = this->secret_name_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->secret_name(i).data(), static_cast(this->secret_name(i).length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.Agent.secret_name"); + ::google::protobuf::internal::WireFormatLite::WriteString( + 2, this->secret_name(i), output); + } + + // string supported_task_type = 3; + if (this->supported_task_type().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->supported_task_type().data(), static_cast(this->supported_task_type().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.Agent.supported_task_type"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 3, this->supported_task_type(), output); + } + + // bool is_sync = 4; + if (this->is_sync() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->is_sync(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.admin.Agent) +} + +::google::protobuf::uint8* Agent::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.Agent) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string name = 1; + if (this->name().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.Agent.name"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->name(), target); + } + + // repeated string secret_name = 2; + for (int i = 0, n = this->secret_name_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->secret_name(i).data(), static_cast(this->secret_name(i).length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.Agent.secret_name"); + target = ::google::protobuf::internal::WireFormatLite:: + WriteStringToArray(2, this->secret_name(i), target); + } + + // string supported_task_type = 3; + if (this->supported_task_type().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->supported_task_type().data(), static_cast(this->supported_task_type().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.Agent.supported_task_type"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 3, this->supported_task_type(), target); + } + + // bool is_sync = 4; + if (this->is_sync() != 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->is_sync(), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.Agent) + return target; +} + +size_t Agent::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.Agent) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // repeated string secret_name = 2; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->secret_name_size()); + for (int i = 0, n = this->secret_name_size(); i < n; i++) { + total_size += ::google::protobuf::internal::WireFormatLite::StringSize( + this->secret_name(i)); + } + + // string name = 1; + if (this->name().size() > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); + } + + // string supported_task_type = 3; + if (this->supported_task_type().size() > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->supported_task_type()); + } + + // bool is_sync = 4; + if (this->is_sync() != 0) { + total_size += 1 + 1; + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void Agent::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.Agent) + GOOGLE_DCHECK_NE(&from, this); + const Agent* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.Agent) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.Agent) + MergeFrom(*source); + } +} + +void Agent::MergeFrom(const Agent& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.Agent) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + secret_name_.MergeFrom(from.secret_name_); + if (from.name().size() > 0) { + + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.supported_task_type().size() > 0) { + + supported_task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_type_); + } + if (from.is_sync() != 0) { + set_is_sync(from.is_sync()); + } +} + +void Agent::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.Agent) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void Agent::CopyFrom(const Agent& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.Agent) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool Agent::IsInitialized() const { + return true; +} + +void Agent::Swap(Agent* other) { + if (other == this) return; + InternalSwap(other); +} +void Agent::InternalSwap(Agent* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + secret_name_.InternalSwap(CastToBase(&other->secret_name_)); + name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); + supported_task_type_.Swap(&other->supported_task_type_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); + swap(is_sync_, other->is_sync_); +} + +::google::protobuf::Metadata Agent::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto); + return ::file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void GetAgentRequest::InitAsDefaultInstance() { +} +class GetAgentRequest::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GetAgentRequest::kNameFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +GetAgentRequest::GetAgentRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.admin.GetAgentRequest) +} +GetAgentRequest::GetAgentRequest(const GetAgentRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.name().size() > 0) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + // @@protoc_insertion_point(copy_constructor:flyteidl.admin.GetAgentRequest) +} + +void GetAgentRequest::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_GetAgentRequest_flyteidl_2fadmin_2fagent_2eproto.base); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} + +GetAgentRequest::~GetAgentRequest() { + // @@protoc_insertion_point(destructor:flyteidl.admin.GetAgentRequest) + SharedDtor(); +} + +void GetAgentRequest::SharedDtor() { + name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} + +void GetAgentRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const GetAgentRequest& GetAgentRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_GetAgentRequest_flyteidl_2fadmin_2fagent_2eproto.base); + return *internal_default_instance(); +} + + +void GetAgentRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.admin.GetAgentRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GetAgentRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string name = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("flyteidl.admin.GetAgentRequest.name"); + object = msg->mutable_name(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GetAgentRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.admin.GetAgentRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string name = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_name())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.GetAgentRequest.name")); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.admin.GetAgentRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.admin.GetAgentRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GetAgentRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.admin.GetAgentRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string name = 1; + if (this->name().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.GetAgentRequest.name"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->name(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.admin.GetAgentRequest) +} + +::google::protobuf::uint8* GetAgentRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.GetAgentRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string name = 1; + if (this->name().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.GetAgentRequest.name"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->name(), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.GetAgentRequest) + return target; +} + +size_t GetAgentRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.GetAgentRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // string name = 1; + if (this->name().size() > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void GetAgentRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.GetAgentRequest) + GOOGLE_DCHECK_NE(&from, this); + const GetAgentRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.GetAgentRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.GetAgentRequest) + MergeFrom(*source); + } +} + +void GetAgentRequest::MergeFrom(const GetAgentRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.GetAgentRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.name().size() > 0) { + + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } +} + +void GetAgentRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.GetAgentRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void GetAgentRequest::CopyFrom(const GetAgentRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.GetAgentRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool GetAgentRequest::IsInitialized() const { + return true; +} + +void GetAgentRequest::Swap(GetAgentRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void GetAgentRequest::InternalSwap(GetAgentRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); +} + +::google::protobuf::Metadata GetAgentRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto); + return ::file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void GetAgentResponse::InitAsDefaultInstance() { + ::flyteidl::admin::_GetAgentResponse_default_instance_._instance.get_mutable()->agent_ = const_cast< ::flyteidl::admin::Agent*>( + ::flyteidl::admin::Agent::internal_default_instance()); +} +class GetAgentResponse::HasBitSetters { + public: + static const ::flyteidl::admin::Agent& agent(const GetAgentResponse* msg); +}; + +const ::flyteidl::admin::Agent& +GetAgentResponse::HasBitSetters::agent(const GetAgentResponse* msg) { + return *msg->agent_; +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GetAgentResponse::kAgentFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +GetAgentResponse::GetAgentResponse() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.admin.GetAgentResponse) +} +GetAgentResponse::GetAgentResponse(const GetAgentResponse& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from.has_agent()) { + agent_ = new ::flyteidl::admin::Agent(*from.agent_); + } else { + agent_ = nullptr; + } + // @@protoc_insertion_point(copy_constructor:flyteidl.admin.GetAgentResponse) +} + +void GetAgentResponse::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_GetAgentResponse_flyteidl_2fadmin_2fagent_2eproto.base); + agent_ = nullptr; +} + +GetAgentResponse::~GetAgentResponse() { + // @@protoc_insertion_point(destructor:flyteidl.admin.GetAgentResponse) + SharedDtor(); +} + +void GetAgentResponse::SharedDtor() { + if (this != internal_default_instance()) delete agent_; +} + +void GetAgentResponse::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const GetAgentResponse& GetAgentResponse::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_GetAgentResponse_flyteidl_2fadmin_2fagent_2eproto.base); + return *internal_default_instance(); +} + + +void GetAgentResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.admin.GetAgentResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + if (GetArenaNoVirtual() == nullptr && agent_ != nullptr) { + delete agent_; + } + agent_ = nullptr; + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GetAgentResponse::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .flyteidl.admin.Agent agent = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::admin::Agent::_InternalParse; + object = msg->mutable_agent(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GetAgentResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.admin.GetAgentResponse) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .flyteidl.admin.Agent agent = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_agent())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.admin.GetAgentResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.admin.GetAgentResponse) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GetAgentResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.admin.GetAgentResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.admin.Agent agent = 1; + if (this->has_agent()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::agent(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.admin.GetAgentResponse) +} + +::google::protobuf::uint8* GetAgentResponse::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.GetAgentResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .flyteidl.admin.Agent agent = 1; + if (this->has_agent()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, HasBitSetters::agent(this), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.GetAgentResponse) + return target; +} + +size_t GetAgentResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.GetAgentResponse) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // .flyteidl.admin.Agent agent = 1; + if (this->has_agent()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *agent_); + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void GetAgentResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.GetAgentResponse) + GOOGLE_DCHECK_NE(&from, this); + const GetAgentResponse* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.GetAgentResponse) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.GetAgentResponse) + MergeFrom(*source); + } +} + +void GetAgentResponse::MergeFrom(const GetAgentResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.GetAgentResponse) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (from.has_agent()) { + mutable_agent()->::flyteidl::admin::Agent::MergeFrom(from.agent()); + } +} + +void GetAgentResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.GetAgentResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void GetAgentResponse::CopyFrom(const GetAgentResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.GetAgentResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool GetAgentResponse::IsInitialized() const { + return true; +} + +void GetAgentResponse::Swap(GetAgentResponse* other) { + if (other == this) return; + InternalSwap(other); +} +void GetAgentResponse::InternalSwap(GetAgentResponse* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + swap(agent_, other->agent_); +} + +::google::protobuf::Metadata GetAgentResponse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto); + return ::file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void ListAgentsRequest::InitAsDefaultInstance() { +} +class ListAgentsRequest::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +ListAgentsRequest::ListAgentsRequest() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.admin.ListAgentsRequest) +} +ListAgentsRequest::ListAgentsRequest(const ListAgentsRequest& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + // @@protoc_insertion_point(copy_constructor:flyteidl.admin.ListAgentsRequest) +} + +void ListAgentsRequest::SharedCtor() { +} + +ListAgentsRequest::~ListAgentsRequest() { + // @@protoc_insertion_point(destructor:flyteidl.admin.ListAgentsRequest) + SharedDtor(); +} + +void ListAgentsRequest::SharedDtor() { +} + +void ListAgentsRequest::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const ListAgentsRequest& ListAgentsRequest::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_ListAgentsRequest_flyteidl_2fadmin_2fagent_2eproto.base); + return *internal_default_instance(); +} + + +void ListAgentsRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.admin.ListAgentsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* ListAgentsRequest::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + default: { + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool ListAgentsRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.admin.ListAgentsRequest) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.admin.ListAgentsRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.admin.ListAgentsRequest) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void ListAgentsRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.admin.ListAgentsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.admin.ListAgentsRequest) +} + +::google::protobuf::uint8* ListAgentsRequest::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.ListAgentsRequest) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.ListAgentsRequest) + return target; +} + +size_t ListAgentsRequest::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.ListAgentsRequest) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void ListAgentsRequest::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.ListAgentsRequest) + GOOGLE_DCHECK_NE(&from, this); + const ListAgentsRequest* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.ListAgentsRequest) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.ListAgentsRequest) + MergeFrom(*source); + } +} + +void ListAgentsRequest::MergeFrom(const ListAgentsRequest& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.ListAgentsRequest) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + +} + +void ListAgentsRequest::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.ListAgentsRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void ListAgentsRequest::CopyFrom(const ListAgentsRequest& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.ListAgentsRequest) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool ListAgentsRequest::IsInitialized() const { + return true; +} + +void ListAgentsRequest::Swap(ListAgentsRequest* other) { + if (other == this) return; + InternalSwap(other); +} +void ListAgentsRequest::InternalSwap(ListAgentsRequest* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); +} + +::google::protobuf::Metadata ListAgentsRequest::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto); + return ::file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[kIndexInFileMessages]; +} + + +// =================================================================== + +void ListAgentsResponse::InitAsDefaultInstance() { +} +class ListAgentsResponse::HasBitSetters { + public: +}; + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int ListAgentsResponse::kAgentsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +ListAgentsResponse::ListAgentsResponse() + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + SharedCtor(); + // @@protoc_insertion_point(constructor:flyteidl.admin.ListAgentsResponse) +} +ListAgentsResponse::ListAgentsResponse(const ListAgentsResponse& from) + : ::google::protobuf::Message(), + _internal_metadata_(nullptr), + agents_(from.agents_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + // @@protoc_insertion_point(copy_constructor:flyteidl.admin.ListAgentsResponse) +} + +void ListAgentsResponse::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_ListAgentsResponse_flyteidl_2fadmin_2fagent_2eproto.base); +} + +ListAgentsResponse::~ListAgentsResponse() { + // @@protoc_insertion_point(destructor:flyteidl.admin.ListAgentsResponse) + SharedDtor(); +} + +void ListAgentsResponse::SharedDtor() { +} + +void ListAgentsResponse::SetCachedSize(int size) const { + _cached_size_.Set(size); +} +const ListAgentsResponse& ListAgentsResponse::default_instance() { + ::google::protobuf::internal::InitSCC(&::scc_info_ListAgentsResponse_flyteidl_2fadmin_2fagent_2eproto.base); + return *internal_default_instance(); +} + + +void ListAgentsResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:flyteidl.admin.ListAgentsResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + agents_.Clear(); + _internal_metadata_.Clear(); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* ListAgentsResponse::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // repeated .flyteidl.admin.Agent agents = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::admin::Agent::_InternalParse; + object = msg->add_agents(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool ListAgentsResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:flyteidl.admin.ListAgentsResponse) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .flyteidl.admin.Agent agents = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_agents())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:flyteidl.admin.ListAgentsResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:flyteidl.admin.ListAgentsResponse) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void ListAgentsResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:flyteidl.admin.ListAgentsResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .flyteidl.admin.Agent agents = 1; + for (unsigned int i = 0, + n = static_cast(this->agents_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, + this->agents(static_cast(i)), + output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:flyteidl.admin.ListAgentsResponse) +} + +::google::protobuf::uint8* ListAgentsResponse::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:flyteidl.admin.ListAgentsResponse) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .flyteidl.admin.Agent agents = 1; + for (unsigned int i = 0, + n = static_cast(this->agents_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, this->agents(static_cast(i)), target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:flyteidl.admin.ListAgentsResponse) + return target; +} + +size_t ListAgentsResponse::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:flyteidl.admin.ListAgentsResponse) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // repeated .flyteidl.admin.Agent agents = 1; + { + unsigned int count = static_cast(this->agents_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->agents(static_cast(i))); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + SetCachedSize(cached_size); + return total_size; +} + +void ListAgentsResponse::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:flyteidl.admin.ListAgentsResponse) + GOOGLE_DCHECK_NE(&from, this); + const ListAgentsResponse* source = + ::google::protobuf::DynamicCastToGenerated( + &from); + if (source == nullptr) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:flyteidl.admin.ListAgentsResponse) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:flyteidl.admin.ListAgentsResponse) + MergeFrom(*source); + } +} + +void ListAgentsResponse::MergeFrom(const ListAgentsResponse& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:flyteidl.admin.ListAgentsResponse) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + agents_.MergeFrom(from.agents_); +} + +void ListAgentsResponse::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:flyteidl.admin.ListAgentsResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void ListAgentsResponse::CopyFrom(const ListAgentsResponse& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:flyteidl.admin.ListAgentsResponse) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool ListAgentsResponse::IsInitialized() const { + return true; +} + +void ListAgentsResponse::Swap(ListAgentsResponse* other) { + if (other == this) return; + InternalSwap(other); +} +void ListAgentsResponse::InternalSwap(ListAgentsResponse* other) { + using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); + CastToBase(&agents_)->InternalSwap(CastToBase(&other->agents_)); +} + +::google::protobuf::Metadata ListAgentsResponse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto); + return ::file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[kIndexInFileMessages]; +} + + +// @@protoc_insertion_point(namespace_scope) +} // namespace admin +} // namespace flyteidl +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata_LabelsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionMetadata_LabelsEntry_DoNotUse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionMetadata_LabelsEntry_DoNotUse >(arena); } template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse >(arena); @@ -3942,6 +5949,9 @@ template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata_Environmen template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionMetadata >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionMetadata >(arena); } +template<> PROTOBUF_NOINLINE ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse >(arena); +} template<> PROTOBUF_NOINLINE ::flyteidl::admin::CreateTaskRequest* Arena::CreateMaybeMessage< ::flyteidl::admin::CreateTaskRequest >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::CreateTaskRequest >(arena); } @@ -3963,6 +5973,21 @@ template<> PROTOBUF_NOINLINE ::flyteidl::admin::DeleteTaskRequest* Arena::Create template<> PROTOBUF_NOINLINE ::flyteidl::admin::DeleteTaskResponse* Arena::CreateMaybeMessage< ::flyteidl::admin::DeleteTaskResponse >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::DeleteTaskResponse >(arena); } +template<> PROTOBUF_NOINLINE ::flyteidl::admin::Agent* Arena::CreateMaybeMessage< ::flyteidl::admin::Agent >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::Agent >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::admin::GetAgentRequest* Arena::CreateMaybeMessage< ::flyteidl::admin::GetAgentRequest >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::GetAgentRequest >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::admin::GetAgentResponse* Arena::CreateMaybeMessage< ::flyteidl::admin::GetAgentResponse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::GetAgentResponse >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::admin::ListAgentsRequest* Arena::CreateMaybeMessage< ::flyteidl::admin::ListAgentsRequest >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::ListAgentsRequest >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::admin::ListAgentsResponse* Arena::CreateMaybeMessage< ::flyteidl::admin::ListAgentsResponse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::ListAgentsResponse >(arena); +} } // namespace protobuf } // namespace google diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index 5d43236ad3..812d28bb63 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -39,6 +39,7 @@ #include "flyteidl/core/tasks.pb.h" #include "flyteidl/core/interface.pb.h" #include "flyteidl/core/identifier.pb.h" +#include "flyteidl/core/execution.pb.h" // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto @@ -49,7 +50,7 @@ struct TableStruct_flyteidl_2fadmin_2fagent_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[11] + static const ::google::protobuf::internal::ParseTable schema[17] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -58,9 +59,15 @@ struct TableStruct_flyteidl_2fadmin_2fagent_2eproto { void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto(); namespace flyteidl { namespace admin { +class Agent; +class AgentDefaultTypeInternal; +extern AgentDefaultTypeInternal _Agent_default_instance_; class CreateTaskRequest; class CreateTaskRequestDefaultTypeInternal; extern CreateTaskRequestDefaultTypeInternal _CreateTaskRequest_default_instance_; +class CreateTaskRequest_SecretEntry_DoNotUse; +class CreateTaskRequest_SecretEntry_DoNotUseDefaultTypeInternal; +extern CreateTaskRequest_SecretEntry_DoNotUseDefaultTypeInternal _CreateTaskRequest_SecretEntry_DoNotUse_default_instance_; class CreateTaskResponse; class CreateTaskResponseDefaultTypeInternal; extern CreateTaskResponseDefaultTypeInternal _CreateTaskResponse_default_instance_; @@ -70,12 +77,24 @@ extern DeleteTaskRequestDefaultTypeInternal _DeleteTaskRequest_default_instance_ class DeleteTaskResponse; class DeleteTaskResponseDefaultTypeInternal; extern DeleteTaskResponseDefaultTypeInternal _DeleteTaskResponse_default_instance_; +class GetAgentRequest; +class GetAgentRequestDefaultTypeInternal; +extern GetAgentRequestDefaultTypeInternal _GetAgentRequest_default_instance_; +class GetAgentResponse; +class GetAgentResponseDefaultTypeInternal; +extern GetAgentResponseDefaultTypeInternal _GetAgentResponse_default_instance_; class GetTaskRequest; class GetTaskRequestDefaultTypeInternal; extern GetTaskRequestDefaultTypeInternal _GetTaskRequest_default_instance_; class GetTaskResponse; class GetTaskResponseDefaultTypeInternal; extern GetTaskResponseDefaultTypeInternal _GetTaskResponse_default_instance_; +class ListAgentsRequest; +class ListAgentsRequestDefaultTypeInternal; +extern ListAgentsRequestDefaultTypeInternal _ListAgentsRequest_default_instance_; +class ListAgentsResponse; +class ListAgentsResponseDefaultTypeInternal; +extern ListAgentsResponseDefaultTypeInternal _ListAgentsResponse_default_instance_; class Resource; class ResourceDefaultTypeInternal; extern ResourceDefaultTypeInternal _Resource_default_instance_; @@ -95,12 +114,18 @@ extern TaskExecutionMetadata_LabelsEntry_DoNotUseDefaultTypeInternal _TaskExecut } // namespace flyteidl namespace google { namespace protobuf { +template<> ::flyteidl::admin::Agent* Arena::CreateMaybeMessage<::flyteidl::admin::Agent>(Arena*); template<> ::flyteidl::admin::CreateTaskRequest* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskRequest>(Arena*); +template<> ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse>(Arena*); template<> ::flyteidl::admin::CreateTaskResponse* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskResponse>(Arena*); template<> ::flyteidl::admin::DeleteTaskRequest* Arena::CreateMaybeMessage<::flyteidl::admin::DeleteTaskRequest>(Arena*); template<> ::flyteidl::admin::DeleteTaskResponse* Arena::CreateMaybeMessage<::flyteidl::admin::DeleteTaskResponse>(Arena*); +template<> ::flyteidl::admin::GetAgentRequest* Arena::CreateMaybeMessage<::flyteidl::admin::GetAgentRequest>(Arena*); +template<> ::flyteidl::admin::GetAgentResponse* Arena::CreateMaybeMessage<::flyteidl::admin::GetAgentResponse>(Arena*); template<> ::flyteidl::admin::GetTaskRequest* Arena::CreateMaybeMessage<::flyteidl::admin::GetTaskRequest>(Arena*); template<> ::flyteidl::admin::GetTaskResponse* Arena::CreateMaybeMessage<::flyteidl::admin::GetTaskResponse>(Arena*); +template<> ::flyteidl::admin::ListAgentsRequest* Arena::CreateMaybeMessage<::flyteidl::admin::ListAgentsRequest>(Arena*); +template<> ::flyteidl::admin::ListAgentsResponse* Arena::CreateMaybeMessage<::flyteidl::admin::ListAgentsResponse>(Arena*); template<> ::flyteidl::admin::Resource* Arena::CreateMaybeMessage<::flyteidl::admin::Resource>(Arena*); template<> ::flyteidl::admin::TaskExecutionMetadata* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionMetadata>(Arena*); template<> ::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse>(Arena*); @@ -400,6 +425,30 @@ class TaskExecutionMetadata final : }; // ------------------------------------------------------------------- +class CreateTaskRequest_SecretEntry_DoNotUse : public ::google::protobuf::internal::MapEntry { +public: +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + typedef ::google::protobuf::internal::MapEntry SuperType; + CreateTaskRequest_SecretEntry_DoNotUse(); + CreateTaskRequest_SecretEntry_DoNotUse(::google::protobuf::Arena* arena); + void MergeFrom(const CreateTaskRequest_SecretEntry_DoNotUse& other); + static const CreateTaskRequest_SecretEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_CreateTaskRequest_SecretEntry_DoNotUse_default_instance_); } + void MergeFrom(const ::google::protobuf::Message& other) final; + ::google::protobuf::Metadata GetMetadata() const; +}; + +// ------------------------------------------------------------------- + class CreateTaskRequest final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.CreateTaskRequest) */ { public: @@ -438,7 +487,7 @@ class CreateTaskRequest final : &_CreateTaskRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 4; + 5; void Swap(CreateTaskRequest* other); friend void swap(CreateTaskRequest& a, CreateTaskRequest& b) { @@ -493,8 +542,18 @@ class CreateTaskRequest final : // nested types ---------------------------------------------------- + // accessors ------------------------------------------------------- + // map secret = 5; + int secret_size() const; + void clear_secret(); + static const int kSecretFieldNumber = 5; + const ::google::protobuf::Map< ::std::string, ::std::string >& + secret() const; + ::google::protobuf::Map< ::std::string, ::std::string >* + mutable_secret(); + // string output_prefix = 3; void clear_output_prefix(); static const int kOutputPrefixFieldNumber = 3; @@ -541,6 +600,12 @@ class CreateTaskRequest final : class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::MapField< + CreateTaskRequest_SecretEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 > secret_; ::google::protobuf::internal::ArenaStringPtr output_prefix_; ::flyteidl::core::LiteralMap* inputs_; ::flyteidl::core::TaskTemplate* template__; @@ -588,7 +653,7 @@ class CreateTaskResponse final : &_CreateTaskResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 5; + 6; void Swap(CreateTaskResponse* other); friend void swap(CreateTaskResponse& a, CreateTaskResponse& b) { @@ -708,7 +773,7 @@ class GetTaskRequest final : &_GetTaskRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 6; + 7; void Swap(GetTaskRequest* other); friend void swap(GetTaskRequest& a, GetTaskRequest& b) { @@ -843,7 +908,7 @@ class GetTaskResponse final : &_GetTaskResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 7; + 8; void Swap(GetTaskResponse* other); friend void swap(GetTaskResponse& a, GetTaskResponse& b) { @@ -900,6 +965,18 @@ class GetTaskResponse final : // accessors ------------------------------------------------------- + // repeated .flyteidl.core.TaskLog logs = 2; + int logs_size() const; + void clear_logs(); + static const int kLogsFieldNumber = 2; + ::flyteidl::core::TaskLog* mutable_logs(int index); + ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog >* + mutable_logs(); + const ::flyteidl::core::TaskLog& logs(int index) const; + ::flyteidl::core::TaskLog* add_logs(); + const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog >& + logs() const; + // .flyteidl.admin.Resource resource = 1; bool has_resource() const; void clear_resource(); @@ -914,6 +991,7 @@ class GetTaskResponse final : class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog > logs_; ::flyteidl::admin::Resource* resource_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; @@ -958,7 +1036,7 @@ class Resource final : &_Resource_default_instance_); } static constexpr int kIndexInFileMessages = - 8; + 9; void Swap(Resource* other); friend void swap(Resource& a, Resource& b) { @@ -1049,33 +1127,673 @@ class Resource final : class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::internal::ArenaStringPtr message_; - ::flyteidl::core::LiteralMap* outputs_; - int state_; + ::google::protobuf::internal::ArenaStringPtr message_; + ::flyteidl::core::LiteralMap* outputs_; + int state_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; +}; +// ------------------------------------------------------------------- + +class DeleteTaskRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.DeleteTaskRequest) */ { + public: + DeleteTaskRequest(); + virtual ~DeleteTaskRequest(); + + DeleteTaskRequest(const DeleteTaskRequest& from); + + inline DeleteTaskRequest& operator=(const DeleteTaskRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + DeleteTaskRequest(DeleteTaskRequest&& from) noexcept + : DeleteTaskRequest() { + *this = ::std::move(from); + } + + inline DeleteTaskRequest& operator=(DeleteTaskRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const DeleteTaskRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const DeleteTaskRequest* internal_default_instance() { + return reinterpret_cast( + &_DeleteTaskRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 10; + + void Swap(DeleteTaskRequest* other); + friend void swap(DeleteTaskRequest& a, DeleteTaskRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline DeleteTaskRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + DeleteTaskRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const DeleteTaskRequest& from); + void MergeFrom(const DeleteTaskRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(DeleteTaskRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // string task_type = 1; + void clear_task_type(); + static const int kTaskTypeFieldNumber = 1; + const ::std::string& task_type() const; + void set_task_type(const ::std::string& value); + #if LANG_CXX11 + void set_task_type(::std::string&& value); + #endif + void set_task_type(const char* value); + void set_task_type(const char* value, size_t size); + ::std::string* mutable_task_type(); + ::std::string* release_task_type(); + void set_allocated_task_type(::std::string* task_type); + + // bytes resource_meta = 2; + void clear_resource_meta(); + static const int kResourceMetaFieldNumber = 2; + const ::std::string& resource_meta() const; + void set_resource_meta(const ::std::string& value); + #if LANG_CXX11 + void set_resource_meta(::std::string&& value); + #endif + void set_resource_meta(const char* value); + void set_resource_meta(const void* value, size_t size); + ::std::string* mutable_resource_meta(); + ::std::string* release_resource_meta(); + void set_allocated_resource_meta(::std::string* resource_meta); + + // @@protoc_insertion_point(class_scope:flyteidl.admin.DeleteTaskRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::ArenaStringPtr task_type_; + ::google::protobuf::internal::ArenaStringPtr resource_meta_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; +}; +// ------------------------------------------------------------------- + +class DeleteTaskResponse final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.DeleteTaskResponse) */ { + public: + DeleteTaskResponse(); + virtual ~DeleteTaskResponse(); + + DeleteTaskResponse(const DeleteTaskResponse& from); + + inline DeleteTaskResponse& operator=(const DeleteTaskResponse& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + DeleteTaskResponse(DeleteTaskResponse&& from) noexcept + : DeleteTaskResponse() { + *this = ::std::move(from); + } + + inline DeleteTaskResponse& operator=(DeleteTaskResponse&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const DeleteTaskResponse& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const DeleteTaskResponse* internal_default_instance() { + return reinterpret_cast( + &_DeleteTaskResponse_default_instance_); + } + static constexpr int kIndexInFileMessages = + 11; + + void Swap(DeleteTaskResponse* other); + friend void swap(DeleteTaskResponse& a, DeleteTaskResponse& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline DeleteTaskResponse* New() const final { + return CreateMaybeMessage(nullptr); + } + + DeleteTaskResponse* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const DeleteTaskResponse& from); + void MergeFrom(const DeleteTaskResponse& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(DeleteTaskResponse* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // @@protoc_insertion_point(class_scope:flyteidl.admin.DeleteTaskResponse) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; +}; +// ------------------------------------------------------------------- + +class Agent final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.Agent) */ { + public: + Agent(); + virtual ~Agent(); + + Agent(const Agent& from); + + inline Agent& operator=(const Agent& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + Agent(Agent&& from) noexcept + : Agent() { + *this = ::std::move(from); + } + + inline Agent& operator=(Agent&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const Agent& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const Agent* internal_default_instance() { + return reinterpret_cast( + &_Agent_default_instance_); + } + static constexpr int kIndexInFileMessages = + 12; + + void Swap(Agent* other); + friend void swap(Agent& a, Agent& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline Agent* New() const final { + return CreateMaybeMessage(nullptr); + } + + Agent* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const Agent& from); + void MergeFrom(const Agent& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(Agent* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated string secret_name = 2; + int secret_name_size() const; + void clear_secret_name(); + static const int kSecretNameFieldNumber = 2; + const ::std::string& secret_name(int index) const; + ::std::string* mutable_secret_name(int index); + void set_secret_name(int index, const ::std::string& value); + #if LANG_CXX11 + void set_secret_name(int index, ::std::string&& value); + #endif + void set_secret_name(int index, const char* value); + void set_secret_name(int index, const char* value, size_t size); + ::std::string* add_secret_name(); + void add_secret_name(const ::std::string& value); + #if LANG_CXX11 + void add_secret_name(::std::string&& value); + #endif + void add_secret_name(const char* value); + void add_secret_name(const char* value, size_t size); + const ::google::protobuf::RepeatedPtrField<::std::string>& secret_name() const; + ::google::protobuf::RepeatedPtrField<::std::string>* mutable_secret_name(); + + // string name = 1; + void clear_name(); + static const int kNameFieldNumber = 1; + const ::std::string& name() const; + void set_name(const ::std::string& value); + #if LANG_CXX11 + void set_name(::std::string&& value); + #endif + void set_name(const char* value); + void set_name(const char* value, size_t size); + ::std::string* mutable_name(); + ::std::string* release_name(); + void set_allocated_name(::std::string* name); + + // string supported_task_type = 3; + void clear_supported_task_type(); + static const int kSupportedTaskTypeFieldNumber = 3; + const ::std::string& supported_task_type() const; + void set_supported_task_type(const ::std::string& value); + #if LANG_CXX11 + void set_supported_task_type(::std::string&& value); + #endif + void set_supported_task_type(const char* value); + void set_supported_task_type(const char* value, size_t size); + ::std::string* mutable_supported_task_type(); + ::std::string* release_supported_task_type(); + void set_allocated_supported_task_type(::std::string* supported_task_type); + + // bool is_sync = 4; + void clear_is_sync(); + static const int kIsSyncFieldNumber = 4; + bool is_sync() const; + void set_is_sync(bool value); + + // @@protoc_insertion_point(class_scope:flyteidl.admin.Agent) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField<::std::string> secret_name_; + ::google::protobuf::internal::ArenaStringPtr name_; + ::google::protobuf::internal::ArenaStringPtr supported_task_type_; + bool is_sync_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; +}; +// ------------------------------------------------------------------- + +class GetAgentRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.GetAgentRequest) */ { + public: + GetAgentRequest(); + virtual ~GetAgentRequest(); + + GetAgentRequest(const GetAgentRequest& from); + + inline GetAgentRequest& operator=(const GetAgentRequest& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + GetAgentRequest(GetAgentRequest&& from) noexcept + : GetAgentRequest() { + *this = ::std::move(from); + } + + inline GetAgentRequest& operator=(GetAgentRequest&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const GetAgentRequest& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const GetAgentRequest* internal_default_instance() { + return reinterpret_cast( + &_GetAgentRequest_default_instance_); + } + static constexpr int kIndexInFileMessages = + 13; + + void Swap(GetAgentRequest* other); + friend void swap(GetAgentRequest& a, GetAgentRequest& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline GetAgentRequest* New() const final { + return CreateMaybeMessage(nullptr); + } + + GetAgentRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const GetAgentRequest& from); + void MergeFrom(const GetAgentRequest& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(GetAgentRequest* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // string name = 1; + void clear_name(); + static const int kNameFieldNumber = 1; + const ::std::string& name() const; + void set_name(const ::std::string& value); + #if LANG_CXX11 + void set_name(::std::string&& value); + #endif + void set_name(const char* value); + void set_name(const char* value, size_t size); + ::std::string* mutable_name(); + ::std::string* release_name(); + void set_allocated_name(::std::string* name); + + // @@protoc_insertion_point(class_scope:flyteidl.admin.GetAgentRequest) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::ArenaStringPtr name_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; +}; +// ------------------------------------------------------------------- + +class GetAgentResponse final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.GetAgentResponse) */ { + public: + GetAgentResponse(); + virtual ~GetAgentResponse(); + + GetAgentResponse(const GetAgentResponse& from); + + inline GetAgentResponse& operator=(const GetAgentResponse& from) { + CopyFrom(from); + return *this; + } + #if LANG_CXX11 + GetAgentResponse(GetAgentResponse&& from) noexcept + : GetAgentResponse() { + *this = ::std::move(from); + } + + inline GetAgentResponse& operator=(GetAgentResponse&& from) noexcept { + if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { + if (this != &from) InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } + static const GetAgentResponse& default_instance(); + + static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY + static inline const GetAgentResponse* internal_default_instance() { + return reinterpret_cast( + &_GetAgentResponse_default_instance_); + } + static constexpr int kIndexInFileMessages = + 14; + + void Swap(GetAgentResponse* other); + friend void swap(GetAgentResponse& a, GetAgentResponse& b) { + a.Swap(&b); + } + + // implements Message ---------------------------------------------- + + inline GetAgentResponse* New() const final { + return CreateMaybeMessage(nullptr); + } + + GetAgentResponse* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); + } + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const GetAgentResponse& from); + void MergeFrom(const GetAgentResponse& from); + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; + int GetCachedSize() const final { return _cached_size_.Get(); } + + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const final; + void InternalSwap(GetAgentResponse* other); + private: + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + return nullptr; + } + inline void* MaybeArenaPtr() const { + return nullptr; + } + public: + + ::google::protobuf::Metadata GetMetadata() const final; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // .flyteidl.admin.Agent agent = 1; + bool has_agent() const; + void clear_agent(); + static const int kAgentFieldNumber = 1; + const ::flyteidl::admin::Agent& agent() const; + ::flyteidl::admin::Agent* release_agent(); + ::flyteidl::admin::Agent* mutable_agent(); + void set_allocated_agent(::flyteidl::admin::Agent* agent); + + // @@protoc_insertion_point(class_scope:flyteidl.admin.GetAgentResponse) + private: + class HasBitSetters; + + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::flyteidl::admin::Agent* agent_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; }; // ------------------------------------------------------------------- -class DeleteTaskRequest final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.DeleteTaskRequest) */ { +class ListAgentsRequest final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.ListAgentsRequest) */ { public: - DeleteTaskRequest(); - virtual ~DeleteTaskRequest(); + ListAgentsRequest(); + virtual ~ListAgentsRequest(); - DeleteTaskRequest(const DeleteTaskRequest& from); + ListAgentsRequest(const ListAgentsRequest& from); - inline DeleteTaskRequest& operator=(const DeleteTaskRequest& from) { + inline ListAgentsRequest& operator=(const ListAgentsRequest& from) { CopyFrom(from); return *this; } #if LANG_CXX11 - DeleteTaskRequest(DeleteTaskRequest&& from) noexcept - : DeleteTaskRequest() { + ListAgentsRequest(ListAgentsRequest&& from) noexcept + : ListAgentsRequest() { *this = ::std::move(from); } - inline DeleteTaskRequest& operator=(DeleteTaskRequest&& from) noexcept { + inline ListAgentsRequest& operator=(ListAgentsRequest&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); } else { @@ -1087,34 +1805,34 @@ class DeleteTaskRequest final : static const ::google::protobuf::Descriptor* descriptor() { return default_instance().GetDescriptor(); } - static const DeleteTaskRequest& default_instance(); + static const ListAgentsRequest& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY - static inline const DeleteTaskRequest* internal_default_instance() { - return reinterpret_cast( - &_DeleteTaskRequest_default_instance_); + static inline const ListAgentsRequest* internal_default_instance() { + return reinterpret_cast( + &_ListAgentsRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 9; + 15; - void Swap(DeleteTaskRequest* other); - friend void swap(DeleteTaskRequest& a, DeleteTaskRequest& b) { + void Swap(ListAgentsRequest* other); + friend void swap(ListAgentsRequest& a, ListAgentsRequest& b) { a.Swap(&b); } // implements Message ---------------------------------------------- - inline DeleteTaskRequest* New() const final { - return CreateMaybeMessage(nullptr); + inline ListAgentsRequest* New() const final { + return CreateMaybeMessage(nullptr); } - DeleteTaskRequest* New(::google::protobuf::Arena* arena) const final { - return CreateMaybeMessage(arena); + ListAgentsRequest* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); } void CopyFrom(const ::google::protobuf::Message& from) final; void MergeFrom(const ::google::protobuf::Message& from) final; - void CopyFrom(const DeleteTaskRequest& from); - void MergeFrom(const DeleteTaskRequest& from); + void CopyFrom(const ListAgentsRequest& from); + void MergeFrom(const ListAgentsRequest& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -1136,7 +1854,7 @@ class DeleteTaskRequest final : void SharedCtor(); void SharedDtor(); void SetCachedSize(int size) const final; - void InternalSwap(DeleteTaskRequest* other); + void InternalSwap(ListAgentsRequest* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; @@ -1152,65 +1870,35 @@ class DeleteTaskRequest final : // accessors ------------------------------------------------------- - // string task_type = 1; - void clear_task_type(); - static const int kTaskTypeFieldNumber = 1; - const ::std::string& task_type() const; - void set_task_type(const ::std::string& value); - #if LANG_CXX11 - void set_task_type(::std::string&& value); - #endif - void set_task_type(const char* value); - void set_task_type(const char* value, size_t size); - ::std::string* mutable_task_type(); - ::std::string* release_task_type(); - void set_allocated_task_type(::std::string* task_type); - - // bytes resource_meta = 2; - void clear_resource_meta(); - static const int kResourceMetaFieldNumber = 2; - const ::std::string& resource_meta() const; - void set_resource_meta(const ::std::string& value); - #if LANG_CXX11 - void set_resource_meta(::std::string&& value); - #endif - void set_resource_meta(const char* value); - void set_resource_meta(const void* value, size_t size); - ::std::string* mutable_resource_meta(); - ::std::string* release_resource_meta(); - void set_allocated_resource_meta(::std::string* resource_meta); - - // @@protoc_insertion_point(class_scope:flyteidl.admin.DeleteTaskRequest) + // @@protoc_insertion_point(class_scope:flyteidl.admin.ListAgentsRequest) private: class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::internal::ArenaStringPtr task_type_; - ::google::protobuf::internal::ArenaStringPtr resource_meta_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; }; // ------------------------------------------------------------------- -class DeleteTaskResponse final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.DeleteTaskResponse) */ { +class ListAgentsResponse final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.ListAgentsResponse) */ { public: - DeleteTaskResponse(); - virtual ~DeleteTaskResponse(); + ListAgentsResponse(); + virtual ~ListAgentsResponse(); - DeleteTaskResponse(const DeleteTaskResponse& from); + ListAgentsResponse(const ListAgentsResponse& from); - inline DeleteTaskResponse& operator=(const DeleteTaskResponse& from) { + inline ListAgentsResponse& operator=(const ListAgentsResponse& from) { CopyFrom(from); return *this; } #if LANG_CXX11 - DeleteTaskResponse(DeleteTaskResponse&& from) noexcept - : DeleteTaskResponse() { + ListAgentsResponse(ListAgentsResponse&& from) noexcept + : ListAgentsResponse() { *this = ::std::move(from); } - inline DeleteTaskResponse& operator=(DeleteTaskResponse&& from) noexcept { + inline ListAgentsResponse& operator=(ListAgentsResponse&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); } else { @@ -1222,34 +1910,34 @@ class DeleteTaskResponse final : static const ::google::protobuf::Descriptor* descriptor() { return default_instance().GetDescriptor(); } - static const DeleteTaskResponse& default_instance(); + static const ListAgentsResponse& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY - static inline const DeleteTaskResponse* internal_default_instance() { - return reinterpret_cast( - &_DeleteTaskResponse_default_instance_); + static inline const ListAgentsResponse* internal_default_instance() { + return reinterpret_cast( + &_ListAgentsResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 10; + 16; - void Swap(DeleteTaskResponse* other); - friend void swap(DeleteTaskResponse& a, DeleteTaskResponse& b) { + void Swap(ListAgentsResponse* other); + friend void swap(ListAgentsResponse& a, ListAgentsResponse& b) { a.Swap(&b); } // implements Message ---------------------------------------------- - inline DeleteTaskResponse* New() const final { - return CreateMaybeMessage(nullptr); + inline ListAgentsResponse* New() const final { + return CreateMaybeMessage(nullptr); } - DeleteTaskResponse* New(::google::protobuf::Arena* arena) const final { - return CreateMaybeMessage(arena); + ListAgentsResponse* New(::google::protobuf::Arena* arena) const final { + return CreateMaybeMessage(arena); } void CopyFrom(const ::google::protobuf::Message& from) final; void MergeFrom(const ::google::protobuf::Message& from) final; - void CopyFrom(const DeleteTaskResponse& from); - void MergeFrom(const DeleteTaskResponse& from); + void CopyFrom(const ListAgentsResponse& from); + void MergeFrom(const ListAgentsResponse& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -1271,7 +1959,7 @@ class DeleteTaskResponse final : void SharedCtor(); void SharedDtor(); void SetCachedSize(int size) const final; - void InternalSwap(DeleteTaskResponse* other); + void InternalSwap(ListAgentsResponse* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; @@ -1287,11 +1975,24 @@ class DeleteTaskResponse final : // accessors ------------------------------------------------------- - // @@protoc_insertion_point(class_scope:flyteidl.admin.DeleteTaskResponse) + // repeated .flyteidl.admin.Agent agents = 1; + int agents_size() const; + void clear_agents(); + static const int kAgentsFieldNumber = 1; + ::flyteidl::admin::Agent* mutable_agents(int index); + ::google::protobuf::RepeatedPtrField< ::flyteidl::admin::Agent >* + mutable_agents(); + const ::flyteidl::admin::Agent& agents(int index) const; + ::flyteidl::admin::Agent* add_agents(); + const ::google::protobuf::RepeatedPtrField< ::flyteidl::admin::Agent >& + agents() const; + + // @@protoc_insertion_point(class_scope:flyteidl.admin.ListAgentsResponse) private: class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField< ::flyteidl::admin::Agent > agents_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; }; @@ -1519,6 +2220,8 @@ TaskExecutionMetadata::mutable_environment_variables() { // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + // CreateTaskRequest // .flyteidl.core.LiteralMap inputs = 1; @@ -1715,6 +2418,24 @@ inline void CreateTaskRequest::set_allocated_task_execution_metadata(::flyteidl: // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.CreateTaskRequest.task_execution_metadata) } +// map secret = 5; +inline int CreateTaskRequest::secret_size() const { + return secret_.size(); +} +inline void CreateTaskRequest::clear_secret() { + secret_.Clear(); +} +inline const ::google::protobuf::Map< ::std::string, ::std::string >& +CreateTaskRequest::secret() const { + // @@protoc_insertion_point(field_map:flyteidl.admin.CreateTaskRequest.secret) + return secret_.GetMap(); +} +inline ::google::protobuf::Map< ::std::string, ::std::string >* +CreateTaskRequest::mutable_secret() { + // @@protoc_insertion_point(field_mutable_map:flyteidl.admin.CreateTaskRequest.secret) + return secret_.MutableMap(); +} + // ------------------------------------------------------------------- // CreateTaskResponse @@ -1937,6 +2658,33 @@ inline void GetTaskResponse::set_allocated_resource(::flyteidl::admin::Resource* // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.GetTaskResponse.resource) } +// repeated .flyteidl.core.TaskLog logs = 2; +inline int GetTaskResponse::logs_size() const { + return logs_.size(); +} +inline ::flyteidl::core::TaskLog* GetTaskResponse::mutable_logs(int index) { + // @@protoc_insertion_point(field_mutable:flyteidl.admin.GetTaskResponse.logs) + return logs_.Mutable(index); +} +inline ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog >* +GetTaskResponse::mutable_logs() { + // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.GetTaskResponse.logs) + return &logs_; +} +inline const ::flyteidl::core::TaskLog& GetTaskResponse::logs(int index) const { + // @@protoc_insertion_point(field_get:flyteidl.admin.GetTaskResponse.logs) + return logs_.Get(index); +} +inline ::flyteidl::core::TaskLog* GetTaskResponse::add_logs() { + // @@protoc_insertion_point(field_add:flyteidl.admin.GetTaskResponse.logs) + return logs_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog >& +GetTaskResponse::logs() const { + // @@protoc_insertion_point(field_list:flyteidl.admin.GetTaskResponse.logs) + return logs_; +} + // ------------------------------------------------------------------- // Resource @@ -2167,6 +2915,349 @@ inline void DeleteTaskRequest::set_allocated_resource_meta(::std::string* resour // DeleteTaskResponse +// ------------------------------------------------------------------- + +// Agent + +// string name = 1; +inline void Agent::clear_name() { + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline const ::std::string& Agent::name() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.name) + return name_.GetNoArena(); +} +inline void Agent::set_name(const ::std::string& value) { + + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.name) +} +#if LANG_CXX11 +inline void Agent::set_name(::std::string&& value) { + + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:flyteidl.admin.Agent.name) +} +#endif +inline void Agent::set_name(const char* value) { + GOOGLE_DCHECK(value != nullptr); + + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.name) +} +inline void Agent::set_name(const char* value, size_t size) { + + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.name) +} +inline ::std::string* Agent::mutable_name() { + + // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.name) + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline ::std::string* Agent::release_name() { + // @@protoc_insertion_point(field_release:flyteidl.admin.Agent.name) + + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline void Agent::set_allocated_name(::std::string* name) { + if (name != nullptr) { + + } else { + + } + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.name) +} + +// repeated string secret_name = 2; +inline int Agent::secret_name_size() const { + return secret_name_.size(); +} +inline void Agent::clear_secret_name() { + secret_name_.Clear(); +} +inline const ::std::string& Agent::secret_name(int index) const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.secret_name) + return secret_name_.Get(index); +} +inline ::std::string* Agent::mutable_secret_name(int index) { + // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.secret_name) + return secret_name_.Mutable(index); +} +inline void Agent::set_secret_name(int index, const ::std::string& value) { + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.secret_name) + secret_name_.Mutable(index)->assign(value); +} +#if LANG_CXX11 +inline void Agent::set_secret_name(int index, ::std::string&& value) { + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.secret_name) + secret_name_.Mutable(index)->assign(std::move(value)); +} +#endif +inline void Agent::set_secret_name(int index, const char* value) { + GOOGLE_DCHECK(value != nullptr); + secret_name_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.secret_name) +} +inline void Agent::set_secret_name(int index, const char* value, size_t size) { + secret_name_.Mutable(index)->assign( + reinterpret_cast(value), size); + // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.secret_name) +} +inline ::std::string* Agent::add_secret_name() { + // @@protoc_insertion_point(field_add_mutable:flyteidl.admin.Agent.secret_name) + return secret_name_.Add(); +} +inline void Agent::add_secret_name(const ::std::string& value) { + secret_name_.Add()->assign(value); + // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.secret_name) +} +#if LANG_CXX11 +inline void Agent::add_secret_name(::std::string&& value) { + secret_name_.Add(std::move(value)); + // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.secret_name) +} +#endif +inline void Agent::add_secret_name(const char* value) { + GOOGLE_DCHECK(value != nullptr); + secret_name_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:flyteidl.admin.Agent.secret_name) +} +inline void Agent::add_secret_name(const char* value, size_t size) { + secret_name_.Add()->assign(reinterpret_cast(value), size); + // @@protoc_insertion_point(field_add_pointer:flyteidl.admin.Agent.secret_name) +} +inline const ::google::protobuf::RepeatedPtrField<::std::string>& +Agent::secret_name() const { + // @@protoc_insertion_point(field_list:flyteidl.admin.Agent.secret_name) + return secret_name_; +} +inline ::google::protobuf::RepeatedPtrField<::std::string>* +Agent::mutable_secret_name() { + // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.Agent.secret_name) + return &secret_name_; +} + +// string supported_task_type = 3; +inline void Agent::clear_supported_task_type() { + supported_task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline const ::std::string& Agent::supported_task_type() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.supported_task_type) + return supported_task_type_.GetNoArena(); +} +inline void Agent::set_supported_task_type(const ::std::string& value) { + + supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.supported_task_type) +} +#if LANG_CXX11 +inline void Agent::set_supported_task_type(::std::string&& value) { + + supported_task_type_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:flyteidl.admin.Agent.supported_task_type) +} +#endif +inline void Agent::set_supported_task_type(const char* value) { + GOOGLE_DCHECK(value != nullptr); + + supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.supported_task_type) +} +inline void Agent::set_supported_task_type(const char* value, size_t size) { + + supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.supported_task_type) +} +inline ::std::string* Agent::mutable_supported_task_type() { + + // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.supported_task_type) + return supported_task_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline ::std::string* Agent::release_supported_task_type() { + // @@protoc_insertion_point(field_release:flyteidl.admin.Agent.supported_task_type) + + return supported_task_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline void Agent::set_allocated_supported_task_type(::std::string* supported_task_type) { + if (supported_task_type != nullptr) { + + } else { + + } + supported_task_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), supported_task_type); + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.supported_task_type) +} + +// bool is_sync = 4; +inline void Agent::clear_is_sync() { + is_sync_ = false; +} +inline bool Agent::is_sync() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.is_sync) + return is_sync_; +} +inline void Agent::set_is_sync(bool value) { + + is_sync_ = value; + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.is_sync) +} + +// ------------------------------------------------------------------- + +// GetAgentRequest + +// string name = 1; +inline void GetAgentRequest::clear_name() { + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline const ::std::string& GetAgentRequest::name() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.GetAgentRequest.name) + return name_.GetNoArena(); +} +inline void GetAgentRequest::set_name(const ::std::string& value) { + + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:flyteidl.admin.GetAgentRequest.name) +} +#if LANG_CXX11 +inline void GetAgentRequest::set_name(::std::string&& value) { + + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:flyteidl.admin.GetAgentRequest.name) +} +#endif +inline void GetAgentRequest::set_name(const char* value) { + GOOGLE_DCHECK(value != nullptr); + + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:flyteidl.admin.GetAgentRequest.name) +} +inline void GetAgentRequest::set_name(const char* value, size_t size) { + + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.GetAgentRequest.name) +} +inline ::std::string* GetAgentRequest::mutable_name() { + + // @@protoc_insertion_point(field_mutable:flyteidl.admin.GetAgentRequest.name) + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline ::std::string* GetAgentRequest::release_name() { + // @@protoc_insertion_point(field_release:flyteidl.admin.GetAgentRequest.name) + + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +inline void GetAgentRequest::set_allocated_name(::std::string* name) { + if (name != nullptr) { + + } else { + + } + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.GetAgentRequest.name) +} + +// ------------------------------------------------------------------- + +// GetAgentResponse + +// .flyteidl.admin.Agent agent = 1; +inline bool GetAgentResponse::has_agent() const { + return this != internal_default_instance() && agent_ != nullptr; +} +inline void GetAgentResponse::clear_agent() { + if (GetArenaNoVirtual() == nullptr && agent_ != nullptr) { + delete agent_; + } + agent_ = nullptr; +} +inline const ::flyteidl::admin::Agent& GetAgentResponse::agent() const { + const ::flyteidl::admin::Agent* p = agent_; + // @@protoc_insertion_point(field_get:flyteidl.admin.GetAgentResponse.agent) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::admin::_Agent_default_instance_); +} +inline ::flyteidl::admin::Agent* GetAgentResponse::release_agent() { + // @@protoc_insertion_point(field_release:flyteidl.admin.GetAgentResponse.agent) + + ::flyteidl::admin::Agent* temp = agent_; + agent_ = nullptr; + return temp; +} +inline ::flyteidl::admin::Agent* GetAgentResponse::mutable_agent() { + + if (agent_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::admin::Agent>(GetArenaNoVirtual()); + agent_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.admin.GetAgentResponse.agent) + return agent_; +} +inline void GetAgentResponse::set_allocated_agent(::flyteidl::admin::Agent* agent) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete agent_; + } + if (agent) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + agent = ::google::protobuf::internal::GetOwnedMessage( + message_arena, agent, submessage_arena); + } + + } else { + + } + agent_ = agent; + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.GetAgentResponse.agent) +} + +// ------------------------------------------------------------------- + +// ListAgentsRequest + +// ------------------------------------------------------------------- + +// ListAgentsResponse + +// repeated .flyteidl.admin.Agent agents = 1; +inline int ListAgentsResponse::agents_size() const { + return agents_.size(); +} +inline void ListAgentsResponse::clear_agents() { + agents_.Clear(); +} +inline ::flyteidl::admin::Agent* ListAgentsResponse::mutable_agents(int index) { + // @@protoc_insertion_point(field_mutable:flyteidl.admin.ListAgentsResponse.agents) + return agents_.Mutable(index); +} +inline ::google::protobuf::RepeatedPtrField< ::flyteidl::admin::Agent >* +ListAgentsResponse::mutable_agents() { + // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.ListAgentsResponse.agents) + return &agents_; +} +inline const ::flyteidl::admin::Agent& ListAgentsResponse::agents(int index) const { + // @@protoc_insertion_point(field_get:flyteidl.admin.ListAgentsResponse.agents) + return agents_.Get(index); +} +inline ::flyteidl::admin::Agent* ListAgentsResponse::add_agents() { + // @@protoc_insertion_point(field_add:flyteidl.admin.ListAgentsResponse.agents) + return agents_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::flyteidl::admin::Agent >& +ListAgentsResponse::agents() const { + // @@protoc_insertion_point(field_list:flyteidl.admin.ListAgentsResponse.agents) + return agents_; +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ @@ -2190,6 +3281,18 @@ inline void DeleteTaskRequest::set_allocated_resource_meta(::std::string* resour // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.cc index d3505f4ce8..de150fe2b7 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.cc @@ -164,6 +164,109 @@ ::grpc::Status AsyncAgentService::Service::DeleteTask(::grpc::ServerContext* con } +static const char* AgentMetadataService_method_names[] = { + "/flyteidl.service.AgentMetadataService/GetAgent", + "/flyteidl.service.AgentMetadataService/ListAgent", +}; + +std::unique_ptr< AgentMetadataService::Stub> AgentMetadataService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) { + (void)options; + std::unique_ptr< AgentMetadataService::Stub> stub(new AgentMetadataService::Stub(channel)); + return stub; +} + +AgentMetadataService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel) + : channel_(channel), rpcmethod_GetAgent_(AgentMetadataService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ListAgent_(AgentMetadataService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + {} + +::grpc::Status AgentMetadataService::Stub::GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::flyteidl::admin::GetAgentResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_GetAgent_, context, request, response); +} + +void AgentMetadataService::Stub::experimental_async::GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_GetAgent_, context, request, response, std::move(f)); +} + +void AgentMetadataService::Stub::experimental_async::GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_GetAgent_, context, request, response, std::move(f)); +} + +void AgentMetadataService::Stub::experimental_async::GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_GetAgent_, context, request, response, reactor); +} + +void AgentMetadataService::Stub::experimental_async::GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_GetAgent_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>* AgentMetadataService::Stub::AsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::GetAgentResponse>::Create(channel_.get(), cq, rpcmethod_GetAgent_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>* AgentMetadataService::Stub::PrepareAsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::GetAgentResponse>::Create(channel_.get(), cq, rpcmethod_GetAgent_, context, request, false); +} + +::grpc::Status AgentMetadataService::Stub::ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_ListAgent_, context, request, response); +} + +void AgentMetadataService::Stub::experimental_async::ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ListAgent_, context, request, response, std::move(f)); +} + +void AgentMetadataService::Stub::experimental_async::ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ListAgent_, context, request, response, std::move(f)); +} + +void AgentMetadataService::Stub::experimental_async::ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ListAgent_, context, request, response, reactor); +} + +void AgentMetadataService::Stub::experimental_async::ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ListAgent_, context, request, response, reactor); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AgentMetadataService::Stub::AsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::ListAgentsResponse>::Create(channel_.get(), cq, rpcmethod_ListAgent_, context, request, true); +} + +::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AgentMetadataService::Stub::PrepareAsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::ListAgentsResponse>::Create(channel_.get(), cq, rpcmethod_ListAgent_, context, request, false); +} + +AgentMetadataService::Service::Service() { + AddMethod(new ::grpc::internal::RpcServiceMethod( + AgentMetadataService_method_names[0], + ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< AgentMetadataService::Service, ::flyteidl::admin::GetAgentRequest, ::flyteidl::admin::GetAgentResponse>( + std::mem_fn(&AgentMetadataService::Service::GetAgent), this))); + AddMethod(new ::grpc::internal::RpcServiceMethod( + AgentMetadataService_method_names[1], + ::grpc::internal::RpcMethod::NORMAL_RPC, + new ::grpc::internal::RpcMethodHandler< AgentMetadataService::Service, ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>( + std::mem_fn(&AgentMetadataService::Service::ListAgent), this))); +} + +AgentMetadataService::Service::~Service() { +} + +::grpc::Status AgentMetadataService::Service::GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + +::grpc::Status AgentMetadataService::Service::ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) { + (void) context; + (void) request; + (void) response; + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); +} + + } // namespace flyteidl } // namespace service diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.h index 16b36b249a..d70c8bb44f 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.h @@ -40,7 +40,7 @@ class ServerContext; namespace flyteidl { namespace service { -// AgentService defines an RPC Service that allows propeller to send the request to the agent server. +// AsyncAgentService defines an RPC Service that allows propeller to send the request to the agent server. class AsyncAgentService final { public: static constexpr char const* service_full_name() { @@ -580,6 +580,383 @@ class AsyncAgentService final { typedef WithStreamedUnaryMethod_CreateTask > > StreamedService; }; +// AgentMetadataService defines an RPC service that is also served over HTTP via grpc-gateway. +// This service allows propeller or users to get the metadata of agents. +class AgentMetadataService final { + public: + static constexpr char const* service_full_name() { + return "flyteidl.service.AgentMetadataService"; + } + class StubInterface { + public: + virtual ~StubInterface() {} + // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. + virtual ::grpc::Status GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::flyteidl::admin::GetAgentResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>> AsyncGetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>>(AsyncGetAgentRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>> PrepareAsyncGetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>>(PrepareAsyncGetAgentRaw(context, request, cq)); + } + // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. + virtual ::grpc::Status ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>> AsyncListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>>(AsyncListAgentRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>> PrepareAsyncListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>>(PrepareAsyncListAgentRaw(context, request, cq)); + } + class experimental_async_interface { + public: + virtual ~experimental_async_interface() {} + // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. + virtual void GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, std::function) = 0; + virtual void GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, std::function) = 0; + virtual void GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. + virtual void ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) = 0; + virtual void ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) = 0; + virtual void ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + }; + virtual class experimental_async_interface* experimental_async() { return nullptr; } + private: + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>* AsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>* PrepareAsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>* AsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>* PrepareAsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) = 0; + }; + class Stub final : public StubInterface { + public: + Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel); + ::grpc::Status GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::flyteidl::admin::GetAgentResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>> AsyncGetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>>(AsyncGetAgentRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>> PrepareAsyncGetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>>(PrepareAsyncGetAgentRaw(context, request, cq)); + } + ::grpc::Status ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>> AsyncListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>>(AsyncListAgentRaw(context, request, cq)); + } + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>> PrepareAsyncListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>>(PrepareAsyncListAgentRaw(context, request, cq)); + } + class experimental_async final : + public StubInterface::experimental_async_interface { + public: + void GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, std::function) override; + void GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, std::function) override; + void GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) override; + void ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) override; + void ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + private: + friend class Stub; + explicit experimental_async(Stub* stub): stub_(stub) { } + Stub* stub() { return stub_; } + Stub* stub_; + }; + class experimental_async_interface* experimental_async() override { return &async_stub_; } + + private: + std::shared_ptr< ::grpc::ChannelInterface> channel_; + class experimental_async async_stub_{this}; + ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>* AsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>* PrepareAsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* PrepareAsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) override; + const ::grpc::internal::RpcMethod rpcmethod_GetAgent_; + const ::grpc::internal::RpcMethod rpcmethod_ListAgent_; + }; + static std::unique_ptr NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions()); + + class Service : public ::grpc::Service { + public: + Service(); + virtual ~Service(); + // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. + virtual ::grpc::Status GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response); + // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. + virtual ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response); + }; + template + class WithAsyncMethod_GetAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_GetAgent() { + ::grpc::Service::MarkMethodAsync(0); + } + ~WithAsyncMethod_GetAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestGetAgent(::grpc::ServerContext* context, ::flyteidl::admin::GetAgentRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::GetAgentResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class WithAsyncMethod_ListAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithAsyncMethod_ListAgent() { + ::grpc::Service::MarkMethodAsync(1); + } + ~WithAsyncMethod_ListAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestListAgent(::grpc::ServerContext* context, ::flyteidl::admin::ListAgentsRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ListAgentsResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); + } + }; + typedef WithAsyncMethod_GetAgent > AsyncService; + template + class ExperimentalWithCallbackMethod_GetAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_GetAgent() { + ::grpc::Service::experimental().MarkMethodCallback(0, + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::GetAgentRequest, ::flyteidl::admin::GetAgentResponse>( + [this](::grpc::ServerContext* context, + const ::flyteidl::admin::GetAgentRequest* request, + ::flyteidl::admin::GetAgentResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->GetAgent(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_GetAgent( + ::grpc::experimental::MessageAllocator< ::flyteidl::admin::GetAgentRequest, ::flyteidl::admin::GetAgentResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::GetAgentRequest, ::flyteidl::admin::GetAgentResponse>*>( + ::grpc::Service::experimental().GetHandler(0)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_GetAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_ListAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_ListAgent() { + ::grpc::Service::experimental().MarkMethodCallback(1, + new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>( + [this](::grpc::ServerContext* context, + const ::flyteidl::admin::ListAgentsRequest* request, + ::flyteidl::admin::ListAgentsResponse* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->ListAgent(context, request, response, controller); + })); + } + void SetMessageAllocatorFor_ListAgent( + ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>* allocator) { + static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>*>( + ::grpc::Service::experimental().GetHandler(1)) + ->SetMessageAllocator(allocator); + } + ~ExperimentalWithCallbackMethod_ListAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + typedef ExperimentalWithCallbackMethod_GetAgent > ExperimentalCallbackService; + template + class WithGenericMethod_GetAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_GetAgent() { + ::grpc::Service::MarkMethodGeneric(0); + } + ~WithGenericMethod_GetAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template + class WithGenericMethod_ListAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithGenericMethod_ListAgent() { + ::grpc::Service::MarkMethodGeneric(1); + } + ~WithGenericMethod_ListAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + }; + template + class WithRawMethod_GetAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_GetAgent() { + ::grpc::Service::MarkMethodRaw(0); + } + ~WithRawMethod_GetAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestGetAgent(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class WithRawMethod_ListAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithRawMethod_ListAgent() { + ::grpc::Service::MarkMethodRaw(1); + } + ~WithRawMethod_ListAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + void RequestListAgent(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); + } + }; + template + class ExperimentalWithRawCallbackMethod_GetAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_GetAgent() { + ::grpc::Service::experimental().MarkMethodRawCallback(0, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->GetAgent(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_GetAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void GetAgent(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithRawCallbackMethod_ListAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_ListAgent() { + ::grpc::Service::experimental().MarkMethodRawCallback(1, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->ListAgent(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_ListAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void ListAgent(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class WithStreamedUnaryMethod_GetAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_GetAgent() { + ::grpc::Service::MarkMethodStreamed(0, + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::GetAgentRequest, ::flyteidl::admin::GetAgentResponse>(std::bind(&WithStreamedUnaryMethod_GetAgent::StreamedGetAgent, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_GetAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedGetAgent(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::GetAgentRequest,::flyteidl::admin::GetAgentResponse>* server_unary_streamer) = 0; + }; + template + class WithStreamedUnaryMethod_ListAgent : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + WithStreamedUnaryMethod_ListAgent() { + ::grpc::Service::MarkMethodStreamed(1, + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>(std::bind(&WithStreamedUnaryMethod_ListAgent::StreamedListAgent, this, std::placeholders::_1, std::placeholders::_2))); + } + ~WithStreamedUnaryMethod_ListAgent() override { + BaseClassMustBeDerivedFromService(this); + } + // disable regular version of this method + ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + // replace default version of method with streamed unary + virtual ::grpc::Status StreamedListAgent(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::ListAgentsRequest,::flyteidl::admin::ListAgentsResponse>* server_unary_streamer) = 0; + }; + typedef WithStreamedUnaryMethod_GetAgent > StreamedUnaryService; + typedef Service SplitStreamedService; + typedef WithStreamedUnaryMethod_GetAgent > StreamedService; +}; + } // namespace service } // namespace flyteidl diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.cc index 4963d13cc8..cee8c63e19 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.cc @@ -38,29 +38,37 @@ ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_fl const char descriptor_table_protodef_flyteidl_2fservice_2fagent_2eproto[] = "\n\034flyteidl/service/agent.proto\022\020flyteidl" - ".service\032\032flyteidl/admin/agent.proto2\217\002\n" - "\021AsyncAgentService\022U\n\nCreateTask\022!.flyte" - "idl.admin.CreateTaskRequest\032\".flyteidl.a" - "dmin.CreateTaskResponse\"\000\022L\n\007GetTask\022\036.f" - "lyteidl.admin.GetTaskRequest\032\037.flyteidl." - "admin.GetTaskResponse\"\000\022U\n\nDeleteTask\022!." - "flyteidl.admin.DeleteTaskRequest\032\".flyte" - "idl.admin.DeleteTaskResponse\"\000B\?Z=github" - ".com/flyteorg/flyte/flyteidl/gen/pb-go/f" - "lyteidl/serviceb\006proto3" + ".service\032\034google/api/annotations.proto\032\032" + "flyteidl/admin/agent.proto2\217\002\n\021AsyncAgen" + "tService\022U\n\nCreateTask\022!.flyteidl.admin." + "CreateTaskRequest\032\".flyteidl.admin.Creat" + "eTaskResponse\"\000\022L\n\007GetTask\022\036.flyteidl.ad" + "min.GetTaskRequest\032\037.flyteidl.admin.GetT" + "askResponse\"\000\022U\n\nDeleteTask\022!.flyteidl.a" + "dmin.DeleteTaskRequest\032\".flyteidl.admin." + "DeleteTaskResponse\"\0002\360\001\n\024AgentMetadataSe" + "rvice\022l\n\010GetAgent\022\037.flyteidl.admin.GetAg" + "entRequest\032 .flyteidl.admin.GetAgentResp" + "onse\"\035\202\323\344\223\002\027\022\025/api/v1/agents/{name}\022j\n\tL" + "istAgent\022!.flyteidl.admin.ListAgentsRequ" + "est\032\".flyteidl.admin.ListAgentsResponse\"" + "\026\202\323\344\223\002\020\022\016/api/v1/agentsB\?Z=github.com/fl" + "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" + "/serviceb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fservice_2fagent_2eproto = { false, InitDefaults_flyteidl_2fservice_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fservice_2fagent_2eproto, - "flyteidl/service/agent.proto", &assign_descriptors_table_flyteidl_2fservice_2fagent_2eproto, 423, + "flyteidl/service/agent.proto", &assign_descriptors_table_flyteidl_2fservice_2fagent_2eproto, 696, }; void AddDescriptors_flyteidl_2fservice_2fagent_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[1] = + static constexpr ::google::protobuf::internal::InitFunc deps[2] = { + ::AddDescriptors_google_2fapi_2fannotations_2eproto, ::AddDescriptors_flyteidl_2fadmin_2fagent_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fservice_2fagent_2eproto, deps, 1); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fservice_2fagent_2eproto, deps, 2); } // Force running AddDescriptors() at dynamic initialization time. diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.h index 367d5b767e..2b91672863 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.h @@ -29,6 +29,7 @@ #include #include // IWYU pragma: export #include // IWYU pragma: export +#include "google/api/annotations.pb.h" #include "flyteidl/admin/agent.pb.h" // @@protoc_insertion_point(includes) #include diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 7511d46559..5b04ed9cb5 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -154,9 +154,13 @@ type CreateTaskRequest struct { OutputPrefix string `protobuf:"bytes,3,opt,name=output_prefix,json=outputPrefix,proto3" json:"output_prefix,omitempty"` // subset of runtime task execution metadata. TaskExecutionMetadata *TaskExecutionMetadata `protobuf:"bytes,4,opt,name=task_execution_metadata,json=taskExecutionMetadata,proto3" json:"task_execution_metadata,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // Secret to be passed to the agent. + // Key is the name of the secret in secret manager. + // Value is the actual secret value. + Secret map[string]string `protobuf:"bytes,5,rep,name=secret,proto3" json:"secret,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateTaskRequest) Reset() { *m = CreateTaskRequest{} } @@ -212,6 +216,13 @@ func (m *CreateTaskRequest) GetTaskExecutionMetadata() *TaskExecutionMetadata { return nil } +func (m *CreateTaskRequest) GetSecret() map[string]string { + if m != nil { + return m.Secret + } + return nil +} + // Represents a create response structure. type CreateTaskResponse struct { // Metadata is created by the agent. It could be a string (jobId) or a dict (more complex metadata). @@ -305,10 +316,12 @@ func (m *GetTaskRequest) GetResourceMeta() []byte { // Response to get an individual task resource. type GetTaskResponse struct { - Resource *Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Resource *Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` + // log information for the task execution + Logs []*core.TaskLog `protobuf:"bytes,2,rep,name=logs,proto3" json:"logs,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetTaskResponse) Reset() { *m = GetTaskResponse{} } @@ -343,6 +356,13 @@ func (m *GetTaskResponse) GetResource() *Resource { return nil } +func (m *GetTaskResponse) GetLogs() []*core.TaskLog { + if m != nil { + return m.Logs + } + return nil +} + type Resource struct { // The state of the execution is used to control its visibility in the UI/CLI. State State `protobuf:"varint,1,opt,name=state,proto3,enum=flyteidl.admin.State" json:"state,omitempty"` @@ -485,6 +505,227 @@ func (m *DeleteTaskResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteTaskResponse proto.InternalMessageInfo +// A message containing the agent metadata. +type Agent struct { + // The name of the agent. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // A list of secret in the secret manager. + SecretName []string `protobuf:"bytes,2,rep,name=secret_name,json=secretName,proto3" json:"secret_name,omitempty"` + // The type of the task that the agent can handle. + SupportedTaskType string `protobuf:"bytes,3,opt,name=supported_task_type,json=supportedTaskType,proto3" json:"supported_task_type,omitempty"` + // Indicates if this agent is a sync agent. + IsSync bool `protobuf:"varint,4,opt,name=is_sync,json=isSync,proto3" json:"is_sync,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Agent) Reset() { *m = Agent{} } +func (m *Agent) String() string { return proto.CompactTextString(m) } +func (*Agent) ProtoMessage() {} +func (*Agent) Descriptor() ([]byte, []int) { + return fileDescriptor_c434e52bb0028071, []int{8} +} + +func (m *Agent) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Agent.Unmarshal(m, b) +} +func (m *Agent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Agent.Marshal(b, m, deterministic) +} +func (m *Agent) XXX_Merge(src proto.Message) { + xxx_messageInfo_Agent.Merge(m, src) +} +func (m *Agent) XXX_Size() int { + return xxx_messageInfo_Agent.Size(m) +} +func (m *Agent) XXX_DiscardUnknown() { + xxx_messageInfo_Agent.DiscardUnknown(m) +} + +var xxx_messageInfo_Agent proto.InternalMessageInfo + +func (m *Agent) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Agent) GetSecretName() []string { + if m != nil { + return m.SecretName + } + return nil +} + +func (m *Agent) GetSupportedTaskType() string { + if m != nil { + return m.SupportedTaskType + } + return "" +} + +func (m *Agent) GetIsSync() bool { + if m != nil { + return m.IsSync + } + return false +} + +// A request to get an agent. +type GetAgentRequest struct { + // The name of the agent. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetAgentRequest) Reset() { *m = GetAgentRequest{} } +func (m *GetAgentRequest) String() string { return proto.CompactTextString(m) } +func (*GetAgentRequest) ProtoMessage() {} +func (*GetAgentRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_c434e52bb0028071, []int{9} +} + +func (m *GetAgentRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetAgentRequest.Unmarshal(m, b) +} +func (m *GetAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetAgentRequest.Marshal(b, m, deterministic) +} +func (m *GetAgentRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetAgentRequest.Merge(m, src) +} +func (m *GetAgentRequest) XXX_Size() int { + return xxx_messageInfo_GetAgentRequest.Size(m) +} +func (m *GetAgentRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetAgentRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetAgentRequest proto.InternalMessageInfo + +func (m *GetAgentRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +// A response containing an agent. +type GetAgentResponse struct { + Agent *Agent `protobuf:"bytes,1,opt,name=agent,proto3" json:"agent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetAgentResponse) Reset() { *m = GetAgentResponse{} } +func (m *GetAgentResponse) String() string { return proto.CompactTextString(m) } +func (*GetAgentResponse) ProtoMessage() {} +func (*GetAgentResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_c434e52bb0028071, []int{10} +} + +func (m *GetAgentResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetAgentResponse.Unmarshal(m, b) +} +func (m *GetAgentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetAgentResponse.Marshal(b, m, deterministic) +} +func (m *GetAgentResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetAgentResponse.Merge(m, src) +} +func (m *GetAgentResponse) XXX_Size() int { + return xxx_messageInfo_GetAgentResponse.Size(m) +} +func (m *GetAgentResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetAgentResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetAgentResponse proto.InternalMessageInfo + +func (m *GetAgentResponse) GetAgent() *Agent { + if m != nil { + return m.Agent + } + return nil +} + +// A request to list all agents. +type ListAgentsRequest struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ListAgentsRequest) Reset() { *m = ListAgentsRequest{} } +func (m *ListAgentsRequest) String() string { return proto.CompactTextString(m) } +func (*ListAgentsRequest) ProtoMessage() {} +func (*ListAgentsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_c434e52bb0028071, []int{11} +} + +func (m *ListAgentsRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ListAgentsRequest.Unmarshal(m, b) +} +func (m *ListAgentsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ListAgentsRequest.Marshal(b, m, deterministic) +} +func (m *ListAgentsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListAgentsRequest.Merge(m, src) +} +func (m *ListAgentsRequest) XXX_Size() int { + return xxx_messageInfo_ListAgentsRequest.Size(m) +} +func (m *ListAgentsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ListAgentsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ListAgentsRequest proto.InternalMessageInfo + +// A response containing a list of agents. +type ListAgentsResponse struct { + Agents []*Agent `protobuf:"bytes,1,rep,name=agents,proto3" json:"agents,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ListAgentsResponse) Reset() { *m = ListAgentsResponse{} } +func (m *ListAgentsResponse) String() string { return proto.CompactTextString(m) } +func (*ListAgentsResponse) ProtoMessage() {} +func (*ListAgentsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_c434e52bb0028071, []int{12} +} + +func (m *ListAgentsResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ListAgentsResponse.Unmarshal(m, b) +} +func (m *ListAgentsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ListAgentsResponse.Marshal(b, m, deterministic) +} +func (m *ListAgentsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListAgentsResponse.Merge(m, src) +} +func (m *ListAgentsResponse) XXX_Size() int { + return xxx_messageInfo_ListAgentsResponse.Size(m) +} +func (m *ListAgentsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ListAgentsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ListAgentsResponse proto.InternalMessageInfo + +func (m *ListAgentsResponse) GetAgents() []*Agent { + if m != nil { + return m.Agents + } + return nil +} + func init() { proto.RegisterEnum("flyteidl.admin.State", State_name, State_value) proto.RegisterType((*TaskExecutionMetadata)(nil), "flyteidl.admin.TaskExecutionMetadata") @@ -492,63 +733,80 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntry") proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.TaskExecutionMetadata.LabelsEntry") proto.RegisterType((*CreateTaskRequest)(nil), "flyteidl.admin.CreateTaskRequest") + proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.CreateTaskRequest.SecretEntry") proto.RegisterType((*CreateTaskResponse)(nil), "flyteidl.admin.CreateTaskResponse") proto.RegisterType((*GetTaskRequest)(nil), "flyteidl.admin.GetTaskRequest") proto.RegisterType((*GetTaskResponse)(nil), "flyteidl.admin.GetTaskResponse") proto.RegisterType((*Resource)(nil), "flyteidl.admin.Resource") proto.RegisterType((*DeleteTaskRequest)(nil), "flyteidl.admin.DeleteTaskRequest") proto.RegisterType((*DeleteTaskResponse)(nil), "flyteidl.admin.DeleteTaskResponse") + proto.RegisterType((*Agent)(nil), "flyteidl.admin.Agent") + proto.RegisterType((*GetAgentRequest)(nil), "flyteidl.admin.GetAgentRequest") + proto.RegisterType((*GetAgentResponse)(nil), "flyteidl.admin.GetAgentResponse") + proto.RegisterType((*ListAgentsRequest)(nil), "flyteidl.admin.ListAgentsRequest") + proto.RegisterType((*ListAgentsResponse)(nil), "flyteidl.admin.ListAgentsResponse") } func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 740 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x7f, 0x6b, 0x2a, 0x47, - 0x14, 0xad, 0x1a, 0x8d, 0x5e, 0xf3, 0x43, 0xa7, 0x91, 0x6e, 0x4c, 0x5a, 0x82, 0xa5, 0x25, 0xb4, - 0x74, 0x25, 0xa6, 0xb4, 0x49, 0x4b, 0x5b, 0x4c, 0xdc, 0x8a, 0x60, 0x24, 0x4c, 0xb4, 0xb4, 0x85, - 0x56, 0xc6, 0xf5, 0xea, 0x5b, 0x5c, 0x67, 0xf7, 0xed, 0xcc, 0x4a, 0xfc, 0xfb, 0xc1, 0xfb, 0x0c, - 0xef, 0xe3, 0x3e, 0x76, 0xf6, 0x47, 0x54, 0x7c, 0x8f, 0x84, 0xf7, 0xdf, 0xce, 0x3d, 0xf7, 0x9e, - 0x39, 0x73, 0xce, 0x2c, 0x03, 0xd5, 0x89, 0xbd, 0x94, 0x68, 0x8d, 0xed, 0x3a, 0x1b, 0xcf, 0x2d, - 0x5e, 0x67, 0x53, 0xe4, 0x52, 0x77, 0x3d, 0x47, 0x3a, 0xe4, 0x20, 0xc6, 0x74, 0x85, 0x55, 0x4f, - 0x93, 0x5e, 0xd3, 0xf1, 0xb0, 0x6e, 0x5b, 0x12, 0x3d, 0x66, 0x8b, 0xb0, 0xbb, 0x7a, 0xbc, 0x8e, - 0x4a, 0x26, 0x66, 0x31, 0xf4, 0xe5, 0x3a, 0x64, 0x71, 0x89, 0xde, 0x84, 0x99, 0x18, 0xc1, 0x5f, - 0x6d, 0xc0, 0x63, 0xe4, 0xd2, 0x9a, 0x58, 0xe8, 0x85, 0x78, 0xed, 0x5d, 0x16, 0x2a, 0x7d, 0x26, - 0x66, 0xc6, 0x23, 0x9a, 0xbe, 0xb4, 0x1c, 0x7e, 0x87, 0x92, 0x8d, 0x99, 0x64, 0x84, 0x42, 0x39, - 0xd8, 0x67, 0x88, 0x31, 0x32, 0xb4, 0xc6, 0x5a, 0xea, 0x2c, 0x75, 0x5e, 0x6c, 0x7c, 0xab, 0x27, - 0xea, 0x03, 0x56, 0x7d, 0x8d, 0xa0, 0x93, 0x6c, 0x41, 0x0f, 0xe5, 0x3a, 0x40, 0x4e, 0xa1, 0xc0, - 0xd9, 0x1c, 0x85, 0xcb, 0x4c, 0xd4, 0xd2, 0x67, 0xa9, 0xf3, 0x02, 0x7d, 0x2a, 0x90, 0x0e, 0xe4, - 0x6c, 0x36, 0x42, 0x5b, 0x68, 0x99, 0xb3, 0xcc, 0x79, 0xb1, 0x71, 0xa1, 0xaf, 0x9b, 0xa4, 0x6f, - 0x15, 0xaa, 0x77, 0xd5, 0x8c, 0xc1, 0xa5, 0xb7, 0xa4, 0x11, 0x01, 0xf9, 0x1b, 0x8a, 0x8c, 0x73, - 0x47, 0xb2, 0xa0, 0x53, 0x68, 0x3b, 0x8a, 0xef, 0xa7, 0xe7, 0xf1, 0x35, 0x9f, 0x06, 0x43, 0xd2, - 0x55, 0x2a, 0xa2, 0xc3, 0xe7, 0xb3, 0x2b, 0x31, 0x14, 0xe8, 0x2d, 0x2c, 0x13, 0x87, 0xcc, 0x34, - 0x1d, 0x9f, 0x4b, 0x2d, 0xab, 0x0e, 0x53, 0x9e, 0x5d, 0x89, 0x87, 0x10, 0x69, 0x86, 0x00, 0x91, - 0x50, 0x41, 0xbe, 0xb0, 0x3c, 0x87, 0xcf, 0x91, 0xcb, 0xe1, 0x82, 0x79, 0x16, 0x1b, 0xd9, 0x28, - 0xb4, 0x9c, 0xd2, 0xf4, 0xc7, 0xf3, 0x34, 0x19, 0x4f, 0x14, 0x7f, 0xc5, 0x0c, 0xa1, 0xb8, 0x23, - 0xdc, 0x02, 0x55, 0xaf, 0xa1, 0xb8, 0x62, 0x0b, 0x29, 0x41, 0x66, 0x86, 0x4b, 0x95, 0x5e, 0x81, - 0x06, 0x9f, 0xe4, 0x08, 0xb2, 0x0b, 0x66, 0xfb, 0x71, 0x0a, 0xe1, 0xe2, 0x97, 0xf4, 0x55, 0xaa, - 0xfa, 0x3b, 0x94, 0x36, 0x1d, 0x78, 0xd1, 0x7c, 0x1b, 0x8e, 0x3f, 0xa8, 0xf6, 0x25, 0x44, 0xb5, - 0x37, 0x69, 0x28, 0xdf, 0x7a, 0xc8, 0x24, 0x06, 0x9e, 0x50, 0x7c, 0xed, 0xa3, 0x90, 0xe4, 0x02, - 0x72, 0x16, 0x77, 0x7d, 0x29, 0xa2, 0xbb, 0x78, 0xbc, 0x71, 0x17, 0xbb, 0xe1, 0x9f, 0x73, 0xc7, - 0x5c, 0x1a, 0x35, 0x92, 0x9f, 0x21, 0x2f, 0x71, 0xee, 0xda, 0x4c, 0x86, 0xbb, 0x14, 0x1b, 0x27, - 0x5b, 0x2e, 0x70, 0x3f, 0x6a, 0xa1, 0x49, 0x33, 0xf9, 0x1a, 0xf6, 0x1d, 0x5f, 0xba, 0xbe, 0x1c, - 0xba, 0x1e, 0x4e, 0xac, 0x47, 0x2d, 0xa3, 0x34, 0xee, 0x85, 0xc5, 0x7b, 0x55, 0x23, 0xff, 0xc1, - 0x17, 0x1b, 0xff, 0xc9, 0x3c, 0x4a, 0x4d, 0xdb, 0x51, 0x9b, 0x7d, 0xf3, 0xac, 0x88, 0x69, 0x45, - 0x6e, 0x2b, 0xd7, 0xae, 0x81, 0xac, 0x9a, 0x20, 0x5c, 0x87, 0x0b, 0xa5, 0xcc, 0x43, 0xe1, 0xf8, - 0x9e, 0x89, 0x6a, 0x3b, 0x65, 0xc6, 0x1e, 0xdd, 0x8b, 0x8b, 0xc1, 0x78, 0x8d, 0xc2, 0x41, 0x1b, - 0xe5, 0xaa, 0x79, 0x27, 0x50, 0x50, 0x5a, 0xe5, 0xd2, 0xc5, 0x28, 0x84, 0x7c, 0x50, 0xe8, 0x2f, - 0xdd, 0x2d, 0x9c, 0xe9, 0x2d, 0x9c, 0x6d, 0x38, 0x4c, 0x38, 0x23, 0x2d, 0x3f, 0x42, 0x3e, 0x6e, - 0x89, 0x32, 0xd1, 0x36, 0x4f, 0x4c, 0x23, 0x9c, 0x26, 0x9d, 0xb5, 0xb7, 0x29, 0xc8, 0xc7, 0x65, - 0xf2, 0x3d, 0x64, 0x85, 0x0c, 0xe2, 0x09, 0xe6, 0x0f, 0x1a, 0x95, 0xcd, 0xf9, 0x87, 0x00, 0xa4, - 0x61, 0x0f, 0xb9, 0x84, 0xdd, 0x30, 0x00, 0x11, 0xa5, 0xf9, 0x91, 0x2b, 0x10, 0x77, 0x12, 0x0d, - 0x76, 0xe7, 0x28, 0x04, 0x9b, 0x62, 0x14, 0x62, 0xbc, 0xac, 0x0d, 0xa0, 0xdc, 0x42, 0x1b, 0xd7, - 0x6f, 0xd9, 0xa7, 0x1b, 0x75, 0x04, 0x64, 0x95, 0x36, 0xf4, 0xea, 0xbb, 0xff, 0x21, 0xab, 0xce, - 0x42, 0x2a, 0x50, 0xa6, 0x46, 0x9f, 0xfe, 0xd3, 0xbc, 0xe9, 0x1a, 0xc3, 0x3f, 0x9b, 0x9d, 0xee, - 0x80, 0x1a, 0xa5, 0xcf, 0x82, 0xf2, 0xbd, 0x41, 0xef, 0x9a, 0x3d, 0xa3, 0xd7, 0x4f, 0xca, 0x29, - 0x52, 0x84, 0xdd, 0x7b, 0xa3, 0xd7, 0xea, 0xf4, 0xda, 0xa5, 0x74, 0xb0, 0xa0, 0x83, 0x5e, 0x2f, - 0x58, 0x64, 0xc8, 0x3e, 0x14, 0x1e, 0x06, 0xb7, 0xb7, 0x86, 0xd1, 0x32, 0x5a, 0xa5, 0x9d, 0x9b, - 0xdf, 0xfe, 0xfd, 0x75, 0x6a, 0xc9, 0x57, 0xfe, 0x48, 0x37, 0x9d, 0x79, 0x5d, 0xd9, 0xe2, 0x78, - 0xd3, 0xf0, 0xa3, 0x9e, 0x3c, 0x05, 0x53, 0xe4, 0x75, 0x77, 0xf4, 0xc3, 0xd4, 0xa9, 0xaf, 0xbf, - 0x50, 0xa3, 0x9c, 0x7a, 0x14, 0x2e, 0xdf, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x0a, 0x0e, 0xc8, - 0xba, 0x06, 0x00, 0x00, + // 922 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x7f, 0x6f, 0xdb, 0x36, + 0x10, 0x9d, 0xe3, 0x1f, 0xb1, 0xcf, 0x6d, 0x6a, 0x33, 0xf1, 0xaa, 0xb8, 0xdd, 0x16, 0x68, 0xe8, + 0x10, 0xb4, 0x88, 0x8c, 0xa6, 0xc3, 0x96, 0x6e, 0xd8, 0x0a, 0x37, 0xd1, 0x82, 0x00, 0x8e, 0x11, + 0xd0, 0xce, 0xb0, 0x0d, 0xd8, 0x04, 0x5a, 0xbe, 0x78, 0x82, 0x65, 0x49, 0x13, 0xa9, 0xa0, 0xfe, + 0x00, 0xdd, 0x67, 0xd8, 0xc7, 0x1d, 0x48, 0x4a, 0xf2, 0x8f, 0xba, 0x43, 0x82, 0xfd, 0x27, 0xde, + 0x7b, 0x7c, 0x77, 0xbc, 0x7b, 0x94, 0x04, 0xed, 0x1b, 0x7f, 0x2e, 0xd0, 0x1b, 0xfb, 0x1d, 0x36, + 0x9e, 0x79, 0x41, 0x87, 0x4d, 0x30, 0x10, 0x56, 0x14, 0x87, 0x22, 0x24, 0x3b, 0x19, 0x66, 0x29, + 0xac, 0xfd, 0x34, 0xe7, 0xba, 0x61, 0x8c, 0x1d, 0xdf, 0x13, 0x18, 0x33, 0x9f, 0x6b, 0x76, 0x7b, + 0x7f, 0x15, 0x15, 0x8c, 0x4f, 0x33, 0xe8, 0xb3, 0x55, 0xc8, 0x0b, 0x04, 0xc6, 0x37, 0xcc, 0xc5, + 0x14, 0xfe, 0x7c, 0x0d, 0x1e, 0x63, 0x20, 0xbc, 0x1b, 0x0f, 0xe3, 0xcd, 0xdb, 0xf1, 0x1d, 0xba, + 0x89, 0xf0, 0xc2, 0x40, 0xc3, 0xe6, 0x3f, 0x65, 0x68, 0x0d, 0x19, 0x9f, 0xda, 0x59, 0xfc, 0x12, + 0x05, 0x1b, 0x33, 0xc1, 0x08, 0x85, 0xa6, 0x2c, 0xc3, 0xc9, 0x77, 0x38, 0xde, 0xd8, 0x28, 0x1c, + 0x14, 0x0e, 0xeb, 0xc7, 0x5f, 0x59, 0xf9, 0xe1, 0xa4, 0xa8, 0xb5, 0x22, 0x70, 0x91, 0x57, 0x40, + 0x1f, 0x89, 0x55, 0x80, 0x3c, 0x85, 0x5a, 0xc0, 0x66, 0xc8, 0x23, 0xe6, 0xa2, 0xb1, 0x75, 0x50, + 0x38, 0xac, 0xd1, 0x45, 0x80, 0x5c, 0x40, 0xc5, 0x67, 0x23, 0xf4, 0xb9, 0x51, 0x3c, 0x28, 0x1e, + 0xd6, 0x8f, 0x5f, 0x5a, 0xab, 0x3d, 0xb4, 0x36, 0x16, 0x6a, 0xf5, 0xd4, 0x1e, 0x3b, 0x10, 0xf1, + 0x9c, 0xa6, 0x02, 0xe4, 0x17, 0xa8, 0xb3, 0x20, 0x08, 0x05, 0x93, 0x4c, 0x6e, 0x94, 0x94, 0xde, + 0x37, 0x77, 0xd3, 0xeb, 0x2e, 0x36, 0x6a, 0xd1, 0x65, 0x29, 0x62, 0xc1, 0xee, 0xf4, 0x84, 0x3b, + 0x1c, 0xe3, 0x5b, 0xcf, 0x45, 0x87, 0xb9, 0x6e, 0x98, 0x04, 0xc2, 0x28, 0xab, 0xc3, 0x34, 0xa7, + 0x27, 0x7c, 0xa0, 0x91, 0xae, 0x06, 0x88, 0x80, 0x16, 0x06, 0xb7, 0x5e, 0x1c, 0x06, 0x33, 0x0c, + 0x84, 0x73, 0xcb, 0x62, 0x8f, 0x8d, 0x7c, 0xe4, 0x46, 0x45, 0xd5, 0xf4, 0xe6, 0x6e, 0x35, 0xd9, + 0x0b, 0x89, 0x9f, 0x33, 0x05, 0x5d, 0xdc, 0x1e, 0x6e, 0x80, 0xda, 0xaf, 0xa1, 0xbe, 0xd4, 0x16, + 0xd2, 0x80, 0xe2, 0x14, 0xe7, 0x6a, 0x7a, 0x35, 0x2a, 0x1f, 0xc9, 0x1e, 0x94, 0x6f, 0x99, 0x9f, + 0x64, 0x53, 0xd0, 0x8b, 0xef, 0xb6, 0x4e, 0x0a, 0xed, 0x1f, 0xa1, 0xb1, 0xde, 0x81, 0x7b, 0xed, + 0x3f, 0x87, 0xfd, 0x8f, 0x56, 0x7b, 0x1f, 0x21, 0xf3, 0x7d, 0x11, 0x9a, 0xa7, 0x31, 0x32, 0x81, + 0xb2, 0x27, 0x14, 0xff, 0x4a, 0x90, 0x0b, 0xf2, 0x12, 0x2a, 0x5e, 0x10, 0x25, 0x82, 0xa7, 0x5e, + 0xdc, 0x5f, 0xf3, 0x62, 0x4f, 0x5f, 0xac, 0x4b, 0x16, 0xd1, 0x94, 0x48, 0xbe, 0x85, 0xaa, 0xc0, + 0x59, 0xe4, 0x33, 0xa1, 0xb3, 0xd4, 0x8f, 0x9f, 0x6c, 0x30, 0xf0, 0x30, 0xa5, 0xd0, 0x9c, 0x4c, + 0xbe, 0x84, 0x87, 0x61, 0x22, 0xa2, 0x44, 0x38, 0x51, 0x8c, 0x37, 0xde, 0x3b, 0xa3, 0xa8, 0x6a, + 0x7c, 0xa0, 0x83, 0x57, 0x2a, 0x46, 0x7e, 0x87, 0xc7, 0x6b, 0xf7, 0x64, 0x96, 0x4e, 0xcd, 0x28, + 0xa9, 0x64, 0xcf, 0xee, 0x34, 0x62, 0xda, 0x12, 0x1b, 0xaf, 0xa1, 0x0d, 0x15, 0x8e, 0x6e, 0x8c, + 0xd2, 0x62, 0xd2, 0x30, 0x47, 0xeb, 0x6a, 0x1f, 0xb4, 0xc8, 0x1a, 0x28, 0x7e, 0x7a, 0x21, 0xf4, + 0x66, 0x69, 0x88, 0xa5, 0xf0, 0xbd, 0xe6, 0xf0, 0x1a, 0xc8, 0x72, 0x0e, 0x1e, 0x85, 0x01, 0x57, + 0xbd, 0x89, 0x91, 0x87, 0x49, 0xec, 0xa2, 0x3a, 0xb0, 0xd2, 0x7a, 0x40, 0x1f, 0x64, 0x41, 0x79, + 0x00, 0x93, 0xc2, 0xce, 0x39, 0x8a, 0xe5, 0xf1, 0x3d, 0x81, 0x9a, 0xea, 0x96, 0x98, 0x47, 0x98, + 0xa6, 0xaf, 0xca, 0xc0, 0x70, 0x1e, 0x6d, 0xd0, 0xdc, 0xda, 0xa0, 0xc9, 0xe1, 0x51, 0xae, 0x99, + 0xd6, 0xf2, 0x35, 0x54, 0x33, 0x4a, 0xea, 0x0a, 0x63, 0xbd, 0x4b, 0x34, 0xc5, 0x69, 0xce, 0x24, + 0xcf, 0xa1, 0xe4, 0x87, 0x13, 0x6e, 0x6c, 0xa9, 0xbe, 0x7e, 0xba, 0xc1, 0x12, 0xbd, 0x70, 0x42, + 0x15, 0xc7, 0xfc, 0xbb, 0x00, 0xd5, 0x4c, 0x82, 0xbc, 0x80, 0x32, 0x17, 0xd2, 0x4c, 0x32, 0xd7, + 0xce, 0x71, 0x6b, 0x3d, 0xd7, 0x40, 0x82, 0x54, 0x73, 0xc8, 0x2b, 0xd8, 0xd6, 0x76, 0xe1, 0xa9, + 0xf7, 0xfe, 0xc3, 0xb0, 0x19, 0x93, 0x18, 0xb0, 0x3d, 0x43, 0xce, 0xd9, 0x04, 0x53, 0xcb, 0x65, + 0x4b, 0xf3, 0x1a, 0x9a, 0x67, 0xe8, 0xe3, 0xea, 0x9d, 0xf8, 0xff, 0x4d, 0xdd, 0x03, 0xb2, 0x2c, + 0xab, 0xfb, 0x6a, 0xbe, 0x2f, 0x40, 0xb9, 0x2b, 0xbf, 0x69, 0x84, 0x40, 0x49, 0xbe, 0xa7, 0x53, + 0x71, 0xf5, 0x4c, 0xbe, 0x80, 0xba, 0x36, 0x97, 0xa3, 0x20, 0xd9, 0xc6, 0x1a, 0x05, 0x1d, 0xea, + 0x4b, 0x82, 0x05, 0xbb, 0x3c, 0x89, 0xa2, 0x30, 0x16, 0x38, 0x76, 0x16, 0x05, 0xea, 0x13, 0x35, + 0x73, 0x68, 0x98, 0x55, 0xfa, 0x18, 0xb6, 0x3d, 0xee, 0xf0, 0x79, 0xe0, 0xaa, 0x9b, 0x53, 0xa5, + 0x15, 0x8f, 0x0f, 0xe6, 0x81, 0x6b, 0x3e, 0x53, 0x23, 0x57, 0x95, 0x64, 0x47, 0xde, 0x50, 0x90, + 0xf9, 0x06, 0x1a, 0x0b, 0x5a, 0x6a, 0x8d, 0x17, 0x50, 0x56, 0x5f, 0xe5, 0xd4, 0x17, 0x1f, 0xcc, + 0x4a, 0xb3, 0x35, 0xc7, 0xdc, 0x85, 0x66, 0xcf, 0xe3, 0x5a, 0x81, 0xa7, 0x99, 0xcc, 0x53, 0x20, + 0xcb, 0xc1, 0x54, 0xf7, 0x08, 0x2a, 0x6a, 0x8f, 0x7c, 0x0d, 0x15, 0x3f, 0x2e, 0x9c, 0x92, 0x9e, + 0xff, 0x01, 0x65, 0xe5, 0x0a, 0xd2, 0x82, 0x26, 0xb5, 0x87, 0xf4, 0xd7, 0xee, 0xdb, 0x9e, 0xed, + 0xfc, 0xd4, 0xbd, 0xe8, 0x5d, 0x53, 0xbb, 0xf1, 0x89, 0x0c, 0x5f, 0xd9, 0xf4, 0xb2, 0xdb, 0xb7, + 0xfb, 0xc3, 0x3c, 0x5c, 0x20, 0x75, 0xd8, 0xbe, 0xb2, 0xfb, 0x67, 0x17, 0xfd, 0xf3, 0xc6, 0x96, + 0x5c, 0xd0, 0xeb, 0x7e, 0x5f, 0x2e, 0x8a, 0xe4, 0x21, 0xd4, 0x06, 0xd7, 0xa7, 0xa7, 0xb6, 0x7d, + 0x66, 0x9f, 0x35, 0x4a, 0x6f, 0x7f, 0xf8, 0xed, 0xfb, 0x89, 0x27, 0xfe, 0x4c, 0x46, 0x96, 0x1b, + 0xce, 0x3a, 0xaa, 0x94, 0x30, 0x9e, 0xe8, 0x87, 0x4e, 0xfe, 0x07, 0x30, 0xc1, 0xa0, 0x13, 0x8d, + 0x8e, 0x26, 0x61, 0x67, 0xf5, 0xc7, 0x65, 0x54, 0x51, 0x3f, 0x03, 0xaf, 0xfe, 0x0d, 0x00, 0x00, + 0xff, 0xff, 0x2e, 0xd1, 0xf0, 0x87, 0xd1, 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go index 7efab6b18a..bd89d6645f 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go @@ -163,6 +163,8 @@ func (m *CreateTaskRequest) Validate() error { } } + // no validation rules for Secret + return nil } @@ -378,6 +380,21 @@ func (m *GetTaskResponse) Validate() error { } } + for idx, item := range m.GetLogs() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GetTaskResponseValidationError{ + field: fmt.Sprintf("Logs[%v]", idx), + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + return nil } @@ -650,3 +667,364 @@ var _ interface { Cause() error ErrorName() string } = DeleteTaskResponseValidationError{} + +// Validate checks the field values on Agent with the rules defined in the +// proto definition for this message. If any rules are violated, an error is returned. +func (m *Agent) Validate() error { + if m == nil { + return nil + } + + // no validation rules for Name + + // no validation rules for SupportedTaskType + + // no validation rules for IsSync + + return nil +} + +// AgentValidationError is the validation error returned by Agent.Validate if +// the designated constraints aren't met. +type AgentValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e AgentValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e AgentValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e AgentValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e AgentValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e AgentValidationError) ErrorName() string { return "AgentValidationError" } + +// Error satisfies the builtin error interface +func (e AgentValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sAgent.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = AgentValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = AgentValidationError{} + +// Validate checks the field values on GetAgentRequest with the rules defined +// in the proto definition for this message. If any rules are violated, an +// error is returned. +func (m *GetAgentRequest) Validate() error { + if m == nil { + return nil + } + + // no validation rules for Name + + return nil +} + +// GetAgentRequestValidationError is the validation error returned by +// GetAgentRequest.Validate if the designated constraints aren't met. +type GetAgentRequestValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e GetAgentRequestValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e GetAgentRequestValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e GetAgentRequestValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e GetAgentRequestValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e GetAgentRequestValidationError) ErrorName() string { return "GetAgentRequestValidationError" } + +// Error satisfies the builtin error interface +func (e GetAgentRequestValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sGetAgentRequest.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = GetAgentRequestValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = GetAgentRequestValidationError{} + +// Validate checks the field values on GetAgentResponse with the rules defined +// in the proto definition for this message. If any rules are violated, an +// error is returned. +func (m *GetAgentResponse) Validate() error { + if m == nil { + return nil + } + + if v, ok := interface{}(m.GetAgent()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GetAgentResponseValidationError{ + field: "Agent", + reason: "embedded message failed validation", + cause: err, + } + } + } + + return nil +} + +// GetAgentResponseValidationError is the validation error returned by +// GetAgentResponse.Validate if the designated constraints aren't met. +type GetAgentResponseValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e GetAgentResponseValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e GetAgentResponseValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e GetAgentResponseValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e GetAgentResponseValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e GetAgentResponseValidationError) ErrorName() string { return "GetAgentResponseValidationError" } + +// Error satisfies the builtin error interface +func (e GetAgentResponseValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sGetAgentResponse.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = GetAgentResponseValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = GetAgentResponseValidationError{} + +// Validate checks the field values on ListAgentsRequest with the rules defined +// in the proto definition for this message. If any rules are violated, an +// error is returned. +func (m *ListAgentsRequest) Validate() error { + if m == nil { + return nil + } + + return nil +} + +// ListAgentsRequestValidationError is the validation error returned by +// ListAgentsRequest.Validate if the designated constraints aren't met. +type ListAgentsRequestValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e ListAgentsRequestValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e ListAgentsRequestValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e ListAgentsRequestValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e ListAgentsRequestValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e ListAgentsRequestValidationError) ErrorName() string { + return "ListAgentsRequestValidationError" +} + +// Error satisfies the builtin error interface +func (e ListAgentsRequestValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sListAgentsRequest.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = ListAgentsRequestValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = ListAgentsRequestValidationError{} + +// Validate checks the field values on ListAgentsResponse with the rules +// defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *ListAgentsResponse) Validate() error { + if m == nil { + return nil + } + + for idx, item := range m.GetAgents() { + _, _ = idx, item + + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListAgentsResponseValidationError{ + field: fmt.Sprintf("Agents[%v]", idx), + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// ListAgentsResponseValidationError is the validation error returned by +// ListAgentsResponse.Validate if the designated constraints aren't met. +type ListAgentsResponseValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e ListAgentsResponseValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e ListAgentsResponseValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e ListAgentsResponseValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e ListAgentsResponseValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e ListAgentsResponseValidationError) ErrorName() string { + return "ListAgentsResponseValidationError" +} + +// Error satisfies the builtin error interface +func (e ListAgentsResponseValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sListAgentsResponse.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = ListAgentsResponseValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = ListAgentsResponseValidationError{} diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/service/agent.pb.go index 274daaf196..be2f4c8da3 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.pb.go @@ -8,6 +8,7 @@ import ( fmt "fmt" admin "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" proto "github.com/golang/protobuf/proto" + _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -28,21 +29,28 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("flyteidl/service/agent.proto", fileDescriptor_f7d1dfd1fb77d2ef) } var fileDescriptor_f7d1dfd1fb77d2ef = []byte{ - // 214 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xcb, 0xa9, 0x2c, - 0x49, 0xcd, 0x4c, 0xc9, 0xd1, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x4f, 0x4c, 0x4f, - 0xcd, 0x2b, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x80, 0xc9, 0xea, 0x41, 0x65, 0xa5, - 0xa4, 0xe0, 0xea, 0x13, 0x53, 0x72, 0x33, 0xf3, 0x90, 0x55, 0x1b, 0xf5, 0x33, 0x71, 0x09, 0x3a, - 0x16, 0x57, 0xe6, 0x25, 0x3b, 0x82, 0x04, 0x83, 0x21, 0x3a, 0x84, 0x42, 0xb9, 0xb8, 0x9c, 0x8b, - 0x52, 0x13, 0x4b, 0x52, 0x43, 0x12, 0x8b, 0xb3, 0x85, 0x14, 0xf5, 0xe0, 0x46, 0x82, 0x0d, 0xd0, - 0x43, 0xc8, 0x05, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x48, 0x29, 0xe1, 0x53, 0x52, 0x5c, 0x90, - 0x9f, 0x57, 0x9c, 0xaa, 0xc4, 0x20, 0xe4, 0xc3, 0xc5, 0xee, 0x9e, 0x5a, 0x02, 0x36, 0x53, 0x0e, - 0x5d, 0x03, 0x54, 0x02, 0x66, 0xa0, 0x3c, 0x4e, 0x79, 0xb8, 0x69, 0xa1, 0x5c, 0x5c, 0x2e, 0xa9, - 0x39, 0xa9, 0xb8, 0x1c, 0x89, 0x90, 0xc3, 0xe9, 0x48, 0x64, 0x25, 0x30, 0x63, 0x9d, 0xec, 0xa3, - 0x6c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xc1, 0x3a, 0xf2, 0x8b, - 0xd2, 0x21, 0x0c, 0x7d, 0x78, 0x48, 0xa6, 0xa7, 0xe6, 0xe9, 0x17, 0x24, 0xe9, 0xa6, 0xe7, 0xeb, - 0xa3, 0x47, 0x46, 0x12, 0x1b, 0x38, 0x64, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x92, 0xbb, - 0xf6, 0x3c, 0xa7, 0x01, 0x00, 0x00, + // 326 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xbb, 0x4e, 0xf3, 0x30, + 0x14, 0xc7, 0xbf, 0xaf, 0x03, 0x17, 0x0f, 0xa8, 0x58, 0x5c, 0xa4, 0xa8, 0xdc, 0xba, 0x13, 0x8b, + 0x32, 0x23, 0x54, 0x40, 0xea, 0x52, 0x16, 0xa0, 0x0b, 0xdb, 0x49, 0x72, 0x30, 0x86, 0xc4, 0x0e, + 0xf1, 0x69, 0xa5, 0x0a, 0xb1, 0xf0, 0x02, 0x0c, 0x3c, 0x1a, 0xaf, 0xc0, 0x03, 0xf0, 0x08, 0x08, + 0xe7, 0xd2, 0x50, 0x08, 0x5b, 0xd5, 0xdf, 0x3f, 0xbf, 0xff, 0xb1, 0x7d, 0x58, 0xe7, 0x26, 0x9e, + 0x12, 0xaa, 0x28, 0x16, 0x16, 0xb3, 0x89, 0x0a, 0x51, 0x80, 0x44, 0x4d, 0x7e, 0x9a, 0x19, 0x32, + 0xbc, 0x5d, 0x52, 0xbf, 0xa0, 0x5e, 0x47, 0x1a, 0x23, 0x63, 0x14, 0x90, 0x2a, 0x01, 0x5a, 0x1b, + 0x02, 0x52, 0x46, 0xdb, 0x3c, 0xef, 0x79, 0x95, 0x0d, 0xa2, 0x44, 0xe9, 0xba, 0xab, 0xf7, 0xd2, + 0x62, 0xab, 0x7d, 0x3b, 0xd5, 0x61, 0xff, 0xeb, 0xcf, 0xcb, 0xdc, 0xc7, 0x47, 0x8c, 0x9d, 0x66, + 0x08, 0x84, 0x57, 0x60, 0xef, 0xf9, 0x9e, 0x5f, 0x15, 0x3a, 0x81, 0x3f, 0x63, 0x17, 0xf8, 0x30, + 0x46, 0x4b, 0x5e, 0xf7, 0xaf, 0x88, 0x4d, 0x8d, 0xb6, 0xd8, 0xfd, 0xc7, 0x87, 0x6c, 0x71, 0x80, + 0xe4, 0x9c, 0xdb, 0xf3, 0x1f, 0x14, 0xa0, 0x14, 0xee, 0x34, 0xf2, 0xca, 0x36, 0x62, 0xec, 0x0c, + 0x63, 0x6c, 0x1a, 0x72, 0xc6, 0x1a, 0x87, 0xac, 0x47, 0x4a, 0x6d, 0xef, 0xe3, 0x3f, 0x5b, 0x73, + 0x97, 0x71, 0x8e, 0x04, 0x11, 0x10, 0x94, 0x97, 0x12, 0xb3, 0xa5, 0x01, 0x92, 0x43, 0xfc, 0xb7, + 0xf1, 0x1c, 0x29, 0xbb, 0x76, 0x9b, 0x03, 0x45, 0xd3, 0xd6, 0xf3, 0xdb, 0xfb, 0x6b, 0x6b, 0x93, + 0xaf, 0xbb, 0x57, 0x9b, 0x1c, 0xe4, 0xcf, 0x62, 0xc5, 0xa3, 0x86, 0x04, 0x9f, 0xf8, 0x1d, 0x5b, + 0x1e, 0x2a, 0x5b, 0xd4, 0xfd, 0x38, 0x5c, 0x85, 0x6c, 0xe3, 0xe1, 0xea, 0x91, 0xa2, 0x72, 0xc3, + 0x55, 0xb6, 0xf9, 0xca, 0xf7, 0xca, 0x93, 0xe3, 0xeb, 0x23, 0xa9, 0xe8, 0x76, 0x1c, 0xf8, 0xa1, + 0x49, 0x84, 0xf3, 0x98, 0x4c, 0xe6, 0x3f, 0x44, 0xb5, 0x3c, 0x12, 0xb5, 0x48, 0x83, 0x7d, 0x69, + 0xc4, 0xfc, 0x76, 0x06, 0x0b, 0x6e, 0x99, 0x0e, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x33, 0x19, + 0x8c, 0xff, 0xb8, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -202,3 +210,115 @@ var _AsyncAgentService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "flyteidl/service/agent.proto", } + +// AgentMetadataServiceClient is the client API for AgentMetadataService service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type AgentMetadataServiceClient interface { + // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. + GetAgent(ctx context.Context, in *admin.GetAgentRequest, opts ...grpc.CallOption) (*admin.GetAgentResponse, error) + // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. + ListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) +} + +type agentMetadataServiceClient struct { + cc *grpc.ClientConn +} + +func NewAgentMetadataServiceClient(cc *grpc.ClientConn) AgentMetadataServiceClient { + return &agentMetadataServiceClient{cc} +} + +func (c *agentMetadataServiceClient) GetAgent(ctx context.Context, in *admin.GetAgentRequest, opts ...grpc.CallOption) (*admin.GetAgentResponse, error) { + out := new(admin.GetAgentResponse) + err := c.cc.Invoke(ctx, "/flyteidl.service.AgentMetadataService/GetAgent", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *agentMetadataServiceClient) ListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { + out := new(admin.ListAgentsResponse) + err := c.cc.Invoke(ctx, "/flyteidl.service.AgentMetadataService/ListAgent", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// AgentMetadataServiceServer is the server API for AgentMetadataService service. +type AgentMetadataServiceServer interface { + // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. + GetAgent(context.Context, *admin.GetAgentRequest) (*admin.GetAgentResponse, error) + // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. + ListAgent(context.Context, *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) +} + +// UnimplementedAgentMetadataServiceServer can be embedded to have forward compatible implementations. +type UnimplementedAgentMetadataServiceServer struct { +} + +func (*UnimplementedAgentMetadataServiceServer) GetAgent(ctx context.Context, req *admin.GetAgentRequest) (*admin.GetAgentResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetAgent not implemented") +} +func (*UnimplementedAgentMetadataServiceServer) ListAgent(ctx context.Context, req *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListAgent not implemented") +} + +func RegisterAgentMetadataServiceServer(s *grpc.Server, srv AgentMetadataServiceServer) { + s.RegisterService(&_AgentMetadataService_serviceDesc, srv) +} + +func _AgentMetadataService_GetAgent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(admin.GetAgentRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AgentMetadataServiceServer).GetAgent(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/flyteidl.service.AgentMetadataService/GetAgent", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AgentMetadataServiceServer).GetAgent(ctx, req.(*admin.GetAgentRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _AgentMetadataService_ListAgent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(admin.ListAgentsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AgentMetadataServiceServer).ListAgent(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/flyteidl.service.AgentMetadataService/ListAgent", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AgentMetadataServiceServer).ListAgent(ctx, req.(*admin.ListAgentsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _AgentMetadataService_serviceDesc = grpc.ServiceDesc{ + ServiceName: "flyteidl.service.AgentMetadataService", + HandlerType: (*AgentMetadataServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "GetAgent", + Handler: _AgentMetadataService_GetAgent_Handler, + }, + { + MethodName: "ListAgent", + Handler: _AgentMetadataService_ListAgent_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "flyteidl/service/agent.proto", +} diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/agent.pb.gw.go new file mode 100644 index 0000000000..34543b2e20 --- /dev/null +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.pb.gw.go @@ -0,0 +1,159 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: flyteidl/service/agent.proto + +/* +Package service is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package service + +import ( + "context" + "io" + "net/http" + + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/status" +) + +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray + +func request_AgentMetadataService_GetAgent_0(ctx context.Context, marshaler runtime.Marshaler, client AgentMetadataServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq admin.GetAgentRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") + } + + protoReq.Name, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) + } + + msg, err := client.GetAgent(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func request_AgentMetadataService_ListAgent_0(ctx context.Context, marshaler runtime.Marshaler, client AgentMetadataServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq admin.ListAgentsRequest + var metadata runtime.ServerMetadata + + msg, err := client.ListAgent(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +// RegisterAgentMetadataServiceHandlerFromEndpoint is same as RegisterAgentMetadataServiceHandler but +// automatically dials to "endpoint" and closes the connection when "ctx" gets done. +func RegisterAgentMetadataServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.Dial(endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + }() + }() + + return RegisterAgentMetadataServiceHandler(ctx, mux, conn) +} + +// RegisterAgentMetadataServiceHandler registers the http handlers for service AgentMetadataService to "mux". +// The handlers forward requests to the grpc endpoint over "conn". +func RegisterAgentMetadataServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterAgentMetadataServiceHandlerClient(ctx, mux, NewAgentMetadataServiceClient(conn)) +} + +// RegisterAgentMetadataServiceHandlerClient registers the http handlers for service AgentMetadataService +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "AgentMetadataServiceClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "AgentMetadataServiceClient" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// "AgentMetadataServiceClient" to call the correct interceptors. +func RegisterAgentMetadataServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client AgentMetadataServiceClient) error { + + mux.Handle("GET", pattern_AgentMetadataService_GetAgent_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_AgentMetadataService_GetAgent_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_AgentMetadataService_GetAgent_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_AgentMetadataService_ListAgent_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_AgentMetadataService_ListAgent_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_AgentMetadataService_ListAgent_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_AgentMetadataService_GetAgent_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "agents", "name"}, "")) + + pattern_AgentMetadataService_ListAgent_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "agents"}, "")) +) + +var ( + forward_AgentMetadataService_GetAgent_0 = runtime.ForwardResponseMessage + + forward_AgentMetadataService_ListAgent_0 = runtime.ForwardResponseMessage +) diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index e71c02d2de..878557c994 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -14,7 +14,51 @@ "produces": [ "application/json" ], - "paths": {}, + "paths": { + "/api/v1/agents": { + "get": { + "summary": "Get job status.", + "operationId": "ListAgent", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/adminListAgentsResponse" + } + } + }, + "tags": [ + "AgentMetadataService" + ] + } + }, + "/api/v1/agents/{name}": { + "get": { + "summary": "Send a task create request to the agent server.", + "operationId": "GetAgent", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/adminGetAgentResponse" + } + } + }, + "parameters": [ + { + "name": "name", + "description": "The name of the agent.", + "in": "path", + "required": true, + "type": "string" + } + ], + "tags": [ + "AgentMetadataService" + ] + } + } + }, "definitions": { "BlobTypeBlobDimensionality": { "type": "string", @@ -163,6 +207,41 @@ } } }, + "TaskLogMessageFormat": { + "type": "string", + "enum": [ + "UNKNOWN", + "CSV", + "JSON" + ], + "default": "UNKNOWN" + }, + "adminAgent": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The name of the agent." + }, + "secret_name": { + "type": "array", + "items": { + "type": "string" + }, + "description": "A list of secret in the secret manager." + }, + "supported_task_type": { + "type": "string", + "description": "The type of the task that the agent can handle." + }, + "is_sync": { + "type": "boolean", + "format": "boolean", + "description": "Indicates if this agent is a sync agent." + } + }, + "description": "A message containing the agent metadata." + }, "adminCreateTaskResponse": { "type": "object", "properties": { @@ -178,15 +257,43 @@ "type": "object", "description": "Response to delete a task." }, + "adminGetAgentResponse": { + "type": "object", + "properties": { + "agent": { + "$ref": "#/definitions/adminAgent" + } + }, + "description": "A response containing an agent." + }, "adminGetTaskResponse": { "type": "object", "properties": { "resource": { "$ref": "#/definitions/adminResource" + }, + "logs": { + "type": "array", + "items": { + "$ref": "#/definitions/coreTaskLog" + }, + "title": "log information for the task execution" } }, "description": "Response to get an individual task resource." }, + "adminListAgentsResponse": { + "type": "object", + "properties": { + "agents": { + "type": "array", + "items": { + "$ref": "#/definitions/adminAgent" + } + } + }, + "description": "A response containing a list of agents." + }, "adminResource": { "type": "object", "properties": { @@ -951,6 +1058,24 @@ }, "description": "Encapsulation of fields that identify a Flyte task execution entity." }, + "coreTaskLog": { + "type": "object", + "properties": { + "uri": { + "type": "string" + }, + "name": { + "type": "string" + }, + "message_format": { + "$ref": "#/definitions/TaskLogMessageFormat" + }, + "ttl": { + "type": "string" + } + }, + "title": "Log information for the task that is specific to a log sink\nWhen our log story is flushed out, we may have more metadata here like log link expiry" + }, "coreTaskMetadata": { "type": "object", "properties": { diff --git a/flyteidl/gen/pb-java/flyteidl/admin/Agent.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java similarity index 55% rename from flyteidl/gen/pb-java/flyteidl/admin/Agent.java rename to flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index b2dfd16e61..cb49a8a134 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/Agent.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -3,8 +3,8 @@ package flyteidl.admin; -public final class Agent { - private Agent() {} +public final class AgentOuterClass { + private AgentOuterClass() {} public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } @@ -117,7 +117,7 @@ public State findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return flyteidl.admin.Agent.getDescriptor().getEnumTypes().get(0); + return flyteidl.admin.AgentOuterClass.getDescriptor().getEnumTypes().get(0); } private static final State[] VALUES = values(); @@ -500,7 +500,7 @@ private TaskExecutionMetadata( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_TaskExecutionMetadata_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_TaskExecutionMetadata_descriptor; } @SuppressWarnings({"rawtypes"}) @@ -522,9 +522,9 @@ protected com.google.protobuf.MapField internalGetMapField( @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_TaskExecutionMetadata_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_TaskExecutionMetadata_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.TaskExecutionMetadata.class, flyteidl.admin.Agent.TaskExecutionMetadata.Builder.class); + flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.class, flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.Builder.class); } private int bitField0_; @@ -609,7 +609,7 @@ private static final class LabelsDefaultEntryHolder { java.lang.String, java.lang.String> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - flyteidl.admin.Agent.internal_static_flyteidl_admin_TaskExecutionMetadata_LabelsEntry_descriptor, + flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_TaskExecutionMetadata_LabelsEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, @@ -701,7 +701,7 @@ private static final class AnnotationsDefaultEntryHolder { java.lang.String, java.lang.String> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - flyteidl.admin.Agent.internal_static_flyteidl_admin_TaskExecutionMetadata_AnnotationsEntry_descriptor, + flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_TaskExecutionMetadata_AnnotationsEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, @@ -835,7 +835,7 @@ private static final class EnvironmentVariablesDefaultEntryHolder { java.lang.String, java.lang.String> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - flyteidl.admin.Agent.internal_static_flyteidl_admin_TaskExecutionMetadata_EnvironmentVariablesEntry_descriptor, + flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_TaskExecutionMetadata_EnvironmentVariablesEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, @@ -1021,10 +1021,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof flyteidl.admin.Agent.TaskExecutionMetadata)) { + if (!(obj instanceof flyteidl.admin.AgentOuterClass.TaskExecutionMetadata)) { return super.equals(obj); } - flyteidl.admin.Agent.TaskExecutionMetadata other = (flyteidl.admin.Agent.TaskExecutionMetadata) obj; + flyteidl.admin.AgentOuterClass.TaskExecutionMetadata other = (flyteidl.admin.AgentOuterClass.TaskExecutionMetadata) obj; if (hasTaskExecutionId() != other.hasTaskExecutionId()) return false; if (hasTaskExecutionId()) { @@ -1077,69 +1077,69 @@ public int hashCode() { return hash; } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom(byte[] data) + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseDelimitedFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseDelimitedFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1152,7 +1152,7 @@ public static flyteidl.admin.Agent.TaskExecutionMetadata parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(flyteidl.admin.Agent.TaskExecutionMetadata prototype) { + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.TaskExecutionMetadata prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -1177,10 +1177,10 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:flyteidl.admin.TaskExecutionMetadata) - flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder { + flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_TaskExecutionMetadata_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_TaskExecutionMetadata_descriptor; } @SuppressWarnings({"rawtypes"}) @@ -1216,12 +1216,12 @@ protected com.google.protobuf.MapField internalGetMutableMapField( @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_TaskExecutionMetadata_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_TaskExecutionMetadata_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.TaskExecutionMetadata.class, flyteidl.admin.Agent.TaskExecutionMetadata.Builder.class); + flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.class, flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.Builder.class); } - // Construct using flyteidl.admin.Agent.TaskExecutionMetadata.newBuilder() + // Construct using flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1258,17 +1258,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_TaskExecutionMetadata_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_TaskExecutionMetadata_descriptor; } @java.lang.Override - public flyteidl.admin.Agent.TaskExecutionMetadata getDefaultInstanceForType() { - return flyteidl.admin.Agent.TaskExecutionMetadata.getDefaultInstance(); + public flyteidl.admin.AgentOuterClass.TaskExecutionMetadata getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.getDefaultInstance(); } @java.lang.Override - public flyteidl.admin.Agent.TaskExecutionMetadata build() { - flyteidl.admin.Agent.TaskExecutionMetadata result = buildPartial(); + public flyteidl.admin.AgentOuterClass.TaskExecutionMetadata build() { + flyteidl.admin.AgentOuterClass.TaskExecutionMetadata result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -1276,8 +1276,8 @@ public flyteidl.admin.Agent.TaskExecutionMetadata build() { } @java.lang.Override - public flyteidl.admin.Agent.TaskExecutionMetadata buildPartial() { - flyteidl.admin.Agent.TaskExecutionMetadata result = new flyteidl.admin.Agent.TaskExecutionMetadata(this); + public flyteidl.admin.AgentOuterClass.TaskExecutionMetadata buildPartial() { + flyteidl.admin.AgentOuterClass.TaskExecutionMetadata result = new flyteidl.admin.AgentOuterClass.TaskExecutionMetadata(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (taskExecutionIdBuilder_ == null) { @@ -1332,16 +1332,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.admin.Agent.TaskExecutionMetadata) { - return mergeFrom((flyteidl.admin.Agent.TaskExecutionMetadata)other); + if (other instanceof flyteidl.admin.AgentOuterClass.TaskExecutionMetadata) { + return mergeFrom((flyteidl.admin.AgentOuterClass.TaskExecutionMetadata)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(flyteidl.admin.Agent.TaskExecutionMetadata other) { - if (other == flyteidl.admin.Agent.TaskExecutionMetadata.getDefaultInstance()) return this; + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.TaskExecutionMetadata other) { + if (other == flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.getDefaultInstance()) return this; if (other.hasTaskExecutionId()) { mergeTaskExecutionId(other.getTaskExecutionId()); } @@ -1374,11 +1374,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - flyteidl.admin.Agent.TaskExecutionMetadata parsedMessage = null; + flyteidl.admin.AgentOuterClass.TaskExecutionMetadata parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.admin.Agent.TaskExecutionMetadata) e.getUnfinishedMessage(); + parsedMessage = (flyteidl.admin.AgentOuterClass.TaskExecutionMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -2189,12 +2189,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:flyteidl.admin.TaskExecutionMetadata) - private static final flyteidl.admin.Agent.TaskExecutionMetadata DEFAULT_INSTANCE; + private static final flyteidl.admin.AgentOuterClass.TaskExecutionMetadata DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new flyteidl.admin.Agent.TaskExecutionMetadata(); + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.TaskExecutionMetadata(); } - public static flyteidl.admin.Agent.TaskExecutionMetadata getDefaultInstance() { + public static flyteidl.admin.AgentOuterClass.TaskExecutionMetadata getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -2219,7 +2219,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public flyteidl.admin.Agent.TaskExecutionMetadata getDefaultInstanceForType() { + public flyteidl.admin.AgentOuterClass.TaskExecutionMetadata getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2318,7 +2318,7 @@ public interface CreateTaskRequestOrBuilder extends * * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4; */ - flyteidl.admin.Agent.TaskExecutionMetadata getTaskExecutionMetadata(); + flyteidl.admin.AgentOuterClass.TaskExecutionMetadata getTaskExecutionMetadata(); /** *
      * subset of runtime task execution metadata.
@@ -2326,7 +2326,71 @@ public interface CreateTaskRequestOrBuilder extends
      *
      * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
      */
-    flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder getTaskExecutionMetadataOrBuilder();
+    flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder getTaskExecutionMetadataOrBuilder();
+
+    /**
+     * 
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + int getSecretCount(); + /** + *
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + boolean containsSecret( + java.lang.String key); + /** + * Use {@link #getSecretMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getSecret(); + /** + *
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + java.util.Map + getSecretMap(); + /** + *
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + + java.lang.String getSecretOrDefault( + java.lang.String key, + java.lang.String defaultValue); + /** + *
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + + java.lang.String getSecretOrThrow( + java.lang.String key); } /** *
@@ -2405,11 +2469,11 @@ private CreateTaskRequest(
               break;
             }
             case 34: {
-              flyteidl.admin.Agent.TaskExecutionMetadata.Builder subBuilder = null;
+              flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.Builder subBuilder = null;
               if (taskExecutionMetadata_ != null) {
                 subBuilder = taskExecutionMetadata_.toBuilder();
               }
-              taskExecutionMetadata_ = input.readMessage(flyteidl.admin.Agent.TaskExecutionMetadata.parser(), extensionRegistry);
+              taskExecutionMetadata_ = input.readMessage(flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(taskExecutionMetadata_);
                 taskExecutionMetadata_ = subBuilder.buildPartial();
@@ -2417,6 +2481,19 @@ private CreateTaskRequest(
 
               break;
             }
+            case 42: {
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
+                secret_ = com.google.protobuf.MapField.newMapField(
+                    SecretDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000010;
+              }
+              com.google.protobuf.MapEntry
+              secret__ = input.readMessage(
+                  SecretDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              secret_.getMutableMap().put(
+                  secret__.getKey(), secret__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -2438,17 +2515,30 @@ private CreateTaskRequest(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskRequest_descriptor;
+      return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_descriptor;
     }
 
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 5:
+          return internalGetSecret();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable
+      return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              flyteidl.admin.Agent.CreateTaskRequest.class, flyteidl.admin.Agent.CreateTaskRequest.Builder.class);
+              flyteidl.admin.AgentOuterClass.CreateTaskRequest.class, flyteidl.admin.AgentOuterClass.CreateTaskRequest.Builder.class);
     }
 
+    private int bitField0_;
     public static final int INPUTS_FIELD_NUMBER = 1;
     private flyteidl.core.Literals.LiteralMap inputs_;
     /**
@@ -2564,7 +2654,7 @@ public java.lang.String getOutputPrefix() {
     }
 
     public static final int TASK_EXECUTION_METADATA_FIELD_NUMBER = 4;
-    private flyteidl.admin.Agent.TaskExecutionMetadata taskExecutionMetadata_;
+    private flyteidl.admin.AgentOuterClass.TaskExecutionMetadata taskExecutionMetadata_;
     /**
      * 
      * subset of runtime task execution metadata.
@@ -2582,8 +2672,8 @@ public boolean hasTaskExecutionMetadata() {
      *
      * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
      */
-    public flyteidl.admin.Agent.TaskExecutionMetadata getTaskExecutionMetadata() {
-      return taskExecutionMetadata_ == null ? flyteidl.admin.Agent.TaskExecutionMetadata.getDefaultInstance() : taskExecutionMetadata_;
+    public flyteidl.admin.AgentOuterClass.TaskExecutionMetadata getTaskExecutionMetadata() {
+      return taskExecutionMetadata_ == null ? flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.getDefaultInstance() : taskExecutionMetadata_;
     }
     /**
      * 
@@ -2592,10 +2682,110 @@ public flyteidl.admin.Agent.TaskExecutionMetadata getTaskExecutionMetadata() {
      *
      * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
      */
-    public flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder getTaskExecutionMetadataOrBuilder() {
+    public flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder getTaskExecutionMetadataOrBuilder() {
       return getTaskExecutionMetadata();
     }
 
+    public static final int SECRET_FIELD_NUMBER = 5;
+    private static final class SecretDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .newDefaultInstance(
+                  flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
+    }
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> secret_;
+    private com.google.protobuf.MapField
+    internalGetSecret() {
+      if (secret_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            SecretDefaultEntryHolder.defaultEntry);
+      }
+      return secret_;
+    }
+
+    public int getSecretCount() {
+      return internalGetSecret().getMap().size();
+    }
+    /**
+     * 
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + + public boolean containsSecret( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetSecret().getMap().containsKey(key); + } + /** + * Use {@link #getSecretMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getSecret() { + return getSecretMap(); + } + /** + *
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + + public java.util.Map getSecretMap() { + return internalGetSecret().getMap(); + } + /** + *
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + + public java.lang.String getSecretOrDefault( + java.lang.String key, + java.lang.String defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetSecret().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + *
+     * Secret to be passed to the agent.
+     * Key is the name of the secret in secret manager.
+     * Value is the actual secret value.
+     * 
+ * + * map<string, string> secret = 5; + */ + + public java.lang.String getSecretOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetSecret().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -2622,6 +2812,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (taskExecutionMetadata_ != null) { output.writeMessage(4, getTaskExecutionMetadata()); } + com.google.protobuf.GeneratedMessageV3 + .serializeStringMapTo( + output, + internalGetSecret(), + SecretDefaultEntryHolder.defaultEntry, + 5); unknownFields.writeTo(output); } @@ -2646,6 +2842,16 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(4, getTaskExecutionMetadata()); } + for (java.util.Map.Entry entry + : internalGetSecret().getMap().entrySet()) { + com.google.protobuf.MapEntry + secret__ = SecretDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, secret__); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -2656,10 +2862,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof flyteidl.admin.Agent.CreateTaskRequest)) { + if (!(obj instanceof flyteidl.admin.AgentOuterClass.CreateTaskRequest)) { return super.equals(obj); } - flyteidl.admin.Agent.CreateTaskRequest other = (flyteidl.admin.Agent.CreateTaskRequest) obj; + flyteidl.admin.AgentOuterClass.CreateTaskRequest other = (flyteidl.admin.AgentOuterClass.CreateTaskRequest) obj; if (hasInputs() != other.hasInputs()) return false; if (hasInputs()) { @@ -2678,6 +2884,8 @@ public boolean equals(final java.lang.Object obj) { if (!getTaskExecutionMetadata() .equals(other.getTaskExecutionMetadata())) return false; } + if (!internalGetSecret().equals( + other.internalGetSecret())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -2703,74 +2911,78 @@ public int hashCode() { hash = (37 * hash) + TASK_EXECUTION_METADATA_FIELD_NUMBER; hash = (53 * hash) + getTaskExecutionMetadata().hashCode(); } + if (!internalGetSecret().getMap().isEmpty()) { + hash = (37 * hash) + SECRET_FIELD_NUMBER; + hash = (53 * hash) + internalGetSecret().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom(byte[] data) + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskRequest parseDelimitedFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.CreateTaskRequest parseDelimitedFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2783,7 +2995,7 @@ public static flyteidl.admin.Agent.CreateTaskRequest parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(flyteidl.admin.Agent.CreateTaskRequest prototype) { + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.CreateTaskRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -2808,21 +3020,43 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:flyteidl.admin.CreateTaskRequest) - flyteidl.admin.Agent.CreateTaskRequestOrBuilder { + flyteidl.admin.AgentOuterClass.CreateTaskRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskRequest_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_descriptor; } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMapField( + int number) { + switch (number) { + case 5: + return internalGetSecret(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMutableMapField( + int number) { + switch (number) { + case 5: + return internalGetMutableSecret(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.CreateTaskRequest.class, flyteidl.admin.Agent.CreateTaskRequest.Builder.class); + flyteidl.admin.AgentOuterClass.CreateTaskRequest.class, flyteidl.admin.AgentOuterClass.CreateTaskRequest.Builder.class); } - // Construct using flyteidl.admin.Agent.CreateTaskRequest.newBuilder() + // Construct using flyteidl.admin.AgentOuterClass.CreateTaskRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2860,23 +3094,24 @@ public Builder clear() { taskExecutionMetadata_ = null; taskExecutionMetadataBuilder_ = null; } + internalGetMutableSecret().clear(); return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskRequest_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_descriptor; } @java.lang.Override - public flyteidl.admin.Agent.CreateTaskRequest getDefaultInstanceForType() { - return flyteidl.admin.Agent.CreateTaskRequest.getDefaultInstance(); + public flyteidl.admin.AgentOuterClass.CreateTaskRequest getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.CreateTaskRequest.getDefaultInstance(); } @java.lang.Override - public flyteidl.admin.Agent.CreateTaskRequest build() { - flyteidl.admin.Agent.CreateTaskRequest result = buildPartial(); + public flyteidl.admin.AgentOuterClass.CreateTaskRequest build() { + flyteidl.admin.AgentOuterClass.CreateTaskRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -2884,8 +3119,10 @@ public flyteidl.admin.Agent.CreateTaskRequest build() { } @java.lang.Override - public flyteidl.admin.Agent.CreateTaskRequest buildPartial() { - flyteidl.admin.Agent.CreateTaskRequest result = new flyteidl.admin.Agent.CreateTaskRequest(this); + public flyteidl.admin.AgentOuterClass.CreateTaskRequest buildPartial() { + flyteidl.admin.AgentOuterClass.CreateTaskRequest result = new flyteidl.admin.AgentOuterClass.CreateTaskRequest(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; if (inputsBuilder_ == null) { result.inputs_ = inputs_; } else { @@ -2902,6 +3139,9 @@ public flyteidl.admin.Agent.CreateTaskRequest buildPartial() { } else { result.taskExecutionMetadata_ = taskExecutionMetadataBuilder_.build(); } + result.secret_ = internalGetSecret(); + result.secret_.makeImmutable(); + result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -2940,16 +3180,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.admin.Agent.CreateTaskRequest) { - return mergeFrom((flyteidl.admin.Agent.CreateTaskRequest)other); + if (other instanceof flyteidl.admin.AgentOuterClass.CreateTaskRequest) { + return mergeFrom((flyteidl.admin.AgentOuterClass.CreateTaskRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(flyteidl.admin.Agent.CreateTaskRequest other) { - if (other == flyteidl.admin.Agent.CreateTaskRequest.getDefaultInstance()) return this; + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.CreateTaskRequest other) { + if (other == flyteidl.admin.AgentOuterClass.CreateTaskRequest.getDefaultInstance()) return this; if (other.hasInputs()) { mergeInputs(other.getInputs()); } @@ -2963,6 +3203,8 @@ public Builder mergeFrom(flyteidl.admin.Agent.CreateTaskRequest other) { if (other.hasTaskExecutionMetadata()) { mergeTaskExecutionMetadata(other.getTaskExecutionMetadata()); } + internalGetMutableSecret().mergeFrom( + other.internalGetSecret()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -2978,11 +3220,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - flyteidl.admin.Agent.CreateTaskRequest parsedMessage = null; + flyteidl.admin.AgentOuterClass.CreateTaskRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.admin.Agent.CreateTaskRequest) e.getUnfinishedMessage(); + parsedMessage = (flyteidl.admin.AgentOuterClass.CreateTaskRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -2991,6 +3233,7 @@ public Builder mergeFrom( } return this; } + private int bitField0_; private flyteidl.core.Literals.LiteralMap inputs_; private com.google.protobuf.SingleFieldBuilderV3< @@ -3405,9 +3648,9 @@ public Builder setOutputPrefixBytes( return this; } - private flyteidl.admin.Agent.TaskExecutionMetadata taskExecutionMetadata_; + private flyteidl.admin.AgentOuterClass.TaskExecutionMetadata taskExecutionMetadata_; private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.admin.Agent.TaskExecutionMetadata, flyteidl.admin.Agent.TaskExecutionMetadata.Builder, flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder> taskExecutionMetadataBuilder_; + flyteidl.admin.AgentOuterClass.TaskExecutionMetadata, flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.Builder, flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder> taskExecutionMetadataBuilder_; /** *
        * subset of runtime task execution metadata.
@@ -3425,9 +3668,9 @@ public boolean hasTaskExecutionMetadata() {
        *
        * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
        */
-      public flyteidl.admin.Agent.TaskExecutionMetadata getTaskExecutionMetadata() {
+      public flyteidl.admin.AgentOuterClass.TaskExecutionMetadata getTaskExecutionMetadata() {
         if (taskExecutionMetadataBuilder_ == null) {
-          return taskExecutionMetadata_ == null ? flyteidl.admin.Agent.TaskExecutionMetadata.getDefaultInstance() : taskExecutionMetadata_;
+          return taskExecutionMetadata_ == null ? flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.getDefaultInstance() : taskExecutionMetadata_;
         } else {
           return taskExecutionMetadataBuilder_.getMessage();
         }
@@ -3439,7 +3682,7 @@ public flyteidl.admin.Agent.TaskExecutionMetadata getTaskExecutionMetadata() {
        *
        * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
        */
-      public Builder setTaskExecutionMetadata(flyteidl.admin.Agent.TaskExecutionMetadata value) {
+      public Builder setTaskExecutionMetadata(flyteidl.admin.AgentOuterClass.TaskExecutionMetadata value) {
         if (taskExecutionMetadataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3460,7 +3703,7 @@ public Builder setTaskExecutionMetadata(flyteidl.admin.Agent.TaskExecutionMetada
        * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
        */
       public Builder setTaskExecutionMetadata(
-          flyteidl.admin.Agent.TaskExecutionMetadata.Builder builderForValue) {
+          flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.Builder builderForValue) {
         if (taskExecutionMetadataBuilder_ == null) {
           taskExecutionMetadata_ = builderForValue.build();
           onChanged();
@@ -3477,11 +3720,11 @@ public Builder setTaskExecutionMetadata(
        *
        * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
        */
-      public Builder mergeTaskExecutionMetadata(flyteidl.admin.Agent.TaskExecutionMetadata value) {
+      public Builder mergeTaskExecutionMetadata(flyteidl.admin.AgentOuterClass.TaskExecutionMetadata value) {
         if (taskExecutionMetadataBuilder_ == null) {
           if (taskExecutionMetadata_ != null) {
             taskExecutionMetadata_ =
-              flyteidl.admin.Agent.TaskExecutionMetadata.newBuilder(taskExecutionMetadata_).mergeFrom(value).buildPartial();
+              flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.newBuilder(taskExecutionMetadata_).mergeFrom(value).buildPartial();
           } else {
             taskExecutionMetadata_ = value;
           }
@@ -3517,7 +3760,7 @@ public Builder clearTaskExecutionMetadata() {
        *
        * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
        */
-      public flyteidl.admin.Agent.TaskExecutionMetadata.Builder getTaskExecutionMetadataBuilder() {
+      public flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.Builder getTaskExecutionMetadataBuilder() {
         
         onChanged();
         return getTaskExecutionMetadataFieldBuilder().getBuilder();
@@ -3529,12 +3772,12 @@ public flyteidl.admin.Agent.TaskExecutionMetadata.Builder getTaskExecutionMetada
        *
        * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
        */
-      public flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder getTaskExecutionMetadataOrBuilder() {
+      public flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder getTaskExecutionMetadataOrBuilder() {
         if (taskExecutionMetadataBuilder_ != null) {
           return taskExecutionMetadataBuilder_.getMessageOrBuilder();
         } else {
           return taskExecutionMetadata_ == null ?
-              flyteidl.admin.Agent.TaskExecutionMetadata.getDefaultInstance() : taskExecutionMetadata_;
+              flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.getDefaultInstance() : taskExecutionMetadata_;
         }
       }
       /**
@@ -3545,11 +3788,11 @@ public flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder getTaskExecutionMetad
        * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4;
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          flyteidl.admin.Agent.TaskExecutionMetadata, flyteidl.admin.Agent.TaskExecutionMetadata.Builder, flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder> 
+          flyteidl.admin.AgentOuterClass.TaskExecutionMetadata, flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.Builder, flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder> 
           getTaskExecutionMetadataFieldBuilder() {
         if (taskExecutionMetadataBuilder_ == null) {
           taskExecutionMetadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              flyteidl.admin.Agent.TaskExecutionMetadata, flyteidl.admin.Agent.TaskExecutionMetadata.Builder, flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder>(
+              flyteidl.admin.AgentOuterClass.TaskExecutionMetadata, flyteidl.admin.AgentOuterClass.TaskExecutionMetadata.Builder, flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder>(
                   getTaskExecutionMetadata(),
                   getParentForChildren(),
                   isClean());
@@ -3557,6 +3800,171 @@ public flyteidl.admin.Agent.TaskExecutionMetadataOrBuilder getTaskExecutionMetad
         }
         return taskExecutionMetadataBuilder_;
       }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.String> secret_;
+      private com.google.protobuf.MapField
+      internalGetSecret() {
+        if (secret_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              SecretDefaultEntryHolder.defaultEntry);
+        }
+        return secret_;
+      }
+      private com.google.protobuf.MapField
+      internalGetMutableSecret() {
+        onChanged();;
+        if (secret_ == null) {
+          secret_ = com.google.protobuf.MapField.newMapField(
+              SecretDefaultEntryHolder.defaultEntry);
+        }
+        if (!secret_.isMutable()) {
+          secret_ = secret_.copy();
+        }
+        return secret_;
+      }
+
+      public int getSecretCount() {
+        return internalGetSecret().getMap().size();
+      }
+      /**
+       * 
+       * Secret to be passed to the agent.
+       * Key is the name of the secret in secret manager.
+       * Value is the actual secret value.
+       * 
+ * + * map<string, string> secret = 5; + */ + + public boolean containsSecret( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetSecret().getMap().containsKey(key); + } + /** + * Use {@link #getSecretMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getSecret() { + return getSecretMap(); + } + /** + *
+       * Secret to be passed to the agent.
+       * Key is the name of the secret in secret manager.
+       * Value is the actual secret value.
+       * 
+ * + * map<string, string> secret = 5; + */ + + public java.util.Map getSecretMap() { + return internalGetSecret().getMap(); + } + /** + *
+       * Secret to be passed to the agent.
+       * Key is the name of the secret in secret manager.
+       * Value is the actual secret value.
+       * 
+ * + * map<string, string> secret = 5; + */ + + public java.lang.String getSecretOrDefault( + java.lang.String key, + java.lang.String defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetSecret().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + *
+       * Secret to be passed to the agent.
+       * Key is the name of the secret in secret manager.
+       * Value is the actual secret value.
+       * 
+ * + * map<string, string> secret = 5; + */ + + public java.lang.String getSecretOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetSecret().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearSecret() { + internalGetMutableSecret().getMutableMap() + .clear(); + return this; + } + /** + *
+       * Secret to be passed to the agent.
+       * Key is the name of the secret in secret manager.
+       * Value is the actual secret value.
+       * 
+ * + * map<string, string> secret = 5; + */ + + public Builder removeSecret( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + internalGetMutableSecret().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableSecret() { + return internalGetMutableSecret().getMutableMap(); + } + /** + *
+       * Secret to be passed to the agent.
+       * Key is the name of the secret in secret manager.
+       * Value is the actual secret value.
+       * 
+ * + * map<string, string> secret = 5; + */ + public Builder putSecret( + java.lang.String key, + java.lang.String value) { + if (key == null) { throw new java.lang.NullPointerException(); } + if (value == null) { throw new java.lang.NullPointerException(); } + internalGetMutableSecret().getMutableMap() + .put(key, value); + return this; + } + /** + *
+       * Secret to be passed to the agent.
+       * Key is the name of the secret in secret manager.
+       * Value is the actual secret value.
+       * 
+ * + * map<string, string> secret = 5; + */ + + public Builder putAllSecret( + java.util.Map values) { + internalGetMutableSecret().getMutableMap() + .putAll(values); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -3574,12 +3982,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:flyteidl.admin.CreateTaskRequest) - private static final flyteidl.admin.Agent.CreateTaskRequest DEFAULT_INSTANCE; + private static final flyteidl.admin.AgentOuterClass.CreateTaskRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new flyteidl.admin.Agent.CreateTaskRequest(); + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.CreateTaskRequest(); } - public static flyteidl.admin.Agent.CreateTaskRequest getDefaultInstance() { + public static flyteidl.admin.AgentOuterClass.CreateTaskRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -3604,7 +4012,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public flyteidl.admin.Agent.CreateTaskRequest getDefaultInstanceForType() { + public flyteidl.admin.AgentOuterClass.CreateTaskRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -3693,15 +4101,15 @@ private CreateTaskResponse( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskResponse_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskResponse_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.CreateTaskResponse.class, flyteidl.admin.Agent.CreateTaskResponse.Builder.class); + flyteidl.admin.AgentOuterClass.CreateTaskResponse.class, flyteidl.admin.AgentOuterClass.CreateTaskResponse.Builder.class); } public static final int RESOURCE_META_FIELD_NUMBER = 1; @@ -3757,10 +4165,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof flyteidl.admin.Agent.CreateTaskResponse)) { + if (!(obj instanceof flyteidl.admin.AgentOuterClass.CreateTaskResponse)) { return super.equals(obj); } - flyteidl.admin.Agent.CreateTaskResponse other = (flyteidl.admin.Agent.CreateTaskResponse) obj; + flyteidl.admin.AgentOuterClass.CreateTaskResponse other = (flyteidl.admin.AgentOuterClass.CreateTaskResponse) obj; if (!getResourceMeta() .equals(other.getResourceMeta())) return false; @@ -3782,69 +4190,69 @@ public int hashCode() { return hash; } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom(byte[] data) + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskResponse parseDelimitedFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.CreateTaskResponse parseDelimitedFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3857,7 +4265,7 @@ public static flyteidl.admin.Agent.CreateTaskResponse parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(flyteidl.admin.Agent.CreateTaskResponse prototype) { + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.CreateTaskResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -3882,21 +4290,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:flyteidl.admin.CreateTaskResponse) - flyteidl.admin.Agent.CreateTaskResponseOrBuilder { + flyteidl.admin.AgentOuterClass.CreateTaskResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskResponse_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskResponse_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.CreateTaskResponse.class, flyteidl.admin.Agent.CreateTaskResponse.Builder.class); + flyteidl.admin.AgentOuterClass.CreateTaskResponse.class, flyteidl.admin.AgentOuterClass.CreateTaskResponse.Builder.class); } - // Construct using flyteidl.admin.Agent.CreateTaskResponse.newBuilder() + // Construct using flyteidl.admin.AgentOuterClass.CreateTaskResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3922,17 +4330,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_CreateTaskResponse_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskResponse_descriptor; } @java.lang.Override - public flyteidl.admin.Agent.CreateTaskResponse getDefaultInstanceForType() { - return flyteidl.admin.Agent.CreateTaskResponse.getDefaultInstance(); + public flyteidl.admin.AgentOuterClass.CreateTaskResponse getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.CreateTaskResponse.getDefaultInstance(); } @java.lang.Override - public flyteidl.admin.Agent.CreateTaskResponse build() { - flyteidl.admin.Agent.CreateTaskResponse result = buildPartial(); + public flyteidl.admin.AgentOuterClass.CreateTaskResponse build() { + flyteidl.admin.AgentOuterClass.CreateTaskResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -3940,8 +4348,8 @@ public flyteidl.admin.Agent.CreateTaskResponse build() { } @java.lang.Override - public flyteidl.admin.Agent.CreateTaskResponse buildPartial() { - flyteidl.admin.Agent.CreateTaskResponse result = new flyteidl.admin.Agent.CreateTaskResponse(this); + public flyteidl.admin.AgentOuterClass.CreateTaskResponse buildPartial() { + flyteidl.admin.AgentOuterClass.CreateTaskResponse result = new flyteidl.admin.AgentOuterClass.CreateTaskResponse(this); result.resourceMeta_ = resourceMeta_; onBuilt(); return result; @@ -3981,16 +4389,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.admin.Agent.CreateTaskResponse) { - return mergeFrom((flyteidl.admin.Agent.CreateTaskResponse)other); + if (other instanceof flyteidl.admin.AgentOuterClass.CreateTaskResponse) { + return mergeFrom((flyteidl.admin.AgentOuterClass.CreateTaskResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(flyteidl.admin.Agent.CreateTaskResponse other) { - if (other == flyteidl.admin.Agent.CreateTaskResponse.getDefaultInstance()) return this; + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.CreateTaskResponse other) { + if (other == flyteidl.admin.AgentOuterClass.CreateTaskResponse.getDefaultInstance()) return this; if (other.getResourceMeta() != com.google.protobuf.ByteString.EMPTY) { setResourceMeta(other.getResourceMeta()); } @@ -4009,11 +4417,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - flyteidl.admin.Agent.CreateTaskResponse parsedMessage = null; + flyteidl.admin.AgentOuterClass.CreateTaskResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.admin.Agent.CreateTaskResponse) e.getUnfinishedMessage(); + parsedMessage = (flyteidl.admin.AgentOuterClass.CreateTaskResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -4080,12 +4488,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:flyteidl.admin.CreateTaskResponse) - private static final flyteidl.admin.Agent.CreateTaskResponse DEFAULT_INSTANCE; + private static final flyteidl.admin.AgentOuterClass.CreateTaskResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new flyteidl.admin.Agent.CreateTaskResponse(); + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.CreateTaskResponse(); } - public static flyteidl.admin.Agent.CreateTaskResponse getDefaultInstance() { + public static flyteidl.admin.AgentOuterClass.CreateTaskResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -4110,7 +4518,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public flyteidl.admin.Agent.CreateTaskResponse getDefaultInstanceForType() { + public flyteidl.admin.AgentOuterClass.CreateTaskResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -4224,15 +4632,15 @@ private GetTaskRequest( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskRequest_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskRequest_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.GetTaskRequest.class, flyteidl.admin.Agent.GetTaskRequest.Builder.class); + flyteidl.admin.AgentOuterClass.GetTaskRequest.class, flyteidl.admin.AgentOuterClass.GetTaskRequest.Builder.class); } public static final int TASK_TYPE_FIELD_NUMBER = 1; @@ -4336,10 +4744,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof flyteidl.admin.Agent.GetTaskRequest)) { + if (!(obj instanceof flyteidl.admin.AgentOuterClass.GetTaskRequest)) { return super.equals(obj); } - flyteidl.admin.Agent.GetTaskRequest other = (flyteidl.admin.Agent.GetTaskRequest) obj; + flyteidl.admin.AgentOuterClass.GetTaskRequest other = (flyteidl.admin.AgentOuterClass.GetTaskRequest) obj; if (!getTaskType() .equals(other.getTaskType())) return false; @@ -4365,69 +4773,69 @@ public int hashCode() { return hash; } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom(byte[] data) + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskRequest parseDelimitedFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.GetTaskRequest parseDelimitedFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.GetTaskRequest parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4440,7 +4848,7 @@ public static flyteidl.admin.Agent.GetTaskRequest parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(flyteidl.admin.Agent.GetTaskRequest prototype) { + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.GetTaskRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -4465,21 +4873,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:flyteidl.admin.GetTaskRequest) - flyteidl.admin.Agent.GetTaskRequestOrBuilder { + flyteidl.admin.AgentOuterClass.GetTaskRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskRequest_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskRequest_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.GetTaskRequest.class, flyteidl.admin.Agent.GetTaskRequest.Builder.class); + flyteidl.admin.AgentOuterClass.GetTaskRequest.class, flyteidl.admin.AgentOuterClass.GetTaskRequest.Builder.class); } - // Construct using flyteidl.admin.Agent.GetTaskRequest.newBuilder() + // Construct using flyteidl.admin.AgentOuterClass.GetTaskRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4507,17 +4915,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskRequest_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskRequest_descriptor; } @java.lang.Override - public flyteidl.admin.Agent.GetTaskRequest getDefaultInstanceForType() { - return flyteidl.admin.Agent.GetTaskRequest.getDefaultInstance(); + public flyteidl.admin.AgentOuterClass.GetTaskRequest getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.GetTaskRequest.getDefaultInstance(); } @java.lang.Override - public flyteidl.admin.Agent.GetTaskRequest build() { - flyteidl.admin.Agent.GetTaskRequest result = buildPartial(); + public flyteidl.admin.AgentOuterClass.GetTaskRequest build() { + flyteidl.admin.AgentOuterClass.GetTaskRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -4525,8 +4933,8 @@ public flyteidl.admin.Agent.GetTaskRequest build() { } @java.lang.Override - public flyteidl.admin.Agent.GetTaskRequest buildPartial() { - flyteidl.admin.Agent.GetTaskRequest result = new flyteidl.admin.Agent.GetTaskRequest(this); + public flyteidl.admin.AgentOuterClass.GetTaskRequest buildPartial() { + flyteidl.admin.AgentOuterClass.GetTaskRequest result = new flyteidl.admin.AgentOuterClass.GetTaskRequest(this); result.taskType_ = taskType_; result.resourceMeta_ = resourceMeta_; onBuilt(); @@ -4567,16 +4975,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.admin.Agent.GetTaskRequest) { - return mergeFrom((flyteidl.admin.Agent.GetTaskRequest)other); + if (other instanceof flyteidl.admin.AgentOuterClass.GetTaskRequest) { + return mergeFrom((flyteidl.admin.AgentOuterClass.GetTaskRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(flyteidl.admin.Agent.GetTaskRequest other) { - if (other == flyteidl.admin.Agent.GetTaskRequest.getDefaultInstance()) return this; + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.GetTaskRequest other) { + if (other == flyteidl.admin.AgentOuterClass.GetTaskRequest.getDefaultInstance()) return this; if (!other.getTaskType().isEmpty()) { taskType_ = other.taskType_; onChanged(); @@ -4599,11 +5007,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - flyteidl.admin.Agent.GetTaskRequest parsedMessage = null; + flyteidl.admin.AgentOuterClass.GetTaskRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.admin.Agent.GetTaskRequest) e.getUnfinishedMessage(); + parsedMessage = (flyteidl.admin.AgentOuterClass.GetTaskRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -4759,12 +5167,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:flyteidl.admin.GetTaskRequest) - private static final flyteidl.admin.Agent.GetTaskRequest DEFAULT_INSTANCE; + private static final flyteidl.admin.AgentOuterClass.GetTaskRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new flyteidl.admin.Agent.GetTaskRequest(); + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.GetTaskRequest(); } - public static flyteidl.admin.Agent.GetTaskRequest getDefaultInstance() { + public static flyteidl.admin.AgentOuterClass.GetTaskRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -4789,7 +5197,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public flyteidl.admin.Agent.GetTaskRequest getDefaultInstanceForType() { + public flyteidl.admin.AgentOuterClass.GetTaskRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -4806,16 +5214,60 @@ public interface GetTaskResponseOrBuilder extends /** * .flyteidl.admin.Resource resource = 1; */ - flyteidl.admin.Agent.Resource getResource(); + flyteidl.admin.AgentOuterClass.Resource getResource(); /** * .flyteidl.admin.Resource resource = 1; */ - flyteidl.admin.Agent.ResourceOrBuilder getResourceOrBuilder(); - } - /** - *
-   * Response to get an individual task resource.
-   * 
+ flyteidl.admin.AgentOuterClass.ResourceOrBuilder getResourceOrBuilder(); + + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + java.util.List + getLogsList(); + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + flyteidl.core.Execution.TaskLog getLogs(int index); + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + int getLogsCount(); + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + java.util.List + getLogsOrBuilderList(); + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + flyteidl.core.Execution.TaskLogOrBuilder getLogsOrBuilder( + int index); + } + /** + *
+   * Response to get an individual task resource.
+   * 
* * Protobuf type {@code flyteidl.admin.GetTaskResponse} */ @@ -4829,6 +5281,7 @@ private GetTaskResponse(com.google.protobuf.GeneratedMessageV3.Builder builde super(builder); } private GetTaskResponse() { + logs_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -4856,11 +5309,11 @@ private GetTaskResponse( done = true; break; case 10: { - flyteidl.admin.Agent.Resource.Builder subBuilder = null; + flyteidl.admin.AgentOuterClass.Resource.Builder subBuilder = null; if (resource_ != null) { subBuilder = resource_.toBuilder(); } - resource_ = input.readMessage(flyteidl.admin.Agent.Resource.parser(), extensionRegistry); + resource_ = input.readMessage(flyteidl.admin.AgentOuterClass.Resource.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(resource_); resource_ = subBuilder.buildPartial(); @@ -4868,6 +5321,15 @@ private GetTaskResponse( break; } + case 18: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + logs_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + logs_.add( + input.readMessage(flyteidl.core.Execution.TaskLog.parser(), extensionRegistry)); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -4883,25 +5345,29 @@ private GetTaskResponse( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000002) != 0)) { + logs_ = java.util.Collections.unmodifiableList(logs_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskResponse_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskResponse_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.GetTaskResponse.class, flyteidl.admin.Agent.GetTaskResponse.Builder.class); + flyteidl.admin.AgentOuterClass.GetTaskResponse.class, flyteidl.admin.AgentOuterClass.GetTaskResponse.Builder.class); } + private int bitField0_; public static final int RESOURCE_FIELD_NUMBER = 1; - private flyteidl.admin.Agent.Resource resource_; + private flyteidl.admin.AgentOuterClass.Resource resource_; /** * .flyteidl.admin.Resource resource = 1; */ @@ -4911,16 +5377,71 @@ public boolean hasResource() { /** * .flyteidl.admin.Resource resource = 1; */ - public flyteidl.admin.Agent.Resource getResource() { - return resource_ == null ? flyteidl.admin.Agent.Resource.getDefaultInstance() : resource_; + public flyteidl.admin.AgentOuterClass.Resource getResource() { + return resource_ == null ? flyteidl.admin.AgentOuterClass.Resource.getDefaultInstance() : resource_; } /** * .flyteidl.admin.Resource resource = 1; */ - public flyteidl.admin.Agent.ResourceOrBuilder getResourceOrBuilder() { + public flyteidl.admin.AgentOuterClass.ResourceOrBuilder getResourceOrBuilder() { return getResource(); } + public static final int LOGS_FIELD_NUMBER = 2; + private java.util.List logs_; + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public java.util.List getLogsList() { + return logs_; + } + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public java.util.List + getLogsOrBuilderList() { + return logs_; + } + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public int getLogsCount() { + return logs_.size(); + } + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public flyteidl.core.Execution.TaskLog getLogs(int index) { + return logs_.get(index); + } + /** + *
+     * log information for the task execution
+     * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public flyteidl.core.Execution.TaskLogOrBuilder getLogsOrBuilder( + int index) { + return logs_.get(index); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -4938,6 +5459,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (resource_ != null) { output.writeMessage(1, getResource()); } + for (int i = 0; i < logs_.size(); i++) { + output.writeMessage(2, logs_.get(i)); + } unknownFields.writeTo(output); } @@ -4951,6 +5475,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getResource()); } + for (int i = 0; i < logs_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, logs_.get(i)); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -4961,16 +5489,18 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof flyteidl.admin.Agent.GetTaskResponse)) { + if (!(obj instanceof flyteidl.admin.AgentOuterClass.GetTaskResponse)) { return super.equals(obj); } - flyteidl.admin.Agent.GetTaskResponse other = (flyteidl.admin.Agent.GetTaskResponse) obj; + flyteidl.admin.AgentOuterClass.GetTaskResponse other = (flyteidl.admin.AgentOuterClass.GetTaskResponse) obj; if (hasResource() != other.hasResource()) return false; if (hasResource()) { if (!getResource() .equals(other.getResource())) return false; } + if (!getLogsList() + .equals(other.getLogsList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -4986,74 +5516,78 @@ public int hashCode() { hash = (37 * hash) + RESOURCE_FIELD_NUMBER; hash = (53 * hash) + getResource().hashCode(); } + if (getLogsCount() > 0) { + hash = (37 * hash) + LOGS_FIELD_NUMBER; + hash = (53 * hash) + getLogsList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom(byte[] data) + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskResponse parseDelimitedFrom(java.io.InputStream input) + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.GetTaskResponse parseDelimitedFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static flyteidl.admin.Agent.GetTaskResponse parseFrom( + public static flyteidl.admin.AgentOuterClass.GetTaskResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5066,7 +5600,7 @@ public static flyteidl.admin.Agent.GetTaskResponse parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(flyteidl.admin.Agent.GetTaskResponse prototype) { + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.GetTaskResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -5091,21 +5625,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:flyteidl.admin.GetTaskResponse) - flyteidl.admin.Agent.GetTaskResponseOrBuilder { + flyteidl.admin.AgentOuterClass.GetTaskResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskResponse_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskResponse_fieldAccessorTable + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - flyteidl.admin.Agent.GetTaskResponse.class, flyteidl.admin.Agent.GetTaskResponse.Builder.class); + flyteidl.admin.AgentOuterClass.GetTaskResponse.class, flyteidl.admin.AgentOuterClass.GetTaskResponse.Builder.class); } - // Construct using flyteidl.admin.Agent.GetTaskResponse.newBuilder() + // Construct using flyteidl.admin.AgentOuterClass.GetTaskResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5118,6 +5652,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getLogsFieldBuilder(); } } @java.lang.Override @@ -5129,23 +5664,29 @@ public Builder clear() { resource_ = null; resourceBuilder_ = null; } + if (logsBuilder_ == null) { + logs_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + logsBuilder_.clear(); + } return this; } @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return flyteidl.admin.Agent.internal_static_flyteidl_admin_GetTaskResponse_descriptor; + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetTaskResponse_descriptor; } @java.lang.Override - public flyteidl.admin.Agent.GetTaskResponse getDefaultInstanceForType() { - return flyteidl.admin.Agent.GetTaskResponse.getDefaultInstance(); + public flyteidl.admin.AgentOuterClass.GetTaskResponse getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.GetTaskResponse.getDefaultInstance(); } @java.lang.Override - public flyteidl.admin.Agent.GetTaskResponse build() { - flyteidl.admin.Agent.GetTaskResponse result = buildPartial(); + public flyteidl.admin.AgentOuterClass.GetTaskResponse build() { + flyteidl.admin.AgentOuterClass.GetTaskResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -5153,13 +5694,25 @@ public flyteidl.admin.Agent.GetTaskResponse build() { } @java.lang.Override - public flyteidl.admin.Agent.GetTaskResponse buildPartial() { - flyteidl.admin.Agent.GetTaskResponse result = new flyteidl.admin.Agent.GetTaskResponse(this); + public flyteidl.admin.AgentOuterClass.GetTaskResponse buildPartial() { + flyteidl.admin.AgentOuterClass.GetTaskResponse result = new flyteidl.admin.AgentOuterClass.GetTaskResponse(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; if (resourceBuilder_ == null) { result.resource_ = resource_; } else { result.resource_ = resourceBuilder_.build(); } + if (logsBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0)) { + logs_ = java.util.Collections.unmodifiableList(logs_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.logs_ = logs_; + } else { + result.logs_ = logsBuilder_.build(); + } + result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -5198,19 +5751,45 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof flyteidl.admin.Agent.GetTaskResponse) { - return mergeFrom((flyteidl.admin.Agent.GetTaskResponse)other); + if (other instanceof flyteidl.admin.AgentOuterClass.GetTaskResponse) { + return mergeFrom((flyteidl.admin.AgentOuterClass.GetTaskResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(flyteidl.admin.Agent.GetTaskResponse other) { - if (other == flyteidl.admin.Agent.GetTaskResponse.getDefaultInstance()) return this; + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.GetTaskResponse other) { + if (other == flyteidl.admin.AgentOuterClass.GetTaskResponse.getDefaultInstance()) return this; if (other.hasResource()) { mergeResource(other.getResource()); } + if (logsBuilder_ == null) { + if (!other.logs_.isEmpty()) { + if (logs_.isEmpty()) { + logs_ = other.logs_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureLogsIsMutable(); + logs_.addAll(other.logs_); + } + onChanged(); + } + } else { + if (!other.logs_.isEmpty()) { + if (logsBuilder_.isEmpty()) { + logsBuilder_.dispose(); + logsBuilder_ = null; + logs_ = other.logs_; + bitField0_ = (bitField0_ & ~0x00000002); + logsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getLogsFieldBuilder() : null; + } else { + logsBuilder_.addAllMessages(other.logs_); + } + } + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -5226,11 +5805,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - flyteidl.admin.Agent.GetTaskResponse parsedMessage = null; + flyteidl.admin.AgentOuterClass.GetTaskResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (flyteidl.admin.Agent.GetTaskResponse) e.getUnfinishedMessage(); + parsedMessage = (flyteidl.admin.AgentOuterClass.GetTaskResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -5239,10 +5818,11 @@ public Builder mergeFrom( } return this; } + private int bitField0_; - private flyteidl.admin.Agent.Resource resource_; + private flyteidl.admin.AgentOuterClass.Resource resource_; private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.admin.Agent.Resource, flyteidl.admin.Agent.Resource.Builder, flyteidl.admin.Agent.ResourceOrBuilder> resourceBuilder_; + flyteidl.admin.AgentOuterClass.Resource, flyteidl.admin.AgentOuterClass.Resource.Builder, flyteidl.admin.AgentOuterClass.ResourceOrBuilder> resourceBuilder_; /** * .flyteidl.admin.Resource resource = 1; */ @@ -5252,9 +5832,9 @@ public boolean hasResource() { /** * .flyteidl.admin.Resource resource = 1; */ - public flyteidl.admin.Agent.Resource getResource() { + public flyteidl.admin.AgentOuterClass.Resource getResource() { if (resourceBuilder_ == null) { - return resource_ == null ? flyteidl.admin.Agent.Resource.getDefaultInstance() : resource_; + return resource_ == null ? flyteidl.admin.AgentOuterClass.Resource.getDefaultInstance() : resource_; } else { return resourceBuilder_.getMessage(); } @@ -5262,7 +5842,7 @@ public flyteidl.admin.Agent.Resource getResource() { /** * .flyteidl.admin.Resource resource = 1; */ - public Builder setResource(flyteidl.admin.Agent.Resource value) { + public Builder setResource(flyteidl.admin.AgentOuterClass.Resource value) { if (resourceBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5279,7 +5859,7 @@ public Builder setResource(flyteidl.admin.Agent.Resource value) { * .flyteidl.admin.Resource resource = 1; */ public Builder setResource( - flyteidl.admin.Agent.Resource.Builder builderForValue) { + flyteidl.admin.AgentOuterClass.Resource.Builder builderForValue) { if (resourceBuilder_ == null) { resource_ = builderForValue.build(); onChanged(); @@ -5292,11 +5872,11 @@ public Builder setResource( /** * .flyteidl.admin.Resource resource = 1; */ - public Builder mergeResource(flyteidl.admin.Agent.Resource value) { + public Builder mergeResource(flyteidl.admin.AgentOuterClass.Resource value) { if (resourceBuilder_ == null) { if (resource_ != null) { resource_ = - flyteidl.admin.Agent.Resource.newBuilder(resource_).mergeFrom(value).buildPartial(); + flyteidl.admin.AgentOuterClass.Resource.newBuilder(resource_).mergeFrom(value).buildPartial(); } else { resource_ = value; } @@ -5324,7 +5904,7 @@ public Builder clearResource() { /** * .flyteidl.admin.Resource resource = 1; */ - public flyteidl.admin.Agent.Resource.Builder getResourceBuilder() { + public flyteidl.admin.AgentOuterClass.Resource.Builder getResourceBuilder() { onChanged(); return getResourceFieldBuilder().getBuilder(); @@ -5332,23 +5912,23 @@ public flyteidl.admin.Agent.Resource.Builder getResourceBuilder() { /** * .flyteidl.admin.Resource resource = 1; */ - public flyteidl.admin.Agent.ResourceOrBuilder getResourceOrBuilder() { + public flyteidl.admin.AgentOuterClass.ResourceOrBuilder getResourceOrBuilder() { if (resourceBuilder_ != null) { return resourceBuilder_.getMessageOrBuilder(); } else { return resource_ == null ? - flyteidl.admin.Agent.Resource.getDefaultInstance() : resource_; + flyteidl.admin.AgentOuterClass.Resource.getDefaultInstance() : resource_; } } /** * .flyteidl.admin.Resource resource = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.admin.Agent.Resource, flyteidl.admin.Agent.Resource.Builder, flyteidl.admin.Agent.ResourceOrBuilder> + flyteidl.admin.AgentOuterClass.Resource, flyteidl.admin.AgentOuterClass.Resource.Builder, flyteidl.admin.AgentOuterClass.ResourceOrBuilder> getResourceFieldBuilder() { if (resourceBuilder_ == null) { resourceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.admin.Agent.Resource, flyteidl.admin.Agent.Resource.Builder, flyteidl.admin.Agent.ResourceOrBuilder>( + flyteidl.admin.AgentOuterClass.Resource, flyteidl.admin.AgentOuterClass.Resource.Builder, flyteidl.admin.AgentOuterClass.ResourceOrBuilder>( getResource(), getParentForChildren(), isClean()); @@ -5356,6 +5936,318 @@ public flyteidl.admin.Agent.ResourceOrBuilder getResourceOrBuilder() { } return resourceBuilder_; } + + private java.util.List logs_ = + java.util.Collections.emptyList(); + private void ensureLogsIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + logs_ = new java.util.ArrayList(logs_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.core.Execution.TaskLog, flyteidl.core.Execution.TaskLog.Builder, flyteidl.core.Execution.TaskLogOrBuilder> logsBuilder_; + + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public java.util.List getLogsList() { + if (logsBuilder_ == null) { + return java.util.Collections.unmodifiableList(logs_); + } else { + return logsBuilder_.getMessageList(); + } + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public int getLogsCount() { + if (logsBuilder_ == null) { + return logs_.size(); + } else { + return logsBuilder_.getCount(); + } + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public flyteidl.core.Execution.TaskLog getLogs(int index) { + if (logsBuilder_ == null) { + return logs_.get(index); + } else { + return logsBuilder_.getMessage(index); + } + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder setLogs( + int index, flyteidl.core.Execution.TaskLog value) { + if (logsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogsIsMutable(); + logs_.set(index, value); + onChanged(); + } else { + logsBuilder_.setMessage(index, value); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder setLogs( + int index, flyteidl.core.Execution.TaskLog.Builder builderForValue) { + if (logsBuilder_ == null) { + ensureLogsIsMutable(); + logs_.set(index, builderForValue.build()); + onChanged(); + } else { + logsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder addLogs(flyteidl.core.Execution.TaskLog value) { + if (logsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogsIsMutable(); + logs_.add(value); + onChanged(); + } else { + logsBuilder_.addMessage(value); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder addLogs( + int index, flyteidl.core.Execution.TaskLog value) { + if (logsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogsIsMutable(); + logs_.add(index, value); + onChanged(); + } else { + logsBuilder_.addMessage(index, value); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder addLogs( + flyteidl.core.Execution.TaskLog.Builder builderForValue) { + if (logsBuilder_ == null) { + ensureLogsIsMutable(); + logs_.add(builderForValue.build()); + onChanged(); + } else { + logsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder addLogs( + int index, flyteidl.core.Execution.TaskLog.Builder builderForValue) { + if (logsBuilder_ == null) { + ensureLogsIsMutable(); + logs_.add(index, builderForValue.build()); + onChanged(); + } else { + logsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder addAllLogs( + java.lang.Iterable values) { + if (logsBuilder_ == null) { + ensureLogsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, logs_); + onChanged(); + } else { + logsBuilder_.addAllMessages(values); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder clearLogs() { + if (logsBuilder_ == null) { + logs_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + logsBuilder_.clear(); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public Builder removeLogs(int index) { + if (logsBuilder_ == null) { + ensureLogsIsMutable(); + logs_.remove(index); + onChanged(); + } else { + logsBuilder_.remove(index); + } + return this; + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public flyteidl.core.Execution.TaskLog.Builder getLogsBuilder( + int index) { + return getLogsFieldBuilder().getBuilder(index); + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public flyteidl.core.Execution.TaskLogOrBuilder getLogsOrBuilder( + int index) { + if (logsBuilder_ == null) { + return logs_.get(index); } else { + return logsBuilder_.getMessageOrBuilder(index); + } + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public java.util.List + getLogsOrBuilderList() { + if (logsBuilder_ != null) { + return logsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(logs_); + } + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public flyteidl.core.Execution.TaskLog.Builder addLogsBuilder() { + return getLogsFieldBuilder().addBuilder( + flyteidl.core.Execution.TaskLog.getDefaultInstance()); + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public flyteidl.core.Execution.TaskLog.Builder addLogsBuilder( + int index) { + return getLogsFieldBuilder().addBuilder( + index, flyteidl.core.Execution.TaskLog.getDefaultInstance()); + } + /** + *
+       * log information for the task execution
+       * 
+ * + * repeated .flyteidl.core.TaskLog logs = 2; + */ + public java.util.List + getLogsBuilderList() { + return getLogsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.core.Execution.TaskLog, flyteidl.core.Execution.TaskLog.Builder, flyteidl.core.Execution.TaskLogOrBuilder> + getLogsFieldBuilder() { + if (logsBuilder_ == null) { + logsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.core.Execution.TaskLog, flyteidl.core.Execution.TaskLog.Builder, flyteidl.core.Execution.TaskLogOrBuilder>( + logs_, + ((bitField0_ & 0x00000002) != 0), + getParentForChildren(), + isClean()); + logs_ = null; + } + return logsBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -5373,12 +6265,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:flyteidl.admin.GetTaskResponse) - private static final flyteidl.admin.Agent.GetTaskResponse DEFAULT_INSTANCE; + private static final flyteidl.admin.AgentOuterClass.GetTaskResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new flyteidl.admin.Agent.GetTaskResponse(); + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.GetTaskResponse(); } - public static flyteidl.admin.Agent.GetTaskResponse getDefaultInstance() { + public static flyteidl.admin.AgentOuterClass.GetTaskResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -5403,7 +6295,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public flyteidl.admin.Agent.GetTaskResponse getDefaultInstanceForType() { + public flyteidl.admin.AgentOuterClass.GetTaskResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -5428,7 +6320,7 @@ public interface ResourceOrBuilder extends * * .flyteidl.admin.State state = 1; */ - flyteidl.admin.Agent.State getState(); + flyteidl.admin.AgentOuterClass.State getState(); /** *
@@ -5566,15 +6458,15 @@ private Resource(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return flyteidl.admin.Agent.internal_static_flyteidl_admin_Resource_descriptor;
+      return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Resource_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return flyteidl.admin.Agent.internal_static_flyteidl_admin_Resource_fieldAccessorTable
+      return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Resource_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              flyteidl.admin.Agent.Resource.class, flyteidl.admin.Agent.Resource.Builder.class);
+              flyteidl.admin.AgentOuterClass.Resource.class, flyteidl.admin.AgentOuterClass.Resource.Builder.class);
     }
 
     public static final int STATE_FIELD_NUMBER = 1;
@@ -5596,10 +6488,10 @@ public int getStateValue() {
      *
      * .flyteidl.admin.State state = 1;
      */
-    public flyteidl.admin.Agent.State getState() {
+    public flyteidl.admin.AgentOuterClass.State getState() {
       @SuppressWarnings("deprecation")
-      flyteidl.admin.Agent.State result = flyteidl.admin.Agent.State.valueOf(state_);
-      return result == null ? flyteidl.admin.Agent.State.UNRECOGNIZED : result;
+      flyteidl.admin.AgentOuterClass.State result = flyteidl.admin.AgentOuterClass.State.valueOf(state_);
+      return result == null ? flyteidl.admin.AgentOuterClass.State.UNRECOGNIZED : result;
     }
 
     public static final int OUTPUTS_FIELD_NUMBER = 2;
@@ -5697,7 +6589,7 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (state_ != flyteidl.admin.Agent.State.RETRYABLE_FAILURE.getNumber()) {
+      if (state_ != flyteidl.admin.AgentOuterClass.State.RETRYABLE_FAILURE.getNumber()) {
         output.writeEnum(1, state_);
       }
       if (outputs_ != null) {
@@ -5715,7 +6607,7 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (state_ != flyteidl.admin.Agent.State.RETRYABLE_FAILURE.getNumber()) {
+      if (state_ != flyteidl.admin.AgentOuterClass.State.RETRYABLE_FAILURE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(1, state_);
       }
@@ -5736,10 +6628,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof flyteidl.admin.Agent.Resource)) {
+      if (!(obj instanceof flyteidl.admin.AgentOuterClass.Resource)) {
         return super.equals(obj);
       }
-      flyteidl.admin.Agent.Resource other = (flyteidl.admin.Agent.Resource) obj;
+      flyteidl.admin.AgentOuterClass.Resource other = (flyteidl.admin.AgentOuterClass.Resource) obj;
 
       if (state_ != other.state_) return false;
       if (hasOutputs() != other.hasOutputs()) return false;
@@ -5773,69 +6665,69 @@ public int hashCode() {
       return hash;
     }
 
-    public static flyteidl.admin.Agent.Resource parseFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(byte[] data)
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(java.io.InputStream input)
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.Resource parseDelimitedFrom(java.io.InputStream input)
+    public static flyteidl.admin.AgentOuterClass.Resource parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.Resource parseDelimitedFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.Resource parseFrom(
+    public static flyteidl.admin.AgentOuterClass.Resource parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5848,7 +6740,7 @@ public static flyteidl.admin.Agent.Resource parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(flyteidl.admin.Agent.Resource prototype) {
+    public static Builder newBuilder(flyteidl.admin.AgentOuterClass.Resource prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5869,21 +6761,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:flyteidl.admin.Resource)
-        flyteidl.admin.Agent.ResourceOrBuilder {
+        flyteidl.admin.AgentOuterClass.ResourceOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_Resource_descriptor;
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Resource_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_Resource_fieldAccessorTable
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Resource_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                flyteidl.admin.Agent.Resource.class, flyteidl.admin.Agent.Resource.Builder.class);
+                flyteidl.admin.AgentOuterClass.Resource.class, flyteidl.admin.AgentOuterClass.Resource.Builder.class);
       }
 
-      // Construct using flyteidl.admin.Agent.Resource.newBuilder()
+      // Construct using flyteidl.admin.AgentOuterClass.Resource.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5917,17 +6809,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_Resource_descriptor;
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Resource_descriptor;
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.Resource getDefaultInstanceForType() {
-        return flyteidl.admin.Agent.Resource.getDefaultInstance();
+      public flyteidl.admin.AgentOuterClass.Resource getDefaultInstanceForType() {
+        return flyteidl.admin.AgentOuterClass.Resource.getDefaultInstance();
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.Resource build() {
-        flyteidl.admin.Agent.Resource result = buildPartial();
+      public flyteidl.admin.AgentOuterClass.Resource build() {
+        flyteidl.admin.AgentOuterClass.Resource result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5935,8 +6827,8 @@ public flyteidl.admin.Agent.Resource build() {
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.Resource buildPartial() {
-        flyteidl.admin.Agent.Resource result = new flyteidl.admin.Agent.Resource(this);
+      public flyteidl.admin.AgentOuterClass.Resource buildPartial() {
+        flyteidl.admin.AgentOuterClass.Resource result = new flyteidl.admin.AgentOuterClass.Resource(this);
         result.state_ = state_;
         if (outputsBuilder_ == null) {
           result.outputs_ = outputs_;
@@ -5982,16 +6874,16 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof flyteidl.admin.Agent.Resource) {
-          return mergeFrom((flyteidl.admin.Agent.Resource)other);
+        if (other instanceof flyteidl.admin.AgentOuterClass.Resource) {
+          return mergeFrom((flyteidl.admin.AgentOuterClass.Resource)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(flyteidl.admin.Agent.Resource other) {
-        if (other == flyteidl.admin.Agent.Resource.getDefaultInstance()) return this;
+      public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Resource other) {
+        if (other == flyteidl.admin.AgentOuterClass.Resource.getDefaultInstance()) return this;
         if (other.state_ != 0) {
           setStateValue(other.getStateValue());
         }
@@ -6017,11 +6909,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        flyteidl.admin.Agent.Resource parsedMessage = null;
+        flyteidl.admin.AgentOuterClass.Resource parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (flyteidl.admin.Agent.Resource) e.getUnfinishedMessage();
+          parsedMessage = (flyteidl.admin.AgentOuterClass.Resource) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6061,10 +6953,10 @@ public Builder setStateValue(int value) {
        *
        * .flyteidl.admin.State state = 1;
        */
-      public flyteidl.admin.Agent.State getState() {
+      public flyteidl.admin.AgentOuterClass.State getState() {
         @SuppressWarnings("deprecation")
-        flyteidl.admin.Agent.State result = flyteidl.admin.Agent.State.valueOf(state_);
-        return result == null ? flyteidl.admin.Agent.State.UNRECOGNIZED : result;
+        flyteidl.admin.AgentOuterClass.State result = flyteidl.admin.AgentOuterClass.State.valueOf(state_);
+        return result == null ? flyteidl.admin.AgentOuterClass.State.UNRECOGNIZED : result;
       }
       /**
        * 
@@ -6073,7 +6965,7 @@ public flyteidl.admin.Agent.State getState() {
        *
        * .flyteidl.admin.State state = 1;
        */
-      public Builder setState(flyteidl.admin.Agent.State value) {
+      public Builder setState(flyteidl.admin.AgentOuterClass.State value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6372,12 +7264,12 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:flyteidl.admin.Resource)
-    private static final flyteidl.admin.Agent.Resource DEFAULT_INSTANCE;
+    private static final flyteidl.admin.AgentOuterClass.Resource DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new flyteidl.admin.Agent.Resource();
+      DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.Resource();
     }
 
-    public static flyteidl.admin.Agent.Resource getDefaultInstance() {
+    public static flyteidl.admin.AgentOuterClass.Resource getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6402,7 +7294,7 @@ public com.google.protobuf.Parser getParserForType() {
     }
 
     @java.lang.Override
-    public flyteidl.admin.Agent.Resource getDefaultInstanceForType() {
+    public flyteidl.admin.AgentOuterClass.Resource getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6516,15 +7408,15 @@ private DeleteTaskRequest(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskRequest_descriptor;
+      return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskRequest_fieldAccessorTable
+      return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              flyteidl.admin.Agent.DeleteTaskRequest.class, flyteidl.admin.Agent.DeleteTaskRequest.Builder.class);
+              flyteidl.admin.AgentOuterClass.DeleteTaskRequest.class, flyteidl.admin.AgentOuterClass.DeleteTaskRequest.Builder.class);
     }
 
     public static final int TASK_TYPE_FIELD_NUMBER = 1;
@@ -6628,10 +7520,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof flyteidl.admin.Agent.DeleteTaskRequest)) {
+      if (!(obj instanceof flyteidl.admin.AgentOuterClass.DeleteTaskRequest)) {
         return super.equals(obj);
       }
-      flyteidl.admin.Agent.DeleteTaskRequest other = (flyteidl.admin.Agent.DeleteTaskRequest) obj;
+      flyteidl.admin.AgentOuterClass.DeleteTaskRequest other = (flyteidl.admin.AgentOuterClass.DeleteTaskRequest) obj;
 
       if (!getTaskType()
           .equals(other.getTaskType())) return false;
@@ -6657,69 +7549,69 @@ public int hashCode() {
       return hash;
     }
 
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(byte[] data)
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(java.io.InputStream input)
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseDelimitedFrom(java.io.InputStream input)
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseDelimitedFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -6732,7 +7624,7 @@ public static flyteidl.admin.Agent.DeleteTaskRequest parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(flyteidl.admin.Agent.DeleteTaskRequest prototype) {
+    public static Builder newBuilder(flyteidl.admin.AgentOuterClass.DeleteTaskRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6757,21 +7649,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:flyteidl.admin.DeleteTaskRequest)
-        flyteidl.admin.Agent.DeleteTaskRequestOrBuilder {
+        flyteidl.admin.AgentOuterClass.DeleteTaskRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskRequest_descriptor;
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskRequest_fieldAccessorTable
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                flyteidl.admin.Agent.DeleteTaskRequest.class, flyteidl.admin.Agent.DeleteTaskRequest.Builder.class);
+                flyteidl.admin.AgentOuterClass.DeleteTaskRequest.class, flyteidl.admin.AgentOuterClass.DeleteTaskRequest.Builder.class);
       }
 
-      // Construct using flyteidl.admin.Agent.DeleteTaskRequest.newBuilder()
+      // Construct using flyteidl.admin.AgentOuterClass.DeleteTaskRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -6799,17 +7691,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskRequest_descriptor;
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskRequest_descriptor;
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.DeleteTaskRequest getDefaultInstanceForType() {
-        return flyteidl.admin.Agent.DeleteTaskRequest.getDefaultInstance();
+      public flyteidl.admin.AgentOuterClass.DeleteTaskRequest getDefaultInstanceForType() {
+        return flyteidl.admin.AgentOuterClass.DeleteTaskRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.DeleteTaskRequest build() {
-        flyteidl.admin.Agent.DeleteTaskRequest result = buildPartial();
+      public flyteidl.admin.AgentOuterClass.DeleteTaskRequest build() {
+        flyteidl.admin.AgentOuterClass.DeleteTaskRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6817,8 +7709,8 @@ public flyteidl.admin.Agent.DeleteTaskRequest build() {
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.DeleteTaskRequest buildPartial() {
-        flyteidl.admin.Agent.DeleteTaskRequest result = new flyteidl.admin.Agent.DeleteTaskRequest(this);
+      public flyteidl.admin.AgentOuterClass.DeleteTaskRequest buildPartial() {
+        flyteidl.admin.AgentOuterClass.DeleteTaskRequest result = new flyteidl.admin.AgentOuterClass.DeleteTaskRequest(this);
         result.taskType_ = taskType_;
         result.resourceMeta_ = resourceMeta_;
         onBuilt();
@@ -6859,16 +7751,16 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof flyteidl.admin.Agent.DeleteTaskRequest) {
-          return mergeFrom((flyteidl.admin.Agent.DeleteTaskRequest)other);
+        if (other instanceof flyteidl.admin.AgentOuterClass.DeleteTaskRequest) {
+          return mergeFrom((flyteidl.admin.AgentOuterClass.DeleteTaskRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(flyteidl.admin.Agent.DeleteTaskRequest other) {
-        if (other == flyteidl.admin.Agent.DeleteTaskRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(flyteidl.admin.AgentOuterClass.DeleteTaskRequest other) {
+        if (other == flyteidl.admin.AgentOuterClass.DeleteTaskRequest.getDefaultInstance()) return this;
         if (!other.getTaskType().isEmpty()) {
           taskType_ = other.taskType_;
           onChanged();
@@ -6891,11 +7783,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        flyteidl.admin.Agent.DeleteTaskRequest parsedMessage = null;
+        flyteidl.admin.AgentOuterClass.DeleteTaskRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (flyteidl.admin.Agent.DeleteTaskRequest) e.getUnfinishedMessage();
+          parsedMessage = (flyteidl.admin.AgentOuterClass.DeleteTaskRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7051,12 +7943,12 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:flyteidl.admin.DeleteTaskRequest)
-    private static final flyteidl.admin.Agent.DeleteTaskRequest DEFAULT_INSTANCE;
+    private static final flyteidl.admin.AgentOuterClass.DeleteTaskRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new flyteidl.admin.Agent.DeleteTaskRequest();
+      DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.DeleteTaskRequest();
     }
 
-    public static flyteidl.admin.Agent.DeleteTaskRequest getDefaultInstance() {
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7081,7 +7973,7 @@ public com.google.protobuf.Parser getParserForType() {
     }
 
     @java.lang.Override
-    public flyteidl.admin.Agent.DeleteTaskRequest getDefaultInstanceForType() {
+    public flyteidl.admin.AgentOuterClass.DeleteTaskRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7154,15 +8046,15 @@ private DeleteTaskResponse(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskResponse_descriptor;
+      return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskResponse_fieldAccessorTable
+      return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              flyteidl.admin.Agent.DeleteTaskResponse.class, flyteidl.admin.Agent.DeleteTaskResponse.Builder.class);
+              flyteidl.admin.AgentOuterClass.DeleteTaskResponse.class, flyteidl.admin.AgentOuterClass.DeleteTaskResponse.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -7198,10 +8090,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof flyteidl.admin.Agent.DeleteTaskResponse)) {
+      if (!(obj instanceof flyteidl.admin.AgentOuterClass.DeleteTaskResponse)) {
         return super.equals(obj);
       }
-      flyteidl.admin.Agent.DeleteTaskResponse other = (flyteidl.admin.Agent.DeleteTaskResponse) obj;
+      flyteidl.admin.AgentOuterClass.DeleteTaskResponse other = (flyteidl.admin.AgentOuterClass.DeleteTaskResponse) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -7219,69 +8111,69 @@ public int hashCode() {
       return hash;
     }
 
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(byte[] data)
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(java.io.InputStream input)
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseDelimitedFrom(java.io.InputStream input)
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseDelimitedFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7294,7 +8186,7 @@ public static flyteidl.admin.Agent.DeleteTaskResponse parseFrom(
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(flyteidl.admin.Agent.DeleteTaskResponse prototype) {
+    public static Builder newBuilder(flyteidl.admin.AgentOuterClass.DeleteTaskResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7319,21 +8211,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:flyteidl.admin.DeleteTaskResponse)
-        flyteidl.admin.Agent.DeleteTaskResponseOrBuilder {
+        flyteidl.admin.AgentOuterClass.DeleteTaskResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskResponse_descriptor;
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskResponse_fieldAccessorTable
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                flyteidl.admin.Agent.DeleteTaskResponse.class, flyteidl.admin.Agent.DeleteTaskResponse.Builder.class);
+                flyteidl.admin.AgentOuterClass.DeleteTaskResponse.class, flyteidl.admin.AgentOuterClass.DeleteTaskResponse.Builder.class);
       }
 
-      // Construct using flyteidl.admin.Agent.DeleteTaskResponse.newBuilder()
+      // Construct using flyteidl.admin.AgentOuterClass.DeleteTaskResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -7357,17 +8249,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return flyteidl.admin.Agent.internal_static_flyteidl_admin_DeleteTaskResponse_descriptor;
+        return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_DeleteTaskResponse_descriptor;
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.DeleteTaskResponse getDefaultInstanceForType() {
-        return flyteidl.admin.Agent.DeleteTaskResponse.getDefaultInstance();
+      public flyteidl.admin.AgentOuterClass.DeleteTaskResponse getDefaultInstanceForType() {
+        return flyteidl.admin.AgentOuterClass.DeleteTaskResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.DeleteTaskResponse build() {
-        flyteidl.admin.Agent.DeleteTaskResponse result = buildPartial();
+      public flyteidl.admin.AgentOuterClass.DeleteTaskResponse build() {
+        flyteidl.admin.AgentOuterClass.DeleteTaskResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7375,8 +8267,8 @@ public flyteidl.admin.Agent.DeleteTaskResponse build() {
       }
 
       @java.lang.Override
-      public flyteidl.admin.Agent.DeleteTaskResponse buildPartial() {
-        flyteidl.admin.Agent.DeleteTaskResponse result = new flyteidl.admin.Agent.DeleteTaskResponse(this);
+      public flyteidl.admin.AgentOuterClass.DeleteTaskResponse buildPartial() {
+        flyteidl.admin.AgentOuterClass.DeleteTaskResponse result = new flyteidl.admin.AgentOuterClass.DeleteTaskResponse(this);
         onBuilt();
         return result;
       }
@@ -7415,16 +8307,16 @@ public Builder addRepeatedField(
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof flyteidl.admin.Agent.DeleteTaskResponse) {
-          return mergeFrom((flyteidl.admin.Agent.DeleteTaskResponse)other);
+        if (other instanceof flyteidl.admin.AgentOuterClass.DeleteTaskResponse) {
+          return mergeFrom((flyteidl.admin.AgentOuterClass.DeleteTaskResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(flyteidl.admin.Agent.DeleteTaskResponse other) {
-        if (other == flyteidl.admin.Agent.DeleteTaskResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(flyteidl.admin.AgentOuterClass.DeleteTaskResponse other) {
+        if (other == flyteidl.admin.AgentOuterClass.DeleteTaskResponse.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -7440,11 +8332,11 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        flyteidl.admin.Agent.DeleteTaskResponse parsedMessage = null;
+        flyteidl.admin.AgentOuterClass.DeleteTaskResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (flyteidl.admin.Agent.DeleteTaskResponse) e.getUnfinishedMessage();
+          parsedMessage = (flyteidl.admin.AgentOuterClass.DeleteTaskResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7470,12 +8362,12 @@ public final Builder mergeUnknownFields(
     }
 
     // @@protoc_insertion_point(class_scope:flyteidl.admin.DeleteTaskResponse)
-    private static final flyteidl.admin.Agent.DeleteTaskResponse DEFAULT_INSTANCE;
+    private static final flyteidl.admin.AgentOuterClass.DeleteTaskResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new flyteidl.admin.Agent.DeleteTaskResponse();
+      DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.DeleteTaskResponse();
     }
 
-    public static flyteidl.admin.Agent.DeleteTaskResponse getDefaultInstance() {
+    public static flyteidl.admin.AgentOuterClass.DeleteTaskResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7500,7 +8392,3533 @@ public com.google.protobuf.Parser getParserForType() {
     }
 
     @java.lang.Override
-    public flyteidl.admin.Agent.DeleteTaskResponse getDefaultInstanceForType() {
+    public flyteidl.admin.AgentOuterClass.DeleteTaskResponse getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface AgentOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:flyteidl.admin.Agent)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * 
+     * The name of the agent.
+     * 
+ * + * string name = 1; + */ + java.lang.String getName(); + /** + *
+     * The name of the agent.
+     * 
+ * + * string name = 1; + */ + com.google.protobuf.ByteString + getNameBytes(); + + /** + *
+     * A list of secret in the secret manager.
+     * 
+ * + * repeated string secret_name = 2; + */ + java.util.List + getSecretNameList(); + /** + *
+     * A list of secret in the secret manager.
+     * 
+ * + * repeated string secret_name = 2; + */ + int getSecretNameCount(); + /** + *
+     * A list of secret in the secret manager.
+     * 
+ * + * repeated string secret_name = 2; + */ + java.lang.String getSecretName(int index); + /** + *
+     * A list of secret in the secret manager.
+     * 
+ * + * repeated string secret_name = 2; + */ + com.google.protobuf.ByteString + getSecretNameBytes(int index); + + /** + *
+     * The type of the task that the agent can handle.
+     * 
+ * + * string supported_task_type = 3; + */ + java.lang.String getSupportedTaskType(); + /** + *
+     * The type of the task that the agent can handle.
+     * 
+ * + * string supported_task_type = 3; + */ + com.google.protobuf.ByteString + getSupportedTaskTypeBytes(); + + /** + *
+     * Indicates if this agent is a sync agent.
+     * 
+ * + * bool is_sync = 4; + */ + boolean getIsSync(); + } + /** + *
+   * A message containing the agent metadata.
+   * 
+ * + * Protobuf type {@code flyteidl.admin.Agent} + */ + public static final class Agent extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.admin.Agent) + AgentOrBuilder { + private static final long serialVersionUID = 0L; + // Use Agent.newBuilder() to construct. + private Agent(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Agent() { + name_ = ""; + secretName_ = com.google.protobuf.LazyStringArrayList.EMPTY; + supportedTaskType_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Agent( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + secretName_ = new com.google.protobuf.LazyStringArrayList(); + mutable_bitField0_ |= 0x00000002; + } + secretName_.add(s); + break; + } + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + + supportedTaskType_ = s; + break; + } + case 32: { + + isSync_ = input.readBool(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000002) != 0)) { + secretName_ = secretName_.getUnmodifiableView(); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Agent_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Agent_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.Agent.class, flyteidl.admin.AgentOuterClass.Agent.Builder.class); + } + + private int bitField0_; + public static final int NAME_FIELD_NUMBER = 1; + private volatile java.lang.Object name_; + /** + *
+     * The name of the agent.
+     * 
+ * + * string name = 1; + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } + } + /** + *
+     * The name of the agent.
+     * 
+ * + * string name = 1; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int SECRET_NAME_FIELD_NUMBER = 2; + private com.google.protobuf.LazyStringList secretName_; + /** + *
+     * A list of secret in the secret manager.
+     * 
+ * + * repeated string secret_name = 2; + */ + public com.google.protobuf.ProtocolStringList + getSecretNameList() { + return secretName_; + } + /** + *
+     * A list of secret in the secret manager.
+     * 
+ * + * repeated string secret_name = 2; + */ + public int getSecretNameCount() { + return secretName_.size(); + } + /** + *
+     * A list of secret in the secret manager.
+     * 
+ * + * repeated string secret_name = 2; + */ + public java.lang.String getSecretName(int index) { + return secretName_.get(index); + } + /** + *
+     * A list of secret in the secret manager.
+     * 
+ * + * repeated string secret_name = 2; + */ + public com.google.protobuf.ByteString + getSecretNameBytes(int index) { + return secretName_.getByteString(index); + } + + public static final int SUPPORTED_TASK_TYPE_FIELD_NUMBER = 3; + private volatile java.lang.Object supportedTaskType_; + /** + *
+     * The type of the task that the agent can handle.
+     * 
+ * + * string supported_task_type = 3; + */ + public java.lang.String getSupportedTaskType() { + java.lang.Object ref = supportedTaskType_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + supportedTaskType_ = s; + return s; + } + } + /** + *
+     * The type of the task that the agent can handle.
+     * 
+ * + * string supported_task_type = 3; + */ + public com.google.protobuf.ByteString + getSupportedTaskTypeBytes() { + java.lang.Object ref = supportedTaskType_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + supportedTaskType_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int IS_SYNC_FIELD_NUMBER = 4; + private boolean isSync_; + /** + *
+     * Indicates if this agent is a sync agent.
+     * 
+ * + * bool is_sync = 4; + */ + public boolean getIsSync() { + return isSync_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); + } + for (int i = 0; i < secretName_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, secretName_.getRaw(i)); + } + if (!getSupportedTaskTypeBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, supportedTaskType_); + } + if (isSync_ != false) { + output.writeBool(4, isSync_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); + } + { + int dataSize = 0; + for (int i = 0; i < secretName_.size(); i++) { + dataSize += computeStringSizeNoTag(secretName_.getRaw(i)); + } + size += dataSize; + size += 1 * getSecretNameList().size(); + } + if (!getSupportedTaskTypeBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, supportedTaskType_); + } + if (isSync_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, isSync_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.admin.AgentOuterClass.Agent)) { + return super.equals(obj); + } + flyteidl.admin.AgentOuterClass.Agent other = (flyteidl.admin.AgentOuterClass.Agent) obj; + + if (!getName() + .equals(other.getName())) return false; + if (!getSecretNameList() + .equals(other.getSecretNameList())) return false; + if (!getSupportedTaskType() + .equals(other.getSupportedTaskType())) return false; + if (getIsSync() + != other.getIsSync()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + if (getSecretNameCount() > 0) { + hash = (37 * hash) + SECRET_NAME_FIELD_NUMBER; + hash = (53 * hash) + getSecretNameList().hashCode(); + } + hash = (37 * hash) + SUPPORTED_TASK_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getSupportedTaskType().hashCode(); + hash = (37 * hash) + IS_SYNC_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsSync()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.admin.AgentOuterClass.Agent parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.Agent parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.Agent parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.Agent parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.Agent prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * A message containing the agent metadata.
+     * 
+ * + * Protobuf type {@code flyteidl.admin.Agent} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.admin.Agent) + flyteidl.admin.AgentOuterClass.AgentOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Agent_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Agent_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.Agent.class, flyteidl.admin.AgentOuterClass.Agent.Builder.class); + } + + // Construct using flyteidl.admin.AgentOuterClass.Agent.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + name_ = ""; + + secretName_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000002); + supportedTaskType_ = ""; + + isSync_ = false; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_Agent_descriptor; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.Agent getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.Agent.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.Agent build() { + flyteidl.admin.AgentOuterClass.Agent result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.Agent buildPartial() { + flyteidl.admin.AgentOuterClass.Agent result = new flyteidl.admin.AgentOuterClass.Agent(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.name_ = name_; + if (((bitField0_ & 0x00000002) != 0)) { + secretName_ = secretName_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.secretName_ = secretName_; + result.supportedTaskType_ = supportedTaskType_; + result.isSync_ = isSync_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.admin.AgentOuterClass.Agent) { + return mergeFrom((flyteidl.admin.AgentOuterClass.Agent)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Agent other) { + if (other == flyteidl.admin.AgentOuterClass.Agent.getDefaultInstance()) return this; + if (!other.getName().isEmpty()) { + name_ = other.name_; + onChanged(); + } + if (!other.secretName_.isEmpty()) { + if (secretName_.isEmpty()) { + secretName_ = other.secretName_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureSecretNameIsMutable(); + secretName_.addAll(other.secretName_); + } + onChanged(); + } + if (!other.getSupportedTaskType().isEmpty()) { + supportedTaskType_ = other.supportedTaskType_; + onChanged(); + } + if (other.getIsSync() != false) { + setIsSync(other.getIsSync()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.admin.AgentOuterClass.Agent parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.admin.AgentOuterClass.Agent) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.lang.Object name_ = ""; + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public Builder setName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + name_ = value; + onChanged(); + return this; + } + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public Builder clearName() { + + name_ = getDefaultInstance().getName(); + onChanged(); + return this; + } + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + name_ = value; + onChanged(); + return this; + } + + private com.google.protobuf.LazyStringList secretName_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private void ensureSecretNameIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + secretName_ = new com.google.protobuf.LazyStringArrayList(secretName_); + bitField0_ |= 0x00000002; + } + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public com.google.protobuf.ProtocolStringList + getSecretNameList() { + return secretName_.getUnmodifiableView(); + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public int getSecretNameCount() { + return secretName_.size(); + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public java.lang.String getSecretName(int index) { + return secretName_.get(index); + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public com.google.protobuf.ByteString + getSecretNameBytes(int index) { + return secretName_.getByteString(index); + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public Builder setSecretName( + int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecretNameIsMutable(); + secretName_.set(index, value); + onChanged(); + return this; + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public Builder addSecretName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecretNameIsMutable(); + secretName_.add(value); + onChanged(); + return this; + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public Builder addAllSecretName( + java.lang.Iterable values) { + ensureSecretNameIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, secretName_); + onChanged(); + return this; + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public Builder clearSecretName() { + secretName_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + *
+       * A list of secret in the secret manager.
+       * 
+ * + * repeated string secret_name = 2; + */ + public Builder addSecretNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + ensureSecretNameIsMutable(); + secretName_.add(value); + onChanged(); + return this; + } + + private java.lang.Object supportedTaskType_ = ""; + /** + *
+       * The type of the task that the agent can handle.
+       * 
+ * + * string supported_task_type = 3; + */ + public java.lang.String getSupportedTaskType() { + java.lang.Object ref = supportedTaskType_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + supportedTaskType_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + *
+       * The type of the task that the agent can handle.
+       * 
+ * + * string supported_task_type = 3; + */ + public com.google.protobuf.ByteString + getSupportedTaskTypeBytes() { + java.lang.Object ref = supportedTaskType_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + supportedTaskType_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + *
+       * The type of the task that the agent can handle.
+       * 
+ * + * string supported_task_type = 3; + */ + public Builder setSupportedTaskType( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + supportedTaskType_ = value; + onChanged(); + return this; + } + /** + *
+       * The type of the task that the agent can handle.
+       * 
+ * + * string supported_task_type = 3; + */ + public Builder clearSupportedTaskType() { + + supportedTaskType_ = getDefaultInstance().getSupportedTaskType(); + onChanged(); + return this; + } + /** + *
+       * The type of the task that the agent can handle.
+       * 
+ * + * string supported_task_type = 3; + */ + public Builder setSupportedTaskTypeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + supportedTaskType_ = value; + onChanged(); + return this; + } + + private boolean isSync_ ; + /** + *
+       * Indicates if this agent is a sync agent.
+       * 
+ * + * bool is_sync = 4; + */ + public boolean getIsSync() { + return isSync_; + } + /** + *
+       * Indicates if this agent is a sync agent.
+       * 
+ * + * bool is_sync = 4; + */ + public Builder setIsSync(boolean value) { + + isSync_ = value; + onChanged(); + return this; + } + /** + *
+       * Indicates if this agent is a sync agent.
+       * 
+ * + * bool is_sync = 4; + */ + public Builder clearIsSync() { + + isSync_ = false; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.admin.Agent) + } + + // @@protoc_insertion_point(class_scope:flyteidl.admin.Agent) + private static final flyteidl.admin.AgentOuterClass.Agent DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.Agent(); + } + + public static flyteidl.admin.AgentOuterClass.Agent getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public Agent parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Agent(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.Agent getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface GetAgentRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.admin.GetAgentRequest) + com.google.protobuf.MessageOrBuilder { + + /** + *
+     * The name of the agent.
+     * 
+ * + * string name = 1; + */ + java.lang.String getName(); + /** + *
+     * The name of the agent.
+     * 
+ * + * string name = 1; + */ + com.google.protobuf.ByteString + getNameBytes(); + } + /** + *
+   * A request to get an agent.
+   * 
+ * + * Protobuf type {@code flyteidl.admin.GetAgentRequest} + */ + public static final class GetAgentRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.admin.GetAgentRequest) + GetAgentRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use GetAgentRequest.newBuilder() to construct. + private GetAgentRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GetAgentRequest() { + name_ = ""; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private GetAgentRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.GetAgentRequest.class, flyteidl.admin.AgentOuterClass.GetAgentRequest.Builder.class); + } + + public static final int NAME_FIELD_NUMBER = 1; + private volatile java.lang.Object name_; + /** + *
+     * The name of the agent.
+     * 
+ * + * string name = 1; + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } + } + /** + *
+     * The name of the agent.
+     * 
+ * + * string name = 1; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getNameBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getNameBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.admin.AgentOuterClass.GetAgentRequest)) { + return super.equals(obj); + } + flyteidl.admin.AgentOuterClass.GetAgentRequest other = (flyteidl.admin.AgentOuterClass.GetAgentRequest) obj; + + if (!getName() + .equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.GetAgentRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.GetAgentRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * A request to get an agent.
+     * 
+ * + * Protobuf type {@code flyteidl.admin.GetAgentRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.admin.GetAgentRequest) + flyteidl.admin.AgentOuterClass.GetAgentRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.GetAgentRequest.class, flyteidl.admin.AgentOuterClass.GetAgentRequest.Builder.class); + } + + // Construct using flyteidl.admin.AgentOuterClass.GetAgentRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + name_ = ""; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentRequest_descriptor; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.GetAgentRequest getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.GetAgentRequest.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.GetAgentRequest build() { + flyteidl.admin.AgentOuterClass.GetAgentRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.GetAgentRequest buildPartial() { + flyteidl.admin.AgentOuterClass.GetAgentRequest result = new flyteidl.admin.AgentOuterClass.GetAgentRequest(this); + result.name_ = name_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.admin.AgentOuterClass.GetAgentRequest) { + return mergeFrom((flyteidl.admin.AgentOuterClass.GetAgentRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.GetAgentRequest other) { + if (other == flyteidl.admin.AgentOuterClass.GetAgentRequest.getDefaultInstance()) return this; + if (!other.getName().isEmpty()) { + name_ = other.name_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.admin.AgentOuterClass.GetAgentRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.admin.AgentOuterClass.GetAgentRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private java.lang.Object name_ = ""; + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public Builder setName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + name_ = value; + onChanged(); + return this; + } + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public Builder clearName() { + + name_ = getDefaultInstance().getName(); + onChanged(); + return this; + } + /** + *
+       * The name of the agent.
+       * 
+ * + * string name = 1; + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + name_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.admin.GetAgentRequest) + } + + // @@protoc_insertion_point(class_scope:flyteidl.admin.GetAgentRequest) + private static final flyteidl.admin.AgentOuterClass.GetAgentRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.GetAgentRequest(); + } + + public static flyteidl.admin.AgentOuterClass.GetAgentRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public GetAgentRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new GetAgentRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.GetAgentRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface GetAgentResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.admin.GetAgentResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * .flyteidl.admin.Agent agent = 1; + */ + boolean hasAgent(); + /** + * .flyteidl.admin.Agent agent = 1; + */ + flyteidl.admin.AgentOuterClass.Agent getAgent(); + /** + * .flyteidl.admin.Agent agent = 1; + */ + flyteidl.admin.AgentOuterClass.AgentOrBuilder getAgentOrBuilder(); + } + /** + *
+   * A response containing an agent.
+   * 
+ * + * Protobuf type {@code flyteidl.admin.GetAgentResponse} + */ + public static final class GetAgentResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.admin.GetAgentResponse) + GetAgentResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use GetAgentResponse.newBuilder() to construct. + private GetAgentResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GetAgentResponse() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private GetAgentResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + flyteidl.admin.AgentOuterClass.Agent.Builder subBuilder = null; + if (agent_ != null) { + subBuilder = agent_.toBuilder(); + } + agent_ = input.readMessage(flyteidl.admin.AgentOuterClass.Agent.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(agent_); + agent_ = subBuilder.buildPartial(); + } + + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.GetAgentResponse.class, flyteidl.admin.AgentOuterClass.GetAgentResponse.Builder.class); + } + + public static final int AGENT_FIELD_NUMBER = 1; + private flyteidl.admin.AgentOuterClass.Agent agent_; + /** + * .flyteidl.admin.Agent agent = 1; + */ + public boolean hasAgent() { + return agent_ != null; + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public flyteidl.admin.AgentOuterClass.Agent getAgent() { + return agent_ == null ? flyteidl.admin.AgentOuterClass.Agent.getDefaultInstance() : agent_; + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public flyteidl.admin.AgentOuterClass.AgentOrBuilder getAgentOrBuilder() { + return getAgent(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (agent_ != null) { + output.writeMessage(1, getAgent()); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (agent_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getAgent()); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.admin.AgentOuterClass.GetAgentResponse)) { + return super.equals(obj); + } + flyteidl.admin.AgentOuterClass.GetAgentResponse other = (flyteidl.admin.AgentOuterClass.GetAgentResponse) obj; + + if (hasAgent() != other.hasAgent()) return false; + if (hasAgent()) { + if (!getAgent() + .equals(other.getAgent())) return false; + } + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasAgent()) { + hash = (37 * hash) + AGENT_FIELD_NUMBER; + hash = (53 * hash) + getAgent().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.GetAgentResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.GetAgentResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * A response containing an agent.
+     * 
+ * + * Protobuf type {@code flyteidl.admin.GetAgentResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.admin.GetAgentResponse) + flyteidl.admin.AgentOuterClass.GetAgentResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.GetAgentResponse.class, flyteidl.admin.AgentOuterClass.GetAgentResponse.Builder.class); + } + + // Construct using flyteidl.admin.AgentOuterClass.GetAgentResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (agentBuilder_ == null) { + agent_ = null; + } else { + agent_ = null; + agentBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_GetAgentResponse_descriptor; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.GetAgentResponse getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.GetAgentResponse.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.GetAgentResponse build() { + flyteidl.admin.AgentOuterClass.GetAgentResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.GetAgentResponse buildPartial() { + flyteidl.admin.AgentOuterClass.GetAgentResponse result = new flyteidl.admin.AgentOuterClass.GetAgentResponse(this); + if (agentBuilder_ == null) { + result.agent_ = agent_; + } else { + result.agent_ = agentBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.admin.AgentOuterClass.GetAgentResponse) { + return mergeFrom((flyteidl.admin.AgentOuterClass.GetAgentResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.GetAgentResponse other) { + if (other == flyteidl.admin.AgentOuterClass.GetAgentResponse.getDefaultInstance()) return this; + if (other.hasAgent()) { + mergeAgent(other.getAgent()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.admin.AgentOuterClass.GetAgentResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.admin.AgentOuterClass.GetAgentResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private flyteidl.admin.AgentOuterClass.Agent agent_; + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.admin.AgentOuterClass.Agent, flyteidl.admin.AgentOuterClass.Agent.Builder, flyteidl.admin.AgentOuterClass.AgentOrBuilder> agentBuilder_; + /** + * .flyteidl.admin.Agent agent = 1; + */ + public boolean hasAgent() { + return agentBuilder_ != null || agent_ != null; + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public flyteidl.admin.AgentOuterClass.Agent getAgent() { + if (agentBuilder_ == null) { + return agent_ == null ? flyteidl.admin.AgentOuterClass.Agent.getDefaultInstance() : agent_; + } else { + return agentBuilder_.getMessage(); + } + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public Builder setAgent(flyteidl.admin.AgentOuterClass.Agent value) { + if (agentBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + agent_ = value; + onChanged(); + } else { + agentBuilder_.setMessage(value); + } + + return this; + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public Builder setAgent( + flyteidl.admin.AgentOuterClass.Agent.Builder builderForValue) { + if (agentBuilder_ == null) { + agent_ = builderForValue.build(); + onChanged(); + } else { + agentBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public Builder mergeAgent(flyteidl.admin.AgentOuterClass.Agent value) { + if (agentBuilder_ == null) { + if (agent_ != null) { + agent_ = + flyteidl.admin.AgentOuterClass.Agent.newBuilder(agent_).mergeFrom(value).buildPartial(); + } else { + agent_ = value; + } + onChanged(); + } else { + agentBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public Builder clearAgent() { + if (agentBuilder_ == null) { + agent_ = null; + onChanged(); + } else { + agent_ = null; + agentBuilder_ = null; + } + + return this; + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public flyteidl.admin.AgentOuterClass.Agent.Builder getAgentBuilder() { + + onChanged(); + return getAgentFieldBuilder().getBuilder(); + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + public flyteidl.admin.AgentOuterClass.AgentOrBuilder getAgentOrBuilder() { + if (agentBuilder_ != null) { + return agentBuilder_.getMessageOrBuilder(); + } else { + return agent_ == null ? + flyteidl.admin.AgentOuterClass.Agent.getDefaultInstance() : agent_; + } + } + /** + * .flyteidl.admin.Agent agent = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + flyteidl.admin.AgentOuterClass.Agent, flyteidl.admin.AgentOuterClass.Agent.Builder, flyteidl.admin.AgentOuterClass.AgentOrBuilder> + getAgentFieldBuilder() { + if (agentBuilder_ == null) { + agentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + flyteidl.admin.AgentOuterClass.Agent, flyteidl.admin.AgentOuterClass.Agent.Builder, flyteidl.admin.AgentOuterClass.AgentOrBuilder>( + getAgent(), + getParentForChildren(), + isClean()); + agent_ = null; + } + return agentBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.admin.GetAgentResponse) + } + + // @@protoc_insertion_point(class_scope:flyteidl.admin.GetAgentResponse) + private static final flyteidl.admin.AgentOuterClass.GetAgentResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.GetAgentResponse(); + } + + public static flyteidl.admin.AgentOuterClass.GetAgentResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public GetAgentResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new GetAgentResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.GetAgentResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface ListAgentsRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.admin.ListAgentsRequest) + com.google.protobuf.MessageOrBuilder { + } + /** + *
+   * A request to list all agents.
+   * 
+ * + * Protobuf type {@code flyteidl.admin.ListAgentsRequest} + */ + public static final class ListAgentsRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.admin.ListAgentsRequest) + ListAgentsRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use ListAgentsRequest.newBuilder() to construct. + private ListAgentsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ListAgentsRequest() { + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ListAgentsRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.ListAgentsRequest.class, flyteidl.admin.AgentOuterClass.ListAgentsRequest.Builder.class); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.admin.AgentOuterClass.ListAgentsRequest)) { + return super.equals(obj); + } + flyteidl.admin.AgentOuterClass.ListAgentsRequest other = (flyteidl.admin.AgentOuterClass.ListAgentsRequest) obj; + + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.ListAgentsRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * A request to list all agents.
+     * 
+ * + * Protobuf type {@code flyteidl.admin.ListAgentsRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.admin.ListAgentsRequest) + flyteidl.admin.AgentOuterClass.ListAgentsRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.ListAgentsRequest.class, flyteidl.admin.AgentOuterClass.ListAgentsRequest.Builder.class); + } + + // Construct using flyteidl.admin.AgentOuterClass.ListAgentsRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsRequest_descriptor; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.ListAgentsRequest getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.ListAgentsRequest.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.ListAgentsRequest build() { + flyteidl.admin.AgentOuterClass.ListAgentsRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.ListAgentsRequest buildPartial() { + flyteidl.admin.AgentOuterClass.ListAgentsRequest result = new flyteidl.admin.AgentOuterClass.ListAgentsRequest(this); + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.admin.AgentOuterClass.ListAgentsRequest) { + return mergeFrom((flyteidl.admin.AgentOuterClass.ListAgentsRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.ListAgentsRequest other) { + if (other == flyteidl.admin.AgentOuterClass.ListAgentsRequest.getDefaultInstance()) return this; + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.admin.AgentOuterClass.ListAgentsRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.admin.AgentOuterClass.ListAgentsRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.admin.ListAgentsRequest) + } + + // @@protoc_insertion_point(class_scope:flyteidl.admin.ListAgentsRequest) + private static final flyteidl.admin.AgentOuterClass.ListAgentsRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.ListAgentsRequest(); + } + + public static flyteidl.admin.AgentOuterClass.ListAgentsRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public ListAgentsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ListAgentsRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.ListAgentsRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface ListAgentsResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:flyteidl.admin.ListAgentsResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + java.util.List + getAgentsList(); + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + flyteidl.admin.AgentOuterClass.Agent getAgents(int index); + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + int getAgentsCount(); + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + java.util.List + getAgentsOrBuilderList(); + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + flyteidl.admin.AgentOuterClass.AgentOrBuilder getAgentsOrBuilder( + int index); + } + /** + *
+   * A response containing a list of agents.
+   * 
+ * + * Protobuf type {@code flyteidl.admin.ListAgentsResponse} + */ + public static final class ListAgentsResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:flyteidl.admin.ListAgentsResponse) + ListAgentsResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use ListAgentsResponse.newBuilder() to construct. + private ListAgentsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ListAgentsResponse() { + agents_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ListAgentsResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + agents_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + agents_.add( + input.readMessage(flyteidl.admin.AgentOuterClass.Agent.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + agents_ = java.util.Collections.unmodifiableList(agents_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.ListAgentsResponse.class, flyteidl.admin.AgentOuterClass.ListAgentsResponse.Builder.class); + } + + public static final int AGENTS_FIELD_NUMBER = 1; + private java.util.List agents_; + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public java.util.List getAgentsList() { + return agents_; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public java.util.List + getAgentsOrBuilderList() { + return agents_; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public int getAgentsCount() { + return agents_.size(); + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public flyteidl.admin.AgentOuterClass.Agent getAgents(int index) { + return agents_.get(index); + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public flyteidl.admin.AgentOuterClass.AgentOrBuilder getAgentsOrBuilder( + int index) { + return agents_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < agents_.size(); i++) { + output.writeMessage(1, agents_.get(i)); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < agents_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, agents_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof flyteidl.admin.AgentOuterClass.ListAgentsResponse)) { + return super.equals(obj); + } + flyteidl.admin.AgentOuterClass.ListAgentsResponse other = (flyteidl.admin.AgentOuterClass.ListAgentsResponse) obj; + + if (!getAgentsList() + .equals(other.getAgentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getAgentsCount() > 0) { + hash = (37 * hash) + AGENTS_FIELD_NUMBER; + hash = (53 * hash) + getAgentsList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(flyteidl.admin.AgentOuterClass.ListAgentsResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + *
+     * A response containing a list of agents.
+     * 
+ * + * Protobuf type {@code flyteidl.admin.ListAgentsResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:flyteidl.admin.ListAgentsResponse) + flyteidl.admin.AgentOuterClass.ListAgentsResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + flyteidl.admin.AgentOuterClass.ListAgentsResponse.class, flyteidl.admin.AgentOuterClass.ListAgentsResponse.Builder.class); + } + + // Construct using flyteidl.admin.AgentOuterClass.ListAgentsResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getAgentsFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (agentsBuilder_ == null) { + agents_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + agentsBuilder_.clear(); + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_ListAgentsResponse_descriptor; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForType() { + return flyteidl.admin.AgentOuterClass.ListAgentsResponse.getDefaultInstance(); + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.ListAgentsResponse build() { + flyteidl.admin.AgentOuterClass.ListAgentsResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.ListAgentsResponse buildPartial() { + flyteidl.admin.AgentOuterClass.ListAgentsResponse result = new flyteidl.admin.AgentOuterClass.ListAgentsResponse(this); + int from_bitField0_ = bitField0_; + if (agentsBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + agents_ = java.util.Collections.unmodifiableList(agents_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.agents_ = agents_; + } else { + result.agents_ = agentsBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof flyteidl.admin.AgentOuterClass.ListAgentsResponse) { + return mergeFrom((flyteidl.admin.AgentOuterClass.ListAgentsResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(flyteidl.admin.AgentOuterClass.ListAgentsResponse other) { + if (other == flyteidl.admin.AgentOuterClass.ListAgentsResponse.getDefaultInstance()) return this; + if (agentsBuilder_ == null) { + if (!other.agents_.isEmpty()) { + if (agents_.isEmpty()) { + agents_ = other.agents_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureAgentsIsMutable(); + agents_.addAll(other.agents_); + } + onChanged(); + } + } else { + if (!other.agents_.isEmpty()) { + if (agentsBuilder_.isEmpty()) { + agentsBuilder_.dispose(); + agentsBuilder_ = null; + agents_ = other.agents_; + bitField0_ = (bitField0_ & ~0x00000001); + agentsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getAgentsFieldBuilder() : null; + } else { + agentsBuilder_.addAllMessages(other.agents_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + flyteidl.admin.AgentOuterClass.ListAgentsResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (flyteidl.admin.AgentOuterClass.ListAgentsResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List agents_ = + java.util.Collections.emptyList(); + private void ensureAgentsIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + agents_ = new java.util.ArrayList(agents_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.admin.AgentOuterClass.Agent, flyteidl.admin.AgentOuterClass.Agent.Builder, flyteidl.admin.AgentOuterClass.AgentOrBuilder> agentsBuilder_; + + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public java.util.List getAgentsList() { + if (agentsBuilder_ == null) { + return java.util.Collections.unmodifiableList(agents_); + } else { + return agentsBuilder_.getMessageList(); + } + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public int getAgentsCount() { + if (agentsBuilder_ == null) { + return agents_.size(); + } else { + return agentsBuilder_.getCount(); + } + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public flyteidl.admin.AgentOuterClass.Agent getAgents(int index) { + if (agentsBuilder_ == null) { + return agents_.get(index); + } else { + return agentsBuilder_.getMessage(index); + } + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder setAgents( + int index, flyteidl.admin.AgentOuterClass.Agent value) { + if (agentsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAgentsIsMutable(); + agents_.set(index, value); + onChanged(); + } else { + agentsBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder setAgents( + int index, flyteidl.admin.AgentOuterClass.Agent.Builder builderForValue) { + if (agentsBuilder_ == null) { + ensureAgentsIsMutable(); + agents_.set(index, builderForValue.build()); + onChanged(); + } else { + agentsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder addAgents(flyteidl.admin.AgentOuterClass.Agent value) { + if (agentsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAgentsIsMutable(); + agents_.add(value); + onChanged(); + } else { + agentsBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder addAgents( + int index, flyteidl.admin.AgentOuterClass.Agent value) { + if (agentsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAgentsIsMutable(); + agents_.add(index, value); + onChanged(); + } else { + agentsBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder addAgents( + flyteidl.admin.AgentOuterClass.Agent.Builder builderForValue) { + if (agentsBuilder_ == null) { + ensureAgentsIsMutable(); + agents_.add(builderForValue.build()); + onChanged(); + } else { + agentsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder addAgents( + int index, flyteidl.admin.AgentOuterClass.Agent.Builder builderForValue) { + if (agentsBuilder_ == null) { + ensureAgentsIsMutable(); + agents_.add(index, builderForValue.build()); + onChanged(); + } else { + agentsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder addAllAgents( + java.lang.Iterable values) { + if (agentsBuilder_ == null) { + ensureAgentsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, agents_); + onChanged(); + } else { + agentsBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder clearAgents() { + if (agentsBuilder_ == null) { + agents_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + agentsBuilder_.clear(); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public Builder removeAgents(int index) { + if (agentsBuilder_ == null) { + ensureAgentsIsMutable(); + agents_.remove(index); + onChanged(); + } else { + agentsBuilder_.remove(index); + } + return this; + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public flyteidl.admin.AgentOuterClass.Agent.Builder getAgentsBuilder( + int index) { + return getAgentsFieldBuilder().getBuilder(index); + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public flyteidl.admin.AgentOuterClass.AgentOrBuilder getAgentsOrBuilder( + int index) { + if (agentsBuilder_ == null) { + return agents_.get(index); } else { + return agentsBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public java.util.List + getAgentsOrBuilderList() { + if (agentsBuilder_ != null) { + return agentsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(agents_); + } + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public flyteidl.admin.AgentOuterClass.Agent.Builder addAgentsBuilder() { + return getAgentsFieldBuilder().addBuilder( + flyteidl.admin.AgentOuterClass.Agent.getDefaultInstance()); + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public flyteidl.admin.AgentOuterClass.Agent.Builder addAgentsBuilder( + int index) { + return getAgentsFieldBuilder().addBuilder( + index, flyteidl.admin.AgentOuterClass.Agent.getDefaultInstance()); + } + /** + * repeated .flyteidl.admin.Agent agents = 1; + */ + public java.util.List + getAgentsBuilderList() { + return getAgentsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.admin.AgentOuterClass.Agent, flyteidl.admin.AgentOuterClass.Agent.Builder, flyteidl.admin.AgentOuterClass.AgentOrBuilder> + getAgentsFieldBuilder() { + if (agentsBuilder_ == null) { + agentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + flyteidl.admin.AgentOuterClass.Agent, flyteidl.admin.AgentOuterClass.Agent.Builder, flyteidl.admin.AgentOuterClass.AgentOrBuilder>( + agents_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + agents_ = null; + } + return agentsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:flyteidl.admin.ListAgentsResponse) + } + + // @@protoc_insertion_point(class_scope:flyteidl.admin.ListAgentsResponse) + private static final flyteidl.admin.AgentOuterClass.ListAgentsResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new flyteidl.admin.AgentOuterClass.ListAgentsResponse(); + } + + public static flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public ListAgentsResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ListAgentsResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -7531,6 +11949,11 @@ public flyteidl.admin.Agent.DeleteTaskResponse getDefaultInstanceForType() { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_admin_CreateTaskResponse_descriptor; private static final @@ -7561,6 +11984,31 @@ public flyteidl.admin.Agent.DeleteTaskResponse getDefaultInstanceForType() { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_admin_DeleteTaskResponse_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_admin_Agent_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_admin_Agent_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_admin_GetAgentRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_admin_GetAgentResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_admin_GetAgentResponse_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_admin_ListAgentsRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_admin_ListAgentsRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_admin_ListAgentsResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_admin_ListAgentsResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -7574,39 +12022,50 @@ public flyteidl.admin.Agent.DeleteTaskResponse getDefaultInstanceForType() { "dmin\032\034flyteidl/core/literals.proto\032\031flyt" + "eidl/core/tasks.proto\032\035flyteidl/core/int" + "erface.proto\032\036flyteidl/core/identifier.p" + - "roto\"\232\004\n\025TaskExecutionMetadata\022A\n\021task_e" + - "xecution_id\030\001 \001(\0132&.flyteidl.core.TaskEx" + - "ecutionIdentifier\022\021\n\tnamespace\030\002 \001(\t\022A\n\006" + - "labels\030\003 \003(\01321.flyteidl.admin.TaskExecut" + - "ionMetadata.LabelsEntry\022K\n\013annotations\030\004" + - " \003(\01326.flyteidl.admin.TaskExecutionMetad" + - "ata.AnnotationsEntry\022\033\n\023k8s_service_acco" + - "unt\030\005 \001(\t\022^\n\025environment_variables\030\006 \003(\013" + - "2?.flyteidl.admin.TaskExecutionMetadata." + - "EnvironmentVariablesEntry\032-\n\013LabelsEntry" + - "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020Anno" + - "tationsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t" + - ":\0028\001\032;\n\031EnvironmentVariablesEntry\022\013\n\003key" + - "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\314\001\n\021CreateTask" + - "Request\022)\n\006inputs\030\001 \001(\0132\031.flyteidl.core." + - "LiteralMap\022-\n\010template\030\002 \001(\0132\033.flyteidl." + - "core.TaskTemplate\022\025\n\routput_prefix\030\003 \001(\t" + - "\022F\n\027task_execution_metadata\030\004 \001(\0132%.flyt" + - "eidl.admin.TaskExecutionMetadata\"+\n\022Crea" + - "teTaskResponse\022\025\n\rresource_meta\030\001 \001(\014\":\n" + - "\016GetTaskRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rre" + - "source_meta\030\002 \001(\014\"=\n\017GetTaskResponse\022*\n\010" + - "resource\030\001 \001(\0132\030.flyteidl.admin.Resource" + - "\"m\n\010Resource\022$\n\005state\030\001 \001(\0162\025.flyteidl.a" + - "dmin.State\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.c" + - "ore.LiteralMap\022\017\n\007message\030\003 \001(\t\"=\n\021Delet" + - "eTaskRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresou" + - "rce_meta\030\002 \001(\014\"\024\n\022DeleteTaskResponse*^\n\005" + - "State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANEN" + - "T_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n" + - "\tSUCCEEDED\020\004B=Z;github.com/flyteorg/flyt" + - "e/flyteidl/gen/pb-go/flyteidl/adminb\006pro" + - "to3" + "roto\032\035flyteidl/core/execution.proto\"\232\004\n\025" + + "TaskExecutionMetadata\022A\n\021task_execution_" + + "id\030\001 \001(\0132&.flyteidl.core.TaskExecutionId" + + "entifier\022\021\n\tnamespace\030\002 \001(\t\022A\n\006labels\030\003 " + + "\003(\01321.flyteidl.admin.TaskExecutionMetada" + + "ta.LabelsEntry\022K\n\013annotations\030\004 \003(\01326.fl" + + "yteidl.admin.TaskExecutionMetadata.Annot" + + "ationsEntry\022\033\n\023k8s_service_account\030\005 \001(\t" + + "\022^\n\025environment_variables\030\006 \003(\0132?.flytei" + + "dl.admin.TaskExecutionMetadata.Environme" + + "ntVariablesEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001" + + " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" + + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" + + "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + + "\005value\030\002 \001(\t:\0028\001\"\272\002\n\021CreateTaskRequest\022)" + + "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" + + "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" + + "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" + + "execution_metadata\030\004 \001(\0132%.flyteidl.admi" + + "n.TaskExecutionMetadata\022=\n\006secret\030\005 \003(\0132" + + "-.flyteidl.admin.CreateTaskRequest.Secre" + + "tEntry\032-\n\013SecretEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" + + "lue\030\002 \001(\t:\0028\001\"+\n\022CreateTaskResponse\022\025\n\rr" + + "esource_meta\030\001 \001(\014\":\n\016GetTaskRequest\022\021\n\t" + + "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"c" + + "\n\017GetTaskResponse\022*\n\010resource\030\001 \001(\0132\030.fl" + + "yteidl.admin.Resource\022$\n\004logs\030\002 \003(\0132\026.fl" + + "yteidl.core.TaskLog\"m\n\010Resource\022$\n\005state" + + "\030\001 \001(\0162\025.flyteidl.admin.State\022*\n\007outputs" + + "\030\002 \001(\0132\031.flyteidl.core.LiteralMap\022\017\n\007mes" + + "sage\030\003 \001(\t\"=\n\021DeleteTaskRequest\022\021\n\ttask_" + + "type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022Del" + + "eteTaskResponse\"X\n\005Agent\022\014\n\004name\030\001 \001(\t\022\023" + + "\n\013secret_name\030\002 \003(\t\022\033\n\023supported_task_ty" + + "pe\030\003 \001(\t\022\017\n\007is_sync\030\004 \001(\010\"\037\n\017GetAgentReq" + + "uest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$" + + "\n\005agent\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021" + + "ListAgentsRequest\";\n\022ListAgentsResponse\022" + + "%\n\006agents\030\001 \003(\0132\025.flyteidl.admin.Agent*^" + + "\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMAN" + + "ENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022" + + "\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteorg/fl" + + "yte/flyteidl/gen/pb-go/flyteidl/adminb\006p" + + "roto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -7623,6 +12082,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( flyteidl.core.Tasks.getDescriptor(), flyteidl.core.Interface.getDescriptor(), flyteidl.core.IdentifierOuterClass.getDescriptor(), + flyteidl.core.Execution.getDescriptor(), }, assigner); internal_static_flyteidl_admin_TaskExecutionMetadata_descriptor = getDescriptor().getMessageTypes().get(0); @@ -7653,7 +12113,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_CreateTaskRequest_descriptor, - new java.lang.String[] { "Inputs", "Template", "OutputPrefix", "TaskExecutionMetadata", }); + new java.lang.String[] { "Inputs", "Template", "OutputPrefix", "TaskExecutionMetadata", "Secret", }); + internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_descriptor = + internal_static_flyteidl_admin_CreateTaskRequest_descriptor.getNestedTypes().get(0); + internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); internal_static_flyteidl_admin_CreateTaskResponse_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_flyteidl_admin_CreateTaskResponse_fieldAccessorTable = new @@ -7671,7 +12137,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_GetTaskResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_GetTaskResponse_descriptor, - new java.lang.String[] { "Resource", }); + new java.lang.String[] { "Resource", "Logs", }); internal_static_flyteidl_admin_Resource_descriptor = getDescriptor().getMessageTypes().get(5); internal_static_flyteidl_admin_Resource_fieldAccessorTable = new @@ -7690,10 +12156,41 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_DeleteTaskResponse_descriptor, new java.lang.String[] { }); + internal_static_flyteidl_admin_Agent_descriptor = + getDescriptor().getMessageTypes().get(8); + internal_static_flyteidl_admin_Agent_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_admin_Agent_descriptor, + new java.lang.String[] { "Name", "SecretName", "SupportedTaskType", "IsSync", }); + internal_static_flyteidl_admin_GetAgentRequest_descriptor = + getDescriptor().getMessageTypes().get(9); + internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_admin_GetAgentRequest_descriptor, + new java.lang.String[] { "Name", }); + internal_static_flyteidl_admin_GetAgentResponse_descriptor = + getDescriptor().getMessageTypes().get(10); + internal_static_flyteidl_admin_GetAgentResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_admin_GetAgentResponse_descriptor, + new java.lang.String[] { "Agent", }); + internal_static_flyteidl_admin_ListAgentsRequest_descriptor = + getDescriptor().getMessageTypes().get(11); + internal_static_flyteidl_admin_ListAgentsRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_admin_ListAgentsRequest_descriptor, + new java.lang.String[] { }); + internal_static_flyteidl_admin_ListAgentsResponse_descriptor = + getDescriptor().getMessageTypes().get(12); + internal_static_flyteidl_admin_ListAgentsResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_admin_ListAgentsResponse_descriptor, + new java.lang.String[] { "Agents", }); flyteidl.core.Literals.getDescriptor(); flyteidl.core.Tasks.getDescriptor(); flyteidl.core.Interface.getDescriptor(); flyteidl.core.IdentifierOuterClass.getDescriptor(); + flyteidl.core.Execution.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/flyteidl/gen/pb-java/flyteidl/service/Agent.java b/flyteidl/gen/pb-java/flyteidl/service/Agent.java index 8d80085901..42032174a1 100644 --- a/flyteidl/gen/pb-java/flyteidl/service/Agent.java +++ b/flyteidl/gen/pb-java/flyteidl/service/Agent.java @@ -24,16 +24,23 @@ public static void registerAllExtensions( static { java.lang.String[] descriptorData = { "\n\034flyteidl/service/agent.proto\022\020flyteidl" + - ".service\032\032flyteidl/admin/agent.proto2\217\002\n" + - "\021AsyncAgentService\022U\n\nCreateTask\022!.flyte" + - "idl.admin.CreateTaskRequest\032\".flyteidl.a" + - "dmin.CreateTaskResponse\"\000\022L\n\007GetTask\022\036.f" + - "lyteidl.admin.GetTaskRequest\032\037.flyteidl." + - "admin.GetTaskResponse\"\000\022U\n\nDeleteTask\022!." + - "flyteidl.admin.DeleteTaskRequest\032\".flyte" + - "idl.admin.DeleteTaskResponse\"\000B?Z=github" + - ".com/flyteorg/flyte/flyteidl/gen/pb-go/f" + - "lyteidl/serviceb\006proto3" + ".service\032\034google/api/annotations.proto\032\032" + + "flyteidl/admin/agent.proto2\217\002\n\021AsyncAgen" + + "tService\022U\n\nCreateTask\022!.flyteidl.admin." + + "CreateTaskRequest\032\".flyteidl.admin.Creat" + + "eTaskResponse\"\000\022L\n\007GetTask\022\036.flyteidl.ad" + + "min.GetTaskRequest\032\037.flyteidl.admin.GetT" + + "askResponse\"\000\022U\n\nDeleteTask\022!.flyteidl.a" + + "dmin.DeleteTaskRequest\032\".flyteidl.admin." + + "DeleteTaskResponse\"\0002\360\001\n\024AgentMetadataSe" + + "rvice\022l\n\010GetAgent\022\037.flyteidl.admin.GetAg" + + "entRequest\032 .flyteidl.admin.GetAgentResp" + + "onse\"\035\202\323\344\223\002\027\022\025/api/v1/agents/{name}\022j\n\tL" + + "istAgent\022!.flyteidl.admin.ListAgentsRequ" + + "est\032\".flyteidl.admin.ListAgentsResponse\"" + + "\026\202\323\344\223\002\020\022\016/api/v1/agentsB?Z=github.com/fl" + + "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" + + "/serviceb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -46,9 +53,16 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - flyteidl.admin.Agent.getDescriptor(), + com.google.api.AnnotationsProto.getDescriptor(), + flyteidl.admin.AgentOuterClass.getDescriptor(), }, assigner); - flyteidl.admin.Agent.getDescriptor(); + com.google.protobuf.ExtensionRegistry registry = + com.google.protobuf.ExtensionRegistry.newInstance(); + registry.add(com.google.api.AnnotationsProto.http); + com.google.protobuf.Descriptors.FileDescriptor + .internalUpdateFileDescriptor(descriptor, registry); + com.google.api.AnnotationsProto.getDescriptor(); + flyteidl.admin.AgentOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index f7186dea01..db8c6fac78 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -7961,6 +7961,9 @@ export namespace flyteidl { /** CreateTaskRequest taskExecutionMetadata */ taskExecutionMetadata?: (flyteidl.admin.ITaskExecutionMetadata|null); + + /** CreateTaskRequest secret */ + secret?: ({ [k: string]: string }|null); } /** Represents a CreateTaskRequest. */ @@ -7984,6 +7987,9 @@ export namespace flyteidl { /** CreateTaskRequest taskExecutionMetadata. */ public taskExecutionMetadata?: (flyteidl.admin.ITaskExecutionMetadata|null); + /** CreateTaskRequest secret. */ + public secret: { [k: string]: string }; + /** * Creates a new CreateTaskRequest instance using the specified properties. * @param [properties] Properties to set @@ -8132,6 +8138,9 @@ export namespace flyteidl { /** GetTaskResponse resource */ resource?: (flyteidl.admin.IResource|null); + + /** GetTaskResponse logs */ + logs?: (flyteidl.core.ITaskLog[]|null); } /** Represents a GetTaskResponse. */ @@ -8146,6 +8155,9 @@ export namespace flyteidl { /** GetTaskResponse resource. */ public resource?: (flyteidl.admin.IResource|null); + /** GetTaskResponse logs. */ + public logs: flyteidl.core.ITaskLog[]; + /** * Creates a new GetTaskResponse instance using the specified properties. * @param [properties] Properties to set @@ -8347,6 +8359,278 @@ export namespace flyteidl { public static verify(message: { [k: string]: any }): (string|null); } + /** Properties of an Agent. */ + interface IAgent { + + /** Agent name */ + name?: (string|null); + + /** Agent secretName */ + secretName?: (string[]|null); + + /** Agent supportedTaskType */ + supportedTaskType?: (string|null); + + /** Agent isSync */ + isSync?: (boolean|null); + } + + /** Represents an Agent. */ + class Agent implements IAgent { + + /** + * Constructs a new Agent. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.admin.IAgent); + + /** Agent name. */ + public name: string; + + /** Agent secretName. */ + public secretName: string[]; + + /** Agent supportedTaskType. */ + public supportedTaskType: string; + + /** Agent isSync. */ + public isSync: boolean; + + /** + * Creates a new Agent instance using the specified properties. + * @param [properties] Properties to set + * @returns Agent instance + */ + public static create(properties?: flyteidl.admin.IAgent): flyteidl.admin.Agent; + + /** + * Encodes the specified Agent message. Does not implicitly {@link flyteidl.admin.Agent.verify|verify} messages. + * @param message Agent message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.admin.IAgent, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Agent message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Agent + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.Agent; + + /** + * Verifies an Agent message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Properties of a GetAgentRequest. */ + interface IGetAgentRequest { + + /** GetAgentRequest name */ + name?: (string|null); + } + + /** Represents a GetAgentRequest. */ + class GetAgentRequest implements IGetAgentRequest { + + /** + * Constructs a new GetAgentRequest. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.admin.IGetAgentRequest); + + /** GetAgentRequest name. */ + public name: string; + + /** + * Creates a new GetAgentRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetAgentRequest instance + */ + public static create(properties?: flyteidl.admin.IGetAgentRequest): flyteidl.admin.GetAgentRequest; + + /** + * Encodes the specified GetAgentRequest message. Does not implicitly {@link flyteidl.admin.GetAgentRequest.verify|verify} messages. + * @param message GetAgentRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.admin.IGetAgentRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetAgentRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetAgentRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.GetAgentRequest; + + /** + * Verifies a GetAgentRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Properties of a GetAgentResponse. */ + interface IGetAgentResponse { + + /** GetAgentResponse agent */ + agent?: (flyteidl.admin.IAgent|null); + } + + /** Represents a GetAgentResponse. */ + class GetAgentResponse implements IGetAgentResponse { + + /** + * Constructs a new GetAgentResponse. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.admin.IGetAgentResponse); + + /** GetAgentResponse agent. */ + public agent?: (flyteidl.admin.IAgent|null); + + /** + * Creates a new GetAgentResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns GetAgentResponse instance + */ + public static create(properties?: flyteidl.admin.IGetAgentResponse): flyteidl.admin.GetAgentResponse; + + /** + * Encodes the specified GetAgentResponse message. Does not implicitly {@link flyteidl.admin.GetAgentResponse.verify|verify} messages. + * @param message GetAgentResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.admin.IGetAgentResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetAgentResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetAgentResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.GetAgentResponse; + + /** + * Verifies a GetAgentResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Properties of a ListAgentsRequest. */ + interface IListAgentsRequest { + } + + /** Represents a ListAgentsRequest. */ + class ListAgentsRequest implements IListAgentsRequest { + + /** + * Constructs a new ListAgentsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.admin.IListAgentsRequest); + + /** + * Creates a new ListAgentsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListAgentsRequest instance + */ + public static create(properties?: flyteidl.admin.IListAgentsRequest): flyteidl.admin.ListAgentsRequest; + + /** + * Encodes the specified ListAgentsRequest message. Does not implicitly {@link flyteidl.admin.ListAgentsRequest.verify|verify} messages. + * @param message ListAgentsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.admin.IListAgentsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListAgentsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListAgentsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.ListAgentsRequest; + + /** + * Verifies a ListAgentsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + + /** Properties of a ListAgentsResponse. */ + interface IListAgentsResponse { + + /** ListAgentsResponse agents */ + agents?: (flyteidl.admin.IAgent[]|null); + } + + /** Represents a ListAgentsResponse. */ + class ListAgentsResponse implements IListAgentsResponse { + + /** + * Constructs a new ListAgentsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: flyteidl.admin.IListAgentsResponse); + + /** ListAgentsResponse agents. */ + public agents: flyteidl.admin.IAgent[]; + + /** + * Creates a new ListAgentsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListAgentsResponse instance + */ + public static create(properties?: flyteidl.admin.IListAgentsResponse): flyteidl.admin.ListAgentsResponse; + + /** + * Encodes the specified ListAgentsResponse message. Does not implicitly {@link flyteidl.admin.ListAgentsResponse.verify|verify} messages. + * @param message ListAgentsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: flyteidl.admin.IListAgentsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListAgentsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListAgentsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): flyteidl.admin.ListAgentsResponse; + + /** + * Verifies a ListAgentsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + } + /** Properties of a ClusterAssignment. */ interface IClusterAssignment { @@ -19724,6 +20008,72 @@ export namespace flyteidl { type DeleteTaskCallback = (error: (Error|null), response?: flyteidl.admin.DeleteTaskResponse) => void; } + /** Represents an AgentMetadataService */ + class AgentMetadataService extends $protobuf.rpc.Service { + + /** + * Constructs a new AgentMetadataService service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new AgentMetadataService service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): AgentMetadataService; + + /** + * Calls GetAgent. + * @param request GetAgentRequest message or plain object + * @param callback Node-style callback called with the error, if any, and GetAgentResponse + */ + public getAgent(request: flyteidl.admin.IGetAgentRequest, callback: flyteidl.service.AgentMetadataService.GetAgentCallback): void; + + /** + * Calls GetAgent. + * @param request GetAgentRequest message or plain object + * @returns Promise + */ + public getAgent(request: flyteidl.admin.IGetAgentRequest): Promise; + + /** + * Calls ListAgent. + * @param request ListAgentsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListAgentsResponse + */ + public listAgent(request: flyteidl.admin.IListAgentsRequest, callback: flyteidl.service.AgentMetadataService.ListAgentCallback): void; + + /** + * Calls ListAgent. + * @param request ListAgentsRequest message or plain object + * @returns Promise + */ + public listAgent(request: flyteidl.admin.IListAgentsRequest): Promise; + } + + namespace AgentMetadataService { + + /** + * Callback as used by {@link flyteidl.service.AgentMetadataService#getAgent}. + * @param error Error, if any + * @param [response] GetAgentResponse + */ + type GetAgentCallback = (error: (Error|null), response?: flyteidl.admin.GetAgentResponse) => void; + + /** + * Callback as used by {@link flyteidl.service.AgentMetadataService#listAgent}. + * @param error Error, if any + * @param [response] ListAgentsResponse + */ + type ListAgentCallback = (error: (Error|null), response?: flyteidl.admin.ListAgentsResponse) => void; + } + /** Properties of a OAuth2MetadataRequest. */ interface IOAuth2MetadataRequest { } diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 223d617ecf..21ffe3bec7 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -19474,6 +19474,7 @@ * @property {flyteidl.core.ITaskTemplate|null} [template] CreateTaskRequest template * @property {string|null} [outputPrefix] CreateTaskRequest outputPrefix * @property {flyteidl.admin.ITaskExecutionMetadata|null} [taskExecutionMetadata] CreateTaskRequest taskExecutionMetadata + * @property {Object.|null} [secret] CreateTaskRequest secret */ /** @@ -19485,6 +19486,7 @@ * @param {flyteidl.admin.ICreateTaskRequest=} [properties] Properties to set */ function CreateTaskRequest(properties) { + this.secret = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -19523,6 +19525,14 @@ */ CreateTaskRequest.prototype.taskExecutionMetadata = null; + /** + * CreateTaskRequest secret. + * @member {Object.} secret + * @memberof flyteidl.admin.CreateTaskRequest + * @instance + */ + CreateTaskRequest.prototype.secret = $util.emptyObject; + /** * Creates a new CreateTaskRequest instance using the specified properties. * @function create @@ -19555,6 +19565,9 @@ writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputPrefix); if (message.taskExecutionMetadata != null && message.hasOwnProperty("taskExecutionMetadata")) $root.flyteidl.admin.TaskExecutionMetadata.encode(message.taskExecutionMetadata, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.secret != null && message.hasOwnProperty("secret")) + for (var keys = Object.keys(message.secret), i = 0; i < keys.length; ++i) + writer.uint32(/* id 5, wireType 2 =*/42).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.secret[keys[i]]).ldelim(); return writer; }; @@ -19572,7 +19585,7 @@ CreateTaskRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.CreateTaskRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.CreateTaskRequest(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -19588,6 +19601,14 @@ case 4: message.taskExecutionMetadata = $root.flyteidl.admin.TaskExecutionMetadata.decode(reader, reader.uint32()); break; + case 5: + reader.skip().pos++; + if (message.secret === $util.emptyObject) + message.secret = {}; + key = reader.string(); + reader.pos++; + message.secret[key] = reader.string(); + break; default: reader.skipType(tag & 7); break; @@ -19625,6 +19646,14 @@ if (error) return "taskExecutionMetadata." + error; } + if (message.secret != null && message.hasOwnProperty("secret")) { + if (!$util.isObject(message.secret)) + return "secret: object expected"; + var key = Object.keys(message.secret); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.secret[key[i]])) + return "secret: string{k:string} expected"; + } return null; }; @@ -19875,6 +19904,7 @@ * @memberof flyteidl.admin * @interface IGetTaskResponse * @property {flyteidl.admin.IResource|null} [resource] GetTaskResponse resource + * @property {Array.|null} [logs] GetTaskResponse logs */ /** @@ -19886,6 +19916,7 @@ * @param {flyteidl.admin.IGetTaskResponse=} [properties] Properties to set */ function GetTaskResponse(properties) { + this.logs = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -19900,6 +19931,14 @@ */ GetTaskResponse.prototype.resource = null; + /** + * GetTaskResponse logs. + * @member {Array.} logs + * @memberof flyteidl.admin.GetTaskResponse + * @instance + */ + GetTaskResponse.prototype.logs = $util.emptyArray; + /** * Creates a new GetTaskResponse instance using the specified properties. * @function create @@ -19926,6 +19965,9 @@ writer = $Writer.create(); if (message.resource != null && message.hasOwnProperty("resource")) $root.flyteidl.admin.Resource.encode(message.resource, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.logs != null && message.logs.length) + for (var i = 0; i < message.logs.length; ++i) + $root.flyteidl.core.TaskLog.encode(message.logs[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -19950,6 +19992,11 @@ case 1: message.resource = $root.flyteidl.admin.Resource.decode(reader, reader.uint32()); break; + case 2: + if (!(message.logs && message.logs.length)) + message.logs = []; + message.logs.push($root.flyteidl.core.TaskLog.decode(reader, reader.uint32())); + break; default: reader.skipType(tag & 7); break; @@ -19974,6 +20021,15 @@ if (error) return "resource." + error; } + if (message.logs != null && message.hasOwnProperty("logs")) { + if (!Array.isArray(message.logs)) + return "logs: array expected"; + for (var i = 0; i < message.logs.length; ++i) { + var error = $root.flyteidl.core.TaskLog.verify(message.logs[i]); + if (error) + return "logs." + error; + } + } return null; }; @@ -20354,6 +20410,610 @@ return DeleteTaskResponse; })(); + admin.Agent = (function() { + + /** + * Properties of an Agent. + * @memberof flyteidl.admin + * @interface IAgent + * @property {string|null} [name] Agent name + * @property {Array.|null} [secretName] Agent secretName + * @property {string|null} [supportedTaskType] Agent supportedTaskType + * @property {boolean|null} [isSync] Agent isSync + */ + + /** + * Constructs a new Agent. + * @memberof flyteidl.admin + * @classdesc Represents an Agent. + * @implements IAgent + * @constructor + * @param {flyteidl.admin.IAgent=} [properties] Properties to set + */ + function Agent(properties) { + this.secretName = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Agent name. + * @member {string} name + * @memberof flyteidl.admin.Agent + * @instance + */ + Agent.prototype.name = ""; + + /** + * Agent secretName. + * @member {Array.} secretName + * @memberof flyteidl.admin.Agent + * @instance + */ + Agent.prototype.secretName = $util.emptyArray; + + /** + * Agent supportedTaskType. + * @member {string} supportedTaskType + * @memberof flyteidl.admin.Agent + * @instance + */ + Agent.prototype.supportedTaskType = ""; + + /** + * Agent isSync. + * @member {boolean} isSync + * @memberof flyteidl.admin.Agent + * @instance + */ + Agent.prototype.isSync = false; + + /** + * Creates a new Agent instance using the specified properties. + * @function create + * @memberof flyteidl.admin.Agent + * @static + * @param {flyteidl.admin.IAgent=} [properties] Properties to set + * @returns {flyteidl.admin.Agent} Agent instance + */ + Agent.create = function create(properties) { + return new Agent(properties); + }; + + /** + * Encodes the specified Agent message. Does not implicitly {@link flyteidl.admin.Agent.verify|verify} messages. + * @function encode + * @memberof flyteidl.admin.Agent + * @static + * @param {flyteidl.admin.IAgent} message Agent message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Agent.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.secretName != null && message.secretName.length) + for (var i = 0; i < message.secretName.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.secretName[i]); + if (message.supportedTaskType != null && message.hasOwnProperty("supportedTaskType")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.supportedTaskType); + if (message.isSync != null && message.hasOwnProperty("isSync")) + writer.uint32(/* id 4, wireType 0 =*/32).bool(message.isSync); + return writer; + }; + + /** + * Decodes an Agent message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.admin.Agent + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.admin.Agent} Agent + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Agent.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.Agent(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.secretName && message.secretName.length)) + message.secretName = []; + message.secretName.push(reader.string()); + break; + case 3: + message.supportedTaskType = reader.string(); + break; + case 4: + message.isSync = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies an Agent message. + * @function verify + * @memberof flyteidl.admin.Agent + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Agent.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.secretName != null && message.hasOwnProperty("secretName")) { + if (!Array.isArray(message.secretName)) + return "secretName: array expected"; + for (var i = 0; i < message.secretName.length; ++i) + if (!$util.isString(message.secretName[i])) + return "secretName: string[] expected"; + } + if (message.supportedTaskType != null && message.hasOwnProperty("supportedTaskType")) + if (!$util.isString(message.supportedTaskType)) + return "supportedTaskType: string expected"; + if (message.isSync != null && message.hasOwnProperty("isSync")) + if (typeof message.isSync !== "boolean") + return "isSync: boolean expected"; + return null; + }; + + return Agent; + })(); + + admin.GetAgentRequest = (function() { + + /** + * Properties of a GetAgentRequest. + * @memberof flyteidl.admin + * @interface IGetAgentRequest + * @property {string|null} [name] GetAgentRequest name + */ + + /** + * Constructs a new GetAgentRequest. + * @memberof flyteidl.admin + * @classdesc Represents a GetAgentRequest. + * @implements IGetAgentRequest + * @constructor + * @param {flyteidl.admin.IGetAgentRequest=} [properties] Properties to set + */ + function GetAgentRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetAgentRequest name. + * @member {string} name + * @memberof flyteidl.admin.GetAgentRequest + * @instance + */ + GetAgentRequest.prototype.name = ""; + + /** + * Creates a new GetAgentRequest instance using the specified properties. + * @function create + * @memberof flyteidl.admin.GetAgentRequest + * @static + * @param {flyteidl.admin.IGetAgentRequest=} [properties] Properties to set + * @returns {flyteidl.admin.GetAgentRequest} GetAgentRequest instance + */ + GetAgentRequest.create = function create(properties) { + return new GetAgentRequest(properties); + }; + + /** + * Encodes the specified GetAgentRequest message. Does not implicitly {@link flyteidl.admin.GetAgentRequest.verify|verify} messages. + * @function encode + * @memberof flyteidl.admin.GetAgentRequest + * @static + * @param {flyteidl.admin.IGetAgentRequest} message GetAgentRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetAgentRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + return writer; + }; + + /** + * Decodes a GetAgentRequest message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.admin.GetAgentRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.admin.GetAgentRequest} GetAgentRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetAgentRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.GetAgentRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies a GetAgentRequest message. + * @function verify + * @memberof flyteidl.admin.GetAgentRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetAgentRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + return null; + }; + + return GetAgentRequest; + })(); + + admin.GetAgentResponse = (function() { + + /** + * Properties of a GetAgentResponse. + * @memberof flyteidl.admin + * @interface IGetAgentResponse + * @property {flyteidl.admin.IAgent|null} [agent] GetAgentResponse agent + */ + + /** + * Constructs a new GetAgentResponse. + * @memberof flyteidl.admin + * @classdesc Represents a GetAgentResponse. + * @implements IGetAgentResponse + * @constructor + * @param {flyteidl.admin.IGetAgentResponse=} [properties] Properties to set + */ + function GetAgentResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetAgentResponse agent. + * @member {flyteidl.admin.IAgent|null|undefined} agent + * @memberof flyteidl.admin.GetAgentResponse + * @instance + */ + GetAgentResponse.prototype.agent = null; + + /** + * Creates a new GetAgentResponse instance using the specified properties. + * @function create + * @memberof flyteidl.admin.GetAgentResponse + * @static + * @param {flyteidl.admin.IGetAgentResponse=} [properties] Properties to set + * @returns {flyteidl.admin.GetAgentResponse} GetAgentResponse instance + */ + GetAgentResponse.create = function create(properties) { + return new GetAgentResponse(properties); + }; + + /** + * Encodes the specified GetAgentResponse message. Does not implicitly {@link flyteidl.admin.GetAgentResponse.verify|verify} messages. + * @function encode + * @memberof flyteidl.admin.GetAgentResponse + * @static + * @param {flyteidl.admin.IGetAgentResponse} message GetAgentResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetAgentResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.agent != null && message.hasOwnProperty("agent")) + $root.flyteidl.admin.Agent.encode(message.agent, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Decodes a GetAgentResponse message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.admin.GetAgentResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.admin.GetAgentResponse} GetAgentResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetAgentResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.GetAgentResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.agent = $root.flyteidl.admin.Agent.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies a GetAgentResponse message. + * @function verify + * @memberof flyteidl.admin.GetAgentResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetAgentResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.agent != null && message.hasOwnProperty("agent")) { + var error = $root.flyteidl.admin.Agent.verify(message.agent); + if (error) + return "agent." + error; + } + return null; + }; + + return GetAgentResponse; + })(); + + admin.ListAgentsRequest = (function() { + + /** + * Properties of a ListAgentsRequest. + * @memberof flyteidl.admin + * @interface IListAgentsRequest + */ + + /** + * Constructs a new ListAgentsRequest. + * @memberof flyteidl.admin + * @classdesc Represents a ListAgentsRequest. + * @implements IListAgentsRequest + * @constructor + * @param {flyteidl.admin.IListAgentsRequest=} [properties] Properties to set + */ + function ListAgentsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new ListAgentsRequest instance using the specified properties. + * @function create + * @memberof flyteidl.admin.ListAgentsRequest + * @static + * @param {flyteidl.admin.IListAgentsRequest=} [properties] Properties to set + * @returns {flyteidl.admin.ListAgentsRequest} ListAgentsRequest instance + */ + ListAgentsRequest.create = function create(properties) { + return new ListAgentsRequest(properties); + }; + + /** + * Encodes the specified ListAgentsRequest message. Does not implicitly {@link flyteidl.admin.ListAgentsRequest.verify|verify} messages. + * @function encode + * @memberof flyteidl.admin.ListAgentsRequest + * @static + * @param {flyteidl.admin.IListAgentsRequest} message ListAgentsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListAgentsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Decodes a ListAgentsRequest message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.admin.ListAgentsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.admin.ListAgentsRequest} ListAgentsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListAgentsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.ListAgentsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies a ListAgentsRequest message. + * @function verify + * @memberof flyteidl.admin.ListAgentsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListAgentsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + return ListAgentsRequest; + })(); + + admin.ListAgentsResponse = (function() { + + /** + * Properties of a ListAgentsResponse. + * @memberof flyteidl.admin + * @interface IListAgentsResponse + * @property {Array.|null} [agents] ListAgentsResponse agents + */ + + /** + * Constructs a new ListAgentsResponse. + * @memberof flyteidl.admin + * @classdesc Represents a ListAgentsResponse. + * @implements IListAgentsResponse + * @constructor + * @param {flyteidl.admin.IListAgentsResponse=} [properties] Properties to set + */ + function ListAgentsResponse(properties) { + this.agents = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListAgentsResponse agents. + * @member {Array.} agents + * @memberof flyteidl.admin.ListAgentsResponse + * @instance + */ + ListAgentsResponse.prototype.agents = $util.emptyArray; + + /** + * Creates a new ListAgentsResponse instance using the specified properties. + * @function create + * @memberof flyteidl.admin.ListAgentsResponse + * @static + * @param {flyteidl.admin.IListAgentsResponse=} [properties] Properties to set + * @returns {flyteidl.admin.ListAgentsResponse} ListAgentsResponse instance + */ + ListAgentsResponse.create = function create(properties) { + return new ListAgentsResponse(properties); + }; + + /** + * Encodes the specified ListAgentsResponse message. Does not implicitly {@link flyteidl.admin.ListAgentsResponse.verify|verify} messages. + * @function encode + * @memberof flyteidl.admin.ListAgentsResponse + * @static + * @param {flyteidl.admin.IListAgentsResponse} message ListAgentsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListAgentsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.agents != null && message.agents.length) + for (var i = 0; i < message.agents.length; ++i) + $root.flyteidl.admin.Agent.encode(message.agents[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Decodes a ListAgentsResponse message from the specified reader or buffer. + * @function decode + * @memberof flyteidl.admin.ListAgentsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {flyteidl.admin.ListAgentsResponse} ListAgentsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListAgentsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.ListAgentsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.agents && message.agents.length)) + message.agents = []; + message.agents.push($root.flyteidl.admin.Agent.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Verifies a ListAgentsResponse message. + * @function verify + * @memberof flyteidl.admin.ListAgentsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListAgentsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.agents != null && message.hasOwnProperty("agents")) { + if (!Array.isArray(message.agents)) + return "agents: array expected"; + for (var i = 0; i < message.agents.length; ++i) { + var error = $root.flyteidl.admin.Agent.verify(message.agents[i]); + if (error) + return "agents." + error; + } + } + return null; + }; + + return ListAgentsResponse; + })(); + admin.ClusterAssignment = (function() { /** @@ -46122,6 +46782,107 @@ return AsyncAgentService; })(); + service.AgentMetadataService = (function() { + + /** + * Constructs a new AgentMetadataService service. + * @memberof flyteidl.service + * @classdesc Represents an AgentMetadataService + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function AgentMetadataService(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } + + (AgentMetadataService.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = AgentMetadataService; + + /** + * Creates new AgentMetadataService service using the specified rpc implementation. + * @function create + * @memberof flyteidl.service.AgentMetadataService + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {AgentMetadataService} RPC service. Useful where requests and/or responses are streamed. + */ + AgentMetadataService.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; + + /** + * Callback as used by {@link flyteidl.service.AgentMetadataService#getAgent}. + * @memberof flyteidl.service.AgentMetadataService + * @typedef GetAgentCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {flyteidl.admin.GetAgentResponse} [response] GetAgentResponse + */ + + /** + * Calls GetAgent. + * @function getAgent + * @memberof flyteidl.service.AgentMetadataService + * @instance + * @param {flyteidl.admin.IGetAgentRequest} request GetAgentRequest message or plain object + * @param {flyteidl.service.AgentMetadataService.GetAgentCallback} callback Node-style callback called with the error, if any, and GetAgentResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(AgentMetadataService.prototype.getAgent = function getAgent(request, callback) { + return this.rpcCall(getAgent, $root.flyteidl.admin.GetAgentRequest, $root.flyteidl.admin.GetAgentResponse, request, callback); + }, "name", { value: "GetAgent" }); + + /** + * Calls GetAgent. + * @function getAgent + * @memberof flyteidl.service.AgentMetadataService + * @instance + * @param {flyteidl.admin.IGetAgentRequest} request GetAgentRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link flyteidl.service.AgentMetadataService#listAgent}. + * @memberof flyteidl.service.AgentMetadataService + * @typedef ListAgentCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {flyteidl.admin.ListAgentsResponse} [response] ListAgentsResponse + */ + + /** + * Calls ListAgent. + * @function listAgent + * @memberof flyteidl.service.AgentMetadataService + * @instance + * @param {flyteidl.admin.IListAgentsRequest} request ListAgentsRequest message or plain object + * @param {flyteidl.service.AgentMetadataService.ListAgentCallback} callback Node-style callback called with the error, if any, and ListAgentsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(AgentMetadataService.prototype.listAgent = function listAgent(request, callback) { + return this.rpcCall(listAgent, $root.flyteidl.admin.ListAgentsRequest, $root.flyteidl.admin.ListAgentsResponse, request, callback); + }, "name", { value: "ListAgent" }); + + /** + * Calls ListAgent. + * @function listAgent + * @memberof flyteidl.service.AgentMetadataService + * @instance + * @param {flyteidl.admin.IListAgentsRequest} request ListAgentsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return AgentMetadataService; + })(); + service.OAuth2MetadataRequest = (function() { /** diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index bb0aa9384a..a73e8e0948 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -15,9 +15,10 @@ from flyteidl.core import tasks_pb2 as flyteidl_dot_core_dot_tasks__pb2 from flyteidl.core import interface_pb2 as flyteidl_dot_core_dot_interface__pb2 from flyteidl.core import identifier_pb2 as flyteidl_dot_core_dot_identifier__pb2 +from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"G\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x85\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12\x45\n\x06secret\x18\x05 \x03(\x0b\x32-.flyteidl.admin.CreateTaskRequest.SecretEntryR\x06secret\x1a\x39\n\x0bSecretEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"s\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12*\n\x04logs\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x04logs\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x85\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0bsecret_name\x18\x02 \x03(\tR\nsecretName\x12.\n\x13supported_task_type\x18\x03 \x01(\tR\x11supportedTaskType\x12\x17\n\x07is_sync\x18\x04 \x01(\x08R\x06isSync\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -32,28 +33,42 @@ _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001' _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=1557 - _globals['_STATE']._serialized_end=1651 - _globals['_TASKEXECUTIONMETADATA']._serialized_start=167 - _globals['_TASKEXECUTIONMETADATA']._serialized_end=831 - _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=637 - _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_end=694 - _globals['_TASKEXECUTIONMETADATA_ANNOTATIONSENTRY']._serialized_start=696 - _globals['_TASKEXECUTIONMETADATA_ANNOTATIONSENTRY']._serialized_end=758 - _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_start=760 - _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_end=831 - _globals['_CREATETASKREQUEST']._serialized_start=834 - _globals['_CREATETASKREQUEST']._serialized_end=1093 - _globals['_CREATETASKRESPONSE']._serialized_start=1095 - _globals['_CREATETASKRESPONSE']._serialized_end=1152 - _globals['_GETTASKREQUEST']._serialized_start=1154 - _globals['_GETTASKREQUEST']._serialized_end=1236 - _globals['_GETTASKRESPONSE']._serialized_start=1238 - _globals['_GETTASKRESPONSE']._serialized_end=1309 - _globals['_RESOURCE']._serialized_start=1312 - _globals['_RESOURCE']._serialized_end=1446 - _globals['_DELETETASKREQUEST']._serialized_start=1448 - _globals['_DELETETASKREQUEST']._serialized_end=1533 - _globals['_DELETETASKRESPONSE']._serialized_start=1535 - _globals['_DELETETASKRESPONSE']._serialized_end=1555 + _CREATETASKREQUEST_SECRETENTRY._options = None + _CREATETASKREQUEST_SECRETENTRY._serialized_options = b'8\001' + _globals['_STATE']._serialized_start=2092 + _globals['_STATE']._serialized_end=2186 + _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 + _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 + _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 + _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_end=725 + _globals['_TASKEXECUTIONMETADATA_ANNOTATIONSENTRY']._serialized_start=727 + _globals['_TASKEXECUTIONMETADATA_ANNOTATIONSENTRY']._serialized_end=789 + _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_start=791 + _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_end=862 + _globals['_CREATETASKREQUEST']._serialized_start=865 + _globals['_CREATETASKREQUEST']._serialized_end=1254 + _globals['_CREATETASKREQUEST_SECRETENTRY']._serialized_start=1197 + _globals['_CREATETASKREQUEST_SECRETENTRY']._serialized_end=1254 + _globals['_CREATETASKRESPONSE']._serialized_start=1256 + _globals['_CREATETASKRESPONSE']._serialized_end=1313 + _globals['_GETTASKREQUEST']._serialized_start=1315 + _globals['_GETTASKREQUEST']._serialized_end=1397 + _globals['_GETTASKRESPONSE']._serialized_start=1399 + _globals['_GETTASKRESPONSE']._serialized_end=1514 + _globals['_RESOURCE']._serialized_start=1517 + _globals['_RESOURCE']._serialized_end=1651 + _globals['_DELETETASKREQUEST']._serialized_start=1653 + _globals['_DELETETASKREQUEST']._serialized_end=1738 + _globals['_DELETETASKRESPONSE']._serialized_start=1740 + _globals['_DELETETASKRESPONSE']._serialized_end=1760 + _globals['_AGENT']._serialized_start=1763 + _globals['_AGENT']._serialized_end=1896 + _globals['_GETAGENTREQUEST']._serialized_start=1898 + _globals['_GETAGENTREQUEST']._serialized_end=1935 + _globals['_GETAGENTRESPONSE']._serialized_start=1937 + _globals['_GETAGENTRESPONSE']._serialized_end=2000 + _globals['_LISTAGENTSREQUEST']._serialized_start=2002 + _globals['_LISTAGENTSREQUEST']._serialized_end=2021 + _globals['_LISTAGENTSRESPONSE']._serialized_start=2023 + _globals['_LISTAGENTSRESPONSE']._serialized_end=2090 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi index 6ca7ba23a7..4989b0a9ab 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi @@ -2,11 +2,12 @@ from flyteidl.core import literals_pb2 as _literals_pb2 from flyteidl.core import tasks_pb2 as _tasks_pb2 from flyteidl.core import interface_pb2 as _interface_pb2 from flyteidl.core import identifier_pb2 as _identifier_pb2 +from flyteidl.core import execution_pb2 as _execution_pb2 from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union +from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union DESCRIPTOR: _descriptor.FileDescriptor @@ -61,16 +62,25 @@ class TaskExecutionMetadata(_message.Message): def __init__(self, task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., namespace: _Optional[str] = ..., labels: _Optional[_Mapping[str, str]] = ..., annotations: _Optional[_Mapping[str, str]] = ..., k8s_service_account: _Optional[str] = ..., environment_variables: _Optional[_Mapping[str, str]] = ...) -> None: ... class CreateTaskRequest(_message.Message): - __slots__ = ["inputs", "template", "output_prefix", "task_execution_metadata"] + __slots__ = ["inputs", "template", "output_prefix", "task_execution_metadata", "secret"] + class SecretEntry(_message.Message): + __slots__ = ["key", "value"] + KEY_FIELD_NUMBER: _ClassVar[int] + VALUE_FIELD_NUMBER: _ClassVar[int] + key: str + value: str + def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ... INPUTS_FIELD_NUMBER: _ClassVar[int] TEMPLATE_FIELD_NUMBER: _ClassVar[int] OUTPUT_PREFIX_FIELD_NUMBER: _ClassVar[int] TASK_EXECUTION_METADATA_FIELD_NUMBER: _ClassVar[int] + SECRET_FIELD_NUMBER: _ClassVar[int] inputs: _literals_pb2.LiteralMap template: _tasks_pb2.TaskTemplate output_prefix: str task_execution_metadata: TaskExecutionMetadata - def __init__(self, inputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., template: _Optional[_Union[_tasks_pb2.TaskTemplate, _Mapping]] = ..., output_prefix: _Optional[str] = ..., task_execution_metadata: _Optional[_Union[TaskExecutionMetadata, _Mapping]] = ...) -> None: ... + secret: _containers.ScalarMap[str, str] + def __init__(self, inputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., template: _Optional[_Union[_tasks_pb2.TaskTemplate, _Mapping]] = ..., output_prefix: _Optional[str] = ..., task_execution_metadata: _Optional[_Union[TaskExecutionMetadata, _Mapping]] = ..., secret: _Optional[_Mapping[str, str]] = ...) -> None: ... class CreateTaskResponse(_message.Message): __slots__ = ["resource_meta"] @@ -87,10 +97,12 @@ class GetTaskRequest(_message.Message): def __init__(self, task_type: _Optional[str] = ..., resource_meta: _Optional[bytes] = ...) -> None: ... class GetTaskResponse(_message.Message): - __slots__ = ["resource"] + __slots__ = ["resource", "logs"] RESOURCE_FIELD_NUMBER: _ClassVar[int] + LOGS_FIELD_NUMBER: _ClassVar[int] resource: Resource - def __init__(self, resource: _Optional[_Union[Resource, _Mapping]] = ...) -> None: ... + logs: _containers.RepeatedCompositeFieldContainer[_execution_pb2.TaskLog] + def __init__(self, resource: _Optional[_Union[Resource, _Mapping]] = ..., logs: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ...) -> None: ... class Resource(_message.Message): __slots__ = ["state", "outputs", "message"] @@ -113,3 +125,37 @@ class DeleteTaskRequest(_message.Message): class DeleteTaskResponse(_message.Message): __slots__ = [] def __init__(self) -> None: ... + +class Agent(_message.Message): + __slots__ = ["name", "secret_name", "supported_task_type", "is_sync"] + NAME_FIELD_NUMBER: _ClassVar[int] + SECRET_NAME_FIELD_NUMBER: _ClassVar[int] + SUPPORTED_TASK_TYPE_FIELD_NUMBER: _ClassVar[int] + IS_SYNC_FIELD_NUMBER: _ClassVar[int] + name: str + secret_name: _containers.RepeatedScalarFieldContainer[str] + supported_task_type: str + is_sync: bool + def __init__(self, name: _Optional[str] = ..., secret_name: _Optional[_Iterable[str]] = ..., supported_task_type: _Optional[str] = ..., is_sync: bool = ...) -> None: ... + +class GetAgentRequest(_message.Message): + __slots__ = ["name"] + NAME_FIELD_NUMBER: _ClassVar[int] + name: str + def __init__(self, name: _Optional[str] = ...) -> None: ... + +class GetAgentResponse(_message.Message): + __slots__ = ["agent"] + AGENT_FIELD_NUMBER: _ClassVar[int] + agent: Agent + def __init__(self, agent: _Optional[_Union[Agent, _Mapping]] = ...) -> None: ... + +class ListAgentsRequest(_message.Message): + __slots__ = [] + def __init__(self) -> None: ... + +class ListAgentsResponse(_message.Message): + __slots__ = ["agents"] + AGENTS_FIELD_NUMBER: _ClassVar[int] + agents: _containers.RepeatedCompositeFieldContainer[Agent] + def __init__(self, agents: _Optional[_Iterable[_Union[Agent, _Mapping]]] = ...) -> None: ... diff --git a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.py index 8227bdc438..866d4c893e 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.py @@ -11,10 +11,11 @@ _sym_db = _symbol_database.Default() +from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 from flyteidl.admin import agent_pb2 as flyteidl_dot_admin_dot_agent__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/agent.proto\x12\x10\x66lyteidl.service\x1a\x1a\x66lyteidl/admin/agent.proto2\x8f\x02\n\x11\x41syncAgentService\x12U\n\nCreateTask\x12!.flyteidl.admin.CreateTaskRequest\x1a\".flyteidl.admin.CreateTaskResponse\"\x00\x12L\n\x07GetTask\x12\x1e.flyteidl.admin.GetTaskRequest\x1a\x1f.flyteidl.admin.GetTaskResponse\"\x00\x12U\n\nDeleteTask\x12!.flyteidl.admin.DeleteTaskRequest\x1a\".flyteidl.admin.DeleteTaskResponse\"\x00\x42\xc2\x01\n\x14\x63om.flyteidl.serviceB\nAgentProtoP\x01Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/agent.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/admin/agent.proto2\x8f\x02\n\x11\x41syncAgentService\x12U\n\nCreateTask\x12!.flyteidl.admin.CreateTaskRequest\x1a\".flyteidl.admin.CreateTaskResponse\"\x00\x12L\n\x07GetTask\x12\x1e.flyteidl.admin.GetTaskRequest\x1a\x1f.flyteidl.admin.GetTaskResponse\"\x00\x12U\n\nDeleteTask\x12!.flyteidl.admin.DeleteTaskRequest\x1a\".flyteidl.admin.DeleteTaskResponse\"\x00\x32\xf0\x01\n\x14\x41gentMetadataService\x12l\n\x08GetAgent\x12\x1f.flyteidl.admin.GetAgentRequest\x1a .flyteidl.admin.GetAgentResponse\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/api/v1/agents/{name}\x12j\n\tListAgent\x12!.flyteidl.admin.ListAgentsRequest\x1a\".flyteidl.admin.ListAgentsResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/api/v1/agentsB\xc2\x01\n\x14\x63om.flyteidl.serviceB\nAgentProtoP\x01Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -23,6 +24,12 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nAgentProtoP\001Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service' - _globals['_ASYNCAGENTSERVICE']._serialized_start=79 - _globals['_ASYNCAGENTSERVICE']._serialized_end=350 + _AGENTMETADATASERVICE.methods_by_name['GetAgent']._options = None + _AGENTMETADATASERVICE.methods_by_name['GetAgent']._serialized_options = b'\202\323\344\223\002\027\022\025/api/v1/agents/{name}' + _AGENTMETADATASERVICE.methods_by_name['ListAgent']._options = None + _AGENTMETADATASERVICE.methods_by_name['ListAgent']._serialized_options = b'\202\323\344\223\002\020\022\016/api/v1/agents' + _globals['_ASYNCAGENTSERVICE']._serialized_start=109 + _globals['_ASYNCAGENTSERVICE']._serialized_end=380 + _globals['_AGENTMETADATASERVICE']._serialized_start=383 + _globals['_AGENTMETADATASERVICE']._serialized_end=623 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.pyi index 8c85e57d2d..1d89a831af 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.pyi @@ -1,3 +1,4 @@ +from google.api import annotations_pb2 as _annotations_pb2 from flyteidl.admin import agent_pb2 as _agent_pb2 from google.protobuf import descriptor as _descriptor from typing import ClassVar as _ClassVar diff --git a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2_grpc.py index 3ef2af39c4..abf411c034 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2_grpc.py +++ b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2_grpc.py @@ -6,7 +6,7 @@ class AsyncAgentServiceStub(object): - """AgentService defines an RPC Service that allows propeller to send the request to the agent server. + """AsyncAgentService defines an RPC Service that allows propeller to send the request to the agent server. """ def __init__(self, channel): @@ -33,7 +33,7 @@ def __init__(self, channel): class AsyncAgentServiceServicer(object): - """AgentService defines an RPC Service that allows propeller to send the request to the agent server. + """AsyncAgentService defines an RPC Service that allows propeller to send the request to the agent server. """ def CreateTask(self, request, context): @@ -83,7 +83,7 @@ def add_AsyncAgentServiceServicer_to_server(servicer, server): # This class is part of an EXPERIMENTAL API. class AsyncAgentService(object): - """AgentService defines an RPC Service that allows propeller to send the request to the agent server. + """AsyncAgentService defines an RPC Service that allows propeller to send the request to the agent server. """ @staticmethod @@ -136,3 +136,105 @@ def DeleteTask(request, flyteidl_dot_admin_dot_agent__pb2.DeleteTaskResponse.FromString, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + +class AgentMetadataServiceStub(object): + """AgentMetadataService defines an RPC service that is also served over HTTP via grpc-gateway. + This service allows propeller or users to get the metadata of agents. + """ + + def __init__(self, channel): + """Constructor. + + Args: + channel: A grpc.Channel. + """ + self.GetAgent = channel.unary_unary( + '/flyteidl.service.AgentMetadataService/GetAgent', + request_serializer=flyteidl_dot_admin_dot_agent__pb2.GetAgentRequest.SerializeToString, + response_deserializer=flyteidl_dot_admin_dot_agent__pb2.GetAgentResponse.FromString, + ) + self.ListAgent = channel.unary_unary( + '/flyteidl.service.AgentMetadataService/ListAgent', + request_serializer=flyteidl_dot_admin_dot_agent__pb2.ListAgentsRequest.SerializeToString, + response_deserializer=flyteidl_dot_admin_dot_agent__pb2.ListAgentsResponse.FromString, + ) + + +class AgentMetadataServiceServicer(object): + """AgentMetadataService defines an RPC service that is also served over HTTP via grpc-gateway. + This service allows propeller or users to get the metadata of agents. + """ + + def GetAgent(self, request, context): + """Fetch a :ref:`ref_flyteidl.admin.Agent` definition. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + def ListAgent(self, request, context): + """Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + +def add_AgentMetadataServiceServicer_to_server(servicer, server): + rpc_method_handlers = { + 'GetAgent': grpc.unary_unary_rpc_method_handler( + servicer.GetAgent, + request_deserializer=flyteidl_dot_admin_dot_agent__pb2.GetAgentRequest.FromString, + response_serializer=flyteidl_dot_admin_dot_agent__pb2.GetAgentResponse.SerializeToString, + ), + 'ListAgent': grpc.unary_unary_rpc_method_handler( + servicer.ListAgent, + request_deserializer=flyteidl_dot_admin_dot_agent__pb2.ListAgentsRequest.FromString, + response_serializer=flyteidl_dot_admin_dot_agent__pb2.ListAgentsResponse.SerializeToString, + ), + } + generic_handler = grpc.method_handlers_generic_handler( + 'flyteidl.service.AgentMetadataService', rpc_method_handlers) + server.add_generic_rpc_handlers((generic_handler,)) + + + # This class is part of an EXPERIMENTAL API. +class AgentMetadataService(object): + """AgentMetadataService defines an RPC service that is also served over HTTP via grpc-gateway. + This service allows propeller or users to get the metadata of agents. + """ + + @staticmethod + def GetAgent(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.AgentMetadataService/GetAgent', + flyteidl_dot_admin_dot_agent__pb2.GetAgentRequest.SerializeToString, + flyteidl_dot_admin_dot_agent__pb2.GetAgentResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def ListAgent(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.AgentMetadataService/ListAgent', + flyteidl_dot_admin_dot_agent__pb2.ListAgentsRequest.SerializeToString, + flyteidl_dot_admin_dot_agent__pb2.ListAgentsResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index 759983a507..904f5b1ecd 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -40,6 +40,11 @@ pub struct CreateTaskRequest { /// subset of runtime task execution metadata. #[prost(message, optional, tag="4")] pub task_execution_metadata: ::core::option::Option, + /// Secret to be passed to the agent. + /// Key is the name of the secret in secret manager. + /// Value is the actual secret value. + #[prost(map="string, string", tag="5")] + pub secret: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, } /// Represents a create response structure. #[allow(clippy::derive_partial_eq_without_eq)] @@ -66,6 +71,9 @@ pub struct GetTaskRequest { pub struct GetTaskResponse { #[prost(message, optional, tag="1")] pub resource: ::core::option::Option, + /// log information for the task execution + #[prost(message, repeated, tag="2")] + pub logs: ::prost::alloc::vec::Vec, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -98,6 +106,50 @@ pub struct DeleteTaskRequest { #[derive(Clone, PartialEq, ::prost::Message)] pub struct DeleteTaskResponse { } +/// A message containing the agent metadata. +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct Agent { + /// The name of the agent. + #[prost(string, tag="1")] + pub name: ::prost::alloc::string::String, + /// A list of secret in the secret manager. + #[prost(string, repeated, tag="2")] + pub secret_name: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + /// The type of the task that the agent can handle. + #[prost(string, tag="3")] + pub supported_task_type: ::prost::alloc::string::String, + /// Indicates if this agent is a sync agent. + #[prost(bool, tag="4")] + pub is_sync: bool, +} +/// A request to get an agent. +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct GetAgentRequest { + /// The name of the agent. + #[prost(string, tag="1")] + pub name: ::prost::alloc::string::String, +} +/// A response containing an agent. +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct GetAgentResponse { + #[prost(message, optional, tag="1")] + pub agent: ::core::option::Option, +} +/// A request to list all agents. +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct ListAgentsRequest { +} +/// A response containing a list of agents. +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct ListAgentsResponse { + #[prost(message, repeated, tag="1")] + pub agents: ::prost::alloc::vec::Vec, +} /// The state of the execution is used to control its visibility in the UI/CLI. #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index a4dade0953..cb90d7811f 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -7,6 +7,7 @@ import "flyteidl/core/literals.proto"; import "flyteidl/core/tasks.proto"; import "flyteidl/core/interface.proto"; import "flyteidl/core/identifier.proto"; +import "flyteidl/core/execution.proto"; // The state of the execution is used to control its visibility in the UI/CLI. enum State { @@ -45,6 +46,10 @@ message CreateTaskRequest { string output_prefix = 3; // subset of runtime task execution metadata. TaskExecutionMetadata task_execution_metadata = 4; + // Secret to be passed to the agent. + // Key is the name of the secret in secret manager. + // Value is the actual secret value. + map secret = 5; } // Represents a create response structure. @@ -64,6 +69,9 @@ message GetTaskRequest { // Response to get an individual task resource. message GetTaskResponse { Resource resource = 1; + + // log information for the task execution + repeated core.TaskLog logs = 2; } message Resource { @@ -86,5 +94,35 @@ message DeleteTaskRequest { } // Response to delete a task. -message DeleteTaskResponse { +message DeleteTaskResponse {} + +// A message containing the agent metadata. +message Agent { + // The name of the agent. + string name = 1; + // A list of secret in the secret manager. + repeated string secret_name = 2; + // The type of the task that the agent can handle. + string supported_task_type = 3; + // Indicates if this agent is a sync agent. + bool is_sync = 4; +} + +// A request to get an agent. +message GetAgentRequest { + // The name of the agent. + string name = 1; +} + +// A response containing an agent. +message GetAgentResponse { + Agent agent = 1; +} + +// A request to list all agents. +message ListAgentsRequest {} + +// A response containing a list of agents. +message ListAgentsResponse { + repeated Agent agents = 1; } diff --git a/flyteidl/protos/flyteidl/service/agent.proto b/flyteidl/protos/flyteidl/service/agent.proto index 6d89bb532e..d8ff91f29e 100644 --- a/flyteidl/protos/flyteidl/service/agent.proto +++ b/flyteidl/protos/flyteidl/service/agent.proto @@ -2,9 +2,11 @@ syntax = "proto3"; package flyteidl.service; option go_package = "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"; + +import "google/api/annotations.proto"; import "flyteidl/admin/agent.proto"; -// AgentService defines an RPC Service that allows propeller to send the request to the agent server. +// AsyncAgentService defines an RPC Service that allows propeller to send the request to the agent server. service AsyncAgentService { // Send a task create request to the agent server. rpc CreateTask (flyteidl.admin.CreateTaskRequest) returns (flyteidl.admin.CreateTaskResponse){}; @@ -13,3 +15,21 @@ service AsyncAgentService { // Delete the task resource. rpc DeleteTask (flyteidl.admin.DeleteTaskRequest) returns (flyteidl.admin.DeleteTaskResponse){}; } + +// AgentMetadataService defines an RPC service that is also served over HTTP via grpc-gateway. +// This service allows propeller or users to get the metadata of agents. +service AgentMetadataService { + // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. + rpc GetAgent (flyteidl.admin.GetAgentRequest) returns (flyteidl.admin.GetAgentResponse){ + option (google.api.http) = { + get: "/api/v1/agents/{name}" + }; + }; + + // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. + rpc ListAgent (flyteidl.admin.ListAgentsRequest) returns (flyteidl.admin.ListAgentsResponse){ + option (google.api.http) = { + get: "/api/v1/agents" + }; + }; +} From f6a9e3b97717d63e025c9077b0f62a833e327d75 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sat, 2 Dec 2023 13:47:01 +0800 Subject: [PATCH 02/47] update pingsu's pr Signed-off-by: Future Outlier --- flyteidl/protos/flyteidl/admin/agent.proto | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index cb90d7811f..68578a3483 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -49,7 +49,7 @@ message CreateTaskRequest { // Secret to be passed to the agent. // Key is the name of the secret in secret manager. // Value is the actual secret value. - map secret = 5; + map secrets = 5; } // Represents a create response structure. @@ -71,7 +71,7 @@ message GetTaskResponse { Resource resource = 1; // log information for the task execution - repeated core.TaskLog logs = 2; + repeated core.TaskLog log_links = 2; } message Resource { @@ -98,14 +98,17 @@ message DeleteTaskResponse {} // A message containing the agent metadata. message Agent { - // The name of the agent. + // Name is the developer-assigned name of the agent. string name = 1; - // A list of secret in the secret manager. - repeated string secret_name = 2; - // The type of the task that the agent can handle. - string supported_task_type = 3; - // Indicates if this agent is a sync agent. - bool is_sync = 4; + + // SupportedTaskTypes are the types of the tasks that the agent can handle. + string supported_task_types = 2; + + // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. + bool is_sync = 3; + + // SecretNames is a list of secrets the agent requires to execute tasks. + repeated string secret_names = 4; } // A request to get an agent. From 8f2869ceaf1caa71bec995a047c097d4917ef353 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sat, 2 Dec 2023 13:54:55 +0800 Subject: [PATCH 03/47] new generate Signed-off-by: Future Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 458 +++---- flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 374 +++--- flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 165 +-- .../pb-go/flyteidl/admin/agent.pb.validate.go | 8 +- .../pb-go/flyteidl/service/agent.swagger.json | 24 +- .../gen/pb-go/flyteidl/service/openapi.go | 2 +- .../flyteidl/admin/AgentOuterClass.java | 1174 ++++++++--------- flyteidl/gen/pb-js/flyteidl.d.ts | 36 +- flyteidl/gen/pb-js/flyteidl.js | 134 +- .../gen/pb_python/flyteidl/admin/agent_pb2.py | 60 +- .../pb_python/flyteidl/admin/agent_pb2.pyi | 30 +- flyteidl/gen/pb_rust/flyteidl.admin.rs | 22 +- 12 files changed, 1244 insertions(+), 1243 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index 4bcfcb1fd4..3aa183f449 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -17,7 +17,7 @@ #include extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_CreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_CreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_LabelsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; @@ -45,10 +45,10 @@ class TaskExecutionMetadataDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _TaskExecutionMetadata_default_instance_; -class CreateTaskRequest_SecretEntry_DoNotUseDefaultTypeInternal { +class CreateTaskRequest_SecretsEntry_DoNotUseDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _CreateTaskRequest_SecretEntry_DoNotUse_default_instance_; + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_; class CreateTaskRequestDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -156,18 +156,18 @@ ::google::protobuf::internal::SCCInfo<4> scc_info_TaskExecutionMetadata_flyteidl &scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base, &scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base,}}; -static void InitDefaultsCreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto() { +static void InitDefaultsCreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::flyteidl::admin::_CreateTaskRequest_SecretEntry_DoNotUse_default_instance_; - new (ptr) ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse(); + void* ptr = &::flyteidl::admin::_CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_; + new (ptr) ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse(); } - ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse::InitAsDefaultInstance(); + ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<0> scc_info_CreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto}, {}}; +::google::protobuf::internal::SCCInfo<0> scc_info_CreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto}, {}}; static void InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -185,7 +185,7 @@ ::google::protobuf::internal::SCCInfo<4> scc_info_CreateTaskRequest_flyteidl_2fa &scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto.base, &scc_info_TaskTemplate_flyteidl_2fcore_2ftasks_2eproto.base, &scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto.base, - &scc_info_CreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base,}}; + &scc_info_CreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base,}}; static void InitDefaultsCreateTaskResponse_flyteidl_2fadmin_2fagent_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -351,7 +351,7 @@ void InitDefaults_flyteidl_2fadmin_2fagent_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskRequest_SecretEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskResponse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_GetTaskRequest_flyteidl_2fadmin_2fagent_2eproto.base); @@ -409,13 +409,13 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, annotations_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, k8s_service_account_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, environment_variables_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse, _has_bits_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse, key_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse, value_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse, value_), 0, 1, ~0u, // no _has_bits_ @@ -427,7 +427,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, template__), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, output_prefix_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, task_execution_metadata_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, secret_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, secrets_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskResponse, _internal_metadata_), ~0u, // no _extensions_ @@ -447,7 +447,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskResponse, resource_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskResponse, logs_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskResponse, log_links_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, _internal_metadata_), ~0u, // no _extensions_ @@ -474,9 +474,9 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, name_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, secret_name_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_type_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_types_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, is_sync_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, secret_names_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetAgentRequest, _internal_metadata_), ~0u, // no _extensions_ @@ -506,7 +506,7 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 9, 16, sizeof(::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse)}, { 18, 25, sizeof(::flyteidl::admin::TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse)}, { 27, -1, sizeof(::flyteidl::admin::TaskExecutionMetadata)}, - { 38, 45, sizeof(::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse)}, + { 38, 45, sizeof(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse)}, { 47, -1, sizeof(::flyteidl::admin::CreateTaskRequest)}, { 57, -1, sizeof(::flyteidl::admin::CreateTaskResponse)}, { 63, -1, sizeof(::flyteidl::admin::GetTaskRequest)}, @@ -526,7 +526,7 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_default_instance_), - reinterpret_cast(&::flyteidl::admin::_CreateTaskRequest_SecretEntry_DoNotUse_default_instance_), + reinterpret_cast(&::flyteidl::admin::_CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_CreateTaskRequest_default_instance_), reinterpret_cast(&::flyteidl::admin::_CreateTaskResponse_default_instance_), reinterpret_cast(&::flyteidl::admin::_GetTaskRequest_default_instance_), @@ -566,41 +566,41 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" - "\005value\030\002 \001(\t:\0028\001\"\272\002\n\021CreateTaskRequest\022)" + "\005value\030\002 \001(\t:\0028\001\"\275\002\n\021CreateTaskRequest\022)" "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" "execution_metadata\030\004 \001(\0132%.flyteidl.admi" - "n.TaskExecutionMetadata\022=\n\006secret\030\005 \003(\0132" - "-.flyteidl.admin.CreateTaskRequest.Secre" - "tEntry\032-\n\013SecretEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" - "lue\030\002 \001(\t:\0028\001\"+\n\022CreateTaskResponse\022\025\n\rr" - "esource_meta\030\001 \001(\014\":\n\016GetTaskRequest\022\021\n\t" - "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"c" - "\n\017GetTaskResponse\022*\n\010resource\030\001 \001(\0132\030.fl" - "yteidl.admin.Resource\022$\n\004logs\030\002 \003(\0132\026.fl" - "yteidl.core.TaskLog\"m\n\010Resource\022$\n\005state" - "\030\001 \001(\0162\025.flyteidl.admin.State\022*\n\007outputs" - "\030\002 \001(\0132\031.flyteidl.core.LiteralMap\022\017\n\007mes" - "sage\030\003 \001(\t\"=\n\021DeleteTaskRequest\022\021\n\ttask_" - "type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022Del" - "eteTaskResponse\"X\n\005Agent\022\014\n\004name\030\001 \001(\t\022\023" - "\n\013secret_name\030\002 \003(\t\022\033\n\023supported_task_ty" - "pe\030\003 \001(\t\022\017\n\007is_sync\030\004 \001(\010\"\037\n\017GetAgentReq" - "uest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$" - "\n\005agent\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021" - "ListAgentsRequest\";\n\022ListAgentsResponse\022" - "%\n\006agents\030\001 \003(\0132\025.flyteidl.admin.Agent*^" - "\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMAN" - "ENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022" - "\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteorg/fl" - "yte/flyteidl/gen/pb-go/flyteidl/adminb\006p" - "roto3" + "n.TaskExecutionMetadata\022\?\n\007secrets\030\005 \003(\013" + "2..flyteidl.admin.CreateTaskRequest.Secr" + "etsEntry\032.\n\014SecretsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\t:\0028\001\"+\n\022CreateTaskResponse\022\025" + "\n\rresource_meta\030\001 \001(\014\":\n\016GetTaskRequest\022" + "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + "\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 \001(\0132\030" + ".flyteidl.admin.Resource\022)\n\tlog_links\030\002 " + "\003(\0132\026.flyteidl.core.TaskLog\"m\n\010Resource\022" + "$\n\005state\030\001 \001(\0162\025.flyteidl.admin.State\022*\n" + "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" + "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" + "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + "\014\"\024\n\022DeleteTaskResponse\"Z\n\005Agent\022\014\n\004name" + "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \001(\t\022\017\n\007" + "is_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017G" + "etAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgent" + "Response\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin" + ".Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgent" + "sResponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.adm" + "in.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000" + "\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007" + "RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/f" + "lyteorg/flyte/flyteidl/gen/pb-go/flyteid" + "l/adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1885, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1895, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { @@ -1691,25 +1691,25 @@ ::google::protobuf::Metadata TaskExecutionMetadata::GetMetadata() const { // =================================================================== -CreateTaskRequest_SecretEntry_DoNotUse::CreateTaskRequest_SecretEntry_DoNotUse() {} -CreateTaskRequest_SecretEntry_DoNotUse::CreateTaskRequest_SecretEntry_DoNotUse(::google::protobuf::Arena* arena) +CreateTaskRequest_SecretsEntry_DoNotUse::CreateTaskRequest_SecretsEntry_DoNotUse() {} +CreateTaskRequest_SecretsEntry_DoNotUse::CreateTaskRequest_SecretsEntry_DoNotUse(::google::protobuf::Arena* arena) : SuperType(arena) {} -void CreateTaskRequest_SecretEntry_DoNotUse::MergeFrom(const CreateTaskRequest_SecretEntry_DoNotUse& other) { +void CreateTaskRequest_SecretsEntry_DoNotUse::MergeFrom(const CreateTaskRequest_SecretsEntry_DoNotUse& other) { MergeFromInternal(other); } -::google::protobuf::Metadata CreateTaskRequest_SecretEntry_DoNotUse::GetMetadata() const { +::google::protobuf::Metadata CreateTaskRequest_SecretsEntry_DoNotUse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto); return ::file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[4]; } -void CreateTaskRequest_SecretEntry_DoNotUse::MergeFrom( +void CreateTaskRequest_SecretsEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { ::google::protobuf::Message::MergeFrom(other); } #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool CreateTaskRequest_SecretEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { +bool CreateTaskRequest_SecretsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { using MF = ::google::protobuf::internal::MapField< - CreateTaskRequest_SecretEntry_DoNotUse, EntryKeyType, EntryValueType, + CreateTaskRequest_SecretsEntry_DoNotUse, EntryKeyType, EntryValueType, kEntryKeyFieldType, kEntryValueFieldType, kEntryDefaultEnumValue>; auto mf = static_cast(object); @@ -1719,11 +1719,11 @@ bool CreateTaskRequest_SecretEntry_DoNotUse::_ParseMap(const char* begin, const DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( parser.key().data(), static_cast(parser.key().length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.CreateTaskRequest.SecretEntry.key")); + "flyteidl.admin.CreateTaskRequest.SecretsEntry.key")); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( parser.value().data(), static_cast(parser.value().length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.CreateTaskRequest.SecretEntry.value")); + "flyteidl.admin.CreateTaskRequest.SecretsEntry.value")); #undef DO_ return true; } @@ -1776,7 +1776,7 @@ const int CreateTaskRequest::kInputsFieldNumber; const int CreateTaskRequest::kTemplateFieldNumber; const int CreateTaskRequest::kOutputPrefixFieldNumber; const int CreateTaskRequest::kTaskExecutionMetadataFieldNumber; -const int CreateTaskRequest::kSecretFieldNumber; +const int CreateTaskRequest::kSecretsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 CreateTaskRequest::CreateTaskRequest() @@ -1788,7 +1788,7 @@ CreateTaskRequest::CreateTaskRequest(const CreateTaskRequest& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - secret_.MergeFrom(from.secret_); + secrets_.MergeFrom(from.secrets_); output_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.output_prefix().size() > 0) { output_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_prefix_); @@ -1847,7 +1847,7 @@ void CreateTaskRequest::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - secret_.Clear(); + secrets_.Clear(); output_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (GetArenaNoVirtual() == nullptr && inputs_ != nullptr) { delete inputs_; @@ -1932,17 +1932,17 @@ const char* CreateTaskRequest::_InternalParse(const char* begin, const char* end {parser_till_end, object}, ptr - size, ptr)); break; } - // map secret = 5; + // map secrets = 5; case 5: { if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; do { ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; - auto parse_map = ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse::_ParseMap; + auto parse_map = ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse::_ParseMap; ctx->extra_parse_data().payload.clear(); ctx->extra_parse_data().parse_map = parse_map; - object = &msg->secret_; + object = &msg->secrets_; if (size > end - ptr) goto len_delim_till_end; auto newend = ptr + size; GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); @@ -2033,26 +2033,26 @@ bool CreateTaskRequest::MergePartialFromCodedStream( break; } - // map secret = 5; + // map secrets = 5; case 5: { if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { - CreateTaskRequest_SecretEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< - CreateTaskRequest_SecretEntry_DoNotUse, + CreateTaskRequest_SecretsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< + CreateTaskRequest_SecretsEntry_DoNotUse, ::std::string, ::std::string, ::google::protobuf::internal::WireFormatLite::TYPE_STRING, ::google::protobuf::internal::WireFormatLite::TYPE_STRING, 0 >, - ::google::protobuf::Map< ::std::string, ::std::string > > parser(&secret_); + ::google::protobuf::Map< ::std::string, ::std::string > > parser(&secrets_); DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, &parser)); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( parser.key().data(), static_cast(parser.key().length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.CreateTaskRequest.SecretEntry.key")); + "flyteidl.admin.CreateTaskRequest.SecretsEntry.key")); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( parser.value().data(), static_cast(parser.value().length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.CreateTaskRequest.SecretEntry.value")); + "flyteidl.admin.CreateTaskRequest.SecretsEntry.value")); } else { goto handle_unusual; } @@ -2114,8 +2114,8 @@ void CreateTaskRequest::SerializeWithCachedSizes( 4, HasBitSetters::task_execution_metadata(this), output); } - // map secret = 5; - if (!this->secret().empty()) { + // map secrets = 5; + if (!this->secrets().empty()) { typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer ConstPtr; typedef ConstPtr SortItem; @@ -2125,38 +2125,38 @@ void CreateTaskRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( p->first.data(), static_cast(p->first.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.CreateTaskRequest.SecretEntry.key"); + "flyteidl.admin.CreateTaskRequest.SecretsEntry.key"); ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( p->second.data(), static_cast(p->second.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.CreateTaskRequest.SecretEntry.value"); + "flyteidl.admin.CreateTaskRequest.SecretsEntry.value"); } }; if (output->IsSerializationDeterministic() && - this->secret().size() > 1) { + this->secrets().size() > 1) { ::std::unique_ptr items( - new SortItem[this->secret().size()]); + new SortItem[this->secrets().size()]); typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; size_type n = 0; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secret().begin(); - it != this->secret().end(); ++it, ++n) { + it = this->secrets().begin(); + it != this->secrets().end(); ++it, ++n) { items[static_cast(n)] = SortItem(&*it); } ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; + ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - entry.reset(secret_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + entry.reset(secrets_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(5, *entry, output); Utf8Check::Check(&(*items[static_cast(i)])); } } else { - ::std::unique_ptr entry; + ::std::unique_ptr entry; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secret().begin(); - it != this->secret().end(); ++it) { - entry.reset(secret_.NewEntryWrapper(it->first, it->second)); + it = this->secrets().begin(); + it != this->secrets().end(); ++it) { + entry.reset(secrets_.NewEntryWrapper(it->first, it->second)); ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(5, *entry, output); Utf8Check::Check(&(*it)); } @@ -2208,8 +2208,8 @@ ::google::protobuf::uint8* CreateTaskRequest::InternalSerializeWithCachedSizesTo 4, HasBitSetters::task_execution_metadata(this), target); } - // map secret = 5; - if (!this->secret().empty()) { + // map secrets = 5; + if (!this->secrets().empty()) { typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer ConstPtr; typedef ConstPtr SortItem; @@ -2219,38 +2219,38 @@ ::google::protobuf::uint8* CreateTaskRequest::InternalSerializeWithCachedSizesTo ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( p->first.data(), static_cast(p->first.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.CreateTaskRequest.SecretEntry.key"); + "flyteidl.admin.CreateTaskRequest.SecretsEntry.key"); ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( p->second.data(), static_cast(p->second.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.CreateTaskRequest.SecretEntry.value"); + "flyteidl.admin.CreateTaskRequest.SecretsEntry.value"); } }; if (false && - this->secret().size() > 1) { + this->secrets().size() > 1) { ::std::unique_ptr items( - new SortItem[this->secret().size()]); + new SortItem[this->secrets().size()]); typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; size_type n = 0; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secret().begin(); - it != this->secret().end(); ++it, ++n) { + it = this->secrets().begin(); + it != this->secrets().end(); ++it, ++n) { items[static_cast(n)] = SortItem(&*it); } ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; + ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - entry.reset(secret_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + entry.reset(secrets_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(5, *entry, target); Utf8Check::Check(&(*items[static_cast(i)])); } } else { - ::std::unique_ptr entry; + ::std::unique_ptr entry; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secret().begin(); - it != this->secret().end(); ++it) { - entry.reset(secret_.NewEntryWrapper(it->first, it->second)); + it = this->secrets().begin(); + it != this->secrets().end(); ++it) { + entry.reset(secrets_.NewEntryWrapper(it->first, it->second)); target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(5, *entry, target); Utf8Check::Check(&(*it)); } @@ -2278,15 +2278,15 @@ size_t CreateTaskRequest::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // map secret = 5; + // map secrets = 5; total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->secret_size()); + ::google::protobuf::internal::FromIntSize(this->secrets_size()); { - ::std::unique_ptr entry; + ::std::unique_ptr entry; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secret().begin(); - it != this->secret().end(); ++it) { - entry.reset(secret_.NewEntryWrapper(it->first, it->second)); + it = this->secrets().begin(); + it != this->secrets().end(); ++it) { + entry.reset(secrets_.NewEntryWrapper(it->first, it->second)); total_size += ::google::protobuf::internal::WireFormatLite:: MessageSizeNoVirtual(*entry); } @@ -2347,7 +2347,7 @@ void CreateTaskRequest::MergeFrom(const CreateTaskRequest& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - secret_.MergeFrom(from.secret_); + secrets_.MergeFrom(from.secrets_); if (from.output_prefix().size() > 0) { output_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_prefix_); @@ -2388,7 +2388,7 @@ void CreateTaskRequest::Swap(CreateTaskRequest* other) { void CreateTaskRequest::InternalSwap(CreateTaskRequest* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - secret_.Swap(&other->secret_); + secrets_.Swap(&other->secrets_); output_prefix_.Swap(&other->output_prefix_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(inputs_, other->inputs_); @@ -3058,12 +3058,12 @@ const ::flyteidl::admin::Resource& GetTaskResponse::HasBitSetters::resource(const GetTaskResponse* msg) { return *msg->resource_; } -void GetTaskResponse::clear_logs() { - logs_.Clear(); +void GetTaskResponse::clear_log_links() { + log_links_.Clear(); } #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GetTaskResponse::kResourceFieldNumber; -const int GetTaskResponse::kLogsFieldNumber; +const int GetTaskResponse::kLogLinksFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GetTaskResponse::GetTaskResponse() @@ -3074,7 +3074,7 @@ GetTaskResponse::GetTaskResponse() GetTaskResponse::GetTaskResponse(const GetTaskResponse& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr), - logs_(from.logs_) { + log_links_(from.log_links_) { _internal_metadata_.MergeFrom(from._internal_metadata_); if (from.has_resource()) { resource_ = new ::flyteidl::admin::Resource(*from.resource_); @@ -3114,7 +3114,7 @@ void GetTaskResponse::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - logs_.Clear(); + log_links_.Clear(); if (GetArenaNoVirtual() == nullptr && resource_ != nullptr) { delete resource_; } @@ -3148,14 +3148,14 @@ const char* GetTaskResponse::_InternalParse(const char* begin, const char* end, {parser_till_end, object}, ptr - size, ptr)); break; } - // repeated .flyteidl.core.TaskLog logs = 2; + // repeated .flyteidl.core.TaskLog log_links = 2; case 2: { if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; do { ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::TaskLog::_InternalParse; - object = msg->add_logs(); + object = msg->add_log_links(); if (size > end - ptr) goto len_delim_till_end; ptr += size; GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( @@ -3205,11 +3205,11 @@ bool GetTaskResponse::MergePartialFromCodedStream( break; } - // repeated .flyteidl.core.TaskLog logs = 2; + // repeated .flyteidl.core.TaskLog log_links = 2; case 2: { if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, add_logs())); + input, add_log_links())); } else { goto handle_unusual; } @@ -3249,12 +3249,12 @@ void GetTaskResponse::SerializeWithCachedSizes( 1, HasBitSetters::resource(this), output); } - // repeated .flyteidl.core.TaskLog logs = 2; + // repeated .flyteidl.core.TaskLog log_links = 2; for (unsigned int i = 0, - n = static_cast(this->logs_size()); i < n; i++) { + n = static_cast(this->log_links_size()); i < n; i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, - this->logs(static_cast(i)), + this->log_links(static_cast(i)), output); } @@ -3278,12 +3278,12 @@ ::google::protobuf::uint8* GetTaskResponse::InternalSerializeWithCachedSizesToAr 1, HasBitSetters::resource(this), target); } - // repeated .flyteidl.core.TaskLog logs = 2; + // repeated .flyteidl.core.TaskLog log_links = 2; for (unsigned int i = 0, - n = static_cast(this->logs_size()); i < n; i++) { + n = static_cast(this->log_links_size()); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 2, this->logs(static_cast(i)), target); + 2, this->log_links(static_cast(i)), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -3307,14 +3307,14 @@ size_t GetTaskResponse::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated .flyteidl.core.TaskLog logs = 2; + // repeated .flyteidl.core.TaskLog log_links = 2; { - unsigned int count = static_cast(this->logs_size()); + unsigned int count = static_cast(this->log_links_size()); total_size += 1UL * count; for (unsigned int i = 0; i < count; i++) { total_size += ::google::protobuf::internal::WireFormatLite::MessageSize( - this->logs(static_cast(i))); + this->log_links(static_cast(i))); } } @@ -3352,7 +3352,7 @@ void GetTaskResponse::MergeFrom(const GetTaskResponse& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - logs_.MergeFrom(from.logs_); + log_links_.MergeFrom(from.log_links_); if (from.has_resource()) { mutable_resource()->::flyteidl::admin::Resource::MergeFrom(from.resource()); } @@ -3383,7 +3383,7 @@ void GetTaskResponse::Swap(GetTaskResponse* other) { void GetTaskResponse::InternalSwap(GetTaskResponse* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - CastToBase(&logs_)->InternalSwap(CastToBase(&other->logs_)); + CastToBase(&log_links_)->InternalSwap(CastToBase(&other->log_links_)); swap(resource_, other->resource_); } @@ -4388,9 +4388,9 @@ class Agent::HasBitSetters { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int Agent::kNameFieldNumber; -const int Agent::kSecretNameFieldNumber; -const int Agent::kSupportedTaskTypeFieldNumber; +const int Agent::kSupportedTaskTypesFieldNumber; const int Agent::kIsSyncFieldNumber; +const int Agent::kSecretNamesFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 Agent::Agent() @@ -4401,15 +4401,15 @@ Agent::Agent() Agent::Agent(const Agent& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr), - secret_name_(from.secret_name_) { + secret_names_(from.secret_names_) { _internal_metadata_.MergeFrom(from._internal_metadata_); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.name().size() > 0) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - supported_task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.supported_task_type().size() > 0) { - supported_task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_type_); + supported_task_types_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.supported_task_types().size() > 0) { + supported_task_types_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_types_); } is_sync_ = from.is_sync_; // @@protoc_insertion_point(copy_constructor:flyteidl.admin.Agent) @@ -4419,7 +4419,7 @@ void Agent::SharedCtor() { ::google::protobuf::internal::InitSCC( &scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_types_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); is_sync_ = false; } @@ -4430,7 +4430,7 @@ Agent::~Agent() { void Agent::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_types_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void Agent::SetCachedSize(int size) const { @@ -4448,9 +4448,9 @@ void Agent::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - secret_name_.Clear(); + secret_names_.Clear(); name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_types_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); is_sync_ = false; _internal_metadata_.Clear(); } @@ -4484,32 +4484,13 @@ const char* Agent::_InternalParse(const char* begin, const char* end, void* obje ptr += size; break; } - // repeated string secret_name = 2; + // string supported_task_types = 2; case 2: { if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.secret_name"); - object = msg->add_secret_name(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 18 && (ptr += 1)); - break; - } - // string supported_task_type = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.supported_task_type"); - object = msg->mutable_supported_task_type(); + ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.supported_task_types"); + object = msg->mutable_supported_task_types(); if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; goto string_till_end; @@ -4519,13 +4500,32 @@ const char* Agent::_InternalParse(const char* begin, const char* end, void* obje ptr += size; break; } - // bool is_sync = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 32) goto handle_unusual; + // bool is_sync = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual; msg->set_is_sync(::google::protobuf::internal::ReadVarint(&ptr)); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); break; } + // repeated string secret_names = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.secret_names"); + object = msg->add_secret_names(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -4575,44 +4575,44 @@ bool Agent::MergePartialFromCodedStream( break; } - // repeated string secret_name = 2; + // string supported_task_types = 2; case 2: { if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->add_secret_name())); + input, this->mutable_supported_task_types())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->secret_name(this->secret_name_size() - 1).data(), - static_cast(this->secret_name(this->secret_name_size() - 1).length()), + this->supported_task_types().data(), static_cast(this->supported_task_types().length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.Agent.secret_name")); + "flyteidl.admin.Agent.supported_task_types")); } else { goto handle_unusual; } break; } - // string supported_task_type = 3; + // bool is_sync = 3; case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_supported_task_type())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_type().data(), static_cast(this->supported_task_type().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.Agent.supported_task_type")); + if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &is_sync_))); } else { goto handle_unusual; } break; } - // bool is_sync = 4; + // repeated string secret_names = 4; case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == (32 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &is_sync_))); + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->add_secret_names())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->secret_names(this->secret_names_size() - 1).data(), + static_cast(this->secret_names(this->secret_names_size() - 1).length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.admin.Agent.secret_names")); } else { goto handle_unusual; } @@ -4656,29 +4656,29 @@ void Agent::SerializeWithCachedSizes( 1, this->name(), output); } - // repeated string secret_name = 2; - for (int i = 0, n = this->secret_name_size(); i < n; i++) { + // string supported_task_types = 2; + if (this->supported_task_types().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->secret_name(i).data(), static_cast(this->secret_name(i).length()), + this->supported_task_types().data(), static_cast(this->supported_task_types().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.secret_name"); - ::google::protobuf::internal::WireFormatLite::WriteString( - 2, this->secret_name(i), output); - } - - // string supported_task_type = 3; - if (this->supported_task_type().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_type().data(), static_cast(this->supported_task_type().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.supported_task_type"); + "flyteidl.admin.Agent.supported_task_types"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 3, this->supported_task_type(), output); + 2, this->supported_task_types(), output); } - // bool is_sync = 4; + // bool is_sync = 3; if (this->is_sync() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->is_sync(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->is_sync(), output); + } + + // repeated string secret_names = 4; + for (int i = 0, n = this->secret_names_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->secret_names(i).data(), static_cast(this->secret_names(i).length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.Agent.secret_names"); + ::google::protobuf::internal::WireFormatLite::WriteString( + 4, this->secret_names(i), output); } if (_internal_metadata_.have_unknown_fields()) { @@ -4705,30 +4705,30 @@ ::google::protobuf::uint8* Agent::InternalSerializeWithCachedSizesToArray( 1, this->name(), target); } - // repeated string secret_name = 2; - for (int i = 0, n = this->secret_name_size(); i < n; i++) { + // string supported_task_types = 2; + if (this->supported_task_types().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->secret_name(i).data(), static_cast(this->secret_name(i).length()), + this->supported_task_types().data(), static_cast(this->supported_task_types().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.secret_name"); - target = ::google::protobuf::internal::WireFormatLite:: - WriteStringToArray(2, this->secret_name(i), target); - } - - // string supported_task_type = 3; - if (this->supported_task_type().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_type().data(), static_cast(this->supported_task_type().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.supported_task_type"); + "flyteidl.admin.Agent.supported_task_types"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 3, this->supported_task_type(), target); + 2, this->supported_task_types(), target); } - // bool is_sync = 4; + // bool is_sync = 3; if (this->is_sync() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->is_sync(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->is_sync(), target); + } + + // repeated string secret_names = 4; + for (int i = 0, n = this->secret_names_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->secret_names(i).data(), static_cast(this->secret_names(i).length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.admin.Agent.secret_names"); + target = ::google::protobuf::internal::WireFormatLite:: + WriteStringToArray(4, this->secret_names(i), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -4752,12 +4752,12 @@ size_t Agent::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated string secret_name = 2; + // repeated string secret_names = 4; total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->secret_name_size()); - for (int i = 0, n = this->secret_name_size(); i < n; i++) { + ::google::protobuf::internal::FromIntSize(this->secret_names_size()); + for (int i = 0, n = this->secret_names_size(); i < n; i++) { total_size += ::google::protobuf::internal::WireFormatLite::StringSize( - this->secret_name(i)); + this->secret_names(i)); } // string name = 1; @@ -4767,14 +4767,14 @@ size_t Agent::ByteSizeLong() const { this->name()); } - // string supported_task_type = 3; - if (this->supported_task_type().size() > 0) { + // string supported_task_types = 2; + if (this->supported_task_types().size() > 0) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( - this->supported_task_type()); + this->supported_task_types()); } - // bool is_sync = 4; + // bool is_sync = 3; if (this->is_sync() != 0) { total_size += 1 + 1; } @@ -4806,14 +4806,14 @@ void Agent::MergeFrom(const Agent& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - secret_name_.MergeFrom(from.secret_name_); + secret_names_.MergeFrom(from.secret_names_); if (from.name().size() > 0) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - if (from.supported_task_type().size() > 0) { + if (from.supported_task_types().size() > 0) { - supported_task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_type_); + supported_task_types_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_types_); } if (from.is_sync() != 0) { set_is_sync(from.is_sync()); @@ -4845,10 +4845,10 @@ void Agent::Swap(Agent* other) { void Agent::InternalSwap(Agent* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - secret_name_.InternalSwap(CastToBase(&other->secret_name_)); + secret_names_.InternalSwap(CastToBase(&other->secret_names_)); name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - supported_task_type_.Swap(&other->supported_task_type_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + supported_task_types_.Swap(&other->supported_task_types_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(is_sync_, other->is_sync_); } @@ -5949,8 +5949,8 @@ template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata_Environmen template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionMetadata >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionMetadata >(arena); } -template<> PROTOBUF_NOINLINE ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse >(arena); +template<> PROTOBUF_NOINLINE ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse >(arena); } template<> PROTOBUF_NOINLINE ::flyteidl::admin::CreateTaskRequest* Arena::CreateMaybeMessage< ::flyteidl::admin::CreateTaskRequest >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::CreateTaskRequest >(arena); diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index 812d28bb63..573e0088db 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -65,9 +65,9 @@ extern AgentDefaultTypeInternal _Agent_default_instance_; class CreateTaskRequest; class CreateTaskRequestDefaultTypeInternal; extern CreateTaskRequestDefaultTypeInternal _CreateTaskRequest_default_instance_; -class CreateTaskRequest_SecretEntry_DoNotUse; -class CreateTaskRequest_SecretEntry_DoNotUseDefaultTypeInternal; -extern CreateTaskRequest_SecretEntry_DoNotUseDefaultTypeInternal _CreateTaskRequest_SecretEntry_DoNotUse_default_instance_; +class CreateTaskRequest_SecretsEntry_DoNotUse; +class CreateTaskRequest_SecretsEntry_DoNotUseDefaultTypeInternal; +extern CreateTaskRequest_SecretsEntry_DoNotUseDefaultTypeInternal _CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_; class CreateTaskResponse; class CreateTaskResponseDefaultTypeInternal; extern CreateTaskResponseDefaultTypeInternal _CreateTaskResponse_default_instance_; @@ -116,7 +116,7 @@ namespace google { namespace protobuf { template<> ::flyteidl::admin::Agent* Arena::CreateMaybeMessage<::flyteidl::admin::Agent>(Arena*); template<> ::flyteidl::admin::CreateTaskRequest* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskRequest>(Arena*); -template<> ::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskRequest_SecretEntry_DoNotUse>(Arena*); +template<> ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse>(Arena*); template<> ::flyteidl::admin::CreateTaskResponse* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskResponse>(Arena*); template<> ::flyteidl::admin::DeleteTaskRequest* Arena::CreateMaybeMessage<::flyteidl::admin::DeleteTaskRequest>(Arena*); template<> ::flyteidl::admin::DeleteTaskResponse* Arena::CreateMaybeMessage<::flyteidl::admin::DeleteTaskResponse>(Arena*); @@ -425,7 +425,7 @@ class TaskExecutionMetadata final : }; // ------------------------------------------------------------------- -class CreateTaskRequest_SecretEntry_DoNotUse : public ::google::protobuf::internal::MapEntry SuperType; - CreateTaskRequest_SecretEntry_DoNotUse(); - CreateTaskRequest_SecretEntry_DoNotUse(::google::protobuf::Arena* arena); - void MergeFrom(const CreateTaskRequest_SecretEntry_DoNotUse& other); - static const CreateTaskRequest_SecretEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_CreateTaskRequest_SecretEntry_DoNotUse_default_instance_); } + CreateTaskRequest_SecretsEntry_DoNotUse(); + CreateTaskRequest_SecretsEntry_DoNotUse(::google::protobuf::Arena* arena); + void MergeFrom(const CreateTaskRequest_SecretsEntry_DoNotUse& other); + static const CreateTaskRequest_SecretsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_); } void MergeFrom(const ::google::protobuf::Message& other) final; ::google::protobuf::Metadata GetMetadata() const; }; @@ -545,14 +545,14 @@ class CreateTaskRequest final : // accessors ------------------------------------------------------- - // map secret = 5; - int secret_size() const; - void clear_secret(); - static const int kSecretFieldNumber = 5; + // map secrets = 5; + int secrets_size() const; + void clear_secrets(); + static const int kSecretsFieldNumber = 5; const ::google::protobuf::Map< ::std::string, ::std::string >& - secret() const; + secrets() const; ::google::protobuf::Map< ::std::string, ::std::string >* - mutable_secret(); + mutable_secrets(); // string output_prefix = 3; void clear_output_prefix(); @@ -601,11 +601,11 @@ class CreateTaskRequest final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::internal::MapField< - CreateTaskRequest_SecretEntry_DoNotUse, + CreateTaskRequest_SecretsEntry_DoNotUse, ::std::string, ::std::string, ::google::protobuf::internal::WireFormatLite::TYPE_STRING, ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - 0 > secret_; + 0 > secrets_; ::google::protobuf::internal::ArenaStringPtr output_prefix_; ::flyteidl::core::LiteralMap* inputs_; ::flyteidl::core::TaskTemplate* template__; @@ -965,17 +965,17 @@ class GetTaskResponse final : // accessors ------------------------------------------------------- - // repeated .flyteidl.core.TaskLog logs = 2; - int logs_size() const; - void clear_logs(); - static const int kLogsFieldNumber = 2; - ::flyteidl::core::TaskLog* mutable_logs(int index); + // repeated .flyteidl.core.TaskLog log_links = 2; + int log_links_size() const; + void clear_log_links(); + static const int kLogLinksFieldNumber = 2; + ::flyteidl::core::TaskLog* mutable_log_links(int index); ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog >* - mutable_logs(); - const ::flyteidl::core::TaskLog& logs(int index) const; - ::flyteidl::core::TaskLog* add_logs(); + mutable_log_links(); + const ::flyteidl::core::TaskLog& log_links(int index) const; + ::flyteidl::core::TaskLog* add_log_links(); const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog >& - logs() const; + log_links() const; // .flyteidl.admin.Resource resource = 1; bool has_resource() const; @@ -991,7 +991,7 @@ class GetTaskResponse final : class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog > logs_; + ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog > log_links_; ::flyteidl::admin::Resource* resource_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; @@ -1470,27 +1470,27 @@ class Agent final : // accessors ------------------------------------------------------- - // repeated string secret_name = 2; - int secret_name_size() const; - void clear_secret_name(); - static const int kSecretNameFieldNumber = 2; - const ::std::string& secret_name(int index) const; - ::std::string* mutable_secret_name(int index); - void set_secret_name(int index, const ::std::string& value); + // repeated string secret_names = 4; + int secret_names_size() const; + void clear_secret_names(); + static const int kSecretNamesFieldNumber = 4; + const ::std::string& secret_names(int index) const; + ::std::string* mutable_secret_names(int index); + void set_secret_names(int index, const ::std::string& value); #if LANG_CXX11 - void set_secret_name(int index, ::std::string&& value); + void set_secret_names(int index, ::std::string&& value); #endif - void set_secret_name(int index, const char* value); - void set_secret_name(int index, const char* value, size_t size); - ::std::string* add_secret_name(); - void add_secret_name(const ::std::string& value); + void set_secret_names(int index, const char* value); + void set_secret_names(int index, const char* value, size_t size); + ::std::string* add_secret_names(); + void add_secret_names(const ::std::string& value); #if LANG_CXX11 - void add_secret_name(::std::string&& value); + void add_secret_names(::std::string&& value); #endif - void add_secret_name(const char* value); - void add_secret_name(const char* value, size_t size); - const ::google::protobuf::RepeatedPtrField<::std::string>& secret_name() const; - ::google::protobuf::RepeatedPtrField<::std::string>* mutable_secret_name(); + void add_secret_names(const char* value); + void add_secret_names(const char* value, size_t size); + const ::google::protobuf::RepeatedPtrField<::std::string>& secret_names() const; + ::google::protobuf::RepeatedPtrField<::std::string>* mutable_secret_names(); // string name = 1; void clear_name(); @@ -1506,23 +1506,23 @@ class Agent final : ::std::string* release_name(); void set_allocated_name(::std::string* name); - // string supported_task_type = 3; - void clear_supported_task_type(); - static const int kSupportedTaskTypeFieldNumber = 3; - const ::std::string& supported_task_type() const; - void set_supported_task_type(const ::std::string& value); + // string supported_task_types = 2; + void clear_supported_task_types(); + static const int kSupportedTaskTypesFieldNumber = 2; + const ::std::string& supported_task_types() const; + void set_supported_task_types(const ::std::string& value); #if LANG_CXX11 - void set_supported_task_type(::std::string&& value); + void set_supported_task_types(::std::string&& value); #endif - void set_supported_task_type(const char* value); - void set_supported_task_type(const char* value, size_t size); - ::std::string* mutable_supported_task_type(); - ::std::string* release_supported_task_type(); - void set_allocated_supported_task_type(::std::string* supported_task_type); + void set_supported_task_types(const char* value); + void set_supported_task_types(const char* value, size_t size); + ::std::string* mutable_supported_task_types(); + ::std::string* release_supported_task_types(); + void set_allocated_supported_task_types(::std::string* supported_task_types); - // bool is_sync = 4; + // bool is_sync = 3; void clear_is_sync(); - static const int kIsSyncFieldNumber = 4; + static const int kIsSyncFieldNumber = 3; bool is_sync() const; void set_is_sync(bool value); @@ -1531,9 +1531,9 @@ class Agent final : class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::RepeatedPtrField<::std::string> secret_name_; + ::google::protobuf::RepeatedPtrField<::std::string> secret_names_; ::google::protobuf::internal::ArenaStringPtr name_; - ::google::protobuf::internal::ArenaStringPtr supported_task_type_; + ::google::protobuf::internal::ArenaStringPtr supported_task_types_; bool is_sync_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; @@ -2418,22 +2418,22 @@ inline void CreateTaskRequest::set_allocated_task_execution_metadata(::flyteidl: // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.CreateTaskRequest.task_execution_metadata) } -// map secret = 5; -inline int CreateTaskRequest::secret_size() const { - return secret_.size(); +// map secrets = 5; +inline int CreateTaskRequest::secrets_size() const { + return secrets_.size(); } -inline void CreateTaskRequest::clear_secret() { - secret_.Clear(); +inline void CreateTaskRequest::clear_secrets() { + secrets_.Clear(); } inline const ::google::protobuf::Map< ::std::string, ::std::string >& -CreateTaskRequest::secret() const { - // @@protoc_insertion_point(field_map:flyteidl.admin.CreateTaskRequest.secret) - return secret_.GetMap(); +CreateTaskRequest::secrets() const { + // @@protoc_insertion_point(field_map:flyteidl.admin.CreateTaskRequest.secrets) + return secrets_.GetMap(); } inline ::google::protobuf::Map< ::std::string, ::std::string >* -CreateTaskRequest::mutable_secret() { - // @@protoc_insertion_point(field_mutable_map:flyteidl.admin.CreateTaskRequest.secret) - return secret_.MutableMap(); +CreateTaskRequest::mutable_secrets() { + // @@protoc_insertion_point(field_mutable_map:flyteidl.admin.CreateTaskRequest.secrets) + return secrets_.MutableMap(); } // ------------------------------------------------------------------- @@ -2658,31 +2658,31 @@ inline void GetTaskResponse::set_allocated_resource(::flyteidl::admin::Resource* // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.GetTaskResponse.resource) } -// repeated .flyteidl.core.TaskLog logs = 2; -inline int GetTaskResponse::logs_size() const { - return logs_.size(); +// repeated .flyteidl.core.TaskLog log_links = 2; +inline int GetTaskResponse::log_links_size() const { + return log_links_.size(); } -inline ::flyteidl::core::TaskLog* GetTaskResponse::mutable_logs(int index) { - // @@protoc_insertion_point(field_mutable:flyteidl.admin.GetTaskResponse.logs) - return logs_.Mutable(index); +inline ::flyteidl::core::TaskLog* GetTaskResponse::mutable_log_links(int index) { + // @@protoc_insertion_point(field_mutable:flyteidl.admin.GetTaskResponse.log_links) + return log_links_.Mutable(index); } inline ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog >* -GetTaskResponse::mutable_logs() { - // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.GetTaskResponse.logs) - return &logs_; +GetTaskResponse::mutable_log_links() { + // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.GetTaskResponse.log_links) + return &log_links_; } -inline const ::flyteidl::core::TaskLog& GetTaskResponse::logs(int index) const { - // @@protoc_insertion_point(field_get:flyteidl.admin.GetTaskResponse.logs) - return logs_.Get(index); +inline const ::flyteidl::core::TaskLog& GetTaskResponse::log_links(int index) const { + // @@protoc_insertion_point(field_get:flyteidl.admin.GetTaskResponse.log_links) + return log_links_.Get(index); } -inline ::flyteidl::core::TaskLog* GetTaskResponse::add_logs() { - // @@protoc_insertion_point(field_add:flyteidl.admin.GetTaskResponse.logs) - return logs_.Add(); +inline ::flyteidl::core::TaskLog* GetTaskResponse::add_log_links() { + // @@protoc_insertion_point(field_add:flyteidl.admin.GetTaskResponse.log_links) + return log_links_.Add(); } inline const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::TaskLog >& -GetTaskResponse::logs() const { - // @@protoc_insertion_point(field_list:flyteidl.admin.GetTaskResponse.logs) - return logs_; +GetTaskResponse::log_links() const { + // @@protoc_insertion_point(field_list:flyteidl.admin.GetTaskResponse.log_links) + return log_links_; } // ------------------------------------------------------------------- @@ -2972,129 +2972,60 @@ inline void Agent::set_allocated_name(::std::string* name) { // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.name) } -// repeated string secret_name = 2; -inline int Agent::secret_name_size() const { - return secret_name_.size(); +// string supported_task_types = 2; +inline void Agent::clear_supported_task_types() { + supported_task_types_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void Agent::clear_secret_name() { - secret_name_.Clear(); +inline const ::std::string& Agent::supported_task_types() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.supported_task_types) + return supported_task_types_.GetNoArena(); } -inline const ::std::string& Agent::secret_name(int index) const { - // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.secret_name) - return secret_name_.Get(index); -} -inline ::std::string* Agent::mutable_secret_name(int index) { - // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.secret_name) - return secret_name_.Mutable(index); -} -inline void Agent::set_secret_name(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.secret_name) - secret_name_.Mutable(index)->assign(value); -} -#if LANG_CXX11 -inline void Agent::set_secret_name(int index, ::std::string&& value) { - // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.secret_name) - secret_name_.Mutable(index)->assign(std::move(value)); -} -#endif -inline void Agent::set_secret_name(int index, const char* value) { - GOOGLE_DCHECK(value != nullptr); - secret_name_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.secret_name) -} -inline void Agent::set_secret_name(int index, const char* value, size_t size) { - secret_name_.Mutable(index)->assign( - reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.secret_name) -} -inline ::std::string* Agent::add_secret_name() { - // @@protoc_insertion_point(field_add_mutable:flyteidl.admin.Agent.secret_name) - return secret_name_.Add(); -} -inline void Agent::add_secret_name(const ::std::string& value) { - secret_name_.Add()->assign(value); - // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.secret_name) -} -#if LANG_CXX11 -inline void Agent::add_secret_name(::std::string&& value) { - secret_name_.Add(std::move(value)); - // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.secret_name) -} -#endif -inline void Agent::add_secret_name(const char* value) { - GOOGLE_DCHECK(value != nullptr); - secret_name_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:flyteidl.admin.Agent.secret_name) -} -inline void Agent::add_secret_name(const char* value, size_t size) { - secret_name_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:flyteidl.admin.Agent.secret_name) -} -inline const ::google::protobuf::RepeatedPtrField<::std::string>& -Agent::secret_name() const { - // @@protoc_insertion_point(field_list:flyteidl.admin.Agent.secret_name) - return secret_name_; -} -inline ::google::protobuf::RepeatedPtrField<::std::string>* -Agent::mutable_secret_name() { - // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.Agent.secret_name) - return &secret_name_; -} - -// string supported_task_type = 3; -inline void Agent::clear_supported_task_type() { - supported_task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -inline const ::std::string& Agent::supported_task_type() const { - // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.supported_task_type) - return supported_task_type_.GetNoArena(); -} -inline void Agent::set_supported_task_type(const ::std::string& value) { +inline void Agent::set_supported_task_types(const ::std::string& value) { - supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.supported_task_type) + supported_task_types_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.supported_task_types) } #if LANG_CXX11 -inline void Agent::set_supported_task_type(::std::string&& value) { +inline void Agent::set_supported_task_types(::std::string&& value) { - supported_task_type_.SetNoArena( + supported_task_types_.SetNoArena( &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:flyteidl.admin.Agent.supported_task_type) + // @@protoc_insertion_point(field_set_rvalue:flyteidl.admin.Agent.supported_task_types) } #endif -inline void Agent::set_supported_task_type(const char* value) { +inline void Agent::set_supported_task_types(const char* value) { GOOGLE_DCHECK(value != nullptr); - supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.supported_task_type) + supported_task_types_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.supported_task_types) } -inline void Agent::set_supported_task_type(const char* value, size_t size) { +inline void Agent::set_supported_task_types(const char* value, size_t size) { - supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + supported_task_types_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.supported_task_type) + // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.supported_task_types) } -inline ::std::string* Agent::mutable_supported_task_type() { +inline ::std::string* Agent::mutable_supported_task_types() { - // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.supported_task_type) - return supported_task_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.supported_task_types) + return supported_task_types_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* Agent::release_supported_task_type() { - // @@protoc_insertion_point(field_release:flyteidl.admin.Agent.supported_task_type) +inline ::std::string* Agent::release_supported_task_types() { + // @@protoc_insertion_point(field_release:flyteidl.admin.Agent.supported_task_types) - return supported_task_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return supported_task_types_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void Agent::set_allocated_supported_task_type(::std::string* supported_task_type) { - if (supported_task_type != nullptr) { +inline void Agent::set_allocated_supported_task_types(::std::string* supported_task_types) { + if (supported_task_types != nullptr) { } else { } - supported_task_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), supported_task_type); - // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.supported_task_type) + supported_task_types_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), supported_task_types); + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.supported_task_types) } -// bool is_sync = 4; +// bool is_sync = 3; inline void Agent::clear_is_sync() { is_sync_ = false; } @@ -3108,6 +3039,75 @@ inline void Agent::set_is_sync(bool value) { // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.is_sync) } +// repeated string secret_names = 4; +inline int Agent::secret_names_size() const { + return secret_names_.size(); +} +inline void Agent::clear_secret_names() { + secret_names_.Clear(); +} +inline const ::std::string& Agent::secret_names(int index) const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.secret_names) + return secret_names_.Get(index); +} +inline ::std::string* Agent::mutable_secret_names(int index) { + // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.secret_names) + return secret_names_.Mutable(index); +} +inline void Agent::set_secret_names(int index, const ::std::string& value) { + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.secret_names) + secret_names_.Mutable(index)->assign(value); +} +#if LANG_CXX11 +inline void Agent::set_secret_names(int index, ::std::string&& value) { + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.secret_names) + secret_names_.Mutable(index)->assign(std::move(value)); +} +#endif +inline void Agent::set_secret_names(int index, const char* value) { + GOOGLE_DCHECK(value != nullptr); + secret_names_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.secret_names) +} +inline void Agent::set_secret_names(int index, const char* value, size_t size) { + secret_names_.Mutable(index)->assign( + reinterpret_cast(value), size); + // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.secret_names) +} +inline ::std::string* Agent::add_secret_names() { + // @@protoc_insertion_point(field_add_mutable:flyteidl.admin.Agent.secret_names) + return secret_names_.Add(); +} +inline void Agent::add_secret_names(const ::std::string& value) { + secret_names_.Add()->assign(value); + // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.secret_names) +} +#if LANG_CXX11 +inline void Agent::add_secret_names(::std::string&& value) { + secret_names_.Add(std::move(value)); + // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.secret_names) +} +#endif +inline void Agent::add_secret_names(const char* value) { + GOOGLE_DCHECK(value != nullptr); + secret_names_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:flyteidl.admin.Agent.secret_names) +} +inline void Agent::add_secret_names(const char* value, size_t size) { + secret_names_.Add()->assign(reinterpret_cast(value), size); + // @@protoc_insertion_point(field_add_pointer:flyteidl.admin.Agent.secret_names) +} +inline const ::google::protobuf::RepeatedPtrField<::std::string>& +Agent::secret_names() const { + // @@protoc_insertion_point(field_list:flyteidl.admin.Agent.secret_names) + return secret_names_; +} +inline ::google::protobuf::RepeatedPtrField<::std::string>* +Agent::mutable_secret_names() { + // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.Agent.secret_names) + return &secret_names_; +} + // ------------------------------------------------------------------- // GetAgentRequest diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 5b04ed9cb5..84dc01d903 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -157,7 +157,7 @@ type CreateTaskRequest struct { // Secret to be passed to the agent. // Key is the name of the secret in secret manager. // Value is the actual secret value. - Secret map[string]string `protobuf:"bytes,5,rep,name=secret,proto3" json:"secret,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Secrets map[string]string `protobuf:"bytes,5,rep,name=secrets,proto3" json:"secrets,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -216,9 +216,9 @@ func (m *CreateTaskRequest) GetTaskExecutionMetadata() *TaskExecutionMetadata { return nil } -func (m *CreateTaskRequest) GetSecret() map[string]string { +func (m *CreateTaskRequest) GetSecrets() map[string]string { if m != nil { - return m.Secret + return m.Secrets } return nil } @@ -318,7 +318,7 @@ func (m *GetTaskRequest) GetResourceMeta() []byte { type GetTaskResponse struct { Resource *Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` // log information for the task execution - Logs []*core.TaskLog `protobuf:"bytes,2,rep,name=logs,proto3" json:"logs,omitempty"` + LogLinks []*core.TaskLog `protobuf:"bytes,2,rep,name=log_links,json=logLinks,proto3" json:"log_links,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -356,9 +356,9 @@ func (m *GetTaskResponse) GetResource() *Resource { return nil } -func (m *GetTaskResponse) GetLogs() []*core.TaskLog { +func (m *GetTaskResponse) GetLogLinks() []*core.TaskLog { if m != nil { - return m.Logs + return m.LogLinks } return nil } @@ -507,14 +507,14 @@ var xxx_messageInfo_DeleteTaskResponse proto.InternalMessageInfo // A message containing the agent metadata. type Agent struct { - // The name of the agent. + // Name is the developer-assigned name of the agent. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // A list of secret in the secret manager. - SecretName []string `protobuf:"bytes,2,rep,name=secret_name,json=secretName,proto3" json:"secret_name,omitempty"` - // The type of the task that the agent can handle. - SupportedTaskType string `protobuf:"bytes,3,opt,name=supported_task_type,json=supportedTaskType,proto3" json:"supported_task_type,omitempty"` - // Indicates if this agent is a sync agent. - IsSync bool `protobuf:"varint,4,opt,name=is_sync,json=isSync,proto3" json:"is_sync,omitempty"` + // SupportedTaskTypes are the types of the tasks that the agent can handle. + SupportedTaskTypes string `protobuf:"bytes,2,opt,name=supported_task_types,json=supportedTaskTypes,proto3" json:"supported_task_types,omitempty"` + // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. + IsSync bool `protobuf:"varint,3,opt,name=is_sync,json=isSync,proto3" json:"is_sync,omitempty"` + // SecretNames is a list of secrets the agent requires to execute tasks. + SecretNames []string `protobuf:"bytes,4,rep,name=secret_names,json=secretNames,proto3" json:"secret_names,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -552,16 +552,9 @@ func (m *Agent) GetName() string { return "" } -func (m *Agent) GetSecretName() []string { - if m != nil { - return m.SecretName - } - return nil -} - -func (m *Agent) GetSupportedTaskType() string { +func (m *Agent) GetSupportedTaskTypes() string { if m != nil { - return m.SupportedTaskType + return m.SupportedTaskTypes } return "" } @@ -573,6 +566,13 @@ func (m *Agent) GetIsSync() bool { return false } +func (m *Agent) GetSecretNames() []string { + if m != nil { + return m.SecretNames + } + return nil +} + // A request to get an agent. type GetAgentRequest struct { // The name of the agent. @@ -733,7 +733,7 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntry") proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.TaskExecutionMetadata.LabelsEntry") proto.RegisterType((*CreateTaskRequest)(nil), "flyteidl.admin.CreateTaskRequest") - proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.CreateTaskRequest.SecretEntry") + proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.CreateTaskRequest.SecretsEntry") proto.RegisterType((*CreateTaskResponse)(nil), "flyteidl.admin.CreateTaskResponse") proto.RegisterType((*GetTaskRequest)(nil), "flyteidl.admin.GetTaskRequest") proto.RegisterType((*GetTaskResponse)(nil), "flyteidl.admin.GetTaskResponse") @@ -750,63 +750,64 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 922 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x7f, 0x6f, 0xdb, 0x36, - 0x10, 0x9d, 0xe3, 0x1f, 0xb1, 0xcf, 0x6d, 0x6a, 0x33, 0xf1, 0xaa, 0xb8, 0xdd, 0x16, 0x68, 0xe8, - 0x10, 0xb4, 0x88, 0x8c, 0xa6, 0xc3, 0x96, 0x6e, 0xd8, 0x0a, 0x37, 0xd1, 0x82, 0x00, 0x8e, 0x11, - 0xd0, 0xce, 0xb0, 0x0d, 0xd8, 0x04, 0x5a, 0xbe, 0x78, 0x82, 0x65, 0x49, 0x13, 0xa9, 0xa0, 0xfe, - 0x00, 0xdd, 0x67, 0xd8, 0xc7, 0x1d, 0x48, 0x4a, 0xf2, 0x8f, 0xba, 0x43, 0x82, 0xfd, 0x27, 0xde, - 0x7b, 0x7c, 0x77, 0xbc, 0x7b, 0x94, 0x04, 0xed, 0x1b, 0x7f, 0x2e, 0xd0, 0x1b, 0xfb, 0x1d, 0x36, - 0x9e, 0x79, 0x41, 0x87, 0x4d, 0x30, 0x10, 0x56, 0x14, 0x87, 0x22, 0x24, 0x3b, 0x19, 0x66, 0x29, - 0xac, 0xfd, 0x34, 0xe7, 0xba, 0x61, 0x8c, 0x1d, 0xdf, 0x13, 0x18, 0x33, 0x9f, 0x6b, 0x76, 0x7b, - 0x7f, 0x15, 0x15, 0x8c, 0x4f, 0x33, 0xe8, 0xb3, 0x55, 0xc8, 0x0b, 0x04, 0xc6, 0x37, 0xcc, 0xc5, - 0x14, 0xfe, 0x7c, 0x0d, 0x1e, 0x63, 0x20, 0xbc, 0x1b, 0x0f, 0xe3, 0xcd, 0xdb, 0xf1, 0x1d, 0xba, - 0x89, 0xf0, 0xc2, 0x40, 0xc3, 0xe6, 0x3f, 0x65, 0x68, 0x0d, 0x19, 0x9f, 0xda, 0x59, 0xfc, 0x12, - 0x05, 0x1b, 0x33, 0xc1, 0x08, 0x85, 0xa6, 0x2c, 0xc3, 0xc9, 0x77, 0x38, 0xde, 0xd8, 0x28, 0x1c, - 0x14, 0x0e, 0xeb, 0xc7, 0x5f, 0x59, 0xf9, 0xe1, 0xa4, 0xa8, 0xb5, 0x22, 0x70, 0x91, 0x57, 0x40, - 0x1f, 0x89, 0x55, 0x80, 0x3c, 0x85, 0x5a, 0xc0, 0x66, 0xc8, 0x23, 0xe6, 0xa2, 0xb1, 0x75, 0x50, - 0x38, 0xac, 0xd1, 0x45, 0x80, 0x5c, 0x40, 0xc5, 0x67, 0x23, 0xf4, 0xb9, 0x51, 0x3c, 0x28, 0x1e, - 0xd6, 0x8f, 0x5f, 0x5a, 0xab, 0x3d, 0xb4, 0x36, 0x16, 0x6a, 0xf5, 0xd4, 0x1e, 0x3b, 0x10, 0xf1, - 0x9c, 0xa6, 0x02, 0xe4, 0x17, 0xa8, 0xb3, 0x20, 0x08, 0x05, 0x93, 0x4c, 0x6e, 0x94, 0x94, 0xde, - 0x37, 0x77, 0xd3, 0xeb, 0x2e, 0x36, 0x6a, 0xd1, 0x65, 0x29, 0x62, 0xc1, 0xee, 0xf4, 0x84, 0x3b, - 0x1c, 0xe3, 0x5b, 0xcf, 0x45, 0x87, 0xb9, 0x6e, 0x98, 0x04, 0xc2, 0x28, 0xab, 0xc3, 0x34, 0xa7, - 0x27, 0x7c, 0xa0, 0x91, 0xae, 0x06, 0x88, 0x80, 0x16, 0x06, 0xb7, 0x5e, 0x1c, 0x06, 0x33, 0x0c, - 0x84, 0x73, 0xcb, 0x62, 0x8f, 0x8d, 0x7c, 0xe4, 0x46, 0x45, 0xd5, 0xf4, 0xe6, 0x6e, 0x35, 0xd9, - 0x0b, 0x89, 0x9f, 0x33, 0x05, 0x5d, 0xdc, 0x1e, 0x6e, 0x80, 0xda, 0xaf, 0xa1, 0xbe, 0xd4, 0x16, - 0xd2, 0x80, 0xe2, 0x14, 0xe7, 0x6a, 0x7a, 0x35, 0x2a, 0x1f, 0xc9, 0x1e, 0x94, 0x6f, 0x99, 0x9f, - 0x64, 0x53, 0xd0, 0x8b, 0xef, 0xb6, 0x4e, 0x0a, 0xed, 0x1f, 0xa1, 0xb1, 0xde, 0x81, 0x7b, 0xed, - 0x3f, 0x87, 0xfd, 0x8f, 0x56, 0x7b, 0x1f, 0x21, 0xf3, 0x7d, 0x11, 0x9a, 0xa7, 0x31, 0x32, 0x81, - 0xb2, 0x27, 0x14, 0xff, 0x4a, 0x90, 0x0b, 0xf2, 0x12, 0x2a, 0x5e, 0x10, 0x25, 0x82, 0xa7, 0x5e, - 0xdc, 0x5f, 0xf3, 0x62, 0x4f, 0x5f, 0xac, 0x4b, 0x16, 0xd1, 0x94, 0x48, 0xbe, 0x85, 0xaa, 0xc0, - 0x59, 0xe4, 0x33, 0xa1, 0xb3, 0xd4, 0x8f, 0x9f, 0x6c, 0x30, 0xf0, 0x30, 0xa5, 0xd0, 0x9c, 0x4c, - 0xbe, 0x84, 0x87, 0x61, 0x22, 0xa2, 0x44, 0x38, 0x51, 0x8c, 0x37, 0xde, 0x3b, 0xa3, 0xa8, 0x6a, - 0x7c, 0xa0, 0x83, 0x57, 0x2a, 0x46, 0x7e, 0x87, 0xc7, 0x6b, 0xf7, 0x64, 0x96, 0x4e, 0xcd, 0x28, - 0xa9, 0x64, 0xcf, 0xee, 0x34, 0x62, 0xda, 0x12, 0x1b, 0xaf, 0xa1, 0x0d, 0x15, 0x8e, 0x6e, 0x8c, - 0xd2, 0x62, 0xd2, 0x30, 0x47, 0xeb, 0x6a, 0x1f, 0xb4, 0xc8, 0x1a, 0x28, 0x7e, 0x7a, 0x21, 0xf4, - 0x66, 0x69, 0x88, 0xa5, 0xf0, 0xbd, 0xe6, 0xf0, 0x1a, 0xc8, 0x72, 0x0e, 0x1e, 0x85, 0x01, 0x57, - 0xbd, 0x89, 0x91, 0x87, 0x49, 0xec, 0xa2, 0x3a, 0xb0, 0xd2, 0x7a, 0x40, 0x1f, 0x64, 0x41, 0x79, - 0x00, 0x93, 0xc2, 0xce, 0x39, 0x8a, 0xe5, 0xf1, 0x3d, 0x81, 0x9a, 0xea, 0x96, 0x98, 0x47, 0x98, - 0xa6, 0xaf, 0xca, 0xc0, 0x70, 0x1e, 0x6d, 0xd0, 0xdc, 0xda, 0xa0, 0xc9, 0xe1, 0x51, 0xae, 0x99, - 0xd6, 0xf2, 0x35, 0x54, 0x33, 0x4a, 0xea, 0x0a, 0x63, 0xbd, 0x4b, 0x34, 0xc5, 0x69, 0xce, 0x24, - 0xcf, 0xa1, 0xe4, 0x87, 0x13, 0x6e, 0x6c, 0xa9, 0xbe, 0x7e, 0xba, 0xc1, 0x12, 0xbd, 0x70, 0x42, - 0x15, 0xc7, 0xfc, 0xbb, 0x00, 0xd5, 0x4c, 0x82, 0xbc, 0x80, 0x32, 0x17, 0xd2, 0x4c, 0x32, 0xd7, - 0xce, 0x71, 0x6b, 0x3d, 0xd7, 0x40, 0x82, 0x54, 0x73, 0xc8, 0x2b, 0xd8, 0xd6, 0x76, 0xe1, 0xa9, - 0xf7, 0xfe, 0xc3, 0xb0, 0x19, 0x93, 0x18, 0xb0, 0x3d, 0x43, 0xce, 0xd9, 0x04, 0x53, 0xcb, 0x65, - 0x4b, 0xf3, 0x1a, 0x9a, 0x67, 0xe8, 0xe3, 0xea, 0x9d, 0xf8, 0xff, 0x4d, 0xdd, 0x03, 0xb2, 0x2c, - 0xab, 0xfb, 0x6a, 0xbe, 0x2f, 0x40, 0xb9, 0x2b, 0xbf, 0x69, 0x84, 0x40, 0x49, 0xbe, 0xa7, 0x53, - 0x71, 0xf5, 0x4c, 0xbe, 0x80, 0xba, 0x36, 0x97, 0xa3, 0x20, 0xd9, 0xc6, 0x1a, 0x05, 0x1d, 0xea, - 0x4b, 0x82, 0x05, 0xbb, 0x3c, 0x89, 0xa2, 0x30, 0x16, 0x38, 0x76, 0x16, 0x05, 0xea, 0x13, 0x35, - 0x73, 0x68, 0x98, 0x55, 0xfa, 0x18, 0xb6, 0x3d, 0xee, 0xf0, 0x79, 0xe0, 0xaa, 0x9b, 0x53, 0xa5, - 0x15, 0x8f, 0x0f, 0xe6, 0x81, 0x6b, 0x3e, 0x53, 0x23, 0x57, 0x95, 0x64, 0x47, 0xde, 0x50, 0x90, - 0xf9, 0x06, 0x1a, 0x0b, 0x5a, 0x6a, 0x8d, 0x17, 0x50, 0x56, 0x5f, 0xe5, 0xd4, 0x17, 0x1f, 0xcc, - 0x4a, 0xb3, 0x35, 0xc7, 0xdc, 0x85, 0x66, 0xcf, 0xe3, 0x5a, 0x81, 0xa7, 0x99, 0xcc, 0x53, 0x20, - 0xcb, 0xc1, 0x54, 0xf7, 0x08, 0x2a, 0x6a, 0x8f, 0x7c, 0x0d, 0x15, 0x3f, 0x2e, 0x9c, 0x92, 0x9e, - 0xff, 0x01, 0x65, 0xe5, 0x0a, 0xd2, 0x82, 0x26, 0xb5, 0x87, 0xf4, 0xd7, 0xee, 0xdb, 0x9e, 0xed, - 0xfc, 0xd4, 0xbd, 0xe8, 0x5d, 0x53, 0xbb, 0xf1, 0x89, 0x0c, 0x5f, 0xd9, 0xf4, 0xb2, 0xdb, 0xb7, - 0xfb, 0xc3, 0x3c, 0x5c, 0x20, 0x75, 0xd8, 0xbe, 0xb2, 0xfb, 0x67, 0x17, 0xfd, 0xf3, 0xc6, 0x96, - 0x5c, 0xd0, 0xeb, 0x7e, 0x5f, 0x2e, 0x8a, 0xe4, 0x21, 0xd4, 0x06, 0xd7, 0xa7, 0xa7, 0xb6, 0x7d, - 0x66, 0x9f, 0x35, 0x4a, 0x6f, 0x7f, 0xf8, 0xed, 0xfb, 0x89, 0x27, 0xfe, 0x4c, 0x46, 0x96, 0x1b, - 0xce, 0x3a, 0xaa, 0x94, 0x30, 0x9e, 0xe8, 0x87, 0x4e, 0xfe, 0x07, 0x30, 0xc1, 0xa0, 0x13, 0x8d, - 0x8e, 0x26, 0x61, 0x67, 0xf5, 0xc7, 0x65, 0x54, 0x51, 0x3f, 0x03, 0xaf, 0xfe, 0x0d, 0x00, 0x00, - 0xff, 0xff, 0x2e, 0xd1, 0xf0, 0x87, 0xd1, 0x08, 0x00, 0x00, + // 939 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x7f, 0x6f, 0xdb, 0x54, + 0x14, 0x25, 0x4d, 0x93, 0x26, 0x37, 0x59, 0x97, 0xbc, 0x35, 0xcc, 0xcd, 0x06, 0x2a, 0x46, 0x43, + 0x15, 0xd3, 0x1c, 0xd6, 0x22, 0xe8, 0x86, 0x60, 0xca, 0x5a, 0x53, 0x2a, 0xa5, 0x51, 0xf5, 0x92, + 0x22, 0x40, 0x02, 0xeb, 0xc5, 0xb9, 0x0d, 0x56, 0x1c, 0xdb, 0xf8, 0x3d, 0x57, 0x8b, 0xc4, 0xdf, + 0x48, 0xfb, 0x06, 0x7c, 0x5c, 0xe4, 0xf7, 0x9e, 0xdd, 0x24, 0xcb, 0x50, 0xab, 0xfd, 0x67, 0xdf, + 0x73, 0xee, 0xb9, 0xf7, 0xdd, 0x7b, 0xfc, 0x03, 0xda, 0x57, 0xfe, 0x5c, 0xa0, 0x37, 0xf6, 0x3b, + 0x6c, 0x3c, 0xf3, 0x82, 0x0e, 0x9b, 0x60, 0x20, 0xac, 0x28, 0x0e, 0x45, 0x48, 0xb6, 0x33, 0xcc, + 0x92, 0x58, 0xfb, 0x71, 0xce, 0x75, 0xc3, 0x18, 0x3b, 0xbe, 0x27, 0x30, 0x66, 0x3e, 0x57, 0xec, + 0xf6, 0xee, 0x32, 0x2a, 0x18, 0x9f, 0x66, 0xd0, 0x27, 0xcb, 0x90, 0x17, 0x08, 0x8c, 0xaf, 0x98, + 0x8b, 0x1a, 0xfe, 0x74, 0x05, 0x1e, 0x63, 0x20, 0xbc, 0x2b, 0x0f, 0xe3, 0xf5, 0xe9, 0xf8, 0x06, + 0xdd, 0x44, 0x78, 0x61, 0xa0, 0x60, 0xf3, 0xdf, 0x12, 0xb4, 0x86, 0x8c, 0x4f, 0xed, 0x2c, 0x7e, + 0x8e, 0x82, 0x8d, 0x99, 0x60, 0x84, 0x42, 0x33, 0x6d, 0xc3, 0xc9, 0x33, 0x1c, 0x6f, 0x6c, 0x14, + 0xf6, 0x0a, 0xfb, 0xb5, 0x83, 0x2f, 0xac, 0xfc, 0x70, 0xa9, 0xa8, 0xb5, 0x24, 0x70, 0x96, 0x77, + 0x40, 0xef, 0x8b, 0x65, 0x80, 0x3c, 0x86, 0x6a, 0xc0, 0x66, 0xc8, 0x23, 0xe6, 0xa2, 0xb1, 0xb1, + 0x57, 0xd8, 0xaf, 0xd2, 0x9b, 0x00, 0x39, 0x83, 0xb2, 0xcf, 0x46, 0xe8, 0x73, 0xa3, 0xb8, 0x57, + 0xdc, 0xaf, 0x1d, 0x3c, 0xb7, 0x96, 0x67, 0x68, 0xad, 0x6d, 0xd4, 0xea, 0xc9, 0x1c, 0x3b, 0x10, + 0xf1, 0x9c, 0x6a, 0x01, 0xf2, 0x0b, 0xd4, 0x58, 0x10, 0x84, 0x82, 0xa5, 0x4c, 0x6e, 0x6c, 0x4a, + 0xbd, 0x6f, 0x6e, 0xa7, 0xd7, 0xbd, 0x49, 0x54, 0xa2, 0x8b, 0x52, 0xc4, 0x82, 0x07, 0xd3, 0x23, + 0xee, 0x70, 0x8c, 0xaf, 0x3d, 0x17, 0x1d, 0xe6, 0xba, 0x61, 0x12, 0x08, 0xa3, 0x24, 0x0f, 0xd3, + 0x9c, 0x1e, 0xf1, 0x81, 0x42, 0xba, 0x0a, 0x20, 0x02, 0x5a, 0x18, 0x5c, 0x7b, 0x71, 0x18, 0xcc, + 0x30, 0x10, 0xce, 0x35, 0x8b, 0x3d, 0x36, 0xf2, 0x91, 0x1b, 0x65, 0xd9, 0xd3, 0xab, 0xdb, 0xf5, + 0x64, 0xdf, 0x48, 0xfc, 0x9c, 0x29, 0xa8, 0xe6, 0x76, 0x70, 0x0d, 0xd4, 0x7e, 0x01, 0xb5, 0x85, + 0xb1, 0x90, 0x06, 0x14, 0xa7, 0x38, 0x97, 0xdb, 0xab, 0xd2, 0xf4, 0x92, 0xec, 0x40, 0xe9, 0x9a, + 0xf9, 0x49, 0xb6, 0x05, 0x75, 0xf3, 0x72, 0xe3, 0xa8, 0xd0, 0xfe, 0x01, 0x1a, 0xab, 0x13, 0xb8, + 0x53, 0xfe, 0x29, 0xec, 0xbe, 0xb7, 0xdb, 0xbb, 0x08, 0x99, 0x6f, 0x8b, 0xd0, 0x3c, 0x8e, 0x91, + 0x09, 0x4c, 0x67, 0x42, 0xf1, 0xaf, 0x04, 0xb9, 0x20, 0xcf, 0xa1, 0xec, 0x05, 0x51, 0x22, 0xb8, + 0xf6, 0xe2, 0xee, 0x8a, 0x17, 0x7b, 0xea, 0xc1, 0x3a, 0x67, 0x11, 0xd5, 0x44, 0xf2, 0x2d, 0x54, + 0x04, 0xce, 0x22, 0x9f, 0x09, 0x55, 0xa5, 0x76, 0xf0, 0x68, 0x8d, 0x81, 0x87, 0x9a, 0x42, 0x73, + 0x32, 0xf9, 0x1c, 0xee, 0x85, 0x89, 0x88, 0x12, 0xe1, 0x44, 0x31, 0x5e, 0x79, 0x6f, 0x8c, 0xa2, + 0xec, 0xb1, 0xae, 0x82, 0x17, 0x32, 0x46, 0x7e, 0x87, 0x87, 0x2b, 0xcf, 0xc9, 0x4c, 0x6f, 0xcd, + 0xd8, 0x94, 0xc5, 0x9e, 0xdc, 0x6a, 0xc5, 0xb4, 0x25, 0xd6, 0x3e, 0x86, 0x3f, 0xc1, 0x16, 0x47, + 0x37, 0x46, 0xc1, 0x8d, 0x92, 0x74, 0x8c, 0xb5, 0x2a, 0xf7, 0xce, 0x8c, 0xac, 0x81, 0x4a, 0x50, + 0x06, 0xc9, 0xd2, 0xdb, 0x2f, 0xa1, 0xbe, 0x08, 0xdc, 0x69, 0x17, 0x2f, 0x80, 0x2c, 0x96, 0xe1, + 0x51, 0x18, 0x70, 0x39, 0x9f, 0x18, 0x79, 0x98, 0xc4, 0x2e, 0xca, 0x43, 0x4b, 0xad, 0x3a, 0xad, + 0x67, 0xc1, 0xf4, 0x10, 0x26, 0x85, 0xed, 0x53, 0x14, 0x8b, 0x2b, 0x7c, 0x04, 0x55, 0x39, 0x31, + 0x31, 0x8f, 0x50, 0x97, 0xaf, 0xa4, 0x81, 0xe1, 0x3c, 0x5a, 0xa3, 0xb9, 0xb1, 0x46, 0xf3, 0x6f, + 0xb8, 0x9f, 0x6b, 0xea, 0x5e, 0xbe, 0x86, 0x4a, 0x46, 0xd1, 0xce, 0x30, 0x56, 0x07, 0x45, 0x35, + 0x4e, 0x73, 0x26, 0x39, 0x84, 0xaa, 0x1f, 0x4e, 0x1c, 0xdf, 0x0b, 0xa6, 0xdc, 0xd8, 0x90, 0xf3, + 0xfd, 0x78, 0x8d, 0x37, 0x7a, 0xe1, 0x84, 0x56, 0xfc, 0x70, 0xd2, 0x4b, 0x79, 0xe6, 0x3f, 0x05, + 0xa8, 0x64, 0x5a, 0xe4, 0x29, 0x94, 0xb8, 0x48, 0x9d, 0x95, 0x16, 0xdd, 0x3e, 0x68, 0xad, 0x16, + 0x1d, 0xa4, 0x20, 0x55, 0x1c, 0x72, 0x08, 0x5b, 0xca, 0x3b, 0x5c, 0x1b, 0xf1, 0x7f, 0xdc, 0x9b, + 0x31, 0x89, 0x01, 0x5b, 0x33, 0xe4, 0x9c, 0x4d, 0x50, 0xfb, 0x2f, 0xbb, 0x35, 0x2f, 0xa1, 0x79, + 0x82, 0x3e, 0x2e, 0x3f, 0x20, 0x1f, 0x3e, 0xdd, 0x1d, 0x20, 0x8b, 0xb2, 0x6a, 0xc0, 0xe6, 0xdb, + 0x02, 0x94, 0xba, 0xe9, 0x07, 0x8e, 0x10, 0xd8, 0x4c, 0x5f, 0xda, 0x5a, 0x5c, 0x5e, 0x93, 0xaf, + 0x60, 0x87, 0x27, 0x51, 0x14, 0xc6, 0x02, 0xc7, 0x4e, 0x5e, 0x9f, 0x6b, 0x27, 0x91, 0x1c, 0x1b, + 0xea, 0x4e, 0x38, 0x79, 0x08, 0x5b, 0x1e, 0x77, 0xf8, 0x3c, 0x70, 0xe5, 0xb1, 0x2a, 0xb4, 0xec, + 0xf1, 0xc1, 0x3c, 0x70, 0xc9, 0x67, 0x50, 0x57, 0x96, 0x75, 0xe4, 0xa7, 0x41, 0xbe, 0xbc, 0xab, + 0xb4, 0xa6, 0x62, 0xfd, 0x34, 0x64, 0x3e, 0x91, 0xfb, 0x97, 0xdd, 0x64, 0xc7, 0x5e, 0xd3, 0x94, + 0xf9, 0x0a, 0x1a, 0x37, 0x34, 0xed, 0x93, 0xa7, 0x50, 0x92, 0x9f, 0x69, 0x6d, 0x92, 0x77, 0xf6, + 0xa5, 0xd8, 0x8a, 0x63, 0x3e, 0x80, 0x66, 0xcf, 0xe3, 0x4a, 0x81, 0xeb, 0x4a, 0xe6, 0x31, 0x90, + 0xc5, 0xa0, 0xd6, 0x7d, 0x06, 0x65, 0x99, 0x93, 0xbe, 0x97, 0x8a, 0xef, 0x17, 0xd6, 0xa4, 0x2f, + 0xff, 0x80, 0x92, 0x74, 0x06, 0x69, 0x41, 0x93, 0xda, 0x43, 0xfa, 0x6b, 0xf7, 0x75, 0xcf, 0x76, + 0x7e, 0xec, 0x9e, 0xf5, 0x2e, 0xa9, 0xdd, 0xf8, 0x28, 0x0d, 0x5f, 0xd8, 0xf4, 0xbc, 0xdb, 0xb7, + 0xfb, 0xc3, 0x3c, 0x5c, 0x20, 0x35, 0xd8, 0xba, 0xb0, 0xfb, 0x27, 0x67, 0xfd, 0xd3, 0xc6, 0x46, + 0x7a, 0x43, 0x2f, 0xfb, 0xfd, 0xf4, 0xa6, 0x48, 0xee, 0x41, 0x75, 0x70, 0x79, 0x7c, 0x6c, 0xdb, + 0x27, 0xf6, 0x49, 0x63, 0xf3, 0xf5, 0xf7, 0xbf, 0x7d, 0x37, 0xf1, 0xc4, 0x9f, 0xc9, 0xc8, 0x72, + 0xc3, 0x59, 0x47, 0xb6, 0x12, 0xc6, 0x13, 0x75, 0xd1, 0xc9, 0x7f, 0x09, 0x26, 0x18, 0x74, 0xa2, + 0xd1, 0xb3, 0x49, 0xd8, 0x59, 0xfe, 0x93, 0x19, 0x95, 0xe5, 0xdf, 0xc1, 0xe1, 0x7f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xd8, 0x5d, 0x86, 0x13, 0xe2, 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go index bd89d6645f..aca6e68144 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go @@ -163,7 +163,7 @@ func (m *CreateTaskRequest) Validate() error { } } - // no validation rules for Secret + // no validation rules for Secrets return nil } @@ -380,13 +380,13 @@ func (m *GetTaskResponse) Validate() error { } } - for idx, item := range m.GetLogs() { + for idx, item := range m.GetLogLinks() { _, _ = idx, item if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return GetTaskResponseValidationError{ - field: fmt.Sprintf("Logs[%v]", idx), + field: fmt.Sprintf("LogLinks[%v]", idx), reason: "embedded message failed validation", cause: err, } @@ -677,7 +677,7 @@ func (m *Agent) Validate() error { // no validation rules for Name - // no validation rules for SupportedTaskType + // no validation rules for SupportedTaskTypes // no validation rules for IsSync diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index 878557c994..a634f2bdab 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -221,23 +221,23 @@ "properties": { "name": { "type": "string", - "description": "The name of the agent." + "description": "Name is the developer-assigned name of the agent." }, - "secret_name": { - "type": "array", - "items": { - "type": "string" - }, - "description": "A list of secret in the secret manager." - }, - "supported_task_type": { + "supported_task_types": { "type": "string", - "description": "The type of the task that the agent can handle." + "description": "SupportedTaskTypes are the types of the tasks that the agent can handle." }, "is_sync": { "type": "boolean", "format": "boolean", - "description": "Indicates if this agent is a sync agent." + "description": "IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress." + }, + "secret_names": { + "type": "array", + "items": { + "type": "string" + }, + "description": "SecretNames is a list of secrets the agent requires to execute tasks." } }, "description": "A message containing the agent metadata." @@ -272,7 +272,7 @@ "resource": { "$ref": "#/definitions/adminResource" }, - "logs": { + "log_links": { "type": "array", "items": { "$ref": "#/definitions/coreTaskLog" diff --git a/flyteidl/gen/pb-go/flyteidl/service/openapi.go b/flyteidl/gen/pb-go/flyteidl/service/openapi.go index 94b2afe544..66072a5bf7 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/openapi.go +++ b/flyteidl/gen/pb-go/flyteidl/service/openapi.go @@ -93,7 +93,7 @@ func adminSwaggerJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "admin.swagger.json", size: 309117, mode: os.FileMode(420), modTime: time.Unix(1562572800, 0)} + info := bindataFileInfo{name: "admin.swagger.json", size: 309117, mode: os.FileMode(511), modTime: time.Unix(1562572800, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index cb49a8a134..9926d93ac0 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -2335,9 +2335,9 @@ public interface CreateTaskRequestOrBuilder extends * Value is the actual secret value. *
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - int getSecretCount(); + int getSecretsCount(); /** *
      * Secret to be passed to the agent.
@@ -2345,16 +2345,16 @@ public interface CreateTaskRequestOrBuilder extends
      * Value is the actual secret value.
      * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - boolean containsSecret( + boolean containsSecrets( java.lang.String key); /** - * Use {@link #getSecretMap()} instead. + * Use {@link #getSecretsMap()} instead. */ @java.lang.Deprecated java.util.Map - getSecret(); + getSecrets(); /** *
      * Secret to be passed to the agent.
@@ -2362,10 +2362,10 @@ boolean containsSecret(
      * Value is the actual secret value.
      * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ java.util.Map - getSecretMap(); + getSecretsMap(); /** *
      * Secret to be passed to the agent.
@@ -2373,10 +2373,10 @@ boolean containsSecret(
      * Value is the actual secret value.
      * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - java.lang.String getSecretOrDefault( + java.lang.String getSecretsOrDefault( java.lang.String key, java.lang.String defaultValue); /** @@ -2386,10 +2386,10 @@ java.lang.String getSecretOrDefault( * Value is the actual secret value. *
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - java.lang.String getSecretOrThrow( + java.lang.String getSecretsOrThrow( java.lang.String key); } /** @@ -2483,15 +2483,15 @@ private CreateTaskRequest( } case 42: { if (!((mutable_bitField0_ & 0x00000010) != 0)) { - secret_ = com.google.protobuf.MapField.newMapField( - SecretDefaultEntryHolder.defaultEntry); + secrets_ = com.google.protobuf.MapField.newMapField( + SecretsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000010; } com.google.protobuf.MapEntry - secret__ = input.readMessage( - SecretDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - secret_.getMutableMap().put( - secret__.getKey(), secret__.getValue()); + secrets__ = input.readMessage( + SecretsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + secrets_.getMutableMap().put( + secrets__.getKey(), secrets__.getValue()); break; } default: { @@ -2524,7 +2524,7 @@ protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { case 5: - return internalGetSecret(); + return internalGetSecrets(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -2686,31 +2686,31 @@ public flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder getTaskExec return getTaskExecutionMetadata(); } - public static final int SECRET_FIELD_NUMBER = 5; - private static final class SecretDefaultEntryHolder { + public static final int SECRETS_FIELD_NUMBER = 5; + private static final class SecretsDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.String, java.lang.String> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_descriptor, + flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, ""); } private com.google.protobuf.MapField< - java.lang.String, java.lang.String> secret_; + java.lang.String, java.lang.String> secrets_; private com.google.protobuf.MapField - internalGetSecret() { - if (secret_ == null) { + internalGetSecrets() { + if (secrets_ == null) { return com.google.protobuf.MapField.emptyMapField( - SecretDefaultEntryHolder.defaultEntry); + SecretsDefaultEntryHolder.defaultEntry); } - return secret_; + return secrets_; } - public int getSecretCount() { - return internalGetSecret().getMap().size(); + public int getSecretsCount() { + return internalGetSecrets().getMap().size(); } /** *
@@ -2719,20 +2719,20 @@ public int getSecretCount() {
      * Value is the actual secret value.
      * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public boolean containsSecret( + public boolean containsSecrets( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetSecret().getMap().containsKey(key); + return internalGetSecrets().getMap().containsKey(key); } /** - * Use {@link #getSecretMap()} instead. + * Use {@link #getSecretsMap()} instead. */ @java.lang.Deprecated - public java.util.Map getSecret() { - return getSecretMap(); + public java.util.Map getSecrets() { + return getSecretsMap(); } /** *
@@ -2741,11 +2741,11 @@ public java.util.Map getSecret() {
      * Value is the actual secret value.
      * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public java.util.Map getSecretMap() { - return internalGetSecret().getMap(); + public java.util.Map getSecretsMap() { + return internalGetSecrets().getMap(); } /** *
@@ -2754,15 +2754,15 @@ public java.util.Map getSecretMap() {
      * Value is the actual secret value.
      * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public java.lang.String getSecretOrDefault( + public java.lang.String getSecretsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetSecret().getMap(); + internalGetSecrets().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** @@ -2772,14 +2772,14 @@ public java.lang.String getSecretOrDefault( * Value is the actual secret value. *
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public java.lang.String getSecretOrThrow( + public java.lang.String getSecretsOrThrow( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetSecret().getMap(); + internalGetSecrets().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } @@ -2815,8 +2815,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) com.google.protobuf.GeneratedMessageV3 .serializeStringMapTo( output, - internalGetSecret(), - SecretDefaultEntryHolder.defaultEntry, + internalGetSecrets(), + SecretsDefaultEntryHolder.defaultEntry, 5); unknownFields.writeTo(output); } @@ -2843,14 +2843,14 @@ public int getSerializedSize() { .computeMessageSize(4, getTaskExecutionMetadata()); } for (java.util.Map.Entry entry - : internalGetSecret().getMap().entrySet()) { + : internalGetSecrets().getMap().entrySet()) { com.google.protobuf.MapEntry - secret__ = SecretDefaultEntryHolder.defaultEntry.newBuilderForType() + secrets__ = SecretsDefaultEntryHolder.defaultEntry.newBuilderForType() .setKey(entry.getKey()) .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, secret__); + .computeMessageSize(5, secrets__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -2884,8 +2884,8 @@ public boolean equals(final java.lang.Object obj) { if (!getTaskExecutionMetadata() .equals(other.getTaskExecutionMetadata())) return false; } - if (!internalGetSecret().equals( - other.internalGetSecret())) return false; + if (!internalGetSecrets().equals( + other.internalGetSecrets())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -2911,9 +2911,9 @@ public int hashCode() { hash = (37 * hash) + TASK_EXECUTION_METADATA_FIELD_NUMBER; hash = (53 * hash) + getTaskExecutionMetadata().hashCode(); } - if (!internalGetSecret().getMap().isEmpty()) { - hash = (37 * hash) + SECRET_FIELD_NUMBER; - hash = (53 * hash) + internalGetSecret().hashCode(); + if (!internalGetSecrets().getMap().isEmpty()) { + hash = (37 * hash) + SECRETS_FIELD_NUMBER; + hash = (53 * hash) + internalGetSecrets().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -3031,7 +3031,7 @@ protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { case 5: - return internalGetSecret(); + return internalGetSecrets(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -3042,7 +3042,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { case 5: - return internalGetMutableSecret(); + return internalGetMutableSecrets(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -3094,7 +3094,7 @@ public Builder clear() { taskExecutionMetadata_ = null; taskExecutionMetadataBuilder_ = null; } - internalGetMutableSecret().clear(); + internalGetMutableSecrets().clear(); return this; } @@ -3139,8 +3139,8 @@ public flyteidl.admin.AgentOuterClass.CreateTaskRequest buildPartial() { } else { result.taskExecutionMetadata_ = taskExecutionMetadataBuilder_.build(); } - result.secret_ = internalGetSecret(); - result.secret_.makeImmutable(); + result.secrets_ = internalGetSecrets(); + result.secrets_.makeImmutable(); result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -3203,8 +3203,8 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.CreateTaskRequest other) if (other.hasTaskExecutionMetadata()) { mergeTaskExecutionMetadata(other.getTaskExecutionMetadata()); } - internalGetMutableSecret().mergeFrom( - other.internalGetSecret()); + internalGetMutableSecrets().mergeFrom( + other.internalGetSecrets()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -3802,30 +3802,30 @@ public flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder getTaskExec } private com.google.protobuf.MapField< - java.lang.String, java.lang.String> secret_; + java.lang.String, java.lang.String> secrets_; private com.google.protobuf.MapField - internalGetSecret() { - if (secret_ == null) { + internalGetSecrets() { + if (secrets_ == null) { return com.google.protobuf.MapField.emptyMapField( - SecretDefaultEntryHolder.defaultEntry); + SecretsDefaultEntryHolder.defaultEntry); } - return secret_; + return secrets_; } private com.google.protobuf.MapField - internalGetMutableSecret() { + internalGetMutableSecrets() { onChanged();; - if (secret_ == null) { - secret_ = com.google.protobuf.MapField.newMapField( - SecretDefaultEntryHolder.defaultEntry); + if (secrets_ == null) { + secrets_ = com.google.protobuf.MapField.newMapField( + SecretsDefaultEntryHolder.defaultEntry); } - if (!secret_.isMutable()) { - secret_ = secret_.copy(); + if (!secrets_.isMutable()) { + secrets_ = secrets_.copy(); } - return secret_; + return secrets_; } - public int getSecretCount() { - return internalGetSecret().getMap().size(); + public int getSecretsCount() { + return internalGetSecrets().getMap().size(); } /** *
@@ -3834,20 +3834,20 @@ public int getSecretCount() {
        * Value is the actual secret value.
        * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public boolean containsSecret( + public boolean containsSecrets( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetSecret().getMap().containsKey(key); + return internalGetSecrets().getMap().containsKey(key); } /** - * Use {@link #getSecretMap()} instead. + * Use {@link #getSecretsMap()} instead. */ @java.lang.Deprecated - public java.util.Map getSecret() { - return getSecretMap(); + public java.util.Map getSecrets() { + return getSecretsMap(); } /** *
@@ -3856,11 +3856,11 @@ public java.util.Map getSecret() {
        * Value is the actual secret value.
        * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public java.util.Map getSecretMap() { - return internalGetSecret().getMap(); + public java.util.Map getSecretsMap() { + return internalGetSecrets().getMap(); } /** *
@@ -3869,15 +3869,15 @@ public java.util.Map getSecretMap() {
        * Value is the actual secret value.
        * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public java.lang.String getSecretOrDefault( + public java.lang.String getSecretsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetSecret().getMap(); + internalGetSecrets().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** @@ -3887,22 +3887,22 @@ public java.lang.String getSecretOrDefault( * Value is the actual secret value. *
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public java.lang.String getSecretOrThrow( + public java.lang.String getSecretsOrThrow( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetSecret().getMap(); + internalGetSecrets().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public Builder clearSecret() { - internalGetMutableSecret().getMutableMap() + public Builder clearSecrets() { + internalGetMutableSecrets().getMutableMap() .clear(); return this; } @@ -3913,13 +3913,13 @@ public Builder clearSecret() { * Value is the actual secret value. *
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public Builder removeSecret( + public Builder removeSecrets( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } - internalGetMutableSecret().getMutableMap() + internalGetMutableSecrets().getMutableMap() .remove(key); return this; } @@ -3928,8 +3928,8 @@ public Builder removeSecret( */ @java.lang.Deprecated public java.util.Map - getMutableSecret() { - return internalGetMutableSecret().getMutableMap(); + getMutableSecrets() { + return internalGetMutableSecrets().getMutableMap(); } /** *
@@ -3938,14 +3938,14 @@ public Builder removeSecret(
        * Value is the actual secret value.
        * 
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public Builder putSecret( + public Builder putSecrets( java.lang.String key, java.lang.String value) { if (key == null) { throw new java.lang.NullPointerException(); } if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableSecret().getMutableMap() + internalGetMutableSecrets().getMutableMap() .put(key, value); return this; } @@ -3956,12 +3956,12 @@ public Builder putSecret( * Value is the actual secret value. *
* - * map<string, string> secret = 5; + * map<string, string> secrets = 5; */ - public Builder putAllSecret( + public Builder putAllSecrets( java.util.Map values) { - internalGetMutableSecret().getMutableMap() + internalGetMutableSecrets().getMutableMap() .putAll(values); return this; } @@ -5225,43 +5225,43 @@ public interface GetTaskResponseOrBuilder extends * log information for the task execution *
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ java.util.List - getLogsList(); + getLogLinksList(); /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - flyteidl.core.Execution.TaskLog getLogs(int index); + flyteidl.core.Execution.TaskLog getLogLinks(int index); /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - int getLogsCount(); + int getLogLinksCount(); /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ java.util.List - getLogsOrBuilderList(); + getLogLinksOrBuilderList(); /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - flyteidl.core.Execution.TaskLogOrBuilder getLogsOrBuilder( + flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder( int index); } /** @@ -5281,7 +5281,7 @@ private GetTaskResponse(com.google.protobuf.GeneratedMessageV3.Builder builde super(builder); } private GetTaskResponse() { - logs_ = java.util.Collections.emptyList(); + logLinks_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -5323,10 +5323,10 @@ private GetTaskResponse( } case 18: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - logs_ = new java.util.ArrayList(); + logLinks_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - logs_.add( + logLinks_.add( input.readMessage(flyteidl.core.Execution.TaskLog.parser(), extensionRegistry)); break; } @@ -5346,7 +5346,7 @@ private GetTaskResponse( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000002) != 0)) { - logs_ = java.util.Collections.unmodifiableList(logs_); + logLinks_ = java.util.Collections.unmodifiableList(logLinks_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -5387,59 +5387,59 @@ public flyteidl.admin.AgentOuterClass.ResourceOrBuilder getResourceOrBuilder() { return getResource(); } - public static final int LOGS_FIELD_NUMBER = 2; - private java.util.List logs_; + public static final int LOG_LINKS_FIELD_NUMBER = 2; + private java.util.List logLinks_; /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public java.util.List getLogsList() { - return logs_; + public java.util.List getLogLinksList() { + return logLinks_; } /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ public java.util.List - getLogsOrBuilderList() { - return logs_; + getLogLinksOrBuilderList() { + return logLinks_; } /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public int getLogsCount() { - return logs_.size(); + public int getLogLinksCount() { + return logLinks_.size(); } /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public flyteidl.core.Execution.TaskLog getLogs(int index) { - return logs_.get(index); + public flyteidl.core.Execution.TaskLog getLogLinks(int index) { + return logLinks_.get(index); } /** *
      * log information for the task execution
      * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public flyteidl.core.Execution.TaskLogOrBuilder getLogsOrBuilder( + public flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder( int index) { - return logs_.get(index); + return logLinks_.get(index); } private byte memoizedIsInitialized = -1; @@ -5459,8 +5459,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (resource_ != null) { output.writeMessage(1, getResource()); } - for (int i = 0; i < logs_.size(); i++) { - output.writeMessage(2, logs_.get(i)); + for (int i = 0; i < logLinks_.size(); i++) { + output.writeMessage(2, logLinks_.get(i)); } unknownFields.writeTo(output); } @@ -5475,9 +5475,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getResource()); } - for (int i = 0; i < logs_.size(); i++) { + for (int i = 0; i < logLinks_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, logs_.get(i)); + .computeMessageSize(2, logLinks_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -5499,8 +5499,8 @@ public boolean equals(final java.lang.Object obj) { if (!getResource() .equals(other.getResource())) return false; } - if (!getLogsList() - .equals(other.getLogsList())) return false; + if (!getLogLinksList() + .equals(other.getLogLinksList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -5516,9 +5516,9 @@ public int hashCode() { hash = (37 * hash) + RESOURCE_FIELD_NUMBER; hash = (53 * hash) + getResource().hashCode(); } - if (getLogsCount() > 0) { - hash = (37 * hash) + LOGS_FIELD_NUMBER; - hash = (53 * hash) + getLogsList().hashCode(); + if (getLogLinksCount() > 0) { + hash = (37 * hash) + LOG_LINKS_FIELD_NUMBER; + hash = (53 * hash) + getLogLinksList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -5652,7 +5652,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getLogsFieldBuilder(); + getLogLinksFieldBuilder(); } } @java.lang.Override @@ -5664,11 +5664,11 @@ public Builder clear() { resource_ = null; resourceBuilder_ = null; } - if (logsBuilder_ == null) { - logs_ = java.util.Collections.emptyList(); + if (logLinksBuilder_ == null) { + logLinks_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); } else { - logsBuilder_.clear(); + logLinksBuilder_.clear(); } return this; } @@ -5703,14 +5703,14 @@ public flyteidl.admin.AgentOuterClass.GetTaskResponse buildPartial() { } else { result.resource_ = resourceBuilder_.build(); } - if (logsBuilder_ == null) { + if (logLinksBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0)) { - logs_ = java.util.Collections.unmodifiableList(logs_); + logLinks_ = java.util.Collections.unmodifiableList(logLinks_); bitField0_ = (bitField0_ & ~0x00000002); } - result.logs_ = logs_; + result.logLinks_ = logLinks_; } else { - result.logs_ = logsBuilder_.build(); + result.logLinks_ = logLinksBuilder_.build(); } result.bitField0_ = to_bitField0_; onBuilt(); @@ -5764,29 +5764,29 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.GetTaskResponse other) { if (other.hasResource()) { mergeResource(other.getResource()); } - if (logsBuilder_ == null) { - if (!other.logs_.isEmpty()) { - if (logs_.isEmpty()) { - logs_ = other.logs_; + if (logLinksBuilder_ == null) { + if (!other.logLinks_.isEmpty()) { + if (logLinks_.isEmpty()) { + logLinks_ = other.logLinks_; bitField0_ = (bitField0_ & ~0x00000002); } else { - ensureLogsIsMutable(); - logs_.addAll(other.logs_); + ensureLogLinksIsMutable(); + logLinks_.addAll(other.logLinks_); } onChanged(); } } else { - if (!other.logs_.isEmpty()) { - if (logsBuilder_.isEmpty()) { - logsBuilder_.dispose(); - logsBuilder_ = null; - logs_ = other.logs_; + if (!other.logLinks_.isEmpty()) { + if (logLinksBuilder_.isEmpty()) { + logLinksBuilder_.dispose(); + logLinksBuilder_ = null; + logLinks_ = other.logLinks_; bitField0_ = (bitField0_ & ~0x00000002); - logsBuilder_ = + logLinksBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getLogsFieldBuilder() : null; + getLogLinksFieldBuilder() : null; } else { - logsBuilder_.addAllMessages(other.logs_); + logLinksBuilder_.addAllMessages(other.logLinks_); } } } @@ -5937,30 +5937,30 @@ public flyteidl.admin.AgentOuterClass.ResourceOrBuilder getResourceOrBuilder() { return resourceBuilder_; } - private java.util.List logs_ = + private java.util.List logLinks_ = java.util.Collections.emptyList(); - private void ensureLogsIsMutable() { + private void ensureLogLinksIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { - logs_ = new java.util.ArrayList(logs_); + logLinks_ = new java.util.ArrayList(logLinks_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilderV3< - flyteidl.core.Execution.TaskLog, flyteidl.core.Execution.TaskLog.Builder, flyteidl.core.Execution.TaskLogOrBuilder> logsBuilder_; + flyteidl.core.Execution.TaskLog, flyteidl.core.Execution.TaskLog.Builder, flyteidl.core.Execution.TaskLogOrBuilder> logLinksBuilder_; /** *
        * log information for the task execution
        * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public java.util.List getLogsList() { - if (logsBuilder_ == null) { - return java.util.Collections.unmodifiableList(logs_); + public java.util.List getLogLinksList() { + if (logLinksBuilder_ == null) { + return java.util.Collections.unmodifiableList(logLinks_); } else { - return logsBuilder_.getMessageList(); + return logLinksBuilder_.getMessageList(); } } /** @@ -5968,13 +5968,13 @@ public java.util.List getLogsList() { * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public int getLogsCount() { - if (logsBuilder_ == null) { - return logs_.size(); + public int getLogLinksCount() { + if (logLinksBuilder_ == null) { + return logLinks_.size(); } else { - return logsBuilder_.getCount(); + return logLinksBuilder_.getCount(); } } /** @@ -5982,13 +5982,13 @@ public int getLogsCount() { * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public flyteidl.core.Execution.TaskLog getLogs(int index) { - if (logsBuilder_ == null) { - return logs_.get(index); + public flyteidl.core.Execution.TaskLog getLogLinks(int index) { + if (logLinksBuilder_ == null) { + return logLinks_.get(index); } else { - return logsBuilder_.getMessage(index); + return logLinksBuilder_.getMessage(index); } } /** @@ -5996,19 +5996,19 @@ public flyteidl.core.Execution.TaskLog getLogs(int index) { * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder setLogs( + public Builder setLogLinks( int index, flyteidl.core.Execution.TaskLog value) { - if (logsBuilder_ == null) { + if (logLinksBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureLogsIsMutable(); - logs_.set(index, value); + ensureLogLinksIsMutable(); + logLinks_.set(index, value); onChanged(); } else { - logsBuilder_.setMessage(index, value); + logLinksBuilder_.setMessage(index, value); } return this; } @@ -6017,16 +6017,16 @@ public Builder setLogs( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder setLogs( + public Builder setLogLinks( int index, flyteidl.core.Execution.TaskLog.Builder builderForValue) { - if (logsBuilder_ == null) { - ensureLogsIsMutable(); - logs_.set(index, builderForValue.build()); + if (logLinksBuilder_ == null) { + ensureLogLinksIsMutable(); + logLinks_.set(index, builderForValue.build()); onChanged(); } else { - logsBuilder_.setMessage(index, builderForValue.build()); + logLinksBuilder_.setMessage(index, builderForValue.build()); } return this; } @@ -6035,18 +6035,18 @@ public Builder setLogs( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder addLogs(flyteidl.core.Execution.TaskLog value) { - if (logsBuilder_ == null) { + public Builder addLogLinks(flyteidl.core.Execution.TaskLog value) { + if (logLinksBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureLogsIsMutable(); - logs_.add(value); + ensureLogLinksIsMutable(); + logLinks_.add(value); onChanged(); } else { - logsBuilder_.addMessage(value); + logLinksBuilder_.addMessage(value); } return this; } @@ -6055,19 +6055,19 @@ public Builder addLogs(flyteidl.core.Execution.TaskLog value) { * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder addLogs( + public Builder addLogLinks( int index, flyteidl.core.Execution.TaskLog value) { - if (logsBuilder_ == null) { + if (logLinksBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureLogsIsMutable(); - logs_.add(index, value); + ensureLogLinksIsMutable(); + logLinks_.add(index, value); onChanged(); } else { - logsBuilder_.addMessage(index, value); + logLinksBuilder_.addMessage(index, value); } return this; } @@ -6076,16 +6076,16 @@ public Builder addLogs( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder addLogs( + public Builder addLogLinks( flyteidl.core.Execution.TaskLog.Builder builderForValue) { - if (logsBuilder_ == null) { - ensureLogsIsMutable(); - logs_.add(builderForValue.build()); + if (logLinksBuilder_ == null) { + ensureLogLinksIsMutable(); + logLinks_.add(builderForValue.build()); onChanged(); } else { - logsBuilder_.addMessage(builderForValue.build()); + logLinksBuilder_.addMessage(builderForValue.build()); } return this; } @@ -6094,16 +6094,16 @@ public Builder addLogs( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder addLogs( + public Builder addLogLinks( int index, flyteidl.core.Execution.TaskLog.Builder builderForValue) { - if (logsBuilder_ == null) { - ensureLogsIsMutable(); - logs_.add(index, builderForValue.build()); + if (logLinksBuilder_ == null) { + ensureLogLinksIsMutable(); + logLinks_.add(index, builderForValue.build()); onChanged(); } else { - logsBuilder_.addMessage(index, builderForValue.build()); + logLinksBuilder_.addMessage(index, builderForValue.build()); } return this; } @@ -6112,17 +6112,17 @@ public Builder addLogs( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder addAllLogs( + public Builder addAllLogLinks( java.lang.Iterable values) { - if (logsBuilder_ == null) { - ensureLogsIsMutable(); + if (logLinksBuilder_ == null) { + ensureLogLinksIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, logs_); + values, logLinks_); onChanged(); } else { - logsBuilder_.addAllMessages(values); + logLinksBuilder_.addAllMessages(values); } return this; } @@ -6131,15 +6131,15 @@ public Builder addAllLogs( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder clearLogs() { - if (logsBuilder_ == null) { - logs_ = java.util.Collections.emptyList(); + public Builder clearLogLinks() { + if (logLinksBuilder_ == null) { + logLinks_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { - logsBuilder_.clear(); + logLinksBuilder_.clear(); } return this; } @@ -6148,15 +6148,15 @@ public Builder clearLogs() { * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public Builder removeLogs(int index) { - if (logsBuilder_ == null) { - ensureLogsIsMutable(); - logs_.remove(index); + public Builder removeLogLinks(int index) { + if (logLinksBuilder_ == null) { + ensureLogLinksIsMutable(); + logLinks_.remove(index); onChanged(); } else { - logsBuilder_.remove(index); + logLinksBuilder_.remove(index); } return this; } @@ -6165,24 +6165,24 @@ public Builder removeLogs(int index) { * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public flyteidl.core.Execution.TaskLog.Builder getLogsBuilder( + public flyteidl.core.Execution.TaskLog.Builder getLogLinksBuilder( int index) { - return getLogsFieldBuilder().getBuilder(index); + return getLogLinksFieldBuilder().getBuilder(index); } /** *
        * log information for the task execution
        * 
* - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public flyteidl.core.Execution.TaskLogOrBuilder getLogsOrBuilder( + public flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder( int index) { - if (logsBuilder_ == null) { - return logs_.get(index); } else { - return logsBuilder_.getMessageOrBuilder(index); + if (logLinksBuilder_ == null) { + return logLinks_.get(index); } else { + return logLinksBuilder_.getMessageOrBuilder(index); } } /** @@ -6190,14 +6190,14 @@ public flyteidl.core.Execution.TaskLogOrBuilder getLogsOrBuilder( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ public java.util.List - getLogsOrBuilderList() { - if (logsBuilder_ != null) { - return logsBuilder_.getMessageOrBuilderList(); + getLogLinksOrBuilderList() { + if (logLinksBuilder_ != null) { + return logLinksBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(logs_); + return java.util.Collections.unmodifiableList(logLinks_); } } /** @@ -6205,10 +6205,10 @@ public flyteidl.core.Execution.TaskLogOrBuilder getLogsOrBuilder( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public flyteidl.core.Execution.TaskLog.Builder addLogsBuilder() { - return getLogsFieldBuilder().addBuilder( + public flyteidl.core.Execution.TaskLog.Builder addLogLinksBuilder() { + return getLogLinksFieldBuilder().addBuilder( flyteidl.core.Execution.TaskLog.getDefaultInstance()); } /** @@ -6216,11 +6216,11 @@ public flyteidl.core.Execution.TaskLog.Builder addLogsBuilder() { * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ - public flyteidl.core.Execution.TaskLog.Builder addLogsBuilder( + public flyteidl.core.Execution.TaskLog.Builder addLogLinksBuilder( int index) { - return getLogsFieldBuilder().addBuilder( + return getLogLinksFieldBuilder().addBuilder( index, flyteidl.core.Execution.TaskLog.getDefaultInstance()); } /** @@ -6228,25 +6228,25 @@ public flyteidl.core.Execution.TaskLog.Builder addLogsBuilder( * log information for the task execution * * - * repeated .flyteidl.core.TaskLog logs = 2; + * repeated .flyteidl.core.TaskLog log_links = 2; */ public java.util.List - getLogsBuilderList() { - return getLogsFieldBuilder().getBuilderList(); + getLogLinksBuilderList() { + return getLogLinksFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< flyteidl.core.Execution.TaskLog, flyteidl.core.Execution.TaskLog.Builder, flyteidl.core.Execution.TaskLogOrBuilder> - getLogsFieldBuilder() { - if (logsBuilder_ == null) { - logsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + getLogLinksFieldBuilder() { + if (logLinksBuilder_ == null) { + logLinksBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< flyteidl.core.Execution.TaskLog, flyteidl.core.Execution.TaskLog.Builder, flyteidl.core.Execution.TaskLogOrBuilder>( - logs_, + logLinks_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); - logs_ = null; + logLinks_ = null; } - return logsBuilder_; + return logLinksBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -8404,7 +8404,7 @@ public interface AgentOrBuilder extends /** *
-     * The name of the agent.
+     * Name is the developer-assigned name of the agent.
      * 
* * string name = 1; @@ -8412,7 +8412,7 @@ public interface AgentOrBuilder extends java.lang.String getName(); /** *
-     * The name of the agent.
+     * Name is the developer-assigned name of the agent.
      * 
* * string name = 1; @@ -8422,65 +8422,65 @@ public interface AgentOrBuilder extends /** *
-     * A list of secret in the secret manager.
+     * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - java.util.List - getSecretNameList(); + java.lang.String getSupportedTaskTypes(); /** *
-     * A list of secret in the secret manager.
+     * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - int getSecretNameCount(); + com.google.protobuf.ByteString + getSupportedTaskTypesBytes(); + /** *
-     * A list of secret in the secret manager.
+     * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
      * 
* - * repeated string secret_name = 2; + * bool is_sync = 3; */ - java.lang.String getSecretName(int index); + boolean getIsSync(); + /** *
-     * A list of secret in the secret manager.
+     * SecretNames is a list of secrets the agent requires to execute tasks.
      * 
* - * repeated string secret_name = 2; + * repeated string secret_names = 4; */ - com.google.protobuf.ByteString - getSecretNameBytes(int index); - + java.util.List + getSecretNamesList(); /** *
-     * The type of the task that the agent can handle.
+     * SecretNames is a list of secrets the agent requires to execute tasks.
      * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - java.lang.String getSupportedTaskType(); + int getSecretNamesCount(); /** *
-     * The type of the task that the agent can handle.
+     * SecretNames is a list of secrets the agent requires to execute tasks.
      * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - com.google.protobuf.ByteString - getSupportedTaskTypeBytes(); - + java.lang.String getSecretNames(int index); /** *
-     * Indicates if this agent is a sync agent.
+     * SecretNames is a list of secrets the agent requires to execute tasks.
      * 
* - * bool is_sync = 4; + * repeated string secret_names = 4; */ - boolean getIsSync(); + com.google.protobuf.ByteString + getSecretNamesBytes(int index); } /** *
@@ -8500,8 +8500,8 @@ private Agent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     }
     private Agent() {
       name_ = "";
-      secretName_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      supportedTaskType_ = "";
+      supportedTaskTypes_ = "";
+      secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
@@ -8536,24 +8536,24 @@ private Agent(
             }
             case 18: {
               java.lang.String s = input.readStringRequireUtf8();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                secretName_ = new com.google.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              secretName_.add(s);
-              break;
-            }
-            case 26: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              supportedTaskType_ = s;
+              supportedTaskTypes_ = s;
               break;
             }
-            case 32: {
+            case 24: {
 
               isSync_ = input.readBool();
               break;
             }
+            case 34: {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                secretNames_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              secretNames_.add(s);
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -8569,8 +8569,8 @@ private Agent(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          secretName_ = secretName_.getUnmodifiableView();
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          secretNames_ = secretNames_.getUnmodifiableView();
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -8594,7 +8594,7 @@ private Agent(
     private volatile java.lang.Object name_;
     /**
      * 
-     * The name of the agent.
+     * Name is the developer-assigned name of the agent.
      * 
* * string name = 1; @@ -8613,7 +8613,7 @@ public java.lang.String getName() { } /** *
-     * The name of the agent.
+     * Name is the developer-assigned name of the agent.
      * 
* * string name = 1; @@ -8632,104 +8632,104 @@ public java.lang.String getName() { } } - public static final int SECRET_NAME_FIELD_NUMBER = 2; - private com.google.protobuf.LazyStringList secretName_; + public static final int SUPPORTED_TASK_TYPES_FIELD_NUMBER = 2; + private volatile java.lang.Object supportedTaskTypes_; /** *
-     * A list of secret in the secret manager.
+     * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - public com.google.protobuf.ProtocolStringList - getSecretNameList() { - return secretName_; + public java.lang.String getSupportedTaskTypes() { + java.lang.Object ref = supportedTaskTypes_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + supportedTaskTypes_ = s; + return s; + } } /** *
-     * A list of secret in the secret manager.
+     * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - public int getSecretNameCount() { - return secretName_.size(); + public com.google.protobuf.ByteString + getSupportedTaskTypesBytes() { + java.lang.Object ref = supportedTaskTypes_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + supportedTaskTypes_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } + + public static final int IS_SYNC_FIELD_NUMBER = 3; + private boolean isSync_; /** *
-     * A list of secret in the secret manager.
+     * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
      * 
* - * repeated string secret_name = 2; + * bool is_sync = 3; */ - public java.lang.String getSecretName(int index) { - return secretName_.get(index); + public boolean getIsSync() { + return isSync_; } + + public static final int SECRET_NAMES_FIELD_NUMBER = 4; + private com.google.protobuf.LazyStringList secretNames_; /** *
-     * A list of secret in the secret manager.
+     * SecretNames is a list of secrets the agent requires to execute tasks.
      * 
* - * repeated string secret_name = 2; + * repeated string secret_names = 4; */ - public com.google.protobuf.ByteString - getSecretNameBytes(int index) { - return secretName_.getByteString(index); + public com.google.protobuf.ProtocolStringList + getSecretNamesList() { + return secretNames_; } - - public static final int SUPPORTED_TASK_TYPE_FIELD_NUMBER = 3; - private volatile java.lang.Object supportedTaskType_; /** *
-     * The type of the task that the agent can handle.
+     * SecretNames is a list of secrets the agent requires to execute tasks.
      * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - public java.lang.String getSupportedTaskType() { - java.lang.Object ref = supportedTaskType_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - supportedTaskType_ = s; - return s; - } + public int getSecretNamesCount() { + return secretNames_.size(); } /** *
-     * The type of the task that the agent can handle.
+     * SecretNames is a list of secrets the agent requires to execute tasks.
      * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - public com.google.protobuf.ByteString - getSupportedTaskTypeBytes() { - java.lang.Object ref = supportedTaskType_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - supportedTaskType_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public java.lang.String getSecretNames(int index) { + return secretNames_.get(index); } - - public static final int IS_SYNC_FIELD_NUMBER = 4; - private boolean isSync_; /** *
-     * Indicates if this agent is a sync agent.
+     * SecretNames is a list of secrets the agent requires to execute tasks.
      * 
* - * bool is_sync = 4; + * repeated string secret_names = 4; */ - public boolean getIsSync() { - return isSync_; + public com.google.protobuf.ByteString + getSecretNamesBytes(int index) { + return secretNames_.getByteString(index); } private byte memoizedIsInitialized = -1; @@ -8749,14 +8749,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!getNameBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - for (int i = 0; i < secretName_.size(); i++) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, secretName_.getRaw(i)); - } - if (!getSupportedTaskTypeBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, supportedTaskType_); + if (!getSupportedTaskTypesBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, supportedTaskTypes_); } if (isSync_ != false) { - output.writeBool(4, isSync_); + output.writeBool(3, isSync_); + } + for (int i = 0; i < secretNames_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, secretNames_.getRaw(i)); } unknownFields.writeTo(output); } @@ -8770,20 +8770,20 @@ public int getSerializedSize() { if (!getNameBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } + if (!getSupportedTaskTypesBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, supportedTaskTypes_); + } + if (isSync_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(3, isSync_); + } { int dataSize = 0; - for (int i = 0; i < secretName_.size(); i++) { - dataSize += computeStringSizeNoTag(secretName_.getRaw(i)); + for (int i = 0; i < secretNames_.size(); i++) { + dataSize += computeStringSizeNoTag(secretNames_.getRaw(i)); } size += dataSize; - size += 1 * getSecretNameList().size(); - } - if (!getSupportedTaskTypeBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, supportedTaskType_); - } - if (isSync_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, isSync_); + size += 1 * getSecretNamesList().size(); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -8802,12 +8802,12 @@ public boolean equals(final java.lang.Object obj) { if (!getName() .equals(other.getName())) return false; - if (!getSecretNameList() - .equals(other.getSecretNameList())) return false; - if (!getSupportedTaskType() - .equals(other.getSupportedTaskType())) return false; + if (!getSupportedTaskTypes() + .equals(other.getSupportedTaskTypes())) return false; if (getIsSync() != other.getIsSync()) return false; + if (!getSecretNamesList() + .equals(other.getSecretNamesList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -8821,15 +8821,15 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - if (getSecretNameCount() > 0) { - hash = (37 * hash) + SECRET_NAME_FIELD_NUMBER; - hash = (53 * hash) + getSecretNameList().hashCode(); - } - hash = (37 * hash) + SUPPORTED_TASK_TYPE_FIELD_NUMBER; - hash = (53 * hash) + getSupportedTaskType().hashCode(); + hash = (37 * hash) + SUPPORTED_TASK_TYPES_FIELD_NUMBER; + hash = (53 * hash) + getSupportedTaskTypes().hashCode(); hash = (37 * hash) + IS_SYNC_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSync()); + if (getSecretNamesCount() > 0) { + hash = (37 * hash) + SECRET_NAMES_FIELD_NUMBER; + hash = (53 * hash) + getSecretNamesList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -8969,12 +8969,12 @@ public Builder clear() { super.clear(); name_ = ""; - secretName_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); - supportedTaskType_ = ""; + supportedTaskTypes_ = ""; isSync_ = false; + secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -9004,13 +9004,13 @@ public flyteidl.admin.AgentOuterClass.Agent buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.name_ = name_; - if (((bitField0_ & 0x00000002) != 0)) { - secretName_ = secretName_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.secretName_ = secretName_; - result.supportedTaskType_ = supportedTaskType_; + result.supportedTaskTypes_ = supportedTaskTypes_; result.isSync_ = isSync_; + if (((bitField0_ & 0x00000008) != 0)) { + secretNames_ = secretNames_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.secretNames_ = secretNames_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -9064,23 +9064,23 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Agent other) { name_ = other.name_; onChanged(); } - if (!other.secretName_.isEmpty()) { - if (secretName_.isEmpty()) { - secretName_ = other.secretName_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureSecretNameIsMutable(); - secretName_.addAll(other.secretName_); - } - onChanged(); - } - if (!other.getSupportedTaskType().isEmpty()) { - supportedTaskType_ = other.supportedTaskType_; + if (!other.getSupportedTaskTypes().isEmpty()) { + supportedTaskTypes_ = other.supportedTaskTypes_; onChanged(); } if (other.getIsSync() != false) { setIsSync(other.getIsSync()); } + if (!other.secretNames_.isEmpty()) { + if (secretNames_.isEmpty()) { + secretNames_ = other.secretNames_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureSecretNamesIsMutable(); + secretNames_.addAll(other.secretNames_); + } + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -9114,7 +9114,7 @@ public Builder mergeFrom( private java.lang.Object name_ = ""; /** *
-       * The name of the agent.
+       * Name is the developer-assigned name of the agent.
        * 
* * string name = 1; @@ -9133,7 +9133,7 @@ public java.lang.String getName() { } /** *
-       * The name of the agent.
+       * Name is the developer-assigned name of the agent.
        * 
* * string name = 1; @@ -9153,7 +9153,7 @@ public java.lang.String getName() { } /** *
-       * The name of the agent.
+       * Name is the developer-assigned name of the agent.
        * 
* * string name = 1; @@ -9170,7 +9170,7 @@ public Builder setName( } /** *
-       * The name of the agent.
+       * Name is the developer-assigned name of the agent.
        * 
* * string name = 1; @@ -9183,7 +9183,7 @@ public Builder clearName() { } /** *
-       * The name of the agent.
+       * Name is the developer-assigned name of the agent.
        * 
* * string name = 1; @@ -9200,259 +9200,259 @@ public Builder setNameBytes( return this; } - private com.google.protobuf.LazyStringList secretName_ = com.google.protobuf.LazyStringArrayList.EMPTY; - private void ensureSecretNameIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - secretName_ = new com.google.protobuf.LazyStringArrayList(secretName_); - bitField0_ |= 0x00000002; - } - } + private java.lang.Object supportedTaskTypes_ = ""; /** *
-       * A list of secret in the secret manager.
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - public com.google.protobuf.ProtocolStringList - getSecretNameList() { - return secretName_.getUnmodifiableView(); + public java.lang.String getSupportedTaskTypes() { + java.lang.Object ref = supportedTaskTypes_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + supportedTaskTypes_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** *
-       * A list of secret in the secret manager.
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - public int getSecretNameCount() { - return secretName_.size(); + public com.google.protobuf.ByteString + getSupportedTaskTypesBytes() { + java.lang.Object ref = supportedTaskTypes_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + supportedTaskTypes_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } } /** *
-       * A list of secret in the secret manager.
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - public java.lang.String getSecretName(int index) { - return secretName_.get(index); + public Builder setSupportedTaskTypes( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + supportedTaskTypes_ = value; + onChanged(); + return this; } /** *
-       * A list of secret in the secret manager.
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - public com.google.protobuf.ByteString - getSecretNameBytes(int index) { - return secretName_.getByteString(index); + public Builder clearSupportedTaskTypes() { + + supportedTaskTypes_ = getDefaultInstance().getSupportedTaskTypes(); + onChanged(); + return this; } /** *
-       * A list of secret in the secret manager.
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * repeated string secret_name = 2; + * string supported_task_types = 2; */ - public Builder setSecretName( - int index, java.lang.String value) { + public Builder setSupportedTaskTypesBytes( + com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - ensureSecretNameIsMutable(); - secretName_.set(index, value); + checkByteStringIsUtf8(value); + + supportedTaskTypes_ = value; onChanged(); return this; } + + private boolean isSync_ ; /** *
-       * A list of secret in the secret manager.
+       * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
        * 
* - * repeated string secret_name = 2; + * bool is_sync = 3; */ - public Builder addSecretName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureSecretNameIsMutable(); - secretName_.add(value); - onChanged(); - return this; + public boolean getIsSync() { + return isSync_; } /** *
-       * A list of secret in the secret manager.
+       * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
        * 
* - * repeated string secret_name = 2; + * bool is_sync = 3; */ - public Builder addAllSecretName( - java.lang.Iterable values) { - ensureSecretNameIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, secretName_); + public Builder setIsSync(boolean value) { + + isSync_ = value; onChanged(); return this; } /** *
-       * A list of secret in the secret manager.
+       * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
        * 
* - * repeated string secret_name = 2; + * bool is_sync = 3; */ - public Builder clearSecretName() { - secretName_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + public Builder clearIsSync() { + + isSync_ = false; onChanged(); return this; } + + private com.google.protobuf.LazyStringList secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private void ensureSecretNamesIsMutable() { + if (!((bitField0_ & 0x00000008) != 0)) { + secretNames_ = new com.google.protobuf.LazyStringArrayList(secretNames_); + bitField0_ |= 0x00000008; + } + } /** *
-       * A list of secret in the secret manager.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * repeated string secret_name = 2; + * repeated string secret_names = 4; */ - public Builder addSecretNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - ensureSecretNameIsMutable(); - secretName_.add(value); - onChanged(); - return this; + public com.google.protobuf.ProtocolStringList + getSecretNamesList() { + return secretNames_.getUnmodifiableView(); } - - private java.lang.Object supportedTaskType_ = ""; /** *
-       * The type of the task that the agent can handle.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - public java.lang.String getSupportedTaskType() { - java.lang.Object ref = supportedTaskType_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - supportedTaskType_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public int getSecretNamesCount() { + return secretNames_.size(); } /** *
-       * The type of the task that the agent can handle.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - public com.google.protobuf.ByteString - getSupportedTaskTypeBytes() { - java.lang.Object ref = supportedTaskType_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - supportedTaskType_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public java.lang.String getSecretNames(int index) { + return secretNames_.get(index); } /** *
-       * The type of the task that the agent can handle.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - public Builder setSupportedTaskType( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - supportedTaskType_ = value; - onChanged(); - return this; + public com.google.protobuf.ByteString + getSecretNamesBytes(int index) { + return secretNames_.getByteString(index); } /** *
-       * The type of the task that the agent can handle.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - public Builder clearSupportedTaskType() { - - supportedTaskType_ = getDefaultInstance().getSupportedTaskType(); + public Builder setSecretNames( + int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecretNamesIsMutable(); + secretNames_.set(index, value); onChanged(); return this; } /** *
-       * The type of the task that the agent can handle.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * string supported_task_type = 3; + * repeated string secret_names = 4; */ - public Builder setSupportedTaskTypeBytes( - com.google.protobuf.ByteString value) { + public Builder addSecretNames( + java.lang.String value) { if (value == null) { throw new NullPointerException(); } - checkByteStringIsUtf8(value); - - supportedTaskType_ = value; + ensureSecretNamesIsMutable(); + secretNames_.add(value); onChanged(); return this; } - - private boolean isSync_ ; /** *
-       * Indicates if this agent is a sync agent.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * bool is_sync = 4; + * repeated string secret_names = 4; */ - public boolean getIsSync() { - return isSync_; + public Builder addAllSecretNames( + java.lang.Iterable values) { + ensureSecretNamesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, secretNames_); + onChanged(); + return this; } /** *
-       * Indicates if this agent is a sync agent.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * bool is_sync = 4; + * repeated string secret_names = 4; */ - public Builder setIsSync(boolean value) { - - isSync_ = value; + public Builder clearSecretNames() { + secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } /** *
-       * Indicates if this agent is a sync agent.
+       * SecretNames is a list of secrets the agent requires to execute tasks.
        * 
* - * bool is_sync = 4; + * repeated string secret_names = 4; */ - public Builder clearIsSync() { - - isSync_ = false; + public Builder addSecretNamesBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + ensureSecretNamesIsMutable(); + secretNames_.add(value); onChanged(); return this; } @@ -11950,10 +11950,10 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_descriptor; + internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_fieldAccessorTable; + internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_admin_CreateTaskResponse_descriptor; private static final @@ -12036,36 +12036,36 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" + "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + - "\005value\030\002 \001(\t:\0028\001\"\272\002\n\021CreateTaskRequest\022)" + + "\005value\030\002 \001(\t:\0028\001\"\275\002\n\021CreateTaskRequest\022)" + "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" + "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" + "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" + "execution_metadata\030\004 \001(\0132%.flyteidl.admi" + - "n.TaskExecutionMetadata\022=\n\006secret\030\005 \003(\0132" + - "-.flyteidl.admin.CreateTaskRequest.Secre" + - "tEntry\032-\n\013SecretEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" + - "lue\030\002 \001(\t:\0028\001\"+\n\022CreateTaskResponse\022\025\n\rr" + - "esource_meta\030\001 \001(\014\":\n\016GetTaskRequest\022\021\n\t" + - "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"c" + - "\n\017GetTaskResponse\022*\n\010resource\030\001 \001(\0132\030.fl" + - "yteidl.admin.Resource\022$\n\004logs\030\002 \003(\0132\026.fl" + - "yteidl.core.TaskLog\"m\n\010Resource\022$\n\005state" + - "\030\001 \001(\0162\025.flyteidl.admin.State\022*\n\007outputs" + - "\030\002 \001(\0132\031.flyteidl.core.LiteralMap\022\017\n\007mes" + - "sage\030\003 \001(\t\"=\n\021DeleteTaskRequest\022\021\n\ttask_" + - "type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022Del" + - "eteTaskResponse\"X\n\005Agent\022\014\n\004name\030\001 \001(\t\022\023" + - "\n\013secret_name\030\002 \003(\t\022\033\n\023supported_task_ty" + - "pe\030\003 \001(\t\022\017\n\007is_sync\030\004 \001(\010\"\037\n\017GetAgentReq" + - "uest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$" + - "\n\005agent\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021" + - "ListAgentsRequest\";\n\022ListAgentsResponse\022" + - "%\n\006agents\030\001 \003(\0132\025.flyteidl.admin.Agent*^" + - "\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMAN" + - "ENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022" + - "\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteorg/fl" + - "yte/flyteidl/gen/pb-go/flyteidl/adminb\006p" + - "roto3" + "n.TaskExecutionMetadata\022?\n\007secrets\030\005 \003(\013" + + "2..flyteidl.admin.CreateTaskRequest.Secr" + + "etsEntry\032.\n\014SecretsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + + "\005value\030\002 \001(\t:\0028\001\"+\n\022CreateTaskResponse\022\025" + + "\n\rresource_meta\030\001 \001(\014\":\n\016GetTaskRequest\022" + + "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + + "\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 \001(\0132\030" + + ".flyteidl.admin.Resource\022)\n\tlog_links\030\002 " + + "\003(\0132\026.flyteidl.core.TaskLog\"m\n\010Resource\022" + + "$\n\005state\030\001 \001(\0162\025.flyteidl.admin.State\022*\n" + + "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" + + "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" + + "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + + "\014\"\024\n\022DeleteTaskResponse\"Z\n\005Agent\022\014\n\004name" + + "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \001(\t\022\017\n\007" + + "is_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017G" + + "etAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgent" + + "Response\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin" + + ".Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgent" + + "sResponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.adm" + + "in.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000" + + "\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007" + + "RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/f" + + "lyteorg/flyte/flyteidl/gen/pb-go/flyteid" + + "l/adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -12113,12 +12113,12 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_CreateTaskRequest_descriptor, - new java.lang.String[] { "Inputs", "Template", "OutputPrefix", "TaskExecutionMetadata", "Secret", }); - internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_descriptor = + new java.lang.String[] { "Inputs", "Template", "OutputPrefix", "TaskExecutionMetadata", "Secrets", }); + internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_descriptor = internal_static_flyteidl_admin_CreateTaskRequest_descriptor.getNestedTypes().get(0); - internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_fieldAccessorTable = new + internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_admin_CreateTaskRequest_SecretEntry_descriptor, + internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_flyteidl_admin_CreateTaskResponse_descriptor = getDescriptor().getMessageTypes().get(2); @@ -12137,7 +12137,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_GetTaskResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_GetTaskResponse_descriptor, - new java.lang.String[] { "Resource", "Logs", }); + new java.lang.String[] { "Resource", "LogLinks", }); internal_static_flyteidl_admin_Resource_descriptor = getDescriptor().getMessageTypes().get(5); internal_static_flyteidl_admin_Resource_fieldAccessorTable = new @@ -12161,7 +12161,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_Agent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_Agent_descriptor, - new java.lang.String[] { "Name", "SecretName", "SupportedTaskType", "IsSync", }); + new java.lang.String[] { "Name", "SupportedTaskTypes", "IsSync", "SecretNames", }); internal_static_flyteidl_admin_GetAgentRequest_descriptor = getDescriptor().getMessageTypes().get(9); internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable = new diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index db8c6fac78..ed1ac1d0f8 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -7962,8 +7962,8 @@ export namespace flyteidl { /** CreateTaskRequest taskExecutionMetadata */ taskExecutionMetadata?: (flyteidl.admin.ITaskExecutionMetadata|null); - /** CreateTaskRequest secret */ - secret?: ({ [k: string]: string }|null); + /** CreateTaskRequest secrets */ + secrets?: ({ [k: string]: string }|null); } /** Represents a CreateTaskRequest. */ @@ -7987,8 +7987,8 @@ export namespace flyteidl { /** CreateTaskRequest taskExecutionMetadata. */ public taskExecutionMetadata?: (flyteidl.admin.ITaskExecutionMetadata|null); - /** CreateTaskRequest secret. */ - public secret: { [k: string]: string }; + /** CreateTaskRequest secrets. */ + public secrets: { [k: string]: string }; /** * Creates a new CreateTaskRequest instance using the specified properties. @@ -8139,8 +8139,8 @@ export namespace flyteidl { /** GetTaskResponse resource */ resource?: (flyteidl.admin.IResource|null); - /** GetTaskResponse logs */ - logs?: (flyteidl.core.ITaskLog[]|null); + /** GetTaskResponse logLinks */ + logLinks?: (flyteidl.core.ITaskLog[]|null); } /** Represents a GetTaskResponse. */ @@ -8155,8 +8155,8 @@ export namespace flyteidl { /** GetTaskResponse resource. */ public resource?: (flyteidl.admin.IResource|null); - /** GetTaskResponse logs. */ - public logs: flyteidl.core.ITaskLog[]; + /** GetTaskResponse logLinks. */ + public logLinks: flyteidl.core.ITaskLog[]; /** * Creates a new GetTaskResponse instance using the specified properties. @@ -8365,14 +8365,14 @@ export namespace flyteidl { /** Agent name */ name?: (string|null); - /** Agent secretName */ - secretName?: (string[]|null); - - /** Agent supportedTaskType */ - supportedTaskType?: (string|null); + /** Agent supportedTaskTypes */ + supportedTaskTypes?: (string|null); /** Agent isSync */ isSync?: (boolean|null); + + /** Agent secretNames */ + secretNames?: (string[]|null); } /** Represents an Agent. */ @@ -8387,15 +8387,15 @@ export namespace flyteidl { /** Agent name. */ public name: string; - /** Agent secretName. */ - public secretName: string[]; - - /** Agent supportedTaskType. */ - public supportedTaskType: string; + /** Agent supportedTaskTypes. */ + public supportedTaskTypes: string; /** Agent isSync. */ public isSync: boolean; + /** Agent secretNames. */ + public secretNames: string[]; + /** * Creates a new Agent instance using the specified properties. * @param [properties] Properties to set diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 21ffe3bec7..e24f7a6204 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -19474,7 +19474,7 @@ * @property {flyteidl.core.ITaskTemplate|null} [template] CreateTaskRequest template * @property {string|null} [outputPrefix] CreateTaskRequest outputPrefix * @property {flyteidl.admin.ITaskExecutionMetadata|null} [taskExecutionMetadata] CreateTaskRequest taskExecutionMetadata - * @property {Object.|null} [secret] CreateTaskRequest secret + * @property {Object.|null} [secrets] CreateTaskRequest secrets */ /** @@ -19486,7 +19486,7 @@ * @param {flyteidl.admin.ICreateTaskRequest=} [properties] Properties to set */ function CreateTaskRequest(properties) { - this.secret = {}; + this.secrets = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -19526,12 +19526,12 @@ CreateTaskRequest.prototype.taskExecutionMetadata = null; /** - * CreateTaskRequest secret. - * @member {Object.} secret + * CreateTaskRequest secrets. + * @member {Object.} secrets * @memberof flyteidl.admin.CreateTaskRequest * @instance */ - CreateTaskRequest.prototype.secret = $util.emptyObject; + CreateTaskRequest.prototype.secrets = $util.emptyObject; /** * Creates a new CreateTaskRequest instance using the specified properties. @@ -19565,9 +19565,9 @@ writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputPrefix); if (message.taskExecutionMetadata != null && message.hasOwnProperty("taskExecutionMetadata")) $root.flyteidl.admin.TaskExecutionMetadata.encode(message.taskExecutionMetadata, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.secret != null && message.hasOwnProperty("secret")) - for (var keys = Object.keys(message.secret), i = 0; i < keys.length; ++i) - writer.uint32(/* id 5, wireType 2 =*/42).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.secret[keys[i]]).ldelim(); + if (message.secrets != null && message.hasOwnProperty("secrets")) + for (var keys = Object.keys(message.secrets), i = 0; i < keys.length; ++i) + writer.uint32(/* id 5, wireType 2 =*/42).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.secrets[keys[i]]).ldelim(); return writer; }; @@ -19603,11 +19603,11 @@ break; case 5: reader.skip().pos++; - if (message.secret === $util.emptyObject) - message.secret = {}; + if (message.secrets === $util.emptyObject) + message.secrets = {}; key = reader.string(); reader.pos++; - message.secret[key] = reader.string(); + message.secrets[key] = reader.string(); break; default: reader.skipType(tag & 7); @@ -19646,13 +19646,13 @@ if (error) return "taskExecutionMetadata." + error; } - if (message.secret != null && message.hasOwnProperty("secret")) { - if (!$util.isObject(message.secret)) - return "secret: object expected"; - var key = Object.keys(message.secret); + if (message.secrets != null && message.hasOwnProperty("secrets")) { + if (!$util.isObject(message.secrets)) + return "secrets: object expected"; + var key = Object.keys(message.secrets); for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.secret[key[i]])) - return "secret: string{k:string} expected"; + if (!$util.isString(message.secrets[key[i]])) + return "secrets: string{k:string} expected"; } return null; }; @@ -19904,7 +19904,7 @@ * @memberof flyteidl.admin * @interface IGetTaskResponse * @property {flyteidl.admin.IResource|null} [resource] GetTaskResponse resource - * @property {Array.|null} [logs] GetTaskResponse logs + * @property {Array.|null} [logLinks] GetTaskResponse logLinks */ /** @@ -19916,7 +19916,7 @@ * @param {flyteidl.admin.IGetTaskResponse=} [properties] Properties to set */ function GetTaskResponse(properties) { - this.logs = []; + this.logLinks = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -19932,12 +19932,12 @@ GetTaskResponse.prototype.resource = null; /** - * GetTaskResponse logs. - * @member {Array.} logs + * GetTaskResponse logLinks. + * @member {Array.} logLinks * @memberof flyteidl.admin.GetTaskResponse * @instance */ - GetTaskResponse.prototype.logs = $util.emptyArray; + GetTaskResponse.prototype.logLinks = $util.emptyArray; /** * Creates a new GetTaskResponse instance using the specified properties. @@ -19965,9 +19965,9 @@ writer = $Writer.create(); if (message.resource != null && message.hasOwnProperty("resource")) $root.flyteidl.admin.Resource.encode(message.resource, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.logs != null && message.logs.length) - for (var i = 0; i < message.logs.length; ++i) - $root.flyteidl.core.TaskLog.encode(message.logs[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.logLinks != null && message.logLinks.length) + for (var i = 0; i < message.logLinks.length; ++i) + $root.flyteidl.core.TaskLog.encode(message.logLinks[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -19993,9 +19993,9 @@ message.resource = $root.flyteidl.admin.Resource.decode(reader, reader.uint32()); break; case 2: - if (!(message.logs && message.logs.length)) - message.logs = []; - message.logs.push($root.flyteidl.core.TaskLog.decode(reader, reader.uint32())); + if (!(message.logLinks && message.logLinks.length)) + message.logLinks = []; + message.logLinks.push($root.flyteidl.core.TaskLog.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -20021,13 +20021,13 @@ if (error) return "resource." + error; } - if (message.logs != null && message.hasOwnProperty("logs")) { - if (!Array.isArray(message.logs)) - return "logs: array expected"; - for (var i = 0; i < message.logs.length; ++i) { - var error = $root.flyteidl.core.TaskLog.verify(message.logs[i]); + if (message.logLinks != null && message.hasOwnProperty("logLinks")) { + if (!Array.isArray(message.logLinks)) + return "logLinks: array expected"; + for (var i = 0; i < message.logLinks.length; ++i) { + var error = $root.flyteidl.core.TaskLog.verify(message.logLinks[i]); if (error) - return "logs." + error; + return "logLinks." + error; } } return null; @@ -20417,9 +20417,9 @@ * @memberof flyteidl.admin * @interface IAgent * @property {string|null} [name] Agent name - * @property {Array.|null} [secretName] Agent secretName - * @property {string|null} [supportedTaskType] Agent supportedTaskType + * @property {string|null} [supportedTaskTypes] Agent supportedTaskTypes * @property {boolean|null} [isSync] Agent isSync + * @property {Array.|null} [secretNames] Agent secretNames */ /** @@ -20431,7 +20431,7 @@ * @param {flyteidl.admin.IAgent=} [properties] Properties to set */ function Agent(properties) { - this.secretName = []; + this.secretNames = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -20447,28 +20447,28 @@ Agent.prototype.name = ""; /** - * Agent secretName. - * @member {Array.} secretName + * Agent supportedTaskTypes. + * @member {string} supportedTaskTypes * @memberof flyteidl.admin.Agent * @instance */ - Agent.prototype.secretName = $util.emptyArray; + Agent.prototype.supportedTaskTypes = ""; /** - * Agent supportedTaskType. - * @member {string} supportedTaskType + * Agent isSync. + * @member {boolean} isSync * @memberof flyteidl.admin.Agent * @instance */ - Agent.prototype.supportedTaskType = ""; + Agent.prototype.isSync = false; /** - * Agent isSync. - * @member {boolean} isSync + * Agent secretNames. + * @member {Array.} secretNames * @memberof flyteidl.admin.Agent * @instance */ - Agent.prototype.isSync = false; + Agent.prototype.secretNames = $util.emptyArray; /** * Creates a new Agent instance using the specified properties. @@ -20496,13 +20496,13 @@ writer = $Writer.create(); if (message.name != null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.secretName != null && message.secretName.length) - for (var i = 0; i < message.secretName.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.secretName[i]); - if (message.supportedTaskType != null && message.hasOwnProperty("supportedTaskType")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.supportedTaskType); + if (message.supportedTaskTypes != null && message.hasOwnProperty("supportedTaskTypes")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.supportedTaskTypes); if (message.isSync != null && message.hasOwnProperty("isSync")) - writer.uint32(/* id 4, wireType 0 =*/32).bool(message.isSync); + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.isSync); + if (message.secretNames != null && message.secretNames.length) + for (var i = 0; i < message.secretNames.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.secretNames[i]); return writer; }; @@ -20528,15 +20528,15 @@ message.name = reader.string(); break; case 2: - if (!(message.secretName && message.secretName.length)) - message.secretName = []; - message.secretName.push(reader.string()); + message.supportedTaskTypes = reader.string(); break; case 3: - message.supportedTaskType = reader.string(); + message.isSync = reader.bool(); break; case 4: - message.isSync = reader.bool(); + if (!(message.secretNames && message.secretNames.length)) + message.secretNames = []; + message.secretNames.push(reader.string()); break; default: reader.skipType(tag & 7); @@ -20560,19 +20560,19 @@ if (message.name != null && message.hasOwnProperty("name")) if (!$util.isString(message.name)) return "name: string expected"; - if (message.secretName != null && message.hasOwnProperty("secretName")) { - if (!Array.isArray(message.secretName)) - return "secretName: array expected"; - for (var i = 0; i < message.secretName.length; ++i) - if (!$util.isString(message.secretName[i])) - return "secretName: string[] expected"; - } - if (message.supportedTaskType != null && message.hasOwnProperty("supportedTaskType")) - if (!$util.isString(message.supportedTaskType)) - return "supportedTaskType: string expected"; + if (message.supportedTaskTypes != null && message.hasOwnProperty("supportedTaskTypes")) + if (!$util.isString(message.supportedTaskTypes)) + return "supportedTaskTypes: string expected"; if (message.isSync != null && message.hasOwnProperty("isSync")) if (typeof message.isSync !== "boolean") return "isSync: boolean expected"; + if (message.secretNames != null && message.hasOwnProperty("secretNames")) { + if (!Array.isArray(message.secretNames)) + return "secretNames: array expected"; + for (var i = 0; i < message.secretNames.length; ++i) + if (!$util.isString(message.secretNames[i])) + return "secretNames: string[] expected"; + } return null; }; diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index a73e8e0948..de908b7f05 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -18,7 +18,7 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x85\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12\x45\n\x06secret\x18\x05 \x03(\x0b\x32-.flyteidl.admin.CreateTaskRequest.SecretEntryR\x06secret\x1a\x39\n\x0bSecretEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"s\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12*\n\x04logs\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x04logs\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x85\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n\x0bsecret_name\x18\x02 \x03(\tR\nsecretName\x12.\n\x13supported_task_type\x18\x03 \x01(\tR\x11supportedTaskType\x12\x17\n\x07is_sync\x18\x04 \x01(\x08R\x06isSync\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x89\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x01(\tR\x12supportedTaskTypes\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\x12!\n\x0csecret_names\x18\x04 \x03(\tR\x0bsecretNames\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -33,10 +33,10 @@ _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001' _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' - _CREATETASKREQUEST_SECRETENTRY._options = None - _CREATETASKREQUEST_SECRETENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=2092 - _globals['_STATE']._serialized_end=2186 + _CREATETASKREQUEST_SECRETSENTRY._options = None + _CREATETASKREQUEST_SECRETSENTRY._serialized_options = b'8\001' + _globals['_STATE']._serialized_start=2109 + _globals['_STATE']._serialized_end=2203 _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 @@ -46,29 +46,29 @@ _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_start=791 _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_end=862 _globals['_CREATETASKREQUEST']._serialized_start=865 - _globals['_CREATETASKREQUEST']._serialized_end=1254 - _globals['_CREATETASKREQUEST_SECRETENTRY']._serialized_start=1197 - _globals['_CREATETASKREQUEST_SECRETENTRY']._serialized_end=1254 - _globals['_CREATETASKRESPONSE']._serialized_start=1256 - _globals['_CREATETASKRESPONSE']._serialized_end=1313 - _globals['_GETTASKREQUEST']._serialized_start=1315 - _globals['_GETTASKREQUEST']._serialized_end=1397 - _globals['_GETTASKRESPONSE']._serialized_start=1399 - _globals['_GETTASKRESPONSE']._serialized_end=1514 - _globals['_RESOURCE']._serialized_start=1517 - _globals['_RESOURCE']._serialized_end=1651 - _globals['_DELETETASKREQUEST']._serialized_start=1653 - _globals['_DELETETASKREQUEST']._serialized_end=1738 - _globals['_DELETETASKRESPONSE']._serialized_start=1740 - _globals['_DELETETASKRESPONSE']._serialized_end=1760 - _globals['_AGENT']._serialized_start=1763 - _globals['_AGENT']._serialized_end=1896 - _globals['_GETAGENTREQUEST']._serialized_start=1898 - _globals['_GETAGENTREQUEST']._serialized_end=1935 - _globals['_GETAGENTRESPONSE']._serialized_start=1937 - _globals['_GETAGENTRESPONSE']._serialized_end=2000 - _globals['_LISTAGENTSREQUEST']._serialized_start=2002 - _globals['_LISTAGENTSREQUEST']._serialized_end=2021 - _globals['_LISTAGENTSRESPONSE']._serialized_start=2023 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2090 + _globals['_CREATETASKREQUEST']._serialized_end=1258 + _globals['_CREATETASKREQUEST_SECRETSENTRY']._serialized_start=1200 + _globals['_CREATETASKREQUEST_SECRETSENTRY']._serialized_end=1258 + _globals['_CREATETASKRESPONSE']._serialized_start=1260 + _globals['_CREATETASKRESPONSE']._serialized_end=1317 + _globals['_GETTASKREQUEST']._serialized_start=1319 + _globals['_GETTASKREQUEST']._serialized_end=1401 + _globals['_GETTASKRESPONSE']._serialized_start=1403 + _globals['_GETTASKRESPONSE']._serialized_end=1527 + _globals['_RESOURCE']._serialized_start=1530 + _globals['_RESOURCE']._serialized_end=1664 + _globals['_DELETETASKREQUEST']._serialized_start=1666 + _globals['_DELETETASKREQUEST']._serialized_end=1751 + _globals['_DELETETASKRESPONSE']._serialized_start=1753 + _globals['_DELETETASKRESPONSE']._serialized_end=1773 + _globals['_AGENT']._serialized_start=1776 + _globals['_AGENT']._serialized_end=1913 + _globals['_GETAGENTREQUEST']._serialized_start=1915 + _globals['_GETAGENTREQUEST']._serialized_end=1952 + _globals['_GETAGENTRESPONSE']._serialized_start=1954 + _globals['_GETAGENTRESPONSE']._serialized_end=2017 + _globals['_LISTAGENTSREQUEST']._serialized_start=2019 + _globals['_LISTAGENTSREQUEST']._serialized_end=2038 + _globals['_LISTAGENTSRESPONSE']._serialized_start=2040 + _globals['_LISTAGENTSRESPONSE']._serialized_end=2107 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi index 4989b0a9ab..28069cd61c 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi @@ -62,8 +62,8 @@ class TaskExecutionMetadata(_message.Message): def __init__(self, task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., namespace: _Optional[str] = ..., labels: _Optional[_Mapping[str, str]] = ..., annotations: _Optional[_Mapping[str, str]] = ..., k8s_service_account: _Optional[str] = ..., environment_variables: _Optional[_Mapping[str, str]] = ...) -> None: ... class CreateTaskRequest(_message.Message): - __slots__ = ["inputs", "template", "output_prefix", "task_execution_metadata", "secret"] - class SecretEntry(_message.Message): + __slots__ = ["inputs", "template", "output_prefix", "task_execution_metadata", "secrets"] + class SecretsEntry(_message.Message): __slots__ = ["key", "value"] KEY_FIELD_NUMBER: _ClassVar[int] VALUE_FIELD_NUMBER: _ClassVar[int] @@ -74,13 +74,13 @@ class CreateTaskRequest(_message.Message): TEMPLATE_FIELD_NUMBER: _ClassVar[int] OUTPUT_PREFIX_FIELD_NUMBER: _ClassVar[int] TASK_EXECUTION_METADATA_FIELD_NUMBER: _ClassVar[int] - SECRET_FIELD_NUMBER: _ClassVar[int] + SECRETS_FIELD_NUMBER: _ClassVar[int] inputs: _literals_pb2.LiteralMap template: _tasks_pb2.TaskTemplate output_prefix: str task_execution_metadata: TaskExecutionMetadata - secret: _containers.ScalarMap[str, str] - def __init__(self, inputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., template: _Optional[_Union[_tasks_pb2.TaskTemplate, _Mapping]] = ..., output_prefix: _Optional[str] = ..., task_execution_metadata: _Optional[_Union[TaskExecutionMetadata, _Mapping]] = ..., secret: _Optional[_Mapping[str, str]] = ...) -> None: ... + secrets: _containers.ScalarMap[str, str] + def __init__(self, inputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., template: _Optional[_Union[_tasks_pb2.TaskTemplate, _Mapping]] = ..., output_prefix: _Optional[str] = ..., task_execution_metadata: _Optional[_Union[TaskExecutionMetadata, _Mapping]] = ..., secrets: _Optional[_Mapping[str, str]] = ...) -> None: ... class CreateTaskResponse(_message.Message): __slots__ = ["resource_meta"] @@ -97,12 +97,12 @@ class GetTaskRequest(_message.Message): def __init__(self, task_type: _Optional[str] = ..., resource_meta: _Optional[bytes] = ...) -> None: ... class GetTaskResponse(_message.Message): - __slots__ = ["resource", "logs"] + __slots__ = ["resource", "log_links"] RESOURCE_FIELD_NUMBER: _ClassVar[int] - LOGS_FIELD_NUMBER: _ClassVar[int] + LOG_LINKS_FIELD_NUMBER: _ClassVar[int] resource: Resource - logs: _containers.RepeatedCompositeFieldContainer[_execution_pb2.TaskLog] - def __init__(self, resource: _Optional[_Union[Resource, _Mapping]] = ..., logs: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ...) -> None: ... + log_links: _containers.RepeatedCompositeFieldContainer[_execution_pb2.TaskLog] + def __init__(self, resource: _Optional[_Union[Resource, _Mapping]] = ..., log_links: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ...) -> None: ... class Resource(_message.Message): __slots__ = ["state", "outputs", "message"] @@ -127,16 +127,16 @@ class DeleteTaskResponse(_message.Message): def __init__(self) -> None: ... class Agent(_message.Message): - __slots__ = ["name", "secret_name", "supported_task_type", "is_sync"] + __slots__ = ["name", "supported_task_types", "is_sync", "secret_names"] NAME_FIELD_NUMBER: _ClassVar[int] - SECRET_NAME_FIELD_NUMBER: _ClassVar[int] - SUPPORTED_TASK_TYPE_FIELD_NUMBER: _ClassVar[int] + SUPPORTED_TASK_TYPES_FIELD_NUMBER: _ClassVar[int] IS_SYNC_FIELD_NUMBER: _ClassVar[int] + SECRET_NAMES_FIELD_NUMBER: _ClassVar[int] name: str - secret_name: _containers.RepeatedScalarFieldContainer[str] - supported_task_type: str + supported_task_types: str is_sync: bool - def __init__(self, name: _Optional[str] = ..., secret_name: _Optional[_Iterable[str]] = ..., supported_task_type: _Optional[str] = ..., is_sync: bool = ...) -> None: ... + secret_names: _containers.RepeatedScalarFieldContainer[str] + def __init__(self, name: _Optional[str] = ..., supported_task_types: _Optional[str] = ..., is_sync: bool = ..., secret_names: _Optional[_Iterable[str]] = ...) -> None: ... class GetAgentRequest(_message.Message): __slots__ = ["name"] diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index 904f5b1ecd..33a518eedc 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -44,7 +44,7 @@ pub struct CreateTaskRequest { /// Key is the name of the secret in secret manager. /// Value is the actual secret value. #[prost(map="string, string", tag="5")] - pub secret: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, + pub secrets: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, } /// Represents a create response structure. #[allow(clippy::derive_partial_eq_without_eq)] @@ -73,7 +73,7 @@ pub struct GetTaskResponse { pub resource: ::core::option::Option, /// log information for the task execution #[prost(message, repeated, tag="2")] - pub logs: ::prost::alloc::vec::Vec, + pub log_links: ::prost::alloc::vec::Vec, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -110,18 +110,18 @@ pub struct DeleteTaskResponse { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Agent { - /// The name of the agent. + /// Name is the developer-assigned name of the agent. #[prost(string, tag="1")] pub name: ::prost::alloc::string::String, - /// A list of secret in the secret manager. - #[prost(string, repeated, tag="2")] - pub secret_name: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// The type of the task that the agent can handle. - #[prost(string, tag="3")] - pub supported_task_type: ::prost::alloc::string::String, - /// Indicates if this agent is a sync agent. - #[prost(bool, tag="4")] + /// SupportedTaskTypes are the types of the tasks that the agent can handle. + #[prost(string, tag="2")] + pub supported_task_types: ::prost::alloc::string::String, + /// IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. + #[prost(bool, tag="3")] pub is_sync: bool, + /// SecretNames is a list of secrets the agent requires to execute tasks. + #[prost(string, repeated, tag="4")] + pub secret_names: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } /// A request to get an agent. #[allow(clippy::derive_partial_eq_without_eq)] From 4ce09559f3b5828e71206e8116ba96f14fca66d0 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 12:30:31 +0800 Subject: [PATCH 04/47] add supported task type Signed-off-by: Future Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 88 ++++++------- flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 80 +++++------ flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 124 +++++++++--------- .../pb-go/flyteidl/admin/agent.pb.validate.go | 2 +- .../pb-go/flyteidl/service/agent.swagger.json | 2 +- .../flyteidl/admin/AgentOuterClass.java | 118 ++++++++--------- flyteidl/gen/pb-js/flyteidl.d.ts | 8 +- flyteidl/gen/pb-js/flyteidl.js | 20 +-- .../gen/pb_python/flyteidl/admin/agent_pb2.py | 24 ++-- .../pb_python/flyteidl/admin/agent_pb2.pyi | 8 +- flyteidl/gen/pb_rust/flyteidl.admin.rs | 2 +- flyteidl/protos/flyteidl/admin/agent.proto | 2 +- .../pluginmachinery/internal/webapi/core.go | 1 + .../go/tasks/plugins/webapi/agent/plugin.go | 79 +++++++++-- 14 files changed, 306 insertions(+), 252 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index 3aa183f449..13ec60b43f 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -474,7 +474,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, name_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_types_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_type_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, is_sync_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, secret_names_), ~0u, // no _has_bits_ @@ -584,23 +584,23 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" - "\014\"\024\n\022DeleteTaskResponse\"Z\n\005Agent\022\014\n\004name" - "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \001(\t\022\017\n\007" - "is_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017G" - "etAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgent" - "Response\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin" - ".Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgent" - "sResponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.adm" - "in.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000" - "\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007" - "RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/f" - "lyteorg/flyte/flyteidl/gen/pb-go/flyteid" - "l/adminb\006proto3" + "\014\"\024\n\022DeleteTaskResponse\"Y\n\005Agent\022\014\n\004name" + "\030\001 \001(\t\022\033\n\023supported_task_type\030\002 \001(\t\022\017\n\007i" + "s_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017Ge" + "tAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentR" + "esponse\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin." + "Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgents" + "Response\022%\n\006agents\030\001 \003(\0132\025.flyteidl.admi" + "n.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022" + "\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007R" + "UNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fl" + "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" + "/adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1895, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1894, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { @@ -4388,7 +4388,7 @@ class Agent::HasBitSetters { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int Agent::kNameFieldNumber; -const int Agent::kSupportedTaskTypesFieldNumber; +const int Agent::kSupportedTaskTypeFieldNumber; const int Agent::kIsSyncFieldNumber; const int Agent::kSecretNamesFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 @@ -4407,9 +4407,9 @@ Agent::Agent(const Agent& from) if (from.name().size() > 0) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - supported_task_types_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.supported_task_types().size() > 0) { - supported_task_types_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_types_); + supported_task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.supported_task_type().size() > 0) { + supported_task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_type_); } is_sync_ = from.is_sync_; // @@protoc_insertion_point(copy_constructor:flyteidl.admin.Agent) @@ -4419,7 +4419,7 @@ void Agent::SharedCtor() { ::google::protobuf::internal::InitSCC( &scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_types_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); is_sync_ = false; } @@ -4430,7 +4430,7 @@ Agent::~Agent() { void Agent::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_types_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void Agent::SetCachedSize(int size) const { @@ -4450,7 +4450,7 @@ void Agent::Clear() { secret_names_.Clear(); name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_types_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + supported_task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); is_sync_ = false; _internal_metadata_.Clear(); } @@ -4484,13 +4484,13 @@ const char* Agent::_InternalParse(const char* begin, const char* end, void* obje ptr += size; break; } - // string supported_task_types = 2; + // string supported_task_type = 2; case 2: { if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.supported_task_types"); - object = msg->mutable_supported_task_types(); + ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.supported_task_type"); + object = msg->mutable_supported_task_type(); if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; goto string_till_end; @@ -4575,15 +4575,15 @@ bool Agent::MergePartialFromCodedStream( break; } - // string supported_task_types = 2; + // string supported_task_type = 2; case 2: { if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_supported_task_types())); + input, this->mutable_supported_task_type())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_types().data(), static_cast(this->supported_task_types().length()), + this->supported_task_type().data(), static_cast(this->supported_task_type().length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.Agent.supported_task_types")); + "flyteidl.admin.Agent.supported_task_type")); } else { goto handle_unusual; } @@ -4656,14 +4656,14 @@ void Agent::SerializeWithCachedSizes( 1, this->name(), output); } - // string supported_task_types = 2; - if (this->supported_task_types().size() > 0) { + // string supported_task_type = 2; + if (this->supported_task_type().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_types().data(), static_cast(this->supported_task_types().length()), + this->supported_task_type().data(), static_cast(this->supported_task_type().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.supported_task_types"); + "flyteidl.admin.Agent.supported_task_type"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 2, this->supported_task_types(), output); + 2, this->supported_task_type(), output); } // bool is_sync = 3; @@ -4705,15 +4705,15 @@ ::google::protobuf::uint8* Agent::InternalSerializeWithCachedSizesToArray( 1, this->name(), target); } - // string supported_task_types = 2; - if (this->supported_task_types().size() > 0) { + // string supported_task_type = 2; + if (this->supported_task_type().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_types().data(), static_cast(this->supported_task_types().length()), + this->supported_task_type().data(), static_cast(this->supported_task_type().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.supported_task_types"); + "flyteidl.admin.Agent.supported_task_type"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 2, this->supported_task_types(), target); + 2, this->supported_task_type(), target); } // bool is_sync = 3; @@ -4767,11 +4767,11 @@ size_t Agent::ByteSizeLong() const { this->name()); } - // string supported_task_types = 2; - if (this->supported_task_types().size() > 0) { + // string supported_task_type = 2; + if (this->supported_task_type().size() > 0) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( - this->supported_task_types()); + this->supported_task_type()); } // bool is_sync = 3; @@ -4811,9 +4811,9 @@ void Agent::MergeFrom(const Agent& from) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - if (from.supported_task_types().size() > 0) { + if (from.supported_task_type().size() > 0) { - supported_task_types_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_types_); + supported_task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_type_); } if (from.is_sync() != 0) { set_is_sync(from.is_sync()); @@ -4848,7 +4848,7 @@ void Agent::InternalSwap(Agent* other) { secret_names_.InternalSwap(CastToBase(&other->secret_names_)); name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - supported_task_types_.Swap(&other->supported_task_types_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + supported_task_type_.Swap(&other->supported_task_type_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(is_sync_, other->is_sync_); } diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index 573e0088db..80b11208f8 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -1506,19 +1506,19 @@ class Agent final : ::std::string* release_name(); void set_allocated_name(::std::string* name); - // string supported_task_types = 2; - void clear_supported_task_types(); - static const int kSupportedTaskTypesFieldNumber = 2; - const ::std::string& supported_task_types() const; - void set_supported_task_types(const ::std::string& value); + // string supported_task_type = 2; + void clear_supported_task_type(); + static const int kSupportedTaskTypeFieldNumber = 2; + const ::std::string& supported_task_type() const; + void set_supported_task_type(const ::std::string& value); #if LANG_CXX11 - void set_supported_task_types(::std::string&& value); + void set_supported_task_type(::std::string&& value); #endif - void set_supported_task_types(const char* value); - void set_supported_task_types(const char* value, size_t size); - ::std::string* mutable_supported_task_types(); - ::std::string* release_supported_task_types(); - void set_allocated_supported_task_types(::std::string* supported_task_types); + void set_supported_task_type(const char* value); + void set_supported_task_type(const char* value, size_t size); + ::std::string* mutable_supported_task_type(); + ::std::string* release_supported_task_type(); + void set_allocated_supported_task_type(::std::string* supported_task_type); // bool is_sync = 3; void clear_is_sync(); @@ -1533,7 +1533,7 @@ class Agent final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::RepeatedPtrField<::std::string> secret_names_; ::google::protobuf::internal::ArenaStringPtr name_; - ::google::protobuf::internal::ArenaStringPtr supported_task_types_; + ::google::protobuf::internal::ArenaStringPtr supported_task_type_; bool is_sync_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; @@ -2972,57 +2972,57 @@ inline void Agent::set_allocated_name(::std::string* name) { // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.name) } -// string supported_task_types = 2; -inline void Agent::clear_supported_task_types() { - supported_task_types_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +// string supported_task_type = 2; +inline void Agent::clear_supported_task_type() { + supported_task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& Agent::supported_task_types() const { - // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.supported_task_types) - return supported_task_types_.GetNoArena(); +inline const ::std::string& Agent::supported_task_type() const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.supported_task_type) + return supported_task_type_.GetNoArena(); } -inline void Agent::set_supported_task_types(const ::std::string& value) { +inline void Agent::set_supported_task_type(const ::std::string& value) { - supported_task_types_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.supported_task_types) + supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.supported_task_type) } #if LANG_CXX11 -inline void Agent::set_supported_task_types(::std::string&& value) { +inline void Agent::set_supported_task_type(::std::string&& value) { - supported_task_types_.SetNoArena( + supported_task_type_.SetNoArena( &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:flyteidl.admin.Agent.supported_task_types) + // @@protoc_insertion_point(field_set_rvalue:flyteidl.admin.Agent.supported_task_type) } #endif -inline void Agent::set_supported_task_types(const char* value) { +inline void Agent::set_supported_task_type(const char* value) { GOOGLE_DCHECK(value != nullptr); - supported_task_types_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.supported_task_types) + supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.supported_task_type) } -inline void Agent::set_supported_task_types(const char* value, size_t size) { +inline void Agent::set_supported_task_type(const char* value, size_t size) { - supported_task_types_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.supported_task_types) + // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.supported_task_type) } -inline ::std::string* Agent::mutable_supported_task_types() { +inline ::std::string* Agent::mutable_supported_task_type() { - // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.supported_task_types) - return supported_task_types_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.supported_task_type) + return supported_task_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* Agent::release_supported_task_types() { - // @@protoc_insertion_point(field_release:flyteidl.admin.Agent.supported_task_types) +inline ::std::string* Agent::release_supported_task_type() { + // @@protoc_insertion_point(field_release:flyteidl.admin.Agent.supported_task_type) - return supported_task_types_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return supported_task_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void Agent::set_allocated_supported_task_types(::std::string* supported_task_types) { - if (supported_task_types != nullptr) { +inline void Agent::set_allocated_supported_task_type(::std::string* supported_task_type) { + if (supported_task_type != nullptr) { } else { } - supported_task_types_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), supported_task_types); - // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.supported_task_types) + supported_task_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), supported_task_type); + // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.supported_task_type) } // bool is_sync = 3; diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 84dc01d903..0b4f0e00fa 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -510,7 +510,7 @@ type Agent struct { // Name is the developer-assigned name of the agent. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // SupportedTaskTypes are the types of the tasks that the agent can handle. - SupportedTaskTypes string `protobuf:"bytes,2,opt,name=supported_task_types,json=supportedTaskTypes,proto3" json:"supported_task_types,omitempty"` + SupportedTaskType string `protobuf:"bytes,2,opt,name=supported_task_type,json=supportedTaskType,proto3" json:"supported_task_type,omitempty"` // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. IsSync bool `protobuf:"varint,3,opt,name=is_sync,json=isSync,proto3" json:"is_sync,omitempty"` // SecretNames is a list of secrets the agent requires to execute tasks. @@ -552,9 +552,9 @@ func (m *Agent) GetName() string { return "" } -func (m *Agent) GetSupportedTaskTypes() string { +func (m *Agent) GetSupportedTaskType() string { if m != nil { - return m.SupportedTaskTypes + return m.SupportedTaskType } return "" } @@ -750,64 +750,64 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 939 bytes of a gzipped FileDescriptorProto + // 937 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x7f, 0x6f, 0xdb, 0x54, - 0x14, 0x25, 0x4d, 0x93, 0x26, 0x37, 0x59, 0x97, 0xbc, 0x35, 0xcc, 0xcd, 0x06, 0x2a, 0x46, 0x43, - 0x15, 0xd3, 0x1c, 0xd6, 0x22, 0xe8, 0x86, 0x60, 0xca, 0x5a, 0x53, 0x2a, 0xa5, 0x51, 0xf5, 0x92, - 0x22, 0x40, 0x02, 0xeb, 0xc5, 0xb9, 0x0d, 0x56, 0x1c, 0xdb, 0xf8, 0x3d, 0x57, 0x8b, 0xc4, 0xdf, - 0x48, 0xfb, 0x06, 0x7c, 0x5c, 0xe4, 0xf7, 0x9e, 0xdd, 0x24, 0xcb, 0x50, 0xab, 0xfd, 0x67, 0xdf, - 0x73, 0xee, 0xb9, 0xf7, 0xdd, 0x7b, 0xfc, 0x03, 0xda, 0x57, 0xfe, 0x5c, 0xa0, 0x37, 0xf6, 0x3b, - 0x6c, 0x3c, 0xf3, 0x82, 0x0e, 0x9b, 0x60, 0x20, 0xac, 0x28, 0x0e, 0x45, 0x48, 0xb6, 0x33, 0xcc, - 0x92, 0x58, 0xfb, 0x71, 0xce, 0x75, 0xc3, 0x18, 0x3b, 0xbe, 0x27, 0x30, 0x66, 0x3e, 0x57, 0xec, - 0xf6, 0xee, 0x32, 0x2a, 0x18, 0x9f, 0x66, 0xd0, 0x27, 0xcb, 0x90, 0x17, 0x08, 0x8c, 0xaf, 0x98, - 0x8b, 0x1a, 0xfe, 0x74, 0x05, 0x1e, 0x63, 0x20, 0xbc, 0x2b, 0x0f, 0xe3, 0xf5, 0xe9, 0xf8, 0x06, - 0xdd, 0x44, 0x78, 0x61, 0xa0, 0x60, 0xf3, 0xdf, 0x12, 0xb4, 0x86, 0x8c, 0x4f, 0xed, 0x2c, 0x7e, - 0x8e, 0x82, 0x8d, 0x99, 0x60, 0x84, 0x42, 0x33, 0x6d, 0xc3, 0xc9, 0x33, 0x1c, 0x6f, 0x6c, 0x14, - 0xf6, 0x0a, 0xfb, 0xb5, 0x83, 0x2f, 0xac, 0xfc, 0x70, 0xa9, 0xa8, 0xb5, 0x24, 0x70, 0x96, 0x77, - 0x40, 0xef, 0x8b, 0x65, 0x80, 0x3c, 0x86, 0x6a, 0xc0, 0x66, 0xc8, 0x23, 0xe6, 0xa2, 0xb1, 0xb1, - 0x57, 0xd8, 0xaf, 0xd2, 0x9b, 0x00, 0x39, 0x83, 0xb2, 0xcf, 0x46, 0xe8, 0x73, 0xa3, 0xb8, 0x57, - 0xdc, 0xaf, 0x1d, 0x3c, 0xb7, 0x96, 0x67, 0x68, 0xad, 0x6d, 0xd4, 0xea, 0xc9, 0x1c, 0x3b, 0x10, - 0xf1, 0x9c, 0x6a, 0x01, 0xf2, 0x0b, 0xd4, 0x58, 0x10, 0x84, 0x82, 0xa5, 0x4c, 0x6e, 0x6c, 0x4a, - 0xbd, 0x6f, 0x6e, 0xa7, 0xd7, 0xbd, 0x49, 0x54, 0xa2, 0x8b, 0x52, 0xc4, 0x82, 0x07, 0xd3, 0x23, - 0xee, 0x70, 0x8c, 0xaf, 0x3d, 0x17, 0x1d, 0xe6, 0xba, 0x61, 0x12, 0x08, 0xa3, 0x24, 0x0f, 0xd3, - 0x9c, 0x1e, 0xf1, 0x81, 0x42, 0xba, 0x0a, 0x20, 0x02, 0x5a, 0x18, 0x5c, 0x7b, 0x71, 0x18, 0xcc, - 0x30, 0x10, 0xce, 0x35, 0x8b, 0x3d, 0x36, 0xf2, 0x91, 0x1b, 0x65, 0xd9, 0xd3, 0xab, 0xdb, 0xf5, - 0x64, 0xdf, 0x48, 0xfc, 0x9c, 0x29, 0xa8, 0xe6, 0x76, 0x70, 0x0d, 0xd4, 0x7e, 0x01, 0xb5, 0x85, - 0xb1, 0x90, 0x06, 0x14, 0xa7, 0x38, 0x97, 0xdb, 0xab, 0xd2, 0xf4, 0x92, 0xec, 0x40, 0xe9, 0x9a, - 0xf9, 0x49, 0xb6, 0x05, 0x75, 0xf3, 0x72, 0xe3, 0xa8, 0xd0, 0xfe, 0x01, 0x1a, 0xab, 0x13, 0xb8, - 0x53, 0xfe, 0x29, 0xec, 0xbe, 0xb7, 0xdb, 0xbb, 0x08, 0x99, 0x6f, 0x8b, 0xd0, 0x3c, 0x8e, 0x91, - 0x09, 0x4c, 0x67, 0x42, 0xf1, 0xaf, 0x04, 0xb9, 0x20, 0xcf, 0xa1, 0xec, 0x05, 0x51, 0x22, 0xb8, - 0xf6, 0xe2, 0xee, 0x8a, 0x17, 0x7b, 0xea, 0xc1, 0x3a, 0x67, 0x11, 0xd5, 0x44, 0xf2, 0x2d, 0x54, - 0x04, 0xce, 0x22, 0x9f, 0x09, 0x55, 0xa5, 0x76, 0xf0, 0x68, 0x8d, 0x81, 0x87, 0x9a, 0x42, 0x73, - 0x32, 0xf9, 0x1c, 0xee, 0x85, 0x89, 0x88, 0x12, 0xe1, 0x44, 0x31, 0x5e, 0x79, 0x6f, 0x8c, 0xa2, - 0xec, 0xb1, 0xae, 0x82, 0x17, 0x32, 0x46, 0x7e, 0x87, 0x87, 0x2b, 0xcf, 0xc9, 0x4c, 0x6f, 0xcd, - 0xd8, 0x94, 0xc5, 0x9e, 0xdc, 0x6a, 0xc5, 0xb4, 0x25, 0xd6, 0x3e, 0x86, 0x3f, 0xc1, 0x16, 0x47, - 0x37, 0x46, 0xc1, 0x8d, 0x92, 0x74, 0x8c, 0xb5, 0x2a, 0xf7, 0xce, 0x8c, 0xac, 0x81, 0x4a, 0x50, - 0x06, 0xc9, 0xd2, 0xdb, 0x2f, 0xa1, 0xbe, 0x08, 0xdc, 0x69, 0x17, 0x2f, 0x80, 0x2c, 0x96, 0xe1, - 0x51, 0x18, 0x70, 0x39, 0x9f, 0x18, 0x79, 0x98, 0xc4, 0x2e, 0xca, 0x43, 0x4b, 0xad, 0x3a, 0xad, - 0x67, 0xc1, 0xf4, 0x10, 0x26, 0x85, 0xed, 0x53, 0x14, 0x8b, 0x2b, 0x7c, 0x04, 0x55, 0x39, 0x31, - 0x31, 0x8f, 0x50, 0x97, 0xaf, 0xa4, 0x81, 0xe1, 0x3c, 0x5a, 0xa3, 0xb9, 0xb1, 0x46, 0xf3, 0x6f, - 0xb8, 0x9f, 0x6b, 0xea, 0x5e, 0xbe, 0x86, 0x4a, 0x46, 0xd1, 0xce, 0x30, 0x56, 0x07, 0x45, 0x35, - 0x4e, 0x73, 0x26, 0x39, 0x84, 0xaa, 0x1f, 0x4e, 0x1c, 0xdf, 0x0b, 0xa6, 0xdc, 0xd8, 0x90, 0xf3, - 0xfd, 0x78, 0x8d, 0x37, 0x7a, 0xe1, 0x84, 0x56, 0xfc, 0x70, 0xd2, 0x4b, 0x79, 0xe6, 0x3f, 0x05, - 0xa8, 0x64, 0x5a, 0xe4, 0x29, 0x94, 0xb8, 0x48, 0x9d, 0x95, 0x16, 0xdd, 0x3e, 0x68, 0xad, 0x16, - 0x1d, 0xa4, 0x20, 0x55, 0x1c, 0x72, 0x08, 0x5b, 0xca, 0x3b, 0x5c, 0x1b, 0xf1, 0x7f, 0xdc, 0x9b, - 0x31, 0x89, 0x01, 0x5b, 0x33, 0xe4, 0x9c, 0x4d, 0x50, 0xfb, 0x2f, 0xbb, 0x35, 0x2f, 0xa1, 0x79, - 0x82, 0x3e, 0x2e, 0x3f, 0x20, 0x1f, 0x3e, 0xdd, 0x1d, 0x20, 0x8b, 0xb2, 0x6a, 0xc0, 0xe6, 0xdb, - 0x02, 0x94, 0xba, 0xe9, 0x07, 0x8e, 0x10, 0xd8, 0x4c, 0x5f, 0xda, 0x5a, 0x5c, 0x5e, 0x93, 0xaf, - 0x60, 0x87, 0x27, 0x51, 0x14, 0xc6, 0x02, 0xc7, 0x4e, 0x5e, 0x9f, 0x6b, 0x27, 0x91, 0x1c, 0x1b, - 0xea, 0x4e, 0x38, 0x79, 0x08, 0x5b, 0x1e, 0x77, 0xf8, 0x3c, 0x70, 0xe5, 0xb1, 0x2a, 0xb4, 0xec, - 0xf1, 0xc1, 0x3c, 0x70, 0xc9, 0x67, 0x50, 0x57, 0x96, 0x75, 0xe4, 0xa7, 0x41, 0xbe, 0xbc, 0xab, - 0xb4, 0xa6, 0x62, 0xfd, 0x34, 0x64, 0x3e, 0x91, 0xfb, 0x97, 0xdd, 0x64, 0xc7, 0x5e, 0xd3, 0x94, - 0xf9, 0x0a, 0x1a, 0x37, 0x34, 0xed, 0x93, 0xa7, 0x50, 0x92, 0x9f, 0x69, 0x6d, 0x92, 0x77, 0xf6, - 0xa5, 0xd8, 0x8a, 0x63, 0x3e, 0x80, 0x66, 0xcf, 0xe3, 0x4a, 0x81, 0xeb, 0x4a, 0xe6, 0x31, 0x90, - 0xc5, 0xa0, 0xd6, 0x7d, 0x06, 0x65, 0x99, 0x93, 0xbe, 0x97, 0x8a, 0xef, 0x17, 0xd6, 0xa4, 0x2f, - 0xff, 0x80, 0x92, 0x74, 0x06, 0x69, 0x41, 0x93, 0xda, 0x43, 0xfa, 0x6b, 0xf7, 0x75, 0xcf, 0x76, - 0x7e, 0xec, 0x9e, 0xf5, 0x2e, 0xa9, 0xdd, 0xf8, 0x28, 0x0d, 0x5f, 0xd8, 0xf4, 0xbc, 0xdb, 0xb7, - 0xfb, 0xc3, 0x3c, 0x5c, 0x20, 0x35, 0xd8, 0xba, 0xb0, 0xfb, 0x27, 0x67, 0xfd, 0xd3, 0xc6, 0x46, - 0x7a, 0x43, 0x2f, 0xfb, 0xfd, 0xf4, 0xa6, 0x48, 0xee, 0x41, 0x75, 0x70, 0x79, 0x7c, 0x6c, 0xdb, - 0x27, 0xf6, 0x49, 0x63, 0xf3, 0xf5, 0xf7, 0xbf, 0x7d, 0x37, 0xf1, 0xc4, 0x9f, 0xc9, 0xc8, 0x72, - 0xc3, 0x59, 0x47, 0xb6, 0x12, 0xc6, 0x13, 0x75, 0xd1, 0xc9, 0x7f, 0x09, 0x26, 0x18, 0x74, 0xa2, - 0xd1, 0xb3, 0x49, 0xd8, 0x59, 0xfe, 0x93, 0x19, 0x95, 0xe5, 0xdf, 0xc1, 0xe1, 0x7f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xd8, 0x5d, 0x86, 0x13, 0xe2, 0x08, 0x00, 0x00, + 0x14, 0x25, 0x4d, 0x93, 0x26, 0x37, 0xd9, 0x96, 0xbc, 0x35, 0xcc, 0xcd, 0x06, 0x2a, 0x46, 0x43, + 0x15, 0xd3, 0x1c, 0xad, 0x45, 0xd0, 0x0d, 0xc1, 0x94, 0xb5, 0xa6, 0x54, 0x4a, 0xa3, 0xea, 0x25, + 0x45, 0x80, 0x04, 0xd6, 0x8b, 0x73, 0x1b, 0xac, 0x38, 0xb6, 0xf1, 0x7b, 0xae, 0x16, 0x89, 0xbf, + 0x41, 0x7c, 0x03, 0x3e, 0x2e, 0x7a, 0xef, 0xd9, 0xce, 0x8f, 0x65, 0xa8, 0x15, 0xff, 0xd9, 0xf7, + 0x9c, 0x7b, 0xee, 0x7d, 0xf7, 0x1e, 0xff, 0x80, 0xf6, 0xb5, 0x3f, 0x17, 0xe8, 0x8d, 0xfd, 0x0e, + 0x1b, 0xcf, 0xbc, 0xa0, 0xc3, 0x26, 0x18, 0x08, 0x2b, 0x8a, 0x43, 0x11, 0x92, 0xfb, 0x19, 0x66, + 0x29, 0xac, 0xfd, 0x24, 0xe7, 0xba, 0x61, 0x8c, 0x1d, 0xdf, 0x13, 0x18, 0x33, 0x9f, 0x6b, 0x76, + 0x7b, 0x6f, 0x15, 0x15, 0x8c, 0x4f, 0x33, 0xe8, 0xa3, 0x55, 0xc8, 0x0b, 0x04, 0xc6, 0xd7, 0xcc, + 0xc5, 0x14, 0xfe, 0x78, 0x0d, 0x1e, 0x63, 0x20, 0xbc, 0x6b, 0x0f, 0xe3, 0xcd, 0xe9, 0xf8, 0x16, + 0xdd, 0x44, 0x78, 0x61, 0xa0, 0x61, 0xf3, 0x9f, 0x12, 0xb4, 0x86, 0x8c, 0x4f, 0xed, 0x2c, 0x7e, + 0x81, 0x82, 0x8d, 0x99, 0x60, 0x84, 0x42, 0x53, 0xb6, 0xe1, 0xe4, 0x19, 0x8e, 0x37, 0x36, 0x0a, + 0xfb, 0x85, 0x83, 0xda, 0xe1, 0x67, 0x56, 0x7e, 0x38, 0x29, 0x6a, 0xad, 0x08, 0x9c, 0xe7, 0x1d, + 0xd0, 0x07, 0x62, 0x15, 0x20, 0x4f, 0xa0, 0x1a, 0xb0, 0x19, 0xf2, 0x88, 0xb9, 0x68, 0x6c, 0xed, + 0x17, 0x0e, 0xaa, 0x74, 0x11, 0x20, 0xe7, 0x50, 0xf6, 0xd9, 0x08, 0x7d, 0x6e, 0x14, 0xf7, 0x8b, + 0x07, 0xb5, 0xc3, 0x17, 0xd6, 0xea, 0x0c, 0xad, 0x8d, 0x8d, 0x5a, 0x3d, 0x95, 0x63, 0x07, 0x22, + 0x9e, 0xd3, 0x54, 0x80, 0xfc, 0x08, 0x35, 0x16, 0x04, 0xa1, 0x60, 0x92, 0xc9, 0x8d, 0x6d, 0xa5, + 0xf7, 0xe5, 0xed, 0xf4, 0xba, 0x8b, 0x44, 0x2d, 0xba, 0x2c, 0x45, 0x2c, 0x78, 0x38, 0x3d, 0xe6, + 0x0e, 0xc7, 0xf8, 0xc6, 0x73, 0xd1, 0x61, 0xae, 0x1b, 0x26, 0x81, 0x30, 0x4a, 0xea, 0x30, 0xcd, + 0xe9, 0x31, 0x1f, 0x68, 0xa4, 0xab, 0x01, 0x22, 0xa0, 0x85, 0xc1, 0x8d, 0x17, 0x87, 0xc1, 0x0c, + 0x03, 0xe1, 0xdc, 0xb0, 0xd8, 0x63, 0x23, 0x1f, 0xb9, 0x51, 0x56, 0x3d, 0xbd, 0xbe, 0x5d, 0x4f, + 0xf6, 0x42, 0xe2, 0x87, 0x4c, 0x41, 0x37, 0xb7, 0x8b, 0x1b, 0xa0, 0xf6, 0x4b, 0xa8, 0x2d, 0x8d, + 0x85, 0x34, 0xa0, 0x38, 0xc5, 0xb9, 0xda, 0x5e, 0x95, 0xca, 0x4b, 0xb2, 0x0b, 0xa5, 0x1b, 0xe6, + 0x27, 0xd9, 0x16, 0xf4, 0xcd, 0xab, 0xad, 0xe3, 0x42, 0xfb, 0x5b, 0x68, 0xac, 0x4f, 0xe0, 0x4e, + 0xf9, 0x67, 0xb0, 0xf7, 0xde, 0x6e, 0xef, 0x22, 0x64, 0xfe, 0x5d, 0x84, 0xe6, 0x49, 0x8c, 0x4c, + 0xa0, 0x9c, 0x09, 0xc5, 0xdf, 0x13, 0xe4, 0x82, 0xbc, 0x80, 0xb2, 0x17, 0x44, 0x89, 0xe0, 0xa9, + 0x17, 0xf7, 0xd6, 0xbc, 0xd8, 0xd3, 0x0f, 0xd6, 0x05, 0x8b, 0x68, 0x4a, 0x24, 0x5f, 0x41, 0x45, + 0xe0, 0x2c, 0xf2, 0x99, 0xd0, 0x55, 0x6a, 0x87, 0x8f, 0x37, 0x18, 0x78, 0x98, 0x52, 0x68, 0x4e, + 0x26, 0x9f, 0xc2, 0xbd, 0x30, 0x11, 0x51, 0x22, 0x9c, 0x28, 0xc6, 0x6b, 0xef, 0xad, 0x51, 0x54, + 0x3d, 0xd6, 0x75, 0xf0, 0x52, 0xc5, 0xc8, 0x2f, 0xf0, 0x68, 0xed, 0x39, 0x99, 0xa5, 0x5b, 0x33, + 0xb6, 0x55, 0xb1, 0xa7, 0xb7, 0x5a, 0x31, 0x6d, 0x89, 0x8d, 0x8f, 0xe1, 0xf7, 0xb0, 0xc3, 0xd1, + 0x8d, 0x51, 0x70, 0xa3, 0xa4, 0x1c, 0x63, 0xad, 0xcb, 0xbd, 0x33, 0x23, 0x6b, 0xa0, 0x13, 0xb4, + 0x41, 0xb2, 0xf4, 0xf6, 0x2b, 0xa8, 0x2f, 0x03, 0x77, 0xda, 0xc5, 0x4b, 0x20, 0xcb, 0x65, 0x78, + 0x14, 0x06, 0x5c, 0xcd, 0x27, 0x46, 0x1e, 0x26, 0xb1, 0x8b, 0xea, 0xd0, 0x4a, 0xab, 0x4e, 0xeb, + 0x59, 0x50, 0x1e, 0xc2, 0xa4, 0x70, 0xff, 0x0c, 0xc5, 0xf2, 0x0a, 0x1f, 0x43, 0x55, 0x4d, 0x4c, + 0xcc, 0x23, 0x4c, 0xcb, 0x57, 0x64, 0x60, 0x38, 0x8f, 0x36, 0x68, 0x6e, 0x6d, 0xd0, 0xfc, 0x03, + 0x1e, 0xe4, 0x9a, 0x69, 0x2f, 0x5f, 0x40, 0x25, 0xa3, 0xa4, 0xce, 0x30, 0xd6, 0x07, 0x45, 0x53, + 0x9c, 0xe6, 0x4c, 0x72, 0x04, 0x55, 0x3f, 0x9c, 0x38, 0xbe, 0x17, 0x4c, 0xb9, 0xb1, 0xa5, 0xe6, + 0xfb, 0xe1, 0x06, 0x6f, 0xf4, 0xc2, 0x09, 0xad, 0xf8, 0xe1, 0xa4, 0x27, 0x79, 0xe6, 0x9f, 0x05, + 0xa8, 0x64, 0x5a, 0xe4, 0x19, 0x94, 0xb8, 0x90, 0xce, 0x92, 0x45, 0xef, 0x1f, 0xb6, 0xd6, 0x8b, + 0x0e, 0x24, 0x48, 0x35, 0x87, 0x1c, 0xc1, 0x8e, 0xf6, 0x0e, 0x4f, 0x8d, 0xf8, 0x1f, 0xee, 0xcd, + 0x98, 0xc4, 0x80, 0x9d, 0x19, 0x72, 0xce, 0x26, 0x98, 0xfa, 0x2f, 0xbb, 0x35, 0xaf, 0xa0, 0x79, + 0x8a, 0x3e, 0xae, 0x3e, 0x20, 0xff, 0x7f, 0xba, 0xbb, 0x40, 0x96, 0x65, 0xf5, 0x80, 0xcd, 0xbf, + 0x0a, 0x50, 0xea, 0xca, 0x0f, 0x1c, 0x21, 0xb0, 0x2d, 0x5f, 0xda, 0xa9, 0xb8, 0xba, 0x96, 0xaf, + 0x45, 0x9e, 0x44, 0x51, 0x18, 0x0b, 0x1c, 0x3b, 0x8b, 0xfa, 0xda, 0x48, 0xcd, 0x1c, 0x1a, 0x66, + 0x8d, 0x3c, 0x82, 0x1d, 0x8f, 0x3b, 0x7c, 0x1e, 0xb8, 0xea, 0x50, 0x15, 0x5a, 0xf6, 0xf8, 0x60, + 0x1e, 0xb8, 0xe4, 0x13, 0xa8, 0x6b, 0xc3, 0x3a, 0xea, 0xc3, 0xa0, 0x5e, 0xdd, 0x55, 0x5a, 0xd3, + 0xb1, 0xbe, 0x0c, 0x99, 0x4f, 0xd5, 0xf6, 0x55, 0x2f, 0xd9, 0xa1, 0x37, 0xb4, 0x64, 0xbe, 0x86, + 0xc6, 0x82, 0x96, 0xba, 0xe4, 0x19, 0x94, 0xd4, 0x47, 0x3a, 0xb5, 0xc8, 0x3b, 0xdb, 0xd2, 0x6c, + 0xcd, 0x31, 0x1f, 0x42, 0xb3, 0xe7, 0x71, 0xad, 0xc0, 0xd3, 0x4a, 0xe6, 0x09, 0x90, 0xe5, 0x60, + 0xaa, 0xfb, 0x1c, 0xca, 0x2a, 0x47, 0xbe, 0x95, 0x8a, 0xef, 0x17, 0x4e, 0x49, 0x9f, 0xff, 0x0a, + 0x25, 0xe5, 0x0b, 0xd2, 0x82, 0x26, 0xb5, 0x87, 0xf4, 0xa7, 0xee, 0x9b, 0x9e, 0xed, 0x7c, 0xd7, + 0x3d, 0xef, 0x5d, 0x51, 0xbb, 0xf1, 0x81, 0x0c, 0x5f, 0xda, 0xf4, 0xa2, 0xdb, 0xb7, 0xfb, 0xc3, + 0x3c, 0x5c, 0x20, 0x35, 0xd8, 0xb9, 0xb4, 0xfb, 0xa7, 0xe7, 0xfd, 0xb3, 0xc6, 0x96, 0xbc, 0xa1, + 0x57, 0xfd, 0xbe, 0xbc, 0x29, 0x92, 0x7b, 0x50, 0x1d, 0x5c, 0x9d, 0x9c, 0xd8, 0xf6, 0xa9, 0x7d, + 0xda, 0xd8, 0x7e, 0xf3, 0xcd, 0xcf, 0x5f, 0x4f, 0x3c, 0xf1, 0x5b, 0x32, 0xb2, 0xdc, 0x70, 0xd6, + 0x51, 0xad, 0x84, 0xf1, 0x44, 0x5f, 0x74, 0xf2, 0x1f, 0x82, 0x09, 0x06, 0x9d, 0x68, 0xf4, 0x7c, + 0x12, 0x76, 0x56, 0xff, 0x63, 0x46, 0x65, 0xf5, 0x6f, 0x70, 0xf4, 0x6f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x86, 0xf5, 0x06, 0x75, 0xe0, 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go index aca6e68144..55a3403701 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go @@ -677,7 +677,7 @@ func (m *Agent) Validate() error { // no validation rules for Name - // no validation rules for SupportedTaskTypes + // no validation rules for SupportedTaskType // no validation rules for IsSync diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index a634f2bdab..48531d958f 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -223,7 +223,7 @@ "type": "string", "description": "Name is the developer-assigned name of the agent." }, - "supported_task_types": { + "supported_task_type": { "type": "string", "description": "SupportedTaskTypes are the types of the tasks that the agent can handle." }, diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index 9926d93ac0..b377df34c6 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -8425,18 +8425,18 @@ public interface AgentOrBuilder extends * SupportedTaskTypes are the types of the tasks that the agent can handle. *
* - * string supported_task_types = 2; + * string supported_task_type = 2; */ - java.lang.String getSupportedTaskTypes(); + java.lang.String getSupportedTaskType(); /** *
      * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * string supported_task_types = 2; + * string supported_task_type = 2; */ com.google.protobuf.ByteString - getSupportedTaskTypesBytes(); + getSupportedTaskTypeBytes(); /** *
@@ -8500,7 +8500,7 @@ private Agent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     }
     private Agent() {
       name_ = "";
-      supportedTaskTypes_ = "";
+      supportedTaskType_ = "";
       secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
@@ -8537,7 +8537,7 @@ private Agent(
             case 18: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              supportedTaskTypes_ = s;
+              supportedTaskType_ = s;
               break;
             }
             case 24: {
@@ -8632,24 +8632,24 @@ public java.lang.String getName() {
       }
     }
 
-    public static final int SUPPORTED_TASK_TYPES_FIELD_NUMBER = 2;
-    private volatile java.lang.Object supportedTaskTypes_;
+    public static final int SUPPORTED_TASK_TYPE_FIELD_NUMBER = 2;
+    private volatile java.lang.Object supportedTaskType_;
     /**
      * 
      * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * string supported_task_types = 2; + * string supported_task_type = 2; */ - public java.lang.String getSupportedTaskTypes() { - java.lang.Object ref = supportedTaskTypes_; + public java.lang.String getSupportedTaskType() { + java.lang.Object ref = supportedTaskType_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - supportedTaskTypes_ = s; + supportedTaskType_ = s; return s; } } @@ -8658,16 +8658,16 @@ public java.lang.String getSupportedTaskTypes() { * SupportedTaskTypes are the types of the tasks that the agent can handle. *
* - * string supported_task_types = 2; + * string supported_task_type = 2; */ public com.google.protobuf.ByteString - getSupportedTaskTypesBytes() { - java.lang.Object ref = supportedTaskTypes_; + getSupportedTaskTypeBytes() { + java.lang.Object ref = supportedTaskType_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - supportedTaskTypes_ = b; + supportedTaskType_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -8749,8 +8749,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!getNameBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getSupportedTaskTypesBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, supportedTaskTypes_); + if (!getSupportedTaskTypeBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, supportedTaskType_); } if (isSync_ != false) { output.writeBool(3, isSync_); @@ -8770,8 +8770,8 @@ public int getSerializedSize() { if (!getNameBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getSupportedTaskTypesBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, supportedTaskTypes_); + if (!getSupportedTaskTypeBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, supportedTaskType_); } if (isSync_ != false) { size += com.google.protobuf.CodedOutputStream @@ -8802,8 +8802,8 @@ public boolean equals(final java.lang.Object obj) { if (!getName() .equals(other.getName())) return false; - if (!getSupportedTaskTypes() - .equals(other.getSupportedTaskTypes())) return false; + if (!getSupportedTaskType() + .equals(other.getSupportedTaskType())) return false; if (getIsSync() != other.getIsSync()) return false; if (!getSecretNamesList() @@ -8821,8 +8821,8 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (37 * hash) + SUPPORTED_TASK_TYPES_FIELD_NUMBER; - hash = (53 * hash) + getSupportedTaskTypes().hashCode(); + hash = (37 * hash) + SUPPORTED_TASK_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getSupportedTaskType().hashCode(); hash = (37 * hash) + IS_SYNC_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSync()); @@ -8969,7 +8969,7 @@ public Builder clear() { super.clear(); name_ = ""; - supportedTaskTypes_ = ""; + supportedTaskType_ = ""; isSync_ = false; @@ -9004,7 +9004,7 @@ public flyteidl.admin.AgentOuterClass.Agent buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.name_ = name_; - result.supportedTaskTypes_ = supportedTaskTypes_; + result.supportedTaskType_ = supportedTaskType_; result.isSync_ = isSync_; if (((bitField0_ & 0x00000008) != 0)) { secretNames_ = secretNames_.getUnmodifiableView(); @@ -9064,8 +9064,8 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Agent other) { name_ = other.name_; onChanged(); } - if (!other.getSupportedTaskTypes().isEmpty()) { - supportedTaskTypes_ = other.supportedTaskTypes_; + if (!other.getSupportedTaskType().isEmpty()) { + supportedTaskType_ = other.supportedTaskType_; onChanged(); } if (other.getIsSync() != false) { @@ -9200,21 +9200,21 @@ public Builder setNameBytes( return this; } - private java.lang.Object supportedTaskTypes_ = ""; + private java.lang.Object supportedTaskType_ = ""; /** *
        * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * string supported_task_types = 2; + * string supported_task_type = 2; */ - public java.lang.String getSupportedTaskTypes() { - java.lang.Object ref = supportedTaskTypes_; + public java.lang.String getSupportedTaskType() { + java.lang.Object ref = supportedTaskType_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - supportedTaskTypes_ = s; + supportedTaskType_ = s; return s; } else { return (java.lang.String) ref; @@ -9225,16 +9225,16 @@ public java.lang.String getSupportedTaskTypes() { * SupportedTaskTypes are the types of the tasks that the agent can handle. * * - * string supported_task_types = 2; + * string supported_task_type = 2; */ public com.google.protobuf.ByteString - getSupportedTaskTypesBytes() { - java.lang.Object ref = supportedTaskTypes_; + getSupportedTaskTypeBytes() { + java.lang.Object ref = supportedTaskType_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - supportedTaskTypes_ = b; + supportedTaskType_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -9245,15 +9245,15 @@ public java.lang.String getSupportedTaskTypes() { * SupportedTaskTypes are the types of the tasks that the agent can handle. * * - * string supported_task_types = 2; + * string supported_task_type = 2; */ - public Builder setSupportedTaskTypes( + public Builder setSupportedTaskType( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - supportedTaskTypes_ = value; + supportedTaskType_ = value; onChanged(); return this; } @@ -9262,11 +9262,11 @@ public Builder setSupportedTaskTypes( * SupportedTaskTypes are the types of the tasks that the agent can handle. * * - * string supported_task_types = 2; + * string supported_task_type = 2; */ - public Builder clearSupportedTaskTypes() { + public Builder clearSupportedTaskType() { - supportedTaskTypes_ = getDefaultInstance().getSupportedTaskTypes(); + supportedTaskType_ = getDefaultInstance().getSupportedTaskType(); onChanged(); return this; } @@ -9275,16 +9275,16 @@ public Builder clearSupportedTaskTypes() { * SupportedTaskTypes are the types of the tasks that the agent can handle. * * - * string supported_task_types = 2; + * string supported_task_type = 2; */ - public Builder setSupportedTaskTypesBytes( + public Builder setSupportedTaskTypeBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - supportedTaskTypes_ = value; + supportedTaskType_ = value; onChanged(); return this; } @@ -12054,18 +12054,18 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" + "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" + "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + - "\014\"\024\n\022DeleteTaskResponse\"Z\n\005Agent\022\014\n\004name" + - "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \001(\t\022\017\n\007" + - "is_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017G" + - "etAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgent" + - "Response\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin" + - ".Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgent" + - "sResponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.adm" + - "in.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000" + - "\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007" + - "RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/f" + - "lyteorg/flyte/flyteidl/gen/pb-go/flyteid" + - "l/adminb\006proto3" + "\014\"\024\n\022DeleteTaskResponse\"Y\n\005Agent\022\014\n\004name" + + "\030\001 \001(\t\022\033\n\023supported_task_type\030\002 \001(\t\022\017\n\007i" + + "s_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017Ge" + + "tAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentR" + + "esponse\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin." + + "Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgents" + + "Response\022%\n\006agents\030\001 \003(\0132\025.flyteidl.admi" + + "n.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022" + + "\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007R" + + "UNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fl" + + "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" + + "/adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -12161,7 +12161,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_Agent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_Agent_descriptor, - new java.lang.String[] { "Name", "SupportedTaskTypes", "IsSync", "SecretNames", }); + new java.lang.String[] { "Name", "SupportedTaskType", "IsSync", "SecretNames", }); internal_static_flyteidl_admin_GetAgentRequest_descriptor = getDescriptor().getMessageTypes().get(9); internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable = new diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index ed1ac1d0f8..ce99568da7 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -8365,8 +8365,8 @@ export namespace flyteidl { /** Agent name */ name?: (string|null); - /** Agent supportedTaskTypes */ - supportedTaskTypes?: (string|null); + /** Agent supportedTaskType */ + supportedTaskType?: (string|null); /** Agent isSync */ isSync?: (boolean|null); @@ -8387,8 +8387,8 @@ export namespace flyteidl { /** Agent name. */ public name: string; - /** Agent supportedTaskTypes. */ - public supportedTaskTypes: string; + /** Agent supportedTaskType. */ + public supportedTaskType: string; /** Agent isSync. */ public isSync: boolean; diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index e24f7a6204..d9226287f6 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -20417,7 +20417,7 @@ * @memberof flyteidl.admin * @interface IAgent * @property {string|null} [name] Agent name - * @property {string|null} [supportedTaskTypes] Agent supportedTaskTypes + * @property {string|null} [supportedTaskType] Agent supportedTaskType * @property {boolean|null} [isSync] Agent isSync * @property {Array.|null} [secretNames] Agent secretNames */ @@ -20447,12 +20447,12 @@ Agent.prototype.name = ""; /** - * Agent supportedTaskTypes. - * @member {string} supportedTaskTypes + * Agent supportedTaskType. + * @member {string} supportedTaskType * @memberof flyteidl.admin.Agent * @instance */ - Agent.prototype.supportedTaskTypes = ""; + Agent.prototype.supportedTaskType = ""; /** * Agent isSync. @@ -20496,8 +20496,8 @@ writer = $Writer.create(); if (message.name != null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.supportedTaskTypes != null && message.hasOwnProperty("supportedTaskTypes")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.supportedTaskTypes); + if (message.supportedTaskType != null && message.hasOwnProperty("supportedTaskType")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.supportedTaskType); if (message.isSync != null && message.hasOwnProperty("isSync")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.isSync); if (message.secretNames != null && message.secretNames.length) @@ -20528,7 +20528,7 @@ message.name = reader.string(); break; case 2: - message.supportedTaskTypes = reader.string(); + message.supportedTaskType = reader.string(); break; case 3: message.isSync = reader.bool(); @@ -20560,9 +20560,9 @@ if (message.name != null && message.hasOwnProperty("name")) if (!$util.isString(message.name)) return "name: string expected"; - if (message.supportedTaskTypes != null && message.hasOwnProperty("supportedTaskTypes")) - if (!$util.isString(message.supportedTaskTypes)) - return "supportedTaskTypes: string expected"; + if (message.supportedTaskType != null && message.hasOwnProperty("supportedTaskType")) + if (!$util.isString(message.supportedTaskType)) + return "supportedTaskType: string expected"; if (message.isSync != null && message.hasOwnProperty("isSync")) if (typeof message.isSync !== "boolean") return "isSync: boolean expected"; diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index de908b7f05..063e705cfc 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -18,7 +18,7 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x89\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x01(\tR\x12supportedTaskTypes\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\x12!\n\x0csecret_names\x18\x04 \x03(\tR\x0bsecretNames\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x87\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12.\n\x13supported_task_type\x18\x02 \x01(\tR\x11supportedTaskType\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\x12!\n\x0csecret_names\x18\x04 \x03(\tR\x0bsecretNames\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -35,8 +35,8 @@ _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' _CREATETASKREQUEST_SECRETSENTRY._options = None _CREATETASKREQUEST_SECRETSENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=2109 - _globals['_STATE']._serialized_end=2203 + _globals['_STATE']._serialized_start=2107 + _globals['_STATE']._serialized_end=2201 _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 @@ -62,13 +62,13 @@ _globals['_DELETETASKRESPONSE']._serialized_start=1753 _globals['_DELETETASKRESPONSE']._serialized_end=1773 _globals['_AGENT']._serialized_start=1776 - _globals['_AGENT']._serialized_end=1913 - _globals['_GETAGENTREQUEST']._serialized_start=1915 - _globals['_GETAGENTREQUEST']._serialized_end=1952 - _globals['_GETAGENTRESPONSE']._serialized_start=1954 - _globals['_GETAGENTRESPONSE']._serialized_end=2017 - _globals['_LISTAGENTSREQUEST']._serialized_start=2019 - _globals['_LISTAGENTSREQUEST']._serialized_end=2038 - _globals['_LISTAGENTSRESPONSE']._serialized_start=2040 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2107 + _globals['_AGENT']._serialized_end=1911 + _globals['_GETAGENTREQUEST']._serialized_start=1913 + _globals['_GETAGENTREQUEST']._serialized_end=1950 + _globals['_GETAGENTRESPONSE']._serialized_start=1952 + _globals['_GETAGENTRESPONSE']._serialized_end=2015 + _globals['_LISTAGENTSREQUEST']._serialized_start=2017 + _globals['_LISTAGENTSREQUEST']._serialized_end=2036 + _globals['_LISTAGENTSRESPONSE']._serialized_start=2038 + _globals['_LISTAGENTSRESPONSE']._serialized_end=2105 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi index 28069cd61c..b176241824 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi @@ -127,16 +127,16 @@ class DeleteTaskResponse(_message.Message): def __init__(self) -> None: ... class Agent(_message.Message): - __slots__ = ["name", "supported_task_types", "is_sync", "secret_names"] + __slots__ = ["name", "supported_task_type", "is_sync", "secret_names"] NAME_FIELD_NUMBER: _ClassVar[int] - SUPPORTED_TASK_TYPES_FIELD_NUMBER: _ClassVar[int] + SUPPORTED_TASK_TYPE_FIELD_NUMBER: _ClassVar[int] IS_SYNC_FIELD_NUMBER: _ClassVar[int] SECRET_NAMES_FIELD_NUMBER: _ClassVar[int] name: str - supported_task_types: str + supported_task_type: str is_sync: bool secret_names: _containers.RepeatedScalarFieldContainer[str] - def __init__(self, name: _Optional[str] = ..., supported_task_types: _Optional[str] = ..., is_sync: bool = ..., secret_names: _Optional[_Iterable[str]] = ...) -> None: ... + def __init__(self, name: _Optional[str] = ..., supported_task_type: _Optional[str] = ..., is_sync: bool = ..., secret_names: _Optional[_Iterable[str]] = ...) -> None: ... class GetAgentRequest(_message.Message): __slots__ = ["name"] diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index 33a518eedc..fcd8a97601 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -115,7 +115,7 @@ pub struct Agent { pub name: ::prost::alloc::string::String, /// SupportedTaskTypes are the types of the tasks that the agent can handle. #[prost(string, tag="2")] - pub supported_task_types: ::prost::alloc::string::String, + pub supported_task_type: ::prost::alloc::string::String, /// IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. #[prost(bool, tag="3")] pub is_sync: bool, diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index 68578a3483..e81c37ce39 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -102,7 +102,7 @@ message Agent { string name = 1; // SupportedTaskTypes are the types of the tasks that the agent can handle. - string supported_task_types = 2; + string supported_task_type = 2; // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. bool is_sync = 3; diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go index d5e04f7347..d51209a77c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go @@ -143,6 +143,7 @@ func validateRangeFloat64(fieldName string, min, max, provided float64) error { return nil } + func validateConfig(cfg webapi.PluginConfig) error { errs := stdErrs.ErrorCollection{} errs.Append(validateRangeInt("cache size", minCacheSize, maxCacheSize, cfg.Caching.Size)) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index d115bad896..3638925ecb 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -27,12 +27,12 @@ import ( "github.com/flyteorg/flyte/flytestdlib/promutils" ) -type GetClientFunc func(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) +type GetAsyncClientFunc func(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) type Plugin struct { metricScope promutils.Scope cfg *Config - getClient GetClientFunc + getAsyncClient GetAsyncClientFunc connectionCache map[*Agent]*grpc.ClientConn } @@ -92,7 +92,8 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR if err != nil { return nil, nil, fmt.Errorf("failed to find agent agent with error: %v", err) } - client, err := p.getClient(ctx, agent, p.connectionCache) + + client, err := p.getAsyncClient(ctx, agent, p.connectionCache) if err != nil { return nil, nil, fmt.Errorf("failed to connect to agent with error: %v", err) } @@ -126,7 +127,8 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba if err != nil { return nil, fmt.Errorf("failed to find agent with error: %v", err) } - client, err := p.getClient(ctx, agent, p.connectionCache) + + client, err := p.getAsyncClient(ctx, agent, p.connectionCache) if err != nil { return nil, fmt.Errorf("failed to connect to agent with error: %v", err) } @@ -156,7 +158,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error if err != nil { return fmt.Errorf("failed to find agent agent with error: %v", err) } - client, err := p.getClient(ctx, agent, p.connectionCache) + client, err := p.getAsyncClient(ctx, agent, p.connectionCache) if err != nil { return fmt.Errorf("failed to connect to agent with error: %v", err) } @@ -225,12 +227,11 @@ func getFinalAgent(taskType string, cfg *Config) (*Agent, error) { return &cfg.DefaultAgent, nil } -func getClientFunc(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { +func getGrpcConnection(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (*grpc.ClientConn, error) { conn, ok := connectionCache[agent] if ok { - return service.NewAsyncAgentServiceClient(conn), nil + return conn, nil } - var opts []grpc.DialOption if agent.Insecure { @@ -269,9 +270,28 @@ func getClientFunc(ctx context.Context, agent *Agent, connectionCache map[*Agent } }() }() + + return conn, nil +} + +func getAsyncClientFunc(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { + conn, err := getGrpcConnection(ctx, agent, connectionCache) + if err != nil { + return nil, err + } + return service.NewAsyncAgentServiceClient(conn), nil } +func getAgentMetadataClientFunc(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AgentMetadataServiceClient, error) { + conn, err := getGrpcConnection(ctx, agent, connectionCache) + if err != nil { + return nil, err + } + + return service.NewAgentMetadataServiceClient(conn), nil +} + func buildTaskExecutionMetadata(taskExecutionMetadata core.TaskExecutionMetadata) admin.TaskExecutionMetadata { taskExecutionID := taskExecutionMetadata.GetTaskExecutionID().GetID() return admin.TaskExecutionMetadata{ @@ -300,18 +320,51 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte return context.WithTimeout(ctx, timeout) } +func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) []string { + agent, err := getFinalAgent("", cfg) + if err != nil { + logger.Errorf(context.Background(), "failed to find agent with error: %v", err) + return []string{} + } + + client, err := getAgentMetadataClientFunc(context.Background(), agent, connectionCache) + if err != nil { + logger.Errorf(context.Background(), "failed to connect to agent with error: %v", err) + return []string{} + } + + finalCtx, cancel := getFinalContext(context.Background(), "ListAgent", agent) + defer cancel() + + res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) + if err != nil { + logger.Errorf(context.Background(), "failed to send list agent request with error: %v", err) + return []string{} + } + + agents := res.GetAgents() + supportedTaskTypes := make([]string, 0, len(agents)) + + for _, agent := range agents { + supportedTaskTypes = append(supportedTaskTypes, agent.SupportedTaskType) + } + + return supportedTaskTypes +} + func newAgentPlugin() webapi.PluginEntry { - supportedTaskTypes := GetConfig().SupportedTaskTypes + cfg := GetConfig() + connectionCache := make(map[*Agent]*grpc.ClientConn) return webapi.PluginEntry{ ID: "agent-service", - SupportedTaskTypes: supportedTaskTypes, + SupportedTaskTypes: getSupportedTaskTypes(cfg, connectionCache), PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { return &Plugin{ metricScope: iCtx.MetricsScope(), - cfg: GetConfig(), - getClient: getClientFunc, - connectionCache: make(map[*Agent]*grpc.ClientConn), + cfg: cfg, + getAsyncClient: getAsyncClientFunc, + connectionCache: connectionCache, }, nil }, } From 9eb72d6e044b1c5685af76ea0c5a4134a3618dd4 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 12:40:52 +0800 Subject: [PATCH 05/47] change os FileMode from 511 to 420 Signed-off-by: Future Outlier --- flyteidl/gen/pb-go/flyteidl/service/openapi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flyteidl/gen/pb-go/flyteidl/service/openapi.go b/flyteidl/gen/pb-go/flyteidl/service/openapi.go index 66072a5bf7..94b2afe544 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/openapi.go +++ b/flyteidl/gen/pb-go/flyteidl/service/openapi.go @@ -93,7 +93,7 @@ func adminSwaggerJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "admin.swagger.json", size: 309117, mode: os.FileMode(511), modTime: time.Unix(1562572800, 0)} + info := bindataFileInfo{name: "admin.swagger.json", size: 309117, mode: os.FileMode(420), modTime: time.Unix(1562572800, 0)} a := &asset{bytes: bytes, info: info} return a, nil } From 637e13e52e50835e9891a5a0abf70c8e14218896 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 12:53:14 +0800 Subject: [PATCH 06/47] add test Signed-off-by: Future Outlier --- .../plugins/webapi/agent/integration_test.go | 26 +++++++++---------- .../tasks/plugins/webapi/agent/plugin_test.go | 14 +++++----- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go index 0aecffdfc7..bc9ca03417 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go @@ -37,10 +37,10 @@ type MockPlugin struct { Plugin } -type MockClient struct { +type MockAsyncClient struct { } -func (m *MockClient) CreateTask(_ context.Context, createTaskRequest *admin.CreateTaskRequest, _ ...grpc.CallOption) (*admin.CreateTaskResponse, error) { +func (m *MockAsyncClient) CreateTask(_ context.Context, createTaskRequest *admin.CreateTaskRequest, _ ...grpc.CallOption) (*admin.CreateTaskResponse, error) { expectedArgs := []string{"pyflyte-fast-execute", "--output-prefix", "fake://bucket/prefix/nhv"} if slices.Equal(createTaskRequest.Template.GetContainer().Args, expectedArgs) { return nil, fmt.Errorf("args not as expected") @@ -48,7 +48,7 @@ func (m *MockClient) CreateTask(_ context.Context, createTaskRequest *admin.Crea return &admin.CreateTaskResponse{ResourceMeta: []byte{1, 2, 3, 4}}, nil } -func (m *MockClient) GetTask(_ context.Context, req *admin.GetTaskRequest, _ ...grpc.CallOption) (*admin.GetTaskResponse, error) { +func (m *MockAsyncClient) GetTask(_ context.Context, req *admin.GetTaskRequest, _ ...grpc.CallOption) (*admin.GetTaskResponse, error) { if req.GetTaskType() == "bigquery_query_job_task" { return &admin.GetTaskResponse{Resource: &admin.Resource{State: admin.State_SUCCEEDED, Outputs: &flyteIdlCore.LiteralMap{ Literals: map[string]*flyteIdlCore.Literal{ @@ -59,15 +59,15 @@ func (m *MockClient) GetTask(_ context.Context, req *admin.GetTaskRequest, _ ... return &admin.GetTaskResponse{Resource: &admin.Resource{State: admin.State_SUCCEEDED}}, nil } -func (m *MockClient) DeleteTask(_ context.Context, _ *admin.DeleteTaskRequest, _ ...grpc.CallOption) (*admin.DeleteTaskResponse, error) { +func (m *MockAsyncClient) DeleteTask(_ context.Context, _ *admin.DeleteTaskRequest, _ ...grpc.CallOption) (*admin.DeleteTaskResponse, error) { return &admin.DeleteTaskResponse{}, nil } -func mockGetClientFunc(_ context.Context, _ *Agent, _ map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { - return &MockClient{}, nil +func mockGetAsyncClientFunc(_ context.Context, _ *Agent, _ map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { + return &MockAsyncClient{}, nil } -func mockGetBadClientFunc(_ context.Context, _ *Agent, _ map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { +func mockGetAsyncBadClientFunc(_ context.Context, _ *Agent, _ map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { return nil, fmt.Errorf("error") } @@ -128,9 +128,9 @@ func TestEndToEnd(t *testing.T) { agentPlugin.PluginLoader = func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { return &MockPlugin{ Plugin{ - metricScope: iCtx.MetricsScope(), - cfg: GetConfig(), - getClient: mockGetBadClientFunc, + metricScope: iCtx.MetricsScope(), + cfg: GetConfig(), + getAsyncClient: mockGetAsyncBadClientFunc, }, }, nil } @@ -263,9 +263,9 @@ func newMockAgentPlugin() webapi.PluginEntry { PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { return &MockPlugin{ Plugin{ - metricScope: iCtx.MetricsScope(), - cfg: GetConfig(), - getClient: mockGetClientFunc, + metricScope: iCtx.MetricsScope(), + cfg: GetConfig(), + getAsyncClient: mockGetAsyncClientFunc, }, }, nil }, diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index ee3b699e9d..cdc9c1a981 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -59,28 +59,28 @@ func TestPlugin(t *testing.T) { assert.NotNil(t, err) }) - t.Run("test getClientFunc", func(t *testing.T) { - client, err := getClientFunc(context.Background(), &Agent{Endpoint: "localhost:80"}, map[*Agent]*grpc.ClientConn{}) + t.Run("test getAsyncClientFunc", func(t *testing.T) { + client, err := getAsyncClientFunc(context.Background(), &Agent{Endpoint: "localhost:80"}, map[*Agent]*grpc.ClientConn{}) assert.NoError(t, err) assert.NotNil(t, client) }) - t.Run("test getClientFunc more config", func(t *testing.T) { - client, err := getClientFunc(context.Background(), &Agent{Endpoint: "localhost:80", Insecure: true, DefaultServiceConfig: "{\"loadBalancingConfig\": [{\"round_robin\":{}}]}"}, map[*Agent]*grpc.ClientConn{}) + t.Run("test getAsyncClientFunc more config", func(t *testing.T) { + client, err := getAsyncClientFunc(context.Background(), &Agent{Endpoint: "localhost:80", Insecure: true, DefaultServiceConfig: "{\"loadBalancingConfig\": [{\"round_robin\":{}}]}"}, map[*Agent]*grpc.ClientConn{}) assert.NoError(t, err) assert.NotNil(t, client) }) - t.Run("test getClientFunc cache hit", func(t *testing.T) { + t.Run("test getAsyncClientFunc cache hit", func(t *testing.T) { connectionCache := make(map[*Agent]*grpc.ClientConn) agent := &Agent{Endpoint: "localhost:80", Insecure: true, DefaultServiceConfig: "{\"loadBalancingConfig\": [{\"round_robin\":{}}]}"} - client, err := getClientFunc(context.Background(), agent, connectionCache) + client, err := getAsyncClientFunc(context.Background(), agent, connectionCache) assert.NoError(t, err) assert.NotNil(t, client) assert.NotNil(t, client, connectionCache[agent]) - cachedClient, err := getClientFunc(context.Background(), agent, connectionCache) + cachedClient, err := getAsyncClientFunc(context.Background(), agent, connectionCache) assert.NoError(t, err) assert.NotNil(t, cachedClient) assert.Equal(t, client, cachedClient) From 02400ef03ebca22b9e7216619b21f03cd86e3568 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 13:24:26 +0800 Subject: [PATCH 07/47] add initialTaskTypes Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 3638925ecb..6910b12e29 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -343,7 +343,11 @@ func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientC } agents := res.GetAgents() - supportedTaskTypes := make([]string, 0, len(agents)) + // AsyncPlugin should be registered to at least one task type. + // Reference: https://github.com/flyteorg/flyte/blob/master/flyteplugins/go/tasks/pluginmachinery/registry.go#L27 + initialTaskTypes := []string{"task_type_1", "task_type_2"} + supportedTaskTypes := make([]string, 0, len(initialTaskTypes)+len(agents)) + supportedTaskTypes = append(supportedTaskTypes, initialTaskTypes...) for _, agent := range agents { supportedTaskTypes = append(supportedTaskTypes, agent.SupportedTaskType) From 1e8b98e9ab8631313e339e4759680e43b01cc78d Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 13:38:43 +0800 Subject: [PATCH 08/47] list all agents Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 1 + 1 file changed, 1 insertion(+) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 6910b12e29..62a699be8c 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -343,6 +343,7 @@ func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientC } agents := res.GetAgents() + logger.Infof(context.Background(), "list all agents:[%v]", agents) // AsyncPlugin should be registered to at least one task type. // Reference: https://github.com/flyteorg/flyte/blob/master/flyteplugins/go/tasks/pluginmachinery/registry.go#L27 initialTaskTypes := []string{"task_type_1", "task_type_2"} From 7d77df5f6eadb40dc77505f244a61f7d8dde4db0 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 14:07:27 +0800 Subject: [PATCH 09/47] update config supported task type Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 62a699be8c..f29c4f6595 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -360,10 +360,11 @@ func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientC func newAgentPlugin() webapi.PluginEntry { cfg := GetConfig() connectionCache := make(map[*Agent]*grpc.ClientConn) + cfg.SupportedTaskTypes = getSupportedTaskTypes(cfg, connectionCache) return webapi.PluginEntry{ ID: "agent-service", - SupportedTaskTypes: getSupportedTaskTypes(cfg, connectionCache), + SupportedTaskTypes: cfg.SupportedTaskTypes, PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { return &Plugin{ metricScope: iCtx.MetricsScope(), From 77f0903aa45d6ec7f1272e1ea47fe1656bfe2d28 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 15:06:34 +0800 Subject: [PATCH 10/47] combineToDistinctTaskTypes Signed-off-by: Future Outlier --- .../go/tasks/plugins/webapi/agent/config.go | 2 ++ .../go/tasks/plugins/webapi/agent/plugin.go | 29 ++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/config.go b/flyteplugins/go/tasks/plugins/webapi/agent/config.go index 1045a7cf80..eb8d3915d3 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/config.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/config.go @@ -44,6 +44,8 @@ var ( Insecure: true, DefaultTimeout: config.Duration{Duration: 10 * time.Second}, }, + // AsyncPlugin should be registered to at least one task type. + // Reference: https://github.com/flyteorg/flyte/blob/master/flyteplugins/go/tasks/pluginmachinery/registry.go#L27 SupportedTaskTypes: []string{"task_type_1", "task_type_2"}, } diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index f29c4f6595..268befa3af 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -320,6 +320,24 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte return context.WithTimeout(ctx, timeout) } +func combineToDistinctTaskTypes(grpcSupportedTaskTypes, configSupportedTaskTypes []string) []string { + set := make(map[string]struct{}) + + for _, task := range grpcSupportedTaskTypes { + set[task] = struct{}{} + } + for _, task := range configSupportedTaskTypes { + set[task] = struct{}{} + } + + var supportedTaskTypes []string + for task := range set { + supportedTaskTypes = append(supportedTaskTypes, task) + } + + return supportedTaskTypes +} + func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) []string { agent, err := getFinalAgent("", cfg) if err != nil { @@ -343,13 +361,9 @@ func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientC } agents := res.GetAgents() - logger.Infof(context.Background(), "list all agents:[%v]", agents) - // AsyncPlugin should be registered to at least one task type. - // Reference: https://github.com/flyteorg/flyte/blob/master/flyteplugins/go/tasks/pluginmachinery/registry.go#L27 - initialTaskTypes := []string{"task_type_1", "task_type_2"} - supportedTaskTypes := make([]string, 0, len(initialTaskTypes)+len(agents)) - supportedTaskTypes = append(supportedTaskTypes, initialTaskTypes...) + logger.Infof(context.Background(), "here are all agents:[%v]", agents) + var supportedTaskTypes []string for _, agent := range agents { supportedTaskTypes = append(supportedTaskTypes, agent.SupportedTaskType) } @@ -360,7 +374,8 @@ func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientC func newAgentPlugin() webapi.PluginEntry { cfg := GetConfig() connectionCache := make(map[*Agent]*grpc.ClientConn) - cfg.SupportedTaskTypes = getSupportedTaskTypes(cfg, connectionCache) + cfg.SupportedTaskTypes = combineToDistinctTaskTypes(getSupportedTaskTypes(cfg, connectionCache), cfg.SupportedTaskTypes) + logger.Infof(context.Background(), "Supported task types: %v", cfg.SupportedTaskTypes) return webapi.PluginEntry{ ID: "agent-service", From b14da0f5c5bdbe5e3e5cbd19d15a8ab6c6f2e044 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 22:21:49 +0800 Subject: [PATCH 11/47] support all agents supported task type Signed-off-by: Future Outlier --- .../go/tasks/plugins/webapi/agent/plugin.go | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 268befa3af..87482a0342 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -320,13 +320,13 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte return context.WithTimeout(ctx, timeout) } -func combineToDistinctTaskTypes(grpcSupportedTaskTypes, configSupportedTaskTypes []string) []string { +func combineToDistinctTaskTypes(originalTaskTypes, additionalTaskTypes []string) []string { set := make(map[string]struct{}) - for _, task := range grpcSupportedTaskTypes { + for _, task := range originalTaskTypes { set[task] = struct{}{} } - for _, task := range configSupportedTaskTypes { + for _, task := range additionalTaskTypes { set[task] = struct{}{} } @@ -338,16 +338,10 @@ func combineToDistinctTaskTypes(grpcSupportedTaskTypes, configSupportedTaskTypes return supportedTaskTypes } -func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) []string { - agent, err := getFinalAgent("", cfg) - if err != nil { - logger.Errorf(context.Background(), "failed to find agent with error: %v", err) - return []string{} - } - +func getAgentSupportedTaskTypes(agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) []string { client, err := getAgentMetadataClientFunc(context.Background(), agent, connectionCache) if err != nil { - logger.Errorf(context.Background(), "failed to connect to agent with error: %v", err) + logger.Errorf(context.Background(), "failed to connect to agent [%v] with error: [%v]", agent, err) return []string{} } @@ -356,12 +350,12 @@ func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientC res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) if err != nil { - logger.Errorf(context.Background(), "failed to send list agent request with error: %v", err) + logger.Errorf(context.Background(), "failed to send list agent request with error: [%v]", err) return []string{} } agents := res.GetAgents() - logger.Infof(context.Background(), "here are all agents:[%v]", agents) + logger.Infof(context.Background(), "here are all agents [%v] in [%v] agent server", agents, agent) var supportedTaskTypes []string for _, agent := range agents { @@ -371,11 +365,31 @@ func getSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientC return supportedTaskTypes } +func setSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) { + // Combine default agent server's task types with config's existing task types. + // Use empty string as key to return default agent server + defaultAgent, err := getFinalAgent("", cfg) + if err != nil { + logger.Errorf(context.Background(), "failed to get default agent [%v] with error: [%v]", err) + return + } + + cfg.SupportedTaskTypes = combineToDistinctTaskTypes(cfg.SupportedTaskTypes, getAgentSupportedTaskTypes(defaultAgent, connectionCache)) + + // For each agent server, update config's SupportedTaskTypes by aggregating their unique supported tasks. + // For example, 1 agent server support bigquery task only, another agent server support spark task only + // We can get both of them by combining the supported task types from 2 agent servers + for _, agent := range cfg.Agents { + cfg.SupportedTaskTypes = combineToDistinctTaskTypes(cfg.SupportedTaskTypes, getAgentSupportedTaskTypes(agent, connectionCache)) + } +} + func newAgentPlugin() webapi.PluginEntry { cfg := GetConfig() connectionCache := make(map[*Agent]*grpc.ClientConn) - cfg.SupportedTaskTypes = combineToDistinctTaskTypes(getSupportedTaskTypes(cfg, connectionCache), cfg.SupportedTaskTypes) - logger.Infof(context.Background(), "Supported task types: %v", cfg.SupportedTaskTypes) + + setSupportedTaskTypes(cfg, connectionCache) + logger.Infof(context.Background(), "supported task types: %v", cfg.SupportedTaskTypes) return webapi.PluginEntry{ ID: "agent-service", From 8756f200cb0de36eeda44a8e5678158b6f1ba84b Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 23:19:30 +0800 Subject: [PATCH 12/47] sync plugin routing mechansim Signed-off-by: Future Outlier --- flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go | 1 + flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go index d51209a77c..6cf8a1d2d6 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go @@ -36,6 +36,7 @@ type CorePlugin struct { cache cache.AutoRefresh tokenAllocator tokenAllocator metrics Metrics + IsSyncTask map[string]bool } func (c CorePlugin) unmarshalState(ctx context.Context, stateReader core.PluginStateReader) (State, error) { diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go b/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go index 37be2c1e40..753ec2756b 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go @@ -42,6 +42,9 @@ type PluginEntry struct { // support the same task type. This must be a subset of RegisteredTaskTypes and at most one default per task type // is supported. DefaultForTaskTypes []pluginsCore.TaskType + + // Synchronous plugin + IsSyncTask map[pluginsCore.TaskType]bool } // PluginSetupContext is the interface made available to the plugin loader when initializing the plugin. From 9eecd676b886eb056afe4ec3e9feec10572a5934 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 4 Dec 2023 23:38:06 +0800 Subject: [PATCH 13/47] need refactor and add test Signed-off-by: Future Outlier --- .../go/tasks/plugins/webapi/agent/plugin.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 87482a0342..d65ac38a5c 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -338,7 +338,7 @@ func combineToDistinctTaskTypes(originalTaskTypes, additionalTaskTypes []string) return supportedTaskTypes } -func getAgentSupportedTaskTypes(agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) []string { +func getAgentMetadata(agent *Agent, connectionCache map[*Agent]*grpc.ClientConn, isSyncTask map[string]bool) []string { client, err := getAgentMetadataClientFunc(context.Background(), agent, connectionCache) if err != nil { logger.Errorf(context.Background(), "failed to connect to agent [%v] with error: [%v]", agent, err) @@ -360,36 +360,38 @@ func getAgentSupportedTaskTypes(agent *Agent, connectionCache map[*Agent]*grpc.C var supportedTaskTypes []string for _, agent := range agents { supportedTaskTypes = append(supportedTaskTypes, agent.SupportedTaskType) + isSyncTask[agent.SupportedTaskType] = agent.IsSync } return supportedTaskTypes } -func setSupportedTaskTypes(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) { +func setAgentMetadata(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn, isSyncTask map[string]bool) { // Combine default agent server's task types with config's existing task types. // Use empty string as key to return default agent server defaultAgent, err := getFinalAgent("", cfg) if err != nil { logger.Errorf(context.Background(), "failed to get default agent [%v] with error: [%v]", err) - return + } else { + cfg.SupportedTaskTypes = combineToDistinctTaskTypes(cfg.SupportedTaskTypes, getAgentMetadata(defaultAgent, connectionCache, isSyncTask)) } - cfg.SupportedTaskTypes = combineToDistinctTaskTypes(cfg.SupportedTaskTypes, getAgentSupportedTaskTypes(defaultAgent, connectionCache)) - // For each agent server, update config's SupportedTaskTypes by aggregating their unique supported tasks. // For example, 1 agent server support bigquery task only, another agent server support spark task only // We can get both of them by combining the supported task types from 2 agent servers for _, agent := range cfg.Agents { - cfg.SupportedTaskTypes = combineToDistinctTaskTypes(cfg.SupportedTaskTypes, getAgentSupportedTaskTypes(agent, connectionCache)) + cfg.SupportedTaskTypes = combineToDistinctTaskTypes(cfg.SupportedTaskTypes, getAgentMetadata(agent, connectionCache, isSyncTask)) } } func newAgentPlugin() webapi.PluginEntry { cfg := GetConfig() connectionCache := make(map[*Agent]*grpc.ClientConn) + isSyncTask := make(map[string]bool) - setSupportedTaskTypes(cfg, connectionCache) + setAgentMetadata(cfg, connectionCache, isSyncTask) logger.Infof(context.Background(), "supported task types: %v", cfg.SupportedTaskTypes) + logger.Infof(context.Background(), "is sync task: %v", isSyncTask) return webapi.PluginEntry{ ID: "agent-service", @@ -402,6 +404,7 @@ func newAgentPlugin() webapi.PluginEntry { connectionCache: connectionCache, }, nil }, + IsSyncTask: isSyncTask, } } From dcff3c31cc4f048ee6eb437d92f0dc29e07b664e Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 5 Dec 2023 14:31:45 +0800 Subject: [PATCH 14/47] solve merge conflict Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index 52af65f82a..a12d21818e 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -2,7 +2,6 @@ package agent import ( "context" - flyteidlcore "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" "testing" "time" @@ -10,6 +9,7 @@ import ( "google.golang.org/grpc" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + flyteidlcore "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" webapiPlugin "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi/mocks" From 7996769276f4a123ae0d974f4eb7119c55277b6c Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 5 Dec 2023 15:00:45 +0800 Subject: [PATCH 15/47] merge conflict Signed-off-by: Future Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 36 ----- flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 57 ------- .../pb-go/flyteidl/service/agent.swagger.json | 7 - .../flyteidl/admin/AgentOuterClass.java | 143 ------------------ .../gen/pb_python/flyteidl/admin/agent_pb2.py | 25 --- flyteidl/gen/pb_rust/flyteidl.admin.rs | 4 - 6 files changed, 272 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index 4d846d0d1b..13ec60b43f 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -506,7 +506,6 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 9, 16, sizeof(::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse)}, { 18, 25, sizeof(::flyteidl::admin::TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse)}, { 27, -1, sizeof(::flyteidl::admin::TaskExecutionMetadata)}, -<<<<<<< HEAD { 38, 45, sizeof(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse)}, { 47, -1, sizeof(::flyteidl::admin::CreateTaskRequest)}, { 57, -1, sizeof(::flyteidl::admin::CreateTaskResponse)}, @@ -520,15 +519,6 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 112, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, { 118, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, { 123, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, -======= - { 38, -1, sizeof(::flyteidl::admin::CreateTaskRequest)}, - { 47, -1, sizeof(::flyteidl::admin::CreateTaskResponse)}, - { 53, -1, sizeof(::flyteidl::admin::GetTaskRequest)}, - { 60, -1, sizeof(::flyteidl::admin::GetTaskResponse)}, - { 67, -1, sizeof(::flyteidl::admin::Resource)}, - { 75, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, - { 82, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -576,16 +566,11 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" -<<<<<<< HEAD "\005value\030\002 \001(\t:\0028\001\"\275\002\n\021CreateTaskRequest\022)" -======= - "\005value\030\002 \001(\t:\0028\001\"\314\001\n\021CreateTaskRequest\022)" ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" "execution_metadata\030\004 \001(\0132%.flyteidl.admi" -<<<<<<< HEAD "n.TaskExecutionMetadata\022\?\n\007secrets\030\005 \003(\013" "2..flyteidl.admin.CreateTaskRequest.Secr" "etsEntry\032.\n\014SecretsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" @@ -611,32 +596,11 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "UNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fl" "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" "/adminb\006proto3" -======= - "n.TaskExecutionMetadata\"+\n\022CreateTaskRes" - "ponse\022\025\n\rresource_meta\030\001 \001(\014\":\n\016GetTaskR" - "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" - "ta\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030" - "\001 \001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_l" - "inks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"m\n\010Re" - "source\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.S" - "tate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Li" - "teralMap\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskR" - "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" - "ta\030\002 \001(\014\"\024\n\022DeleteTaskResponse*^\n\005State\022" - "\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAIL" - "URE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCE" - "EDED\020\004B=Z;github.com/flyteorg/flyte/flyt" - "eidl/gen/pb-go/flyteidl/adminb\006proto3" ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, -<<<<<<< HEAD "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1894, -======= - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1517, ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index a62e226075..0b4f0e00fa 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -317,11 +317,7 @@ func (m *GetTaskRequest) GetResourceMeta() []byte { // Response to get an individual task resource. type GetTaskResponse struct { Resource *Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` -<<<<<<< HEAD // log information for the task execution -======= - // log information for the task execution. ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 LogLinks []*core.TaskLog `protobuf:"bytes,2,rep,name=log_links,json=logLinks,proto3" json:"log_links,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -754,7 +750,6 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ -<<<<<<< HEAD // 937 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x7f, 0x6f, 0xdb, 0x54, 0x14, 0x25, 0x4d, 0x93, 0x26, 0x37, 0xd9, 0x96, 0xbc, 0x35, 0xcc, 0xcd, 0x06, 0x2a, 0x46, 0x43, @@ -815,56 +810,4 @@ var fileDescriptor_c434e52bb0028071 = []byte{ 0x51, 0xad, 0x84, 0xf1, 0x44, 0x5f, 0x74, 0xf2, 0x1f, 0x82, 0x09, 0x06, 0x9d, 0x68, 0xf4, 0x7c, 0x12, 0x76, 0x56, 0xff, 0x63, 0x46, 0x65, 0xf5, 0x6f, 0x70, 0xf4, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0xf5, 0x06, 0x75, 0xe0, 0x08, 0x00, 0x00, -======= - // 773 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x7f, 0x6f, 0xe3, 0x44, - 0x10, 0x25, 0x49, 0xd3, 0x26, 0x93, 0x5e, 0x2f, 0x59, 0x1a, 0x70, 0x73, 0x07, 0xaa, 0x82, 0x40, - 0x15, 0x08, 0x47, 0xd7, 0x22, 0xe8, 0x81, 0x00, 0xe5, 0x5a, 0x53, 0x45, 0x4a, 0xa3, 0x6a, 0x9b, - 0x20, 0x40, 0x02, 0x6b, 0xe3, 0x4c, 0x8c, 0x15, 0x67, 0xd7, 0x78, 0xd7, 0xd1, 0x45, 0xe2, 0x3f, - 0x24, 0x3e, 0x03, 0x1f, 0x17, 0x79, 0xfd, 0xa3, 0x49, 0x64, 0x50, 0x4f, 0xf7, 0x9f, 0x77, 0xde, - 0x9b, 0x37, 0x6f, 0x67, 0xc6, 0x5a, 0xe8, 0xcc, 0xfd, 0xb5, 0x42, 0x6f, 0xe6, 0xf7, 0xd8, 0x6c, - 0xe9, 0xf1, 0x1e, 0x73, 0x91, 0x2b, 0x33, 0x08, 0x85, 0x12, 0xe4, 0x28, 0xc3, 0x4c, 0x8d, 0x75, - 0x9e, 0xe7, 0x5c, 0x47, 0x84, 0xd8, 0xf3, 0x3d, 0x85, 0x21, 0xf3, 0x65, 0xc2, 0xee, 0x9c, 0x6c, - 0xa3, 0x8a, 0xc9, 0x45, 0x06, 0x7d, 0xb0, 0x0d, 0x79, 0x5c, 0x61, 0x38, 0x67, 0x0e, 0xa6, 0xf0, - 0x87, 0x3b, 0xf0, 0x0c, 0xb9, 0xf2, 0xe6, 0x1e, 0x86, 0xc5, 0xe9, 0xf8, 0x1a, 0x9d, 0x48, 0x79, - 0x82, 0x27, 0x70, 0xf7, 0x9f, 0x2a, 0xb4, 0xc7, 0x4c, 0x2e, 0xac, 0x2c, 0x7e, 0x8b, 0x8a, 0xcd, - 0x98, 0x62, 0x84, 0x42, 0x2b, 0xb6, 0x61, 0xe7, 0x19, 0xb6, 0x37, 0x33, 0x4a, 0xa7, 0xa5, 0xb3, - 0xc6, 0xf9, 0x27, 0x66, 0x7e, 0xb9, 0x58, 0xd4, 0xdc, 0x12, 0x18, 0xe4, 0x0e, 0xe8, 0x53, 0xb5, - 0x0d, 0x90, 0xe7, 0x50, 0xe7, 0x6c, 0x89, 0x32, 0x60, 0x0e, 0x1a, 0xe5, 0xd3, 0xd2, 0x59, 0x9d, - 0x3e, 0x04, 0xc8, 0x00, 0xf6, 0x7d, 0x36, 0x45, 0x5f, 0x1a, 0x95, 0xd3, 0xca, 0x59, 0xe3, 0xfc, - 0x85, 0xb9, 0xdd, 0x43, 0xb3, 0xd0, 0xa8, 0x39, 0xd4, 0x39, 0x16, 0x57, 0xe1, 0x9a, 0xa6, 0x02, - 0xe4, 0x27, 0x68, 0x30, 0xce, 0x85, 0x62, 0x31, 0x53, 0x1a, 0x7b, 0x5a, 0xef, 0xcb, 0xc7, 0xe9, - 0xf5, 0x1f, 0x12, 0x13, 0xd1, 0x4d, 0x29, 0x62, 0xc2, 0xbb, 0x8b, 0x4b, 0x69, 0x4b, 0x0c, 0x57, - 0x9e, 0x83, 0x36, 0x73, 0x1c, 0x11, 0x71, 0x65, 0x54, 0xf5, 0x65, 0x5a, 0x8b, 0x4b, 0x79, 0x9f, - 0x20, 0xfd, 0x04, 0x20, 0x0a, 0xda, 0xc8, 0x57, 0x5e, 0x28, 0xf8, 0x12, 0xb9, 0xb2, 0x57, 0x2c, - 0xf4, 0xd8, 0xd4, 0x47, 0x69, 0xec, 0x6b, 0x4f, 0xdf, 0x3f, 0xce, 0x93, 0xf5, 0x20, 0xf1, 0x63, - 0xa6, 0x90, 0x98, 0x3b, 0xc6, 0x02, 0xa8, 0xf3, 0x12, 0x1a, 0x1b, 0x6d, 0x21, 0x4d, 0xa8, 0x2c, - 0x70, 0xad, 0xa7, 0x57, 0xa7, 0xf1, 0x27, 0x39, 0x86, 0xea, 0x8a, 0xf9, 0x51, 0x36, 0x85, 0xe4, - 0xf0, 0x75, 0xf9, 0xb2, 0xd4, 0xf9, 0x0e, 0x9a, 0xbb, 0x1d, 0x78, 0xa3, 0xfc, 0x1b, 0x38, 0xf9, - 0x4f, 0xb7, 0x6f, 0x22, 0xd4, 0xfd, 0xab, 0x0c, 0xad, 0xab, 0x10, 0x99, 0xc2, 0xb8, 0x27, 0x14, - 0xff, 0x88, 0x50, 0x2a, 0xf2, 0x02, 0xf6, 0x3d, 0x1e, 0x44, 0x4a, 0xa6, 0xbb, 0x78, 0xb2, 0xb3, - 0x8b, 0xc3, 0xe4, 0xc7, 0xba, 0x65, 0x01, 0x4d, 0x89, 0xe4, 0x2b, 0xa8, 0x29, 0x5c, 0x06, 0x3e, - 0x53, 0x49, 0x95, 0xc6, 0xf9, 0xb3, 0x82, 0x05, 0x1e, 0xa7, 0x14, 0x9a, 0x93, 0xc9, 0x47, 0xf0, - 0x44, 0x44, 0x2a, 0x88, 0x94, 0x1d, 0x84, 0x38, 0xf7, 0x5e, 0x1b, 0x15, 0xed, 0xf1, 0x30, 0x09, - 0xde, 0xe9, 0x18, 0xf9, 0x15, 0xde, 0xdf, 0xf9, 0x4f, 0x96, 0xe9, 0xd4, 0x8c, 0x3d, 0x5d, 0xec, - 0xe3, 0x47, 0x8d, 0x98, 0xb6, 0x55, 0x51, 0xb8, 0xfb, 0x12, 0xc8, 0x66, 0x13, 0x64, 0x20, 0xb8, - 0xd4, 0xce, 0x42, 0x94, 0x22, 0x0a, 0x1d, 0xd4, 0xe5, 0x74, 0x33, 0x0e, 0xe9, 0x61, 0x16, 0x8c, - 0xd3, 0xbb, 0x14, 0x8e, 0x6e, 0x50, 0x6d, 0x36, 0xef, 0x19, 0xd4, 0xb5, 0x57, 0xb5, 0x0e, 0x30, - 0x1d, 0x42, 0x2d, 0x0e, 0x8c, 0xd7, 0x41, 0x81, 0x66, 0xb9, 0x40, 0xf3, 0x4f, 0x78, 0x9a, 0x6b, - 0xa6, 0x5e, 0xbe, 0x80, 0x5a, 0x46, 0x49, 0x67, 0x62, 0xec, 0xde, 0x98, 0xa6, 0x38, 0xcd, 0x99, - 0xe4, 0x02, 0xea, 0xbe, 0x70, 0x6d, 0xdf, 0xe3, 0x0b, 0x69, 0x94, 0xf5, 0xbf, 0xf0, 0x5e, 0xc1, - 0x54, 0x86, 0xc2, 0xa5, 0x35, 0x5f, 0xb8, 0xc3, 0x98, 0xd7, 0xfd, 0xbb, 0x04, 0xb5, 0x4c, 0x8b, - 0x7c, 0x06, 0x55, 0xa9, 0xe2, 0x99, 0xc6, 0x45, 0x8f, 0xce, 0xdb, 0xbb, 0x45, 0xef, 0x63, 0x90, - 0x26, 0x1c, 0x72, 0x01, 0x07, 0xc9, 0xd4, 0x64, 0xba, 0x02, 0xff, 0xb3, 0x37, 0x19, 0x93, 0x18, - 0x70, 0xb0, 0x44, 0x29, 0x99, 0x8b, 0xe9, 0xe4, 0xb3, 0x63, 0x77, 0x02, 0xad, 0x6b, 0xf4, 0x71, - 0x7b, 0x35, 0xdf, 0xbe, 0xbb, 0xc7, 0x40, 0x36, 0x65, 0x93, 0x06, 0x7f, 0xfa, 0x1b, 0x54, 0xf5, - 0x5d, 0x48, 0x1b, 0x5a, 0xd4, 0x1a, 0xd3, 0x9f, 0xfb, 0xaf, 0x86, 0x96, 0xfd, 0x43, 0x7f, 0x30, - 0x9c, 0x50, 0xab, 0xf9, 0x4e, 0x1c, 0xbe, 0xb3, 0xe8, 0x6d, 0x7f, 0x64, 0x8d, 0xc6, 0x79, 0xb8, - 0x44, 0x1a, 0x70, 0x70, 0x67, 0x8d, 0xae, 0x07, 0xa3, 0x9b, 0x66, 0x39, 0x3e, 0xd0, 0xc9, 0x68, - 0x14, 0x1f, 0x2a, 0xe4, 0x09, 0xd4, 0xef, 0x27, 0x57, 0x57, 0x96, 0x75, 0x6d, 0x5d, 0x37, 0xf7, - 0x5e, 0x7d, 0xfb, 0xcb, 0x37, 0xae, 0xa7, 0x7e, 0x8f, 0xa6, 0xa6, 0x23, 0x96, 0x3d, 0xdd, 0x16, - 0x11, 0xba, 0xc9, 0x47, 0x2f, 0x7f, 0x3e, 0x5c, 0xe4, 0xbd, 0x60, 0xfa, 0xb9, 0x2b, 0x7a, 0xdb, - 0xaf, 0xde, 0x74, 0x5f, 0xbf, 0x24, 0x17, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x8d, 0xa5, - 0xb7, 0x0e, 0x07, 0x00, 0x00, ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 } diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index 63af42c1d4..48531d958f 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -216,7 +216,6 @@ ], "default": "UNKNOWN" }, -<<<<<<< HEAD "adminAgent": { "type": "object", "properties": { @@ -243,8 +242,6 @@ }, "description": "A message containing the agent metadata." }, -======= ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 "adminCreateTaskResponse": { "type": "object", "properties": { @@ -280,11 +277,7 @@ "items": { "$ref": "#/definitions/coreTaskLog" }, -<<<<<<< HEAD "title": "log information for the task execution" -======= - "description": "log information for the task execution." ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 } }, "description": "Response to get an individual task resource." diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index 50bb69f3d7..b377df34c6 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -5218,19 +5218,11 @@ public interface GetTaskResponseOrBuilder extends /** * .flyteidl.admin.Resource resource = 1; */ -<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java flyteidl.admin.AgentOuterClass.ResourceOrBuilder getResourceOrBuilder(); /** *
      * log information for the task execution
-=======
-    flyteidl.admin.Agent.ResourceOrBuilder getResourceOrBuilder();
-
-    /**
-     * 
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5239,11 +5231,7 @@ public interface GetTaskResponseOrBuilder extends getLogLinksList(); /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5251,11 +5239,7 @@ public interface GetTaskResponseOrBuilder extends flyteidl.core.Execution.TaskLog getLogLinks(int index); /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5263,11 +5247,7 @@ public interface GetTaskResponseOrBuilder extends int getLogLinksCount(); /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5276,11 +5256,7 @@ public interface GetTaskResponseOrBuilder extends getLogLinksOrBuilderList(); /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5415,11 +5391,7 @@ public flyteidl.admin.AgentOuterClass.ResourceOrBuilder getResourceOrBuilder() { private java.util.List logLinks_; /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5429,11 +5401,7 @@ public java.util.List getLogLinksList() { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5444,11 +5412,7 @@ public java.util.List getLogLinksList() { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5458,11 +5422,7 @@ public int getLogLinksCount() { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5472,11 +5432,7 @@ public flyteidl.core.Execution.TaskLog getLogLinks(int index) { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
      * log information for the task execution
-=======
-     * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
      * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -5738,13 +5694,8 @@ public flyteidl.admin.AgentOuterClass.GetTaskResponse build() { } @java.lang.Override -<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java public flyteidl.admin.AgentOuterClass.GetTaskResponse buildPartial() { flyteidl.admin.AgentOuterClass.GetTaskResponse result = new flyteidl.admin.AgentOuterClass.GetTaskResponse(this); -======= - public flyteidl.admin.Agent.GetTaskResponse buildPartial() { - flyteidl.admin.Agent.GetTaskResponse result = new flyteidl.admin.Agent.GetTaskResponse(this); ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (resourceBuilder_ == null) { @@ -6000,11 +5951,7 @@ private void ensureLogLinksIsMutable() { /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6018,11 +5965,7 @@ public java.util.List getLogLinksList() { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6036,11 +5979,7 @@ public int getLogLinksCount() { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6054,11 +5993,7 @@ public flyteidl.core.Execution.TaskLog getLogLinks(int index) { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6079,11 +6014,7 @@ public Builder setLogLinks( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6101,11 +6032,7 @@ public Builder setLogLinks( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6125,11 +6052,7 @@ public Builder addLogLinks(flyteidl.core.Execution.TaskLog value) { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6150,11 +6073,7 @@ public Builder addLogLinks( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6172,11 +6091,7 @@ public Builder addLogLinks( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6194,11 +6109,7 @@ public Builder addLogLinks( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6217,11 +6128,7 @@ public Builder addAllLogLinks( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6238,11 +6145,7 @@ public Builder clearLogLinks() { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6259,11 +6162,7 @@ public Builder removeLogLinks(int index) { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6274,11 +6173,7 @@ public flyteidl.core.Execution.TaskLog.Builder getLogLinksBuilder( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6292,11 +6187,7 @@ public flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6311,11 +6202,7 @@ public flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6326,11 +6213,7 @@ public flyteidl.core.Execution.TaskLog.Builder addLogLinksBuilder() { } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -6342,11 +6225,7 @@ public flyteidl.core.Execution.TaskLog.Builder addLogLinksBuilder( } /** *
-<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
        * log information for the task execution
-=======
-       * log information for the task execution.
->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java
        * 
* * repeated .flyteidl.core.TaskLog log_links = 2; @@ -12157,16 +12036,11 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" + "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + -<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java "\005value\030\002 \001(\t:\0028\001\"\275\002\n\021CreateTaskRequest\022)" + -======= - "\005value\030\002 \001(\t:\0028\001\"\314\001\n\021CreateTaskRequest\022)" + ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" + "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" + "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" + "execution_metadata\030\004 \001(\0132%.flyteidl.admi" + -<<<<<<< HEAD:flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java "n.TaskExecutionMetadata\022?\n\007secrets\030\005 \003(\013" + "2..flyteidl.admin.CreateTaskRequest.Secr" + "etsEntry\032.\n\014SecretsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + @@ -12192,23 +12066,6 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy "UNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fl" + "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" + "/adminb\006proto3" -======= - "n.TaskExecutionMetadata\"+\n\022CreateTaskRes" + - "ponse\022\025\n\rresource_meta\030\001 \001(\014\":\n\016GetTaskR" + - "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" + - "ta\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030" + - "\001 \001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_l" + - "inks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"m\n\010Re" + - "source\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.S" + - "tate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Li" + - "teralMap\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskR" + - "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" + - "ta\030\002 \001(\014\"\024\n\022DeleteTaskResponse*^\n\005State\022" + - "\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAIL" + - "URE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCE" + - "EDED\020\004B=Z;github.com/flyteorg/flyte/flyt" + - "eidl/gen/pb-go/flyteidl/adminb\006proto3" ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640:flyteidl/gen/pb-java/flyteidl/admin/Agent.java }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index 3146f9df30..063e705cfc 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -18,11 +18,7 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -<<<<<<< HEAD DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x87\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12.\n\x13supported_task_type\x18\x02 \x01(\tR\x11supportedTaskType\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\x12!\n\x0csecret_names\x18\x04 \x03(\tR\x0bsecretNames\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') -======= -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,15 +33,10 @@ _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001' _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' -<<<<<<< HEAD _CREATETASKREQUEST_SECRETSENTRY._options = None _CREATETASKREQUEST_SECRETSENTRY._serialized_options = b'8\001' _globals['_STATE']._serialized_start=2107 _globals['_STATE']._serialized_end=2201 -======= - _globals['_STATE']._serialized_start=1641 - _globals['_STATE']._serialized_end=1735 ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 @@ -55,7 +46,6 @@ _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_start=791 _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_end=862 _globals['_CREATETASKREQUEST']._serialized_start=865 -<<<<<<< HEAD _globals['_CREATETASKREQUEST']._serialized_end=1258 _globals['_CREATETASKREQUEST_SECRETSENTRY']._serialized_start=1200 _globals['_CREATETASKREQUEST_SECRETSENTRY']._serialized_end=1258 @@ -81,19 +71,4 @@ _globals['_LISTAGENTSREQUEST']._serialized_end=2036 _globals['_LISTAGENTSRESPONSE']._serialized_start=2038 _globals['_LISTAGENTSRESPONSE']._serialized_end=2105 -======= - _globals['_CREATETASKREQUEST']._serialized_end=1124 - _globals['_CREATETASKRESPONSE']._serialized_start=1126 - _globals['_CREATETASKRESPONSE']._serialized_end=1183 - _globals['_GETTASKREQUEST']._serialized_start=1185 - _globals['_GETTASKREQUEST']._serialized_end=1267 - _globals['_GETTASKRESPONSE']._serialized_start=1269 - _globals['_GETTASKRESPONSE']._serialized_end=1393 - _globals['_RESOURCE']._serialized_start=1396 - _globals['_RESOURCE']._serialized_end=1530 - _globals['_DELETETASKREQUEST']._serialized_start=1532 - _globals['_DELETETASKREQUEST']._serialized_end=1617 - _globals['_DELETETASKRESPONSE']._serialized_start=1619 - _globals['_DELETETASKRESPONSE']._serialized_end=1639 ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index d03ce551ab..fcd8a97601 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -71,11 +71,7 @@ pub struct GetTaskRequest { pub struct GetTaskResponse { #[prost(message, optional, tag="1")] pub resource: ::core::option::Option, -<<<<<<< HEAD /// log information for the task execution -======= - /// log information for the task execution. ->>>>>>> 475e9d07644c612150f09598cf1b5eef1f1fa640 #[prost(message, repeated, tag="2")] pub log_links: ::prost::alloc::vec::Vec, } From 8f28ffd6f202dc8ec6fae07aa87c95699174a724 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Wed, 6 Dec 2023 16:36:51 +0800 Subject: [PATCH 16/47] Update flyteplugins/go/tasks/plugins/webapi/agent/plugin.go Co-authored-by: Kevin Su Signed-off-by: Future-Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index b3c99fc2d4..605d72a376 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -391,7 +391,7 @@ func newAgentPlugin() webapi.PluginEntry { connectionCache := make(map[*Agent]*grpc.ClientConn) isSyncTask := make(map[string]bool) - setAgentMetadata(cfg, connectionCache, isSyncTask) + agentMetadata := setAgentMetadata(cfg, connectionCache, isSyncTask) logger.Infof(context.Background(), "supported task types: %v", cfg.SupportedTaskTypes) logger.Infof(context.Background(), "is sync task: %v", isSyncTask) From ef0210737ee685cbba05751482a0f382f1681d14 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 10 Dec 2023 16:50:19 +0800 Subject: [PATCH 17/47] refactor Signed-off-by: Future Outlier --- .../go/tasks/pluginmachinery/webapi/plugin.go | 2 +- .../go/tasks/plugins/webapi/agent/plugin.go | 63 ++++++++----------- rsts/_tags/AWS.rst | 10 +++ rsts/_tags/Advanced.rst | 29 +++++++++ rsts/_tags/Agent.rst | 8 +++ rsts/_tags/Authentication.rst | 10 +++ rsts/_tags/Basic.rst | 27 ++++++++ rsts/_tags/Configuration.rst | 8 +++ rsts/_tags/Contribute.rst | 9 +++ rsts/_tags/Data.rst | 11 ++++ rsts/_tags/Design.rst | 19 ++++++ rsts/_tags/GCP.rst | 10 +++ rsts/_tags/Glossary.rst | 20 ++++++ rsts/_tags/Infrastructure.rst | 20 ++++++ rsts/_tags/Integration.rst | 12 ++++ rsts/_tags/Intermediate.rst | 9 +++ rsts/_tags/Kubernetes.rst | 14 +++++ rsts/_tags/MachineLearning.rst | 8 +++ rsts/_tags/Spark.rst | 8 +++ rsts/_tags/Troubleshoot.rst | 8 +++ rsts/_tags/UI.rst | 8 +++ rsts/_tags/WebAPI.rst | 8 +++ rsts/_tags/tagsindex.rst | 31 +++++++++ 23 files changed, 315 insertions(+), 37 deletions(-) create mode 100644 rsts/_tags/AWS.rst create mode 100644 rsts/_tags/Advanced.rst create mode 100644 rsts/_tags/Agent.rst create mode 100644 rsts/_tags/Authentication.rst create mode 100644 rsts/_tags/Basic.rst create mode 100644 rsts/_tags/Configuration.rst create mode 100644 rsts/_tags/Contribute.rst create mode 100644 rsts/_tags/Data.rst create mode 100644 rsts/_tags/Design.rst create mode 100644 rsts/_tags/GCP.rst create mode 100644 rsts/_tags/Glossary.rst create mode 100644 rsts/_tags/Infrastructure.rst create mode 100644 rsts/_tags/Integration.rst create mode 100644 rsts/_tags/Intermediate.rst create mode 100644 rsts/_tags/Kubernetes.rst create mode 100644 rsts/_tags/MachineLearning.rst create mode 100644 rsts/_tags/Spark.rst create mode 100644 rsts/_tags/Troubleshoot.rst create mode 100644 rsts/_tags/UI.rst create mode 100644 rsts/_tags/WebAPI.rst create mode 100644 rsts/_tags/tagsindex.rst diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go b/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go index 753ec2756b..12f3c30b33 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go @@ -43,7 +43,7 @@ type PluginEntry struct { // is supported. DefaultForTaskTypes []pluginsCore.TaskType - // Synchronous plugin + // A map of task types to boolean indicating if the plugin should be used synchronously for that task type. IsSyncTask map[pluginsCore.TaskType]bool } diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 605d72a376..cb203d4b30 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -319,32 +319,15 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte if timeout == 0 { return ctx, func() {} } - return context.WithTimeout(ctx, timeout) -} - -func combineToDistinctTaskTypes(originalTaskTypes, additionalTaskTypes []string) []string { - set := make(map[string]struct{}) - - for _, task := range originalTaskTypes { - set[task] = struct{}{} - } - for _, task := range additionalTaskTypes { - set[task] = struct{}{} - } - - var supportedTaskTypes []string - for task := range set { - supportedTaskTypes = append(supportedTaskTypes, task) - } - return supportedTaskTypes + return context.WithTimeout(ctx, timeout) } -func getAgentMetadata(agent *Agent, connectionCache map[*Agent]*grpc.ClientConn, isSyncTask map[string]bool) []string { +func updateAgentTaskTypes(agent *Agent, connectionCache map[*Agent]*grpc.ClientConn, isSyncTask map[string]bool) { client, err := getAgentMetadataClientFunc(context.Background(), agent, connectionCache) if err != nil { logger.Errorf(context.Background(), "failed to connect to agent [%v] with error: [%v]", agent, err) - return []string{} + return } finalCtx, cancel := getFinalContext(context.Background(), "ListAgent", agent) @@ -353,51 +336,59 @@ func getAgentMetadata(agent *Agent, connectionCache map[*Agent]*grpc.ClientConn, res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) if err != nil { logger.Errorf(context.Background(), "failed to send list agent request with error: [%v]", err) - return []string{} + return } agents := res.GetAgents() logger.Infof(context.Background(), "here are all agents [%v] in [%v] agent server", agents, agent) - var supportedTaskTypes []string for _, agent := range agents { - supportedTaskTypes = append(supportedTaskTypes, agent.SupportedTaskType) isSyncTask[agent.SupportedTaskType] = agent.IsSync } - - return supportedTaskTypes } -func setAgentMetadata(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn, isSyncTask map[string]bool) { - // Combine default agent server's task types with config's existing task types. +func getAgentMetadata(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) ([]string, map[string]bool) { + // Assign supported task types from the config to prevent a panic when no task type is supported. + // https://github.com/flyteorg/flyte/blob/master/flyteplugins/go/tasks/pluginmachinery/registry.go#L27 + supportedTaskTypes := cfg.SupportedTaskTypes + isSyncTask := make(map[string]bool) + + // Combine the default agent server's task types with the config's existing task types. // Use empty string as key to return default agent server defaultAgent, err := getFinalAgent("", cfg) if err != nil { logger.Errorf(context.Background(), "failed to get default agent [%v] with error: [%v]", err) } else { - cfg.SupportedTaskTypes = combineToDistinctTaskTypes(cfg.SupportedTaskTypes, getAgentMetadata(defaultAgent, connectionCache, isSyncTask)) + updateAgentTaskTypes(defaultAgent, connectionCache, isSyncTask) } - // For each agent server, update config's SupportedTaskTypes by aggregating their unique supported tasks. - // For example, 1 agent server support bigquery task only, another agent server support spark task only - // We can get both of them by combining the supported task types from 2 agent servers + // For each agent server, use a map to store its supported task types and whether it is a sync task. + // This combines unique task types across all agents. + // We need to iterate all agent servers to get all supported task types. + // For example, one agent server supports only bigquery tasks, while another supports only spark tasks. + // We can get both by combining the supported task types from two agent servers. for _, agent := range cfg.Agents { - cfg.SupportedTaskTypes = combineToDistinctTaskTypes(cfg.SupportedTaskTypes, getAgentMetadata(agent, connectionCache, isSyncTask)) + updateAgentTaskTypes(agent, connectionCache, isSyncTask) } + + for task := range isSyncTask { + supportedTaskTypes = append(supportedTaskTypes, task) + } + + return supportedTaskTypes, isSyncTask } func newAgentPlugin() webapi.PluginEntry { cfg := GetConfig() connectionCache := make(map[*Agent]*grpc.ClientConn) - isSyncTask := make(map[string]bool) - agentMetadata := setAgentMetadata(cfg, connectionCache, isSyncTask) - logger.Infof(context.Background(), "supported task types: %v", cfg.SupportedTaskTypes) + supportedTaskTypes, isSyncTask := getAgentMetadata(cfg, connectionCache) + logger.Infof(context.Background(), "supported task types: %v", supportedTaskTypes) logger.Infof(context.Background(), "is sync task: %v", isSyncTask) return webapi.PluginEntry{ ID: "agent-service", - SupportedTaskTypes: cfg.SupportedTaskTypes, + SupportedTaskTypes: supportedTaskTypes, PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { return &Plugin{ metricScope: iCtx.MetricsScope(), diff --git a/rsts/_tags/AWS.rst b/rsts/_tags/AWS.rst new file mode 100644 index 0000000000..0024984212 --- /dev/null +++ b/rsts/_tags/AWS.rst @@ -0,0 +1,10 @@ +Tag: AWS +######## + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/configuration/cloud_event.rst + ../deployment/plugins/aws/index.rst + ../deployment/plugins/k8s/index.rst diff --git a/rsts/_tags/Advanced.rst b/rsts/_tags/Advanced.rst new file mode 100644 index 0000000000..34bf5a6849 --- /dev/null +++ b/rsts/_tags/Advanced.rst @@ -0,0 +1,29 @@ +Tag: Advanced +############# + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../concepts/admin.rst + ../concepts/architecture.rst + ../concepts/catalog.rst + ../concepts/component_architecture/flytepropeller_architecture.rst + ../concepts/component_architecture/native_scheduler_architecture.rst + ../deployment/agents/index.rst + ../deployment/configuration/auth_appendix.rst + ../deployment/configuration/auth_migration.rst + ../deployment/configuration/auth_setup.rst + ../deployment/configuration/cloud_event.rst + ../deployment/configuration/customizable_resources.rst + ../deployment/configuration/eventing.rst + ../deployment/configuration/monitoring.rst + ../deployment/configuration/notifications.rst + ../deployment/configuration/performance.rst + ../deployment/deployment/cloud_production.rst + ../deployment/deployment/multicluster.rst + ../deployment/plugins/aws/index.rst + ../deployment/plugins/gcp/index.rst + ../deployment/plugins/k8s/index.rst + ../deployment/plugins/webapi/index.rst + ../deployment/security/index.rst diff --git a/rsts/_tags/Agent.rst b/rsts/_tags/Agent.rst new file mode 100644 index 0000000000..f8f91486ff --- /dev/null +++ b/rsts/_tags/Agent.rst @@ -0,0 +1,8 @@ +Tag: Agent +########## + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/agents/index.rst diff --git a/rsts/_tags/Authentication.rst b/rsts/_tags/Authentication.rst new file mode 100644 index 0000000000..22ed3f3602 --- /dev/null +++ b/rsts/_tags/Authentication.rst @@ -0,0 +1,10 @@ +Tag: Authentication +################### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/configuration/auth_appendix.rst + ../deployment/configuration/auth_migration.rst + ../deployment/configuration/auth_setup.rst diff --git a/rsts/_tags/Basic.rst b/rsts/_tags/Basic.rst new file mode 100644 index 0000000000..5b70159f1d --- /dev/null +++ b/rsts/_tags/Basic.rst @@ -0,0 +1,27 @@ +Tag: Basic +########## + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../community/contribute.rst + ../community/troubleshoot.rst + ../concepts/data_management.rst + ../concepts/domains.rst + ../concepts/dynamic_spec.rst + ../concepts/executions.rst + ../concepts/flyte_console.rst + ../concepts/launchplans.rst + ../concepts/nodes.rst + ../concepts/projects.rst + ../concepts/registration.rst + ../concepts/schedules.rst + ../concepts/state_machine.rst + ../concepts/tasks.rst + ../concepts/versioning.rst + ../concepts/workflow_lifecycle.rst + ../concepts/workflows.rst + ../deployment/deployment/cloud_simple.rst + ../deployment/deployment/sandbox.rst + ../reference/swagger.rst diff --git a/rsts/_tags/Configuration.rst b/rsts/_tags/Configuration.rst new file mode 100644 index 0000000000..f6f6b7f888 --- /dev/null +++ b/rsts/_tags/Configuration.rst @@ -0,0 +1,8 @@ +Tag: Configuration +################## + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/configuration/eventing.rst diff --git a/rsts/_tags/Contribute.rst b/rsts/_tags/Contribute.rst new file mode 100644 index 0000000000..7d3c363d33 --- /dev/null +++ b/rsts/_tags/Contribute.rst @@ -0,0 +1,9 @@ +Tag: Contribute +############### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../community/contribute.rst + ../concepts/console.rst diff --git a/rsts/_tags/Data.rst b/rsts/_tags/Data.rst new file mode 100644 index 0000000000..1cb762fd55 --- /dev/null +++ b/rsts/_tags/Data.rst @@ -0,0 +1,11 @@ +Tag: Data +######### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/agents/index.rst + ../deployment/plugins/aws/index.rst + ../deployment/plugins/gcp/index.rst + ../deployment/plugins/webapi/index.rst diff --git a/rsts/_tags/Design.rst b/rsts/_tags/Design.rst new file mode 100644 index 0000000000..39dedc4155 --- /dev/null +++ b/rsts/_tags/Design.rst @@ -0,0 +1,19 @@ +Tag: Design +########### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../concepts/admin.rst + ../concepts/architecture.rst + ../concepts/catalog.rst + ../concepts/component_architecture/flytepropeller_architecture.rst + ../concepts/component_architecture/native_scheduler_architecture.rst + ../concepts/data_management.rst + ../concepts/dynamic_spec.rst + ../concepts/launchplans.rst + ../concepts/registration.rst + ../concepts/state_machine.rst + ../concepts/workflow_lifecycle.rst + ../deployment/configuration/auth_appendix.rst diff --git a/rsts/_tags/GCP.rst b/rsts/_tags/GCP.rst new file mode 100644 index 0000000000..1fefb911d3 --- /dev/null +++ b/rsts/_tags/GCP.rst @@ -0,0 +1,10 @@ +Tag: GCP +######## + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/configuration/cloud_event.rst + ../deployment/plugins/gcp/index.rst + ../deployment/plugins/k8s/index.rst diff --git a/rsts/_tags/Glossary.rst b/rsts/_tags/Glossary.rst new file mode 100644 index 0000000000..09dbc644ab --- /dev/null +++ b/rsts/_tags/Glossary.rst @@ -0,0 +1,20 @@ +Tag: Glossary +############# + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../concepts/architecture.rst + ../concepts/data_management.rst + ../concepts/domains.rst + ../concepts/execution_timeline.rst + ../concepts/executions.rst + ../concepts/launchplans.rst + ../concepts/nodes.rst + ../concepts/projects.rst + ../concepts/registration.rst + ../concepts/schedules.rst + ../concepts/tasks.rst + ../concepts/versioning.rst + ../concepts/workflows.rst diff --git a/rsts/_tags/Infrastructure.rst b/rsts/_tags/Infrastructure.rst new file mode 100644 index 0000000000..64ce91b56f --- /dev/null +++ b/rsts/_tags/Infrastructure.rst @@ -0,0 +1,20 @@ +Tag: Infrastructure +################### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/configuration/auth_migration.rst + ../deployment/configuration/auth_setup.rst + ../deployment/configuration/cloud_event.rst + ../deployment/configuration/customizable_resources.rst + ../deployment/configuration/eventing.rst + ../deployment/configuration/monitoring.rst + ../deployment/configuration/notifications.rst + ../deployment/configuration/performance.rst + ../deployment/deployment/cloud_production.rst + ../deployment/deployment/cloud_simple.rst + ../deployment/deployment/multicluster.rst + ../deployment/deployment/sandbox.rst + ../deployment/security/index.rst diff --git a/rsts/_tags/Integration.rst b/rsts/_tags/Integration.rst new file mode 100644 index 0000000000..644854cfcb --- /dev/null +++ b/rsts/_tags/Integration.rst @@ -0,0 +1,12 @@ +Tag: Integration +################ + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/agents/index.rst + ../deployment/plugins/aws/index.rst + ../deployment/plugins/gcp/index.rst + ../deployment/plugins/k8s/index.rst + ../deployment/plugins/webapi/index.rst diff --git a/rsts/_tags/Intermediate.rst b/rsts/_tags/Intermediate.rst new file mode 100644 index 0000000000..9ee633326a --- /dev/null +++ b/rsts/_tags/Intermediate.rst @@ -0,0 +1,9 @@ +Tag: Intermediate +################# + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../concepts/console.rst + ../concepts/execution_timeline.rst diff --git a/rsts/_tags/Kubernetes.rst b/rsts/_tags/Kubernetes.rst new file mode 100644 index 0000000000..61874260d0 --- /dev/null +++ b/rsts/_tags/Kubernetes.rst @@ -0,0 +1,14 @@ +Tag: Kubernetes +############### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/configuration/performance.rst + ../deployment/deployment/cloud_production.rst + ../deployment/deployment/cloud_simple.rst + ../deployment/deployment/multicluster.rst + ../deployment/deployment/sandbox.rst + ../deployment/plugins/k8s/index.rst + ../deployment/security/index.rst diff --git a/rsts/_tags/MachineLearning.rst b/rsts/_tags/MachineLearning.rst new file mode 100644 index 0000000000..8116ad5872 --- /dev/null +++ b/rsts/_tags/MachineLearning.rst @@ -0,0 +1,8 @@ +Tag: MachineLearning +#################### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/plugins/aws/index.rst diff --git a/rsts/_tags/Spark.rst b/rsts/_tags/Spark.rst new file mode 100644 index 0000000000..465f9295d5 --- /dev/null +++ b/rsts/_tags/Spark.rst @@ -0,0 +1,8 @@ +Tag: Spark +########## + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/plugins/k8s/index.rst diff --git a/rsts/_tags/Troubleshoot.rst b/rsts/_tags/Troubleshoot.rst new file mode 100644 index 0000000000..b745c7a6b0 --- /dev/null +++ b/rsts/_tags/Troubleshoot.rst @@ -0,0 +1,8 @@ +Tag: Troubleshoot +################# + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../community/troubleshoot.rst diff --git a/rsts/_tags/UI.rst b/rsts/_tags/UI.rst new file mode 100644 index 0000000000..8deb42c6e5 --- /dev/null +++ b/rsts/_tags/UI.rst @@ -0,0 +1,8 @@ +Tag: UI +####### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../concepts/flyte_console.rst diff --git a/rsts/_tags/WebAPI.rst b/rsts/_tags/WebAPI.rst new file mode 100644 index 0000000000..3b68d63d3d --- /dev/null +++ b/rsts/_tags/WebAPI.rst @@ -0,0 +1,8 @@ +Tag: WebAPI +########### + +.. toctree:: + :maxdepth: 1 + :caption: With this tag + + ../deployment/plugins/webapi/index.rst diff --git a/rsts/_tags/tagsindex.rst b/rsts/_tags/tagsindex.rst new file mode 100644 index 0000000000..e032633660 --- /dev/null +++ b/rsts/_tags/tagsindex.rst @@ -0,0 +1,31 @@ +:orphan: + +.. _tagoverview: + +All Tags +######## + +.. toctree:: + :caption: Tags + :maxdepth: 1 + + AWS (3) + Advanced (22) + Agent (1) + Authentication (3) + Basic (20) + Configuration (1) + Contribute (2) + Data (4) + Design (12) + GCP (3) + Glossary (13) + Infrastructure (13) + Integration (5) + Intermediate (2) + Kubernetes (7) + MachineLearning (1) + Spark (1) + Troubleshoot (1) + UI (1) + WebAPI (1) From aa24087682cb029730ef13e8dc63360a2500db59 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 10 Dec 2023 16:53:24 +0800 Subject: [PATCH 18/47] remove tags Signed-off-by: Future Outlier --- rsts/_tags/AWS.rst | 10 ---------- rsts/_tags/Advanced.rst | 29 ----------------------------- rsts/_tags/Agent.rst | 8 -------- rsts/_tags/Authentication.rst | 10 ---------- rsts/_tags/Basic.rst | 27 --------------------------- rsts/_tags/Configuration.rst | 8 -------- rsts/_tags/Contribute.rst | 9 --------- rsts/_tags/Data.rst | 11 ----------- rsts/_tags/Design.rst | 19 ------------------- rsts/_tags/GCP.rst | 10 ---------- rsts/_tags/Glossary.rst | 20 -------------------- rsts/_tags/Infrastructure.rst | 20 -------------------- rsts/_tags/Integration.rst | 12 ------------ rsts/_tags/Intermediate.rst | 9 --------- rsts/_tags/Kubernetes.rst | 14 -------------- rsts/_tags/MachineLearning.rst | 8 -------- rsts/_tags/Spark.rst | 8 -------- rsts/_tags/Troubleshoot.rst | 8 -------- rsts/_tags/UI.rst | 8 -------- rsts/_tags/WebAPI.rst | 8 -------- rsts/_tags/tagsindex.rst | 31 ------------------------------- 21 files changed, 287 deletions(-) delete mode 100644 rsts/_tags/AWS.rst delete mode 100644 rsts/_tags/Advanced.rst delete mode 100644 rsts/_tags/Agent.rst delete mode 100644 rsts/_tags/Authentication.rst delete mode 100644 rsts/_tags/Basic.rst delete mode 100644 rsts/_tags/Configuration.rst delete mode 100644 rsts/_tags/Contribute.rst delete mode 100644 rsts/_tags/Data.rst delete mode 100644 rsts/_tags/Design.rst delete mode 100644 rsts/_tags/GCP.rst delete mode 100644 rsts/_tags/Glossary.rst delete mode 100644 rsts/_tags/Infrastructure.rst delete mode 100644 rsts/_tags/Integration.rst delete mode 100644 rsts/_tags/Intermediate.rst delete mode 100644 rsts/_tags/Kubernetes.rst delete mode 100644 rsts/_tags/MachineLearning.rst delete mode 100644 rsts/_tags/Spark.rst delete mode 100644 rsts/_tags/Troubleshoot.rst delete mode 100644 rsts/_tags/UI.rst delete mode 100644 rsts/_tags/WebAPI.rst delete mode 100644 rsts/_tags/tagsindex.rst diff --git a/rsts/_tags/AWS.rst b/rsts/_tags/AWS.rst deleted file mode 100644 index 0024984212..0000000000 --- a/rsts/_tags/AWS.rst +++ /dev/null @@ -1,10 +0,0 @@ -Tag: AWS -######## - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/configuration/cloud_event.rst - ../deployment/plugins/aws/index.rst - ../deployment/plugins/k8s/index.rst diff --git a/rsts/_tags/Advanced.rst b/rsts/_tags/Advanced.rst deleted file mode 100644 index 34bf5a6849..0000000000 --- a/rsts/_tags/Advanced.rst +++ /dev/null @@ -1,29 +0,0 @@ -Tag: Advanced -############# - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../concepts/admin.rst - ../concepts/architecture.rst - ../concepts/catalog.rst - ../concepts/component_architecture/flytepropeller_architecture.rst - ../concepts/component_architecture/native_scheduler_architecture.rst - ../deployment/agents/index.rst - ../deployment/configuration/auth_appendix.rst - ../deployment/configuration/auth_migration.rst - ../deployment/configuration/auth_setup.rst - ../deployment/configuration/cloud_event.rst - ../deployment/configuration/customizable_resources.rst - ../deployment/configuration/eventing.rst - ../deployment/configuration/monitoring.rst - ../deployment/configuration/notifications.rst - ../deployment/configuration/performance.rst - ../deployment/deployment/cloud_production.rst - ../deployment/deployment/multicluster.rst - ../deployment/plugins/aws/index.rst - ../deployment/plugins/gcp/index.rst - ../deployment/plugins/k8s/index.rst - ../deployment/plugins/webapi/index.rst - ../deployment/security/index.rst diff --git a/rsts/_tags/Agent.rst b/rsts/_tags/Agent.rst deleted file mode 100644 index f8f91486ff..0000000000 --- a/rsts/_tags/Agent.rst +++ /dev/null @@ -1,8 +0,0 @@ -Tag: Agent -########## - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/agents/index.rst diff --git a/rsts/_tags/Authentication.rst b/rsts/_tags/Authentication.rst deleted file mode 100644 index 22ed3f3602..0000000000 --- a/rsts/_tags/Authentication.rst +++ /dev/null @@ -1,10 +0,0 @@ -Tag: Authentication -################### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/configuration/auth_appendix.rst - ../deployment/configuration/auth_migration.rst - ../deployment/configuration/auth_setup.rst diff --git a/rsts/_tags/Basic.rst b/rsts/_tags/Basic.rst deleted file mode 100644 index 5b70159f1d..0000000000 --- a/rsts/_tags/Basic.rst +++ /dev/null @@ -1,27 +0,0 @@ -Tag: Basic -########## - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../community/contribute.rst - ../community/troubleshoot.rst - ../concepts/data_management.rst - ../concepts/domains.rst - ../concepts/dynamic_spec.rst - ../concepts/executions.rst - ../concepts/flyte_console.rst - ../concepts/launchplans.rst - ../concepts/nodes.rst - ../concepts/projects.rst - ../concepts/registration.rst - ../concepts/schedules.rst - ../concepts/state_machine.rst - ../concepts/tasks.rst - ../concepts/versioning.rst - ../concepts/workflow_lifecycle.rst - ../concepts/workflows.rst - ../deployment/deployment/cloud_simple.rst - ../deployment/deployment/sandbox.rst - ../reference/swagger.rst diff --git a/rsts/_tags/Configuration.rst b/rsts/_tags/Configuration.rst deleted file mode 100644 index f6f6b7f888..0000000000 --- a/rsts/_tags/Configuration.rst +++ /dev/null @@ -1,8 +0,0 @@ -Tag: Configuration -################## - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/configuration/eventing.rst diff --git a/rsts/_tags/Contribute.rst b/rsts/_tags/Contribute.rst deleted file mode 100644 index 7d3c363d33..0000000000 --- a/rsts/_tags/Contribute.rst +++ /dev/null @@ -1,9 +0,0 @@ -Tag: Contribute -############### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../community/contribute.rst - ../concepts/console.rst diff --git a/rsts/_tags/Data.rst b/rsts/_tags/Data.rst deleted file mode 100644 index 1cb762fd55..0000000000 --- a/rsts/_tags/Data.rst +++ /dev/null @@ -1,11 +0,0 @@ -Tag: Data -######### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/agents/index.rst - ../deployment/plugins/aws/index.rst - ../deployment/plugins/gcp/index.rst - ../deployment/plugins/webapi/index.rst diff --git a/rsts/_tags/Design.rst b/rsts/_tags/Design.rst deleted file mode 100644 index 39dedc4155..0000000000 --- a/rsts/_tags/Design.rst +++ /dev/null @@ -1,19 +0,0 @@ -Tag: Design -########### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../concepts/admin.rst - ../concepts/architecture.rst - ../concepts/catalog.rst - ../concepts/component_architecture/flytepropeller_architecture.rst - ../concepts/component_architecture/native_scheduler_architecture.rst - ../concepts/data_management.rst - ../concepts/dynamic_spec.rst - ../concepts/launchplans.rst - ../concepts/registration.rst - ../concepts/state_machine.rst - ../concepts/workflow_lifecycle.rst - ../deployment/configuration/auth_appendix.rst diff --git a/rsts/_tags/GCP.rst b/rsts/_tags/GCP.rst deleted file mode 100644 index 1fefb911d3..0000000000 --- a/rsts/_tags/GCP.rst +++ /dev/null @@ -1,10 +0,0 @@ -Tag: GCP -######## - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/configuration/cloud_event.rst - ../deployment/plugins/gcp/index.rst - ../deployment/plugins/k8s/index.rst diff --git a/rsts/_tags/Glossary.rst b/rsts/_tags/Glossary.rst deleted file mode 100644 index 09dbc644ab..0000000000 --- a/rsts/_tags/Glossary.rst +++ /dev/null @@ -1,20 +0,0 @@ -Tag: Glossary -############# - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../concepts/architecture.rst - ../concepts/data_management.rst - ../concepts/domains.rst - ../concepts/execution_timeline.rst - ../concepts/executions.rst - ../concepts/launchplans.rst - ../concepts/nodes.rst - ../concepts/projects.rst - ../concepts/registration.rst - ../concepts/schedules.rst - ../concepts/tasks.rst - ../concepts/versioning.rst - ../concepts/workflows.rst diff --git a/rsts/_tags/Infrastructure.rst b/rsts/_tags/Infrastructure.rst deleted file mode 100644 index 64ce91b56f..0000000000 --- a/rsts/_tags/Infrastructure.rst +++ /dev/null @@ -1,20 +0,0 @@ -Tag: Infrastructure -################### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/configuration/auth_migration.rst - ../deployment/configuration/auth_setup.rst - ../deployment/configuration/cloud_event.rst - ../deployment/configuration/customizable_resources.rst - ../deployment/configuration/eventing.rst - ../deployment/configuration/monitoring.rst - ../deployment/configuration/notifications.rst - ../deployment/configuration/performance.rst - ../deployment/deployment/cloud_production.rst - ../deployment/deployment/cloud_simple.rst - ../deployment/deployment/multicluster.rst - ../deployment/deployment/sandbox.rst - ../deployment/security/index.rst diff --git a/rsts/_tags/Integration.rst b/rsts/_tags/Integration.rst deleted file mode 100644 index 644854cfcb..0000000000 --- a/rsts/_tags/Integration.rst +++ /dev/null @@ -1,12 +0,0 @@ -Tag: Integration -################ - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/agents/index.rst - ../deployment/plugins/aws/index.rst - ../deployment/plugins/gcp/index.rst - ../deployment/plugins/k8s/index.rst - ../deployment/plugins/webapi/index.rst diff --git a/rsts/_tags/Intermediate.rst b/rsts/_tags/Intermediate.rst deleted file mode 100644 index 9ee633326a..0000000000 --- a/rsts/_tags/Intermediate.rst +++ /dev/null @@ -1,9 +0,0 @@ -Tag: Intermediate -################# - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../concepts/console.rst - ../concepts/execution_timeline.rst diff --git a/rsts/_tags/Kubernetes.rst b/rsts/_tags/Kubernetes.rst deleted file mode 100644 index 61874260d0..0000000000 --- a/rsts/_tags/Kubernetes.rst +++ /dev/null @@ -1,14 +0,0 @@ -Tag: Kubernetes -############### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/configuration/performance.rst - ../deployment/deployment/cloud_production.rst - ../deployment/deployment/cloud_simple.rst - ../deployment/deployment/multicluster.rst - ../deployment/deployment/sandbox.rst - ../deployment/plugins/k8s/index.rst - ../deployment/security/index.rst diff --git a/rsts/_tags/MachineLearning.rst b/rsts/_tags/MachineLearning.rst deleted file mode 100644 index 8116ad5872..0000000000 --- a/rsts/_tags/MachineLearning.rst +++ /dev/null @@ -1,8 +0,0 @@ -Tag: MachineLearning -#################### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/plugins/aws/index.rst diff --git a/rsts/_tags/Spark.rst b/rsts/_tags/Spark.rst deleted file mode 100644 index 465f9295d5..0000000000 --- a/rsts/_tags/Spark.rst +++ /dev/null @@ -1,8 +0,0 @@ -Tag: Spark -########## - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/plugins/k8s/index.rst diff --git a/rsts/_tags/Troubleshoot.rst b/rsts/_tags/Troubleshoot.rst deleted file mode 100644 index b745c7a6b0..0000000000 --- a/rsts/_tags/Troubleshoot.rst +++ /dev/null @@ -1,8 +0,0 @@ -Tag: Troubleshoot -################# - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../community/troubleshoot.rst diff --git a/rsts/_tags/UI.rst b/rsts/_tags/UI.rst deleted file mode 100644 index 8deb42c6e5..0000000000 --- a/rsts/_tags/UI.rst +++ /dev/null @@ -1,8 +0,0 @@ -Tag: UI -####### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../concepts/flyte_console.rst diff --git a/rsts/_tags/WebAPI.rst b/rsts/_tags/WebAPI.rst deleted file mode 100644 index 3b68d63d3d..0000000000 --- a/rsts/_tags/WebAPI.rst +++ /dev/null @@ -1,8 +0,0 @@ -Tag: WebAPI -########### - -.. toctree:: - :maxdepth: 1 - :caption: With this tag - - ../deployment/plugins/webapi/index.rst diff --git a/rsts/_tags/tagsindex.rst b/rsts/_tags/tagsindex.rst deleted file mode 100644 index e032633660..0000000000 --- a/rsts/_tags/tagsindex.rst +++ /dev/null @@ -1,31 +0,0 @@ -:orphan: - -.. _tagoverview: - -All Tags -######## - -.. toctree:: - :caption: Tags - :maxdepth: 1 - - AWS (3) - Advanced (22) - Agent (1) - Authentication (3) - Basic (20) - Configuration (1) - Contribute (2) - Data (4) - Design (12) - GCP (3) - Glossary (13) - Infrastructure (13) - Integration (5) - Intermediate (2) - Kubernetes (7) - MachineLearning (1) - Spark (1) - Troubleshoot (1) - UI (1) - WebAPI (1) From 9f14c085c4893448d22abc138a5692d6622369c9 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 10 Dec 2023 18:43:19 +0800 Subject: [PATCH 19/47] add small test Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index a12d21818e..446d3563d4 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -60,6 +60,12 @@ func TestPlugin(t *testing.T) { assert.NotNil(t, err) }) + t.Run("test getAgentMetadataClientFunc", func(t *testing.T) { + client, err := getAgentMetadataClientFunc(context.Background(), &Agent{Endpoint: "localhost:80"}, map[*Agent]*grpc.ClientConn{}) + assert.NoError(t, err) + assert.NotNil(t, client) + }) + t.Run("test getAsyncClientFunc", func(t *testing.T) { client, err := getAsyncClientFunc(context.Background(), &Agent{Endpoint: "localhost:80"}, map[*Agent]*grpc.ClientConn{}) assert.NoError(t, err) From c657e0e1d1ecd71daeda60481d9fa0d1839103a9 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 12 Dec 2023 00:45:02 -0800 Subject: [PATCH 20/47] Add agent registry Signed-off-by: Kevin Su --- .../pluginmachinery/internal/webapi/core.go | 1 - .../go/tasks/pluginmachinery/webapi/plugin.go | 3 - .../go/tasks/plugins/webapi/agent/plugin.go | 86 ++++++++----------- 3 files changed, 34 insertions(+), 56 deletions(-) diff --git a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go index 6cf8a1d2d6..d51209a77c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go +++ b/flyteplugins/go/tasks/pluginmachinery/internal/webapi/core.go @@ -36,7 +36,6 @@ type CorePlugin struct { cache cache.AutoRefresh tokenAllocator tokenAllocator metrics Metrics - IsSyncTask map[string]bool } func (c CorePlugin) unmarshalState(ctx context.Context, stateReader core.PluginStateReader) (State, error) { diff --git a/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go b/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go index 12f3c30b33..37be2c1e40 100644 --- a/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go +++ b/flyteplugins/go/tasks/pluginmachinery/webapi/plugin.go @@ -42,9 +42,6 @@ type PluginEntry struct { // support the same task type. This must be a subset of RegisteredTaskTypes and at most one default per task type // is supported. DefaultForTaskTypes []pluginsCore.TaskType - - // A map of task types to boolean indicating if the plugin should be used synchronously for that task type. - IsSyncTask map[pluginsCore.TaskType]bool } // PluginSetupContext is the interface made available to the plugin loader when initializing the plugin. diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index cb203d4b30..da18b53b0a 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -5,6 +5,7 @@ import ( "crypto/x509" "encoding/gob" "fmt" + "golang.org/x/exp/maps" "time" "google.golang.org/grpc" @@ -34,6 +35,7 @@ type Plugin struct { cfg *Config getAsyncClient GetAsyncClientFunc connectionCache map[*Agent]*grpc.ClientConn + agentRegistry map[string]map[bool]*Agent // map[taskType][isSync] => Agent } type ResourceWrapper struct { @@ -323,68 +325,48 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte return context.WithTimeout(ctx, timeout) } -func updateAgentTaskTypes(agent *Agent, connectionCache map[*Agent]*grpc.ClientConn, isSyncTask map[string]bool) { - client, err := getAgentMetadataClientFunc(context.Background(), agent, connectionCache) - if err != nil { - logger.Errorf(context.Background(), "failed to connect to agent [%v] with error: [%v]", agent, err) - return - } - - finalCtx, cancel := getFinalContext(context.Background(), "ListAgent", agent) - defer cancel() - - res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) - if err != nil { - logger.Errorf(context.Background(), "failed to send list agent request with error: [%v]", err) - return - } - - agents := res.GetAgents() - logger.Infof(context.Background(), "here are all agents [%v] in [%v] agent server", agents, agent) - - for _, agent := range agents { - isSyncTask[agent.SupportedTaskType] = agent.IsSync - } -} - -func getAgentMetadata(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) ([]string, map[string]bool) { - // Assign supported task types from the config to prevent a panic when no task type is supported. - // https://github.com/flyteorg/flyte/blob/master/flyteplugins/go/tasks/pluginmachinery/registry.go#L27 - supportedTaskTypes := cfg.SupportedTaskTypes - isSyncTask := make(map[string]bool) +func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) (map[string]map[bool]*Agent, error) { + agentRegistry := make(map[string]map[bool]*Agent) - // Combine the default agent server's task types with the config's existing task types. - // Use empty string as key to return default agent server - defaultAgent, err := getFinalAgent("", cfg) - if err != nil { - logger.Errorf(context.Background(), "failed to get default agent [%v] with error: [%v]", err) - } else { - updateAgentTaskTypes(defaultAgent, connectionCache, isSyncTask) - } - - // For each agent server, use a map to store its supported task types and whether it is a sync task. - // This combines unique task types across all agents. - // We need to iterate all agent servers to get all supported task types. - // For example, one agent server supports only bigquery tasks, while another supports only spark tasks. - // We can get both by combining the supported task types from two agent servers. - for _, agent := range cfg.Agents { - updateAgentTaskTypes(agent, connectionCache, isSyncTask) + // Ensure that the old configuration is backward compatible + for taskType, agentID := range cfg.AgentForTaskTypes { + agentRegistry[taskType] = make(map[bool]*Agent) + agentRegistry[taskType][false] = cfg.Agents[agentID] } - for task := range isSyncTask { - supportedTaskTypes = append(supportedTaskTypes, task) + for _, agentDeployment := range cfg.Agents { + client, err := getAgentMetadataClientFunc(context.Background(), agentDeployment, connectionCache) + if err != nil { + return nil, fmt.Errorf("failed to connect to agent [%v] with error: [%v]", agentDeployment, err) + } + finalCtx, cancel := getFinalContext(context.Background(), "ListAgent", agentDeployment) + defer cancel() + res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) + if err != nil { + return nil, fmt.Errorf("failed to list agent with error: [%v]", err) + } + agents := res.GetAgents() + for _, agent := range agents { + if _, ok := agentRegistry[agent.SupportedTaskType]; !ok { + agentRegistry[agent.SupportedTaskType] = make(map[bool]*Agent) + } + agentRegistry[agent.SupportedTaskType][agent.IsSync] = agentDeployment + } } - return supportedTaskTypes, isSyncTask + return agentRegistry, nil } func newAgentPlugin() webapi.PluginEntry { cfg := GetConfig() connectionCache := make(map[*Agent]*grpc.ClientConn) + agentRegistry, err := initializeAgentRegistry(cfg, connectionCache) + if err != nil { + panic(err) + } - supportedTaskTypes, isSyncTask := getAgentMetadata(cfg, connectionCache) - logger.Infof(context.Background(), "supported task types: %v", supportedTaskTypes) - logger.Infof(context.Background(), "is sync task: %v", isSyncTask) + supportedTaskTypes := append(maps.Keys(agentRegistry), cfg.SupportedTaskTypes...) + logger.Infof(context.Background(), "Agent supports task types: %v", supportedTaskTypes) return webapi.PluginEntry{ ID: "agent-service", @@ -395,9 +377,9 @@ func newAgentPlugin() webapi.PluginEntry { cfg: cfg, getAsyncClient: getAsyncClientFunc, connectionCache: connectionCache, + agentRegistry: agentRegistry, }, nil }, - IsSyncTask: isSyncTask, } } From 806a602c7f1bbaf1223938652b8bd1e0e1d71762 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 12 Dec 2023 18:01:26 +0800 Subject: [PATCH 21/47] need to change supported task type to supported task types Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index da18b53b0a..93e31d2ebc 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -5,9 +5,9 @@ import ( "crypto/x509" "encoding/gob" "fmt" - "golang.org/x/exp/maps" "time" + "golang.org/x/exp/maps" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" @@ -334,17 +334,27 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien agentRegistry[taskType][false] = cfg.Agents[agentID] } + var agentDeployments []*Agent + agentDeployments = append(agentDeployments, &cfg.DefaultAgent) + for _, agentDeployment := range cfg.Agents { + agentDeployments = append(agentDeployments, agentDeployment) + } + + for _, agentDeployment := range agentDeployments { client, err := getAgentMetadataClientFunc(context.Background(), agentDeployment, connectionCache) if err != nil { return nil, fmt.Errorf("failed to connect to agent [%v] with error: [%v]", agentDeployment, err) } + finalCtx, cancel := getFinalContext(context.Background(), "ListAgent", agentDeployment) defer cancel() + res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) if err != nil { return nil, fmt.Errorf("failed to list agent with error: [%v]", err) } + agents := res.GetAgents() for _, agent := range agents { if _, ok := agentRegistry[agent.SupportedTaskType]; !ok { From 45c1b4d9a95d5c22a1b4c291cea375212bd3abaa Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 12 Dec 2023 18:07:26 +0800 Subject: [PATCH 22/47] refactor agentDeployments Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 93e31d2ebc..ce6a171b67 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -327,6 +327,7 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) (map[string]map[bool]*Agent, error) { agentRegistry := make(map[string]map[bool]*Agent) + agentDeployments := append([]*Agent{&cfg.DefaultAgent}, maps.Values(cfg.Agents)...) // Ensure that the old configuration is backward compatible for taskType, agentID := range cfg.AgentForTaskTypes { @@ -334,13 +335,6 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien agentRegistry[taskType][false] = cfg.Agents[agentID] } - var agentDeployments []*Agent - agentDeployments = append(agentDeployments, &cfg.DefaultAgent) - - for _, agentDeployment := range cfg.Agents { - agentDeployments = append(agentDeployments, agentDeployment) - } - for _, agentDeployment := range agentDeployments { client, err := getAgentMetadataClientFunc(context.Background(), agentDeployment, connectionCache) if err != nil { From 09daecd717146bf723abcb417dea5b8d6562e207 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 12 Dec 2023 18:22:39 +0800 Subject: [PATCH 23/47] change back proto Signed-off-by: Future Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 123 ++++---- flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 134 +++++---- flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 126 ++++---- .../pb-go/flyteidl/admin/agent.pb.validate.go | 2 - .../pb-go/flyteidl/service/agent.swagger.json | 7 +- .../gen/pb-go/flyteidl/service/openapi.go | 2 +- .../flyteidl/admin/AgentOuterClass.java | 276 ++++++++++++------ flyteidl/gen/pb-js/flyteidl.d.ts | 8 +- flyteidl/gen/pb-js/flyteidl.js | 28 +- .../gen/pb_python/flyteidl/admin/agent_pb2.py | 24 +- .../pb_python/flyteidl/admin/agent_pb2.pyi | 8 +- flyteidl/gen/pb_rust/flyteidl.admin.rs | 4 +- flyteidl/protos/flyteidl/admin/agent.proto | 2 +- .../go/tasks/plugins/webapi/agent/plugin.go | 11 +- 14 files changed, 436 insertions(+), 319 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index 13ec60b43f..2b88663f8e 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -474,7 +474,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, name_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_type_), + PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_types_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, is_sync_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, secret_names_), ~0u, // no _has_bits_ @@ -584,23 +584,23 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" - "\014\"\024\n\022DeleteTaskResponse\"Y\n\005Agent\022\014\n\004name" - "\030\001 \001(\t\022\033\n\023supported_task_type\030\002 \001(\t\022\017\n\007i" - "s_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017Ge" - "tAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentR" - "esponse\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin." - "Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgents" - "Response\022%\n\006agents\030\001 \003(\0132\025.flyteidl.admi" - "n.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022" - "\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007R" - "UNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fl" - "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" - "/adminb\006proto3" + "\014\"\024\n\022DeleteTaskResponse\"Z\n\005Agent\022\014\n\004name" + "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \003(\t\022\017\n\007" + "is_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017G" + "etAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgent" + "Response\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin" + ".Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgent" + "sResponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.adm" + "in.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000" + "\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007" + "RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/f" + "lyteorg/flyte/flyteidl/gen/pb-go/flyteid" + "l/adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1894, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1895, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { @@ -4388,7 +4388,7 @@ class Agent::HasBitSetters { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int Agent::kNameFieldNumber; -const int Agent::kSupportedTaskTypeFieldNumber; +const int Agent::kSupportedTaskTypesFieldNumber; const int Agent::kIsSyncFieldNumber; const int Agent::kSecretNamesFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 @@ -4401,16 +4401,13 @@ Agent::Agent() Agent::Agent(const Agent& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr), + supported_task_types_(from.supported_task_types_), secret_names_(from.secret_names_) { _internal_metadata_.MergeFrom(from._internal_metadata_); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.name().size() > 0) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - supported_task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.supported_task_type().size() > 0) { - supported_task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_type_); - } is_sync_ = from.is_sync_; // @@protoc_insertion_point(copy_constructor:flyteidl.admin.Agent) } @@ -4419,7 +4416,6 @@ void Agent::SharedCtor() { ::google::protobuf::internal::InitSCC( &scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); is_sync_ = false; } @@ -4430,7 +4426,6 @@ Agent::~Agent() { void Agent::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void Agent::SetCachedSize(int size) const { @@ -4448,9 +4443,9 @@ void Agent::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + supported_task_types_.Clear(); secret_names_.Clear(); name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - supported_task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); is_sync_ = false; _internal_metadata_.Clear(); } @@ -4484,20 +4479,23 @@ const char* Agent::_InternalParse(const char* begin, const char* end, void* obje ptr += size; break; } - // string supported_task_type = 2; + // repeated string supported_task_types = 2; case 2: { if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.supported_task_type"); - object = msg->mutable_supported_task_type(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.supported_task_types"); + object = msg->add_supported_task_types(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 18 && (ptr += 1)); break; } // bool is_sync = 3; @@ -4575,15 +4573,16 @@ bool Agent::MergePartialFromCodedStream( break; } - // string supported_task_type = 2; + // repeated string supported_task_types = 2; case 2: { if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_supported_task_type())); + input, this->add_supported_task_types())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_type().data(), static_cast(this->supported_task_type().length()), + this->supported_task_types(this->supported_task_types_size() - 1).data(), + static_cast(this->supported_task_types(this->supported_task_types_size() - 1).length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.Agent.supported_task_type")); + "flyteidl.admin.Agent.supported_task_types")); } else { goto handle_unusual; } @@ -4656,14 +4655,14 @@ void Agent::SerializeWithCachedSizes( 1, this->name(), output); } - // string supported_task_type = 2; - if (this->supported_task_type().size() > 0) { + // repeated string supported_task_types = 2; + for (int i = 0, n = this->supported_task_types_size(); i < n; i++) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_type().data(), static_cast(this->supported_task_type().length()), + this->supported_task_types(i).data(), static_cast(this->supported_task_types(i).length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.supported_task_type"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 2, this->supported_task_type(), output); + "flyteidl.admin.Agent.supported_task_types"); + ::google::protobuf::internal::WireFormatLite::WriteString( + 2, this->supported_task_types(i), output); } // bool is_sync = 3; @@ -4705,15 +4704,14 @@ ::google::protobuf::uint8* Agent::InternalSerializeWithCachedSizesToArray( 1, this->name(), target); } - // string supported_task_type = 2; - if (this->supported_task_type().size() > 0) { + // repeated string supported_task_types = 2; + for (int i = 0, n = this->supported_task_types_size(); i < n; i++) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->supported_task_type().data(), static_cast(this->supported_task_type().length()), + this->supported_task_types(i).data(), static_cast(this->supported_task_types(i).length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.supported_task_type"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 2, this->supported_task_type(), target); + "flyteidl.admin.Agent.supported_task_types"); + target = ::google::protobuf::internal::WireFormatLite:: + WriteStringToArray(2, this->supported_task_types(i), target); } // bool is_sync = 3; @@ -4752,6 +4750,14 @@ size_t Agent::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + // repeated string supported_task_types = 2; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->supported_task_types_size()); + for (int i = 0, n = this->supported_task_types_size(); i < n; i++) { + total_size += ::google::protobuf::internal::WireFormatLite::StringSize( + this->supported_task_types(i)); + } + // repeated string secret_names = 4; total_size += 1 * ::google::protobuf::internal::FromIntSize(this->secret_names_size()); @@ -4767,13 +4773,6 @@ size_t Agent::ByteSizeLong() const { this->name()); } - // string supported_task_type = 2; - if (this->supported_task_type().size() > 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->supported_task_type()); - } - // bool is_sync = 3; if (this->is_sync() != 0) { total_size += 1 + 1; @@ -4806,15 +4805,12 @@ void Agent::MergeFrom(const Agent& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + supported_task_types_.MergeFrom(from.supported_task_types_); secret_names_.MergeFrom(from.secret_names_); if (from.name().size() > 0) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - if (from.supported_task_type().size() > 0) { - - supported_task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.supported_task_type_); - } if (from.is_sync() != 0) { set_is_sync(from.is_sync()); } @@ -4845,11 +4841,10 @@ void Agent::Swap(Agent* other) { void Agent::InternalSwap(Agent* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); + supported_task_types_.InternalSwap(CastToBase(&other->supported_task_types_)); secret_names_.InternalSwap(CastToBase(&other->secret_names_)); name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - supported_task_type_.Swap(&other->supported_task_type_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), - GetArenaNoVirtual()); swap(is_sync_, other->is_sync_); } diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index 80b11208f8..0e78304e33 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -1470,6 +1470,28 @@ class Agent final : // accessors ------------------------------------------------------- + // repeated string supported_task_types = 2; + int supported_task_types_size() const; + void clear_supported_task_types(); + static const int kSupportedTaskTypesFieldNumber = 2; + const ::std::string& supported_task_types(int index) const; + ::std::string* mutable_supported_task_types(int index); + void set_supported_task_types(int index, const ::std::string& value); + #if LANG_CXX11 + void set_supported_task_types(int index, ::std::string&& value); + #endif + void set_supported_task_types(int index, const char* value); + void set_supported_task_types(int index, const char* value, size_t size); + ::std::string* add_supported_task_types(); + void add_supported_task_types(const ::std::string& value); + #if LANG_CXX11 + void add_supported_task_types(::std::string&& value); + #endif + void add_supported_task_types(const char* value); + void add_supported_task_types(const char* value, size_t size); + const ::google::protobuf::RepeatedPtrField<::std::string>& supported_task_types() const; + ::google::protobuf::RepeatedPtrField<::std::string>* mutable_supported_task_types(); + // repeated string secret_names = 4; int secret_names_size() const; void clear_secret_names(); @@ -1506,20 +1528,6 @@ class Agent final : ::std::string* release_name(); void set_allocated_name(::std::string* name); - // string supported_task_type = 2; - void clear_supported_task_type(); - static const int kSupportedTaskTypeFieldNumber = 2; - const ::std::string& supported_task_type() const; - void set_supported_task_type(const ::std::string& value); - #if LANG_CXX11 - void set_supported_task_type(::std::string&& value); - #endif - void set_supported_task_type(const char* value); - void set_supported_task_type(const char* value, size_t size); - ::std::string* mutable_supported_task_type(); - ::std::string* release_supported_task_type(); - void set_allocated_supported_task_type(::std::string* supported_task_type); - // bool is_sync = 3; void clear_is_sync(); static const int kIsSyncFieldNumber = 3; @@ -1531,9 +1539,9 @@ class Agent final : class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField<::std::string> supported_task_types_; ::google::protobuf::RepeatedPtrField<::std::string> secret_names_; ::google::protobuf::internal::ArenaStringPtr name_; - ::google::protobuf::internal::ArenaStringPtr supported_task_type_; bool is_sync_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; @@ -2972,57 +2980,73 @@ inline void Agent::set_allocated_name(::std::string* name) { // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.name) } -// string supported_task_type = 2; -inline void Agent::clear_supported_task_type() { - supported_task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +// repeated string supported_task_types = 2; +inline int Agent::supported_task_types_size() const { + return supported_task_types_.size(); } -inline const ::std::string& Agent::supported_task_type() const { - // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.supported_task_type) - return supported_task_type_.GetNoArena(); +inline void Agent::clear_supported_task_types() { + supported_task_types_.Clear(); } -inline void Agent::set_supported_task_type(const ::std::string& value) { - - supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.supported_task_type) +inline const ::std::string& Agent::supported_task_types(int index) const { + // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.supported_task_types) + return supported_task_types_.Get(index); +} +inline ::std::string* Agent::mutable_supported_task_types(int index) { + // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.supported_task_types) + return supported_task_types_.Mutable(index); +} +inline void Agent::set_supported_task_types(int index, const ::std::string& value) { + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.supported_task_types) + supported_task_types_.Mutable(index)->assign(value); } #if LANG_CXX11 -inline void Agent::set_supported_task_type(::std::string&& value) { - - supported_task_type_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); - // @@protoc_insertion_point(field_set_rvalue:flyteidl.admin.Agent.supported_task_type) +inline void Agent::set_supported_task_types(int index, ::std::string&& value) { + // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.supported_task_types) + supported_task_types_.Mutable(index)->assign(std::move(value)); } #endif -inline void Agent::set_supported_task_type(const char* value) { +inline void Agent::set_supported_task_types(int index, const char* value) { GOOGLE_DCHECK(value != nullptr); - - supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.supported_task_type) + supported_task_types_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.supported_task_types) } -inline void Agent::set_supported_task_type(const char* value, size_t size) { - - supported_task_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.supported_task_type) +inline void Agent::set_supported_task_types(int index, const char* value, size_t size) { + supported_task_types_.Mutable(index)->assign( + reinterpret_cast(value), size); + // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.supported_task_types) } -inline ::std::string* Agent::mutable_supported_task_type() { - - // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.supported_task_type) - return supported_task_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +inline ::std::string* Agent::add_supported_task_types() { + // @@protoc_insertion_point(field_add_mutable:flyteidl.admin.Agent.supported_task_types) + return supported_task_types_.Add(); } -inline ::std::string* Agent::release_supported_task_type() { - // @@protoc_insertion_point(field_release:flyteidl.admin.Agent.supported_task_type) - - return supported_task_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +inline void Agent::add_supported_task_types(const ::std::string& value) { + supported_task_types_.Add()->assign(value); + // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.supported_task_types) } -inline void Agent::set_allocated_supported_task_type(::std::string* supported_task_type) { - if (supported_task_type != nullptr) { - - } else { - - } - supported_task_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), supported_task_type); - // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.Agent.supported_task_type) +#if LANG_CXX11 +inline void Agent::add_supported_task_types(::std::string&& value) { + supported_task_types_.Add(std::move(value)); + // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.supported_task_types) +} +#endif +inline void Agent::add_supported_task_types(const char* value) { + GOOGLE_DCHECK(value != nullptr); + supported_task_types_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:flyteidl.admin.Agent.supported_task_types) +} +inline void Agent::add_supported_task_types(const char* value, size_t size) { + supported_task_types_.Add()->assign(reinterpret_cast(value), size); + // @@protoc_insertion_point(field_add_pointer:flyteidl.admin.Agent.supported_task_types) +} +inline const ::google::protobuf::RepeatedPtrField<::std::string>& +Agent::supported_task_types() const { + // @@protoc_insertion_point(field_list:flyteidl.admin.Agent.supported_task_types) + return supported_task_types_; +} +inline ::google::protobuf::RepeatedPtrField<::std::string>* +Agent::mutable_supported_task_types() { + // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.Agent.supported_task_types) + return &supported_task_types_; } // bool is_sync = 3; diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 0b4f0e00fa..38ca368e94 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -510,7 +510,7 @@ type Agent struct { // Name is the developer-assigned name of the agent. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // SupportedTaskTypes are the types of the tasks that the agent can handle. - SupportedTaskType string `protobuf:"bytes,2,opt,name=supported_task_type,json=supportedTaskType,proto3" json:"supported_task_type,omitempty"` + SupportedTaskTypes []string `protobuf:"bytes,2,rep,name=supported_task_types,json=supportedTaskTypes,proto3" json:"supported_task_types,omitempty"` // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. IsSync bool `protobuf:"varint,3,opt,name=is_sync,json=isSync,proto3" json:"is_sync,omitempty"` // SecretNames is a list of secrets the agent requires to execute tasks. @@ -552,11 +552,11 @@ func (m *Agent) GetName() string { return "" } -func (m *Agent) GetSupportedTaskType() string { +func (m *Agent) GetSupportedTaskTypes() []string { if m != nil { - return m.SupportedTaskType + return m.SupportedTaskTypes } - return "" + return nil } func (m *Agent) GetIsSync() bool { @@ -750,64 +750,64 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 937 bytes of a gzipped FileDescriptorProto + // 940 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x7f, 0x6f, 0xdb, 0x54, - 0x14, 0x25, 0x4d, 0x93, 0x26, 0x37, 0xd9, 0x96, 0xbc, 0x35, 0xcc, 0xcd, 0x06, 0x2a, 0x46, 0x43, - 0x15, 0xd3, 0x1c, 0xad, 0x45, 0xd0, 0x0d, 0xc1, 0x94, 0xb5, 0xa6, 0x54, 0x4a, 0xa3, 0xea, 0x25, - 0x45, 0x80, 0x04, 0xd6, 0x8b, 0x73, 0x1b, 0xac, 0x38, 0xb6, 0xf1, 0x7b, 0xae, 0x16, 0x89, 0xbf, - 0x41, 0x7c, 0x03, 0x3e, 0x2e, 0x7a, 0xef, 0xd9, 0xce, 0x8f, 0x65, 0xa8, 0x15, 0xff, 0xd9, 0xf7, - 0x9c, 0x7b, 0xee, 0x7d, 0xf7, 0x1e, 0xff, 0x80, 0xf6, 0xb5, 0x3f, 0x17, 0xe8, 0x8d, 0xfd, 0x0e, - 0x1b, 0xcf, 0xbc, 0xa0, 0xc3, 0x26, 0x18, 0x08, 0x2b, 0x8a, 0x43, 0x11, 0x92, 0xfb, 0x19, 0x66, - 0x29, 0xac, 0xfd, 0x24, 0xe7, 0xba, 0x61, 0x8c, 0x1d, 0xdf, 0x13, 0x18, 0x33, 0x9f, 0x6b, 0x76, - 0x7b, 0x6f, 0x15, 0x15, 0x8c, 0x4f, 0x33, 0xe8, 0xa3, 0x55, 0xc8, 0x0b, 0x04, 0xc6, 0xd7, 0xcc, - 0xc5, 0x14, 0xfe, 0x78, 0x0d, 0x1e, 0x63, 0x20, 0xbc, 0x6b, 0x0f, 0xe3, 0xcd, 0xe9, 0xf8, 0x16, - 0xdd, 0x44, 0x78, 0x61, 0xa0, 0x61, 0xf3, 0x9f, 0x12, 0xb4, 0x86, 0x8c, 0x4f, 0xed, 0x2c, 0x7e, - 0x81, 0x82, 0x8d, 0x99, 0x60, 0x84, 0x42, 0x53, 0xb6, 0xe1, 0xe4, 0x19, 0x8e, 0x37, 0x36, 0x0a, - 0xfb, 0x85, 0x83, 0xda, 0xe1, 0x67, 0x56, 0x7e, 0x38, 0x29, 0x6a, 0xad, 0x08, 0x9c, 0xe7, 0x1d, - 0xd0, 0x07, 0x62, 0x15, 0x20, 0x4f, 0xa0, 0x1a, 0xb0, 0x19, 0xf2, 0x88, 0xb9, 0x68, 0x6c, 0xed, - 0x17, 0x0e, 0xaa, 0x74, 0x11, 0x20, 0xe7, 0x50, 0xf6, 0xd9, 0x08, 0x7d, 0x6e, 0x14, 0xf7, 0x8b, - 0x07, 0xb5, 0xc3, 0x17, 0xd6, 0xea, 0x0c, 0xad, 0x8d, 0x8d, 0x5a, 0x3d, 0x95, 0x63, 0x07, 0x22, - 0x9e, 0xd3, 0x54, 0x80, 0xfc, 0x08, 0x35, 0x16, 0x04, 0xa1, 0x60, 0x92, 0xc9, 0x8d, 0x6d, 0xa5, - 0xf7, 0xe5, 0xed, 0xf4, 0xba, 0x8b, 0x44, 0x2d, 0xba, 0x2c, 0x45, 0x2c, 0x78, 0x38, 0x3d, 0xe6, - 0x0e, 0xc7, 0xf8, 0xc6, 0x73, 0xd1, 0x61, 0xae, 0x1b, 0x26, 0x81, 0x30, 0x4a, 0xea, 0x30, 0xcd, - 0xe9, 0x31, 0x1f, 0x68, 0xa4, 0xab, 0x01, 0x22, 0xa0, 0x85, 0xc1, 0x8d, 0x17, 0x87, 0xc1, 0x0c, - 0x03, 0xe1, 0xdc, 0xb0, 0xd8, 0x63, 0x23, 0x1f, 0xb9, 0x51, 0x56, 0x3d, 0xbd, 0xbe, 0x5d, 0x4f, - 0xf6, 0x42, 0xe2, 0x87, 0x4c, 0x41, 0x37, 0xb7, 0x8b, 0x1b, 0xa0, 0xf6, 0x4b, 0xa8, 0x2d, 0x8d, - 0x85, 0x34, 0xa0, 0x38, 0xc5, 0xb9, 0xda, 0x5e, 0x95, 0xca, 0x4b, 0xb2, 0x0b, 0xa5, 0x1b, 0xe6, - 0x27, 0xd9, 0x16, 0xf4, 0xcd, 0xab, 0xad, 0xe3, 0x42, 0xfb, 0x5b, 0x68, 0xac, 0x4f, 0xe0, 0x4e, - 0xf9, 0x67, 0xb0, 0xf7, 0xde, 0x6e, 0xef, 0x22, 0x64, 0xfe, 0x5d, 0x84, 0xe6, 0x49, 0x8c, 0x4c, - 0xa0, 0x9c, 0x09, 0xc5, 0xdf, 0x13, 0xe4, 0x82, 0xbc, 0x80, 0xb2, 0x17, 0x44, 0x89, 0xe0, 0xa9, - 0x17, 0xf7, 0xd6, 0xbc, 0xd8, 0xd3, 0x0f, 0xd6, 0x05, 0x8b, 0x68, 0x4a, 0x24, 0x5f, 0x41, 0x45, - 0xe0, 0x2c, 0xf2, 0x99, 0xd0, 0x55, 0x6a, 0x87, 0x8f, 0x37, 0x18, 0x78, 0x98, 0x52, 0x68, 0x4e, - 0x26, 0x9f, 0xc2, 0xbd, 0x30, 0x11, 0x51, 0x22, 0x9c, 0x28, 0xc6, 0x6b, 0xef, 0xad, 0x51, 0x54, - 0x3d, 0xd6, 0x75, 0xf0, 0x52, 0xc5, 0xc8, 0x2f, 0xf0, 0x68, 0xed, 0x39, 0x99, 0xa5, 0x5b, 0x33, - 0xb6, 0x55, 0xb1, 0xa7, 0xb7, 0x5a, 0x31, 0x6d, 0x89, 0x8d, 0x8f, 0xe1, 0xf7, 0xb0, 0xc3, 0xd1, - 0x8d, 0x51, 0x70, 0xa3, 0xa4, 0x1c, 0x63, 0xad, 0xcb, 0xbd, 0x33, 0x23, 0x6b, 0xa0, 0x13, 0xb4, - 0x41, 0xb2, 0xf4, 0xf6, 0x2b, 0xa8, 0x2f, 0x03, 0x77, 0xda, 0xc5, 0x4b, 0x20, 0xcb, 0x65, 0x78, - 0x14, 0x06, 0x5c, 0xcd, 0x27, 0x46, 0x1e, 0x26, 0xb1, 0x8b, 0xea, 0xd0, 0x4a, 0xab, 0x4e, 0xeb, - 0x59, 0x50, 0x1e, 0xc2, 0xa4, 0x70, 0xff, 0x0c, 0xc5, 0xf2, 0x0a, 0x1f, 0x43, 0x55, 0x4d, 0x4c, - 0xcc, 0x23, 0x4c, 0xcb, 0x57, 0x64, 0x60, 0x38, 0x8f, 0x36, 0x68, 0x6e, 0x6d, 0xd0, 0xfc, 0x03, - 0x1e, 0xe4, 0x9a, 0x69, 0x2f, 0x5f, 0x40, 0x25, 0xa3, 0xa4, 0xce, 0x30, 0xd6, 0x07, 0x45, 0x53, - 0x9c, 0xe6, 0x4c, 0x72, 0x04, 0x55, 0x3f, 0x9c, 0x38, 0xbe, 0x17, 0x4c, 0xb9, 0xb1, 0xa5, 0xe6, - 0xfb, 0xe1, 0x06, 0x6f, 0xf4, 0xc2, 0x09, 0xad, 0xf8, 0xe1, 0xa4, 0x27, 0x79, 0xe6, 0x9f, 0x05, - 0xa8, 0x64, 0x5a, 0xe4, 0x19, 0x94, 0xb8, 0x90, 0xce, 0x92, 0x45, 0xef, 0x1f, 0xb6, 0xd6, 0x8b, - 0x0e, 0x24, 0x48, 0x35, 0x87, 0x1c, 0xc1, 0x8e, 0xf6, 0x0e, 0x4f, 0x8d, 0xf8, 0x1f, 0xee, 0xcd, - 0x98, 0xc4, 0x80, 0x9d, 0x19, 0x72, 0xce, 0x26, 0x98, 0xfa, 0x2f, 0xbb, 0x35, 0xaf, 0xa0, 0x79, - 0x8a, 0x3e, 0xae, 0x3e, 0x20, 0xff, 0x7f, 0xba, 0xbb, 0x40, 0x96, 0x65, 0xf5, 0x80, 0xcd, 0xbf, - 0x0a, 0x50, 0xea, 0xca, 0x0f, 0x1c, 0x21, 0xb0, 0x2d, 0x5f, 0xda, 0xa9, 0xb8, 0xba, 0x96, 0xaf, - 0x45, 0x9e, 0x44, 0x51, 0x18, 0x0b, 0x1c, 0x3b, 0x8b, 0xfa, 0xda, 0x48, 0xcd, 0x1c, 0x1a, 0x66, - 0x8d, 0x3c, 0x82, 0x1d, 0x8f, 0x3b, 0x7c, 0x1e, 0xb8, 0xea, 0x50, 0x15, 0x5a, 0xf6, 0xf8, 0x60, - 0x1e, 0xb8, 0xe4, 0x13, 0xa8, 0x6b, 0xc3, 0x3a, 0xea, 0xc3, 0xa0, 0x5e, 0xdd, 0x55, 0x5a, 0xd3, - 0xb1, 0xbe, 0x0c, 0x99, 0x4f, 0xd5, 0xf6, 0x55, 0x2f, 0xd9, 0xa1, 0x37, 0xb4, 0x64, 0xbe, 0x86, - 0xc6, 0x82, 0x96, 0xba, 0xe4, 0x19, 0x94, 0xd4, 0x47, 0x3a, 0xb5, 0xc8, 0x3b, 0xdb, 0xd2, 0x6c, - 0xcd, 0x31, 0x1f, 0x42, 0xb3, 0xe7, 0x71, 0xad, 0xc0, 0xd3, 0x4a, 0xe6, 0x09, 0x90, 0xe5, 0x60, - 0xaa, 0xfb, 0x1c, 0xca, 0x2a, 0x47, 0xbe, 0x95, 0x8a, 0xef, 0x17, 0x4e, 0x49, 0x9f, 0xff, 0x0a, - 0x25, 0xe5, 0x0b, 0xd2, 0x82, 0x26, 0xb5, 0x87, 0xf4, 0xa7, 0xee, 0x9b, 0x9e, 0xed, 0x7c, 0xd7, - 0x3d, 0xef, 0x5d, 0x51, 0xbb, 0xf1, 0x81, 0x0c, 0x5f, 0xda, 0xf4, 0xa2, 0xdb, 0xb7, 0xfb, 0xc3, - 0x3c, 0x5c, 0x20, 0x35, 0xd8, 0xb9, 0xb4, 0xfb, 0xa7, 0xe7, 0xfd, 0xb3, 0xc6, 0x96, 0xbc, 0xa1, - 0x57, 0xfd, 0xbe, 0xbc, 0x29, 0x92, 0x7b, 0x50, 0x1d, 0x5c, 0x9d, 0x9c, 0xd8, 0xf6, 0xa9, 0x7d, - 0xda, 0xd8, 0x7e, 0xf3, 0xcd, 0xcf, 0x5f, 0x4f, 0x3c, 0xf1, 0x5b, 0x32, 0xb2, 0xdc, 0x70, 0xd6, - 0x51, 0xad, 0x84, 0xf1, 0x44, 0x5f, 0x74, 0xf2, 0x1f, 0x82, 0x09, 0x06, 0x9d, 0x68, 0xf4, 0x7c, - 0x12, 0x76, 0x56, 0xff, 0x63, 0x46, 0x65, 0xf5, 0x6f, 0x70, 0xf4, 0x6f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x86, 0xf5, 0x06, 0x75, 0xe0, 0x08, 0x00, 0x00, + 0x14, 0x25, 0x4d, 0x93, 0x26, 0x37, 0x59, 0x97, 0xbc, 0x35, 0xcc, 0xcd, 0x06, 0x2a, 0x46, 0x43, + 0x15, 0xd3, 0x1c, 0xd6, 0x22, 0xe8, 0x86, 0x60, 0xca, 0x5a, 0x53, 0x2a, 0xa5, 0x51, 0xf5, 0x92, + 0x22, 0x40, 0x02, 0xeb, 0xc5, 0xb9, 0x0d, 0x56, 0x1c, 0xdb, 0xf8, 0x3d, 0x57, 0x8b, 0xc4, 0xdf, + 0x48, 0xfb, 0x06, 0x7c, 0x5c, 0xe4, 0xf7, 0x9e, 0xdd, 0x24, 0xcb, 0x50, 0xab, 0xfd, 0x67, 0xdf, + 0x73, 0xee, 0xb9, 0xf7, 0xdd, 0x7b, 0xfc, 0x03, 0xda, 0x57, 0xfe, 0x5c, 0xa0, 0x37, 0xf6, 0x3b, + 0x6c, 0x3c, 0xf3, 0x82, 0x0e, 0x9b, 0x60, 0x20, 0xac, 0x28, 0x0e, 0x45, 0x48, 0xb6, 0x33, 0xcc, + 0x92, 0x58, 0xfb, 0x71, 0xce, 0x75, 0xc3, 0x18, 0x3b, 0xbe, 0x27, 0x30, 0x66, 0x3e, 0x57, 0xec, + 0xf6, 0xee, 0x32, 0x2a, 0x18, 0x9f, 0x66, 0xd0, 0x27, 0xcb, 0x90, 0x17, 0x08, 0x8c, 0xaf, 0x98, + 0x8b, 0x1a, 0xfe, 0x74, 0x05, 0x1e, 0x63, 0x20, 0xbc, 0x2b, 0x0f, 0xe3, 0xf5, 0xe9, 0xf8, 0x06, + 0xdd, 0x44, 0x78, 0x61, 0xa0, 0x60, 0xf3, 0xdf, 0x12, 0xb4, 0x86, 0x8c, 0x4f, 0xed, 0x2c, 0x7e, + 0x8e, 0x82, 0x8d, 0x99, 0x60, 0x84, 0x42, 0x33, 0x6d, 0xc3, 0xc9, 0x33, 0x1c, 0x6f, 0x6c, 0x14, + 0xf6, 0x0a, 0xfb, 0xb5, 0x83, 0x2f, 0xac, 0xfc, 0x70, 0xa9, 0xa8, 0xb5, 0x24, 0x70, 0x96, 0x77, + 0x40, 0xef, 0x8b, 0x65, 0x80, 0x3c, 0x86, 0x6a, 0xc0, 0x66, 0xc8, 0x23, 0xe6, 0xa2, 0xb1, 0xb1, + 0x57, 0xd8, 0xaf, 0xd2, 0x9b, 0x00, 0x39, 0x83, 0xb2, 0xcf, 0x46, 0xe8, 0x73, 0xa3, 0xb8, 0x57, + 0xdc, 0xaf, 0x1d, 0x3c, 0xb7, 0x96, 0x67, 0x68, 0xad, 0x6d, 0xd4, 0xea, 0xc9, 0x1c, 0x3b, 0x10, + 0xf1, 0x9c, 0x6a, 0x01, 0xf2, 0x0b, 0xd4, 0x58, 0x10, 0x84, 0x82, 0xa5, 0x4c, 0x6e, 0x6c, 0x4a, + 0xbd, 0x6f, 0x6e, 0xa7, 0xd7, 0xbd, 0x49, 0x54, 0xa2, 0x8b, 0x52, 0xc4, 0x82, 0x07, 0xd3, 0x23, + 0xee, 0x70, 0x8c, 0xaf, 0x3d, 0x17, 0x1d, 0xe6, 0xba, 0x61, 0x12, 0x08, 0xa3, 0x24, 0x0f, 0xd3, + 0x9c, 0x1e, 0xf1, 0x81, 0x42, 0xba, 0x0a, 0x20, 0x02, 0x5a, 0x18, 0x5c, 0x7b, 0x71, 0x18, 0xcc, + 0x30, 0x10, 0xce, 0x35, 0x8b, 0x3d, 0x36, 0xf2, 0x91, 0x1b, 0x65, 0xd9, 0xd3, 0xab, 0xdb, 0xf5, + 0x64, 0xdf, 0x48, 0xfc, 0x9c, 0x29, 0xa8, 0xe6, 0x76, 0x70, 0x0d, 0xd4, 0x7e, 0x01, 0xb5, 0x85, + 0xb1, 0x90, 0x06, 0x14, 0xa7, 0x38, 0x97, 0xdb, 0xab, 0xd2, 0xf4, 0x92, 0xec, 0x40, 0xe9, 0x9a, + 0xf9, 0x49, 0xb6, 0x05, 0x75, 0xf3, 0x72, 0xe3, 0xa8, 0xd0, 0xfe, 0x01, 0x1a, 0xab, 0x13, 0xb8, + 0x53, 0xfe, 0x29, 0xec, 0xbe, 0xb7, 0xdb, 0xbb, 0x08, 0x99, 0x6f, 0x8b, 0xd0, 0x3c, 0x8e, 0x91, + 0x09, 0x4c, 0x67, 0x42, 0xf1, 0xaf, 0x04, 0xb9, 0x20, 0xcf, 0xa1, 0xec, 0x05, 0x51, 0x22, 0xb8, + 0xf6, 0xe2, 0xee, 0x8a, 0x17, 0x7b, 0xea, 0xc1, 0x3a, 0x67, 0x11, 0xd5, 0x44, 0xf2, 0x2d, 0x54, + 0x04, 0xce, 0x22, 0x9f, 0x09, 0x55, 0xa5, 0x76, 0xf0, 0x68, 0x8d, 0x81, 0x87, 0x9a, 0x42, 0x73, + 0x32, 0xf9, 0x1c, 0xee, 0x85, 0x89, 0x88, 0x12, 0xe1, 0x44, 0x31, 0x5e, 0x79, 0x6f, 0x8c, 0xa2, + 0xec, 0xb1, 0xae, 0x82, 0x17, 0x32, 0x46, 0x7e, 0x87, 0x87, 0x2b, 0xcf, 0xc9, 0x4c, 0x6f, 0xcd, + 0xd8, 0x94, 0xc5, 0x9e, 0xdc, 0x6a, 0xc5, 0xb4, 0x25, 0xd6, 0x3e, 0x86, 0x3f, 0xc1, 0x16, 0x47, + 0x37, 0x46, 0xc1, 0x8d, 0x92, 0x74, 0x8c, 0xb5, 0x2a, 0xf7, 0xce, 0x8c, 0xac, 0x81, 0x4a, 0x50, + 0x06, 0xc9, 0xd2, 0xdb, 0x2f, 0xa1, 0xbe, 0x08, 0xdc, 0x69, 0x17, 0x2f, 0x80, 0x2c, 0x96, 0xe1, + 0x51, 0x18, 0x70, 0x39, 0x9f, 0x18, 0x79, 0x98, 0xc4, 0x2e, 0xca, 0x43, 0x4b, 0xad, 0x3a, 0xad, + 0x67, 0xc1, 0xf4, 0x10, 0x26, 0x85, 0xed, 0x53, 0x14, 0x8b, 0x2b, 0x7c, 0x04, 0x55, 0x39, 0x31, + 0x31, 0x8f, 0x50, 0x97, 0xaf, 0xa4, 0x81, 0xe1, 0x3c, 0x5a, 0xa3, 0xb9, 0xb1, 0x46, 0xf3, 0x6f, + 0xb8, 0x9f, 0x6b, 0xea, 0x5e, 0xbe, 0x86, 0x4a, 0x46, 0xd1, 0xce, 0x30, 0x56, 0x07, 0x45, 0x35, + 0x4e, 0x73, 0x26, 0x39, 0x84, 0xaa, 0x1f, 0x4e, 0x1c, 0xdf, 0x0b, 0xa6, 0xdc, 0xd8, 0x90, 0xf3, + 0xfd, 0x78, 0x8d, 0x37, 0x7a, 0xe1, 0x84, 0x56, 0xfc, 0x70, 0xd2, 0x4b, 0x79, 0xe6, 0x3f, 0x05, + 0xa8, 0x64, 0x5a, 0xe4, 0x29, 0x94, 0xb8, 0x48, 0x9d, 0x95, 0x16, 0xdd, 0x3e, 0x68, 0xad, 0x16, + 0x1d, 0xa4, 0x20, 0x55, 0x1c, 0x72, 0x08, 0x5b, 0xca, 0x3b, 0x5c, 0x1b, 0xf1, 0x7f, 0xdc, 0x9b, + 0x31, 0x89, 0x01, 0x5b, 0x33, 0xe4, 0x9c, 0x4d, 0x50, 0xfb, 0x2f, 0xbb, 0x35, 0x2f, 0xa1, 0x79, + 0x82, 0x3e, 0x2e, 0x3f, 0x20, 0x1f, 0x3e, 0xdd, 0x1d, 0x20, 0x8b, 0xb2, 0x6a, 0xc0, 0xe6, 0xdb, + 0x02, 0x94, 0xba, 0xe9, 0x07, 0x8e, 0x10, 0xd8, 0x4c, 0x5f, 0xda, 0x5a, 0x5c, 0x5e, 0x93, 0xaf, + 0x60, 0x87, 0x27, 0x51, 0x14, 0xc6, 0x02, 0xc7, 0x4e, 0x5e, 0x5f, 0xcd, 0xb4, 0x4a, 0x49, 0x8e, + 0x0d, 0x75, 0x27, 0x9c, 0x3c, 0x84, 0x2d, 0x8f, 0x3b, 0x7c, 0x1e, 0xb8, 0xf2, 0x58, 0x15, 0x5a, + 0xf6, 0xf8, 0x60, 0x1e, 0xb8, 0xe4, 0x33, 0xa8, 0x2b, 0xcb, 0x3a, 0xf2, 0xd3, 0x20, 0x5f, 0xde, + 0x55, 0x5a, 0x53, 0xb1, 0x7e, 0x1a, 0x32, 0x9f, 0xc8, 0xfd, 0xcb, 0x6e, 0xb2, 0x63, 0xaf, 0x69, + 0xca, 0x7c, 0x05, 0x8d, 0x1b, 0x9a, 0xf6, 0xc9, 0x53, 0x28, 0xc9, 0xcf, 0xb4, 0x36, 0xc9, 0x3b, + 0xfb, 0x52, 0x6c, 0xc5, 0x31, 0x1f, 0x40, 0xb3, 0xe7, 0x71, 0xa5, 0xc0, 0x75, 0x25, 0xf3, 0x18, + 0xc8, 0x62, 0x50, 0xeb, 0x3e, 0x83, 0xb2, 0xcc, 0x49, 0xdf, 0x4b, 0xc5, 0xf7, 0x0b, 0x6b, 0xd2, + 0x97, 0x7f, 0x40, 0x49, 0x3a, 0x83, 0xb4, 0xa0, 0x49, 0xed, 0x21, 0xfd, 0xb5, 0xfb, 0xba, 0x67, + 0x3b, 0x3f, 0x76, 0xcf, 0x7a, 0x97, 0xd4, 0x6e, 0x7c, 0x94, 0x86, 0x2f, 0x6c, 0x7a, 0xde, 0xed, + 0xdb, 0xfd, 0x61, 0x1e, 0x2e, 0x90, 0x1a, 0x6c, 0x5d, 0xd8, 0xfd, 0x93, 0xb3, 0xfe, 0x69, 0x63, + 0x23, 0xbd, 0xa1, 0x97, 0xfd, 0x7e, 0x7a, 0x53, 0x24, 0xf7, 0xa0, 0x3a, 0xb8, 0x3c, 0x3e, 0xb6, + 0xed, 0x13, 0xfb, 0xa4, 0xb1, 0xf9, 0xfa, 0xfb, 0xdf, 0xbe, 0x9b, 0x78, 0xe2, 0xcf, 0x64, 0x64, + 0xb9, 0xe1, 0xac, 0x23, 0x5b, 0x09, 0xe3, 0x89, 0xba, 0xe8, 0xe4, 0xbf, 0x04, 0x13, 0x0c, 0x3a, + 0xd1, 0xe8, 0xd9, 0x24, 0xec, 0x2c, 0xff, 0xc9, 0x8c, 0xca, 0xf2, 0xef, 0xe0, 0xf0, 0xbf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xf7, 0x75, 0x33, 0xb3, 0xe2, 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go index 55a3403701..6d0fc36a44 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go @@ -677,8 +677,6 @@ func (m *Agent) Validate() error { // no validation rules for Name - // no validation rules for SupportedTaskType - // no validation rules for IsSync return nil diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index 48531d958f..e79343c4b5 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -223,8 +223,11 @@ "type": "string", "description": "Name is the developer-assigned name of the agent." }, - "supported_task_type": { - "type": "string", + "supported_task_types": { + "type": "array", + "items": { + "type": "string" + }, "description": "SupportedTaskTypes are the types of the tasks that the agent can handle." }, "is_sync": { diff --git a/flyteidl/gen/pb-go/flyteidl/service/openapi.go b/flyteidl/gen/pb-go/flyteidl/service/openapi.go index 94b2afe544..66072a5bf7 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/openapi.go +++ b/flyteidl/gen/pb-go/flyteidl/service/openapi.go @@ -93,7 +93,7 @@ func adminSwaggerJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "admin.swagger.json", size: 309117, mode: os.FileMode(420), modTime: time.Unix(1562572800, 0)} + info := bindataFileInfo{name: "admin.swagger.json", size: 309117, mode: os.FileMode(511), modTime: time.Unix(1562572800, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index b377df34c6..bd940affc5 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -8425,18 +8425,35 @@ public interface AgentOrBuilder extends * SupportedTaskTypes are the types of the tasks that the agent can handle. *
* - * string supported_task_type = 2; + * repeated string supported_task_types = 2; */ - java.lang.String getSupportedTaskType(); + java.util.List + getSupportedTaskTypesList(); + /** + *
+     * SupportedTaskTypes are the types of the tasks that the agent can handle.
+     * 
+ * + * repeated string supported_task_types = 2; + */ + int getSupportedTaskTypesCount(); + /** + *
+     * SupportedTaskTypes are the types of the tasks that the agent can handle.
+     * 
+ * + * repeated string supported_task_types = 2; + */ + java.lang.String getSupportedTaskTypes(int index); /** *
      * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * string supported_task_type = 2; + * repeated string supported_task_types = 2; */ com.google.protobuf.ByteString - getSupportedTaskTypeBytes(); + getSupportedTaskTypesBytes(int index); /** *
@@ -8500,7 +8517,7 @@ private Agent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     }
     private Agent() {
       name_ = "";
-      supportedTaskType_ = "";
+      supportedTaskTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
@@ -8536,8 +8553,11 @@ private Agent(
             }
             case 18: {
               java.lang.String s = input.readStringRequireUtf8();
-
-              supportedTaskType_ = s;
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                supportedTaskTypes_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              supportedTaskTypes_.add(s);
               break;
             }
             case 24: {
@@ -8569,6 +8589,9 @@ private Agent(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          supportedTaskTypes_ = supportedTaskTypes_.getUnmodifiableView();
+        }
         if (((mutable_bitField0_ & 0x00000008) != 0)) {
           secretNames_ = secretNames_.getUnmodifiableView();
         }
@@ -8632,46 +8655,49 @@ public java.lang.String getName() {
       }
     }
 
-    public static final int SUPPORTED_TASK_TYPE_FIELD_NUMBER = 2;
-    private volatile java.lang.Object supportedTaskType_;
+    public static final int SUPPORTED_TASK_TYPES_FIELD_NUMBER = 2;
+    private com.google.protobuf.LazyStringList supportedTaskTypes_;
     /**
      * 
      * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * string supported_task_type = 2; + * repeated string supported_task_types = 2; */ - public java.lang.String getSupportedTaskType() { - java.lang.Object ref = supportedTaskType_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - supportedTaskType_ = s; - return s; - } + public com.google.protobuf.ProtocolStringList + getSupportedTaskTypesList() { + return supportedTaskTypes_; + } + /** + *
+     * SupportedTaskTypes are the types of the tasks that the agent can handle.
+     * 
+ * + * repeated string supported_task_types = 2; + */ + public int getSupportedTaskTypesCount() { + return supportedTaskTypes_.size(); + } + /** + *
+     * SupportedTaskTypes are the types of the tasks that the agent can handle.
+     * 
+ * + * repeated string supported_task_types = 2; + */ + public java.lang.String getSupportedTaskTypes(int index) { + return supportedTaskTypes_.get(index); } /** *
      * SupportedTaskTypes are the types of the tasks that the agent can handle.
      * 
* - * string supported_task_type = 2; + * repeated string supported_task_types = 2; */ public com.google.protobuf.ByteString - getSupportedTaskTypeBytes() { - java.lang.Object ref = supportedTaskType_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - supportedTaskType_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + getSupportedTaskTypesBytes(int index) { + return supportedTaskTypes_.getByteString(index); } public static final int IS_SYNC_FIELD_NUMBER = 3; @@ -8749,8 +8775,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!getNameBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getSupportedTaskTypeBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, supportedTaskType_); + for (int i = 0; i < supportedTaskTypes_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, supportedTaskTypes_.getRaw(i)); } if (isSync_ != false) { output.writeBool(3, isSync_); @@ -8770,8 +8796,13 @@ public int getSerializedSize() { if (!getNameBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getSupportedTaskTypeBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, supportedTaskType_); + { + int dataSize = 0; + for (int i = 0; i < supportedTaskTypes_.size(); i++) { + dataSize += computeStringSizeNoTag(supportedTaskTypes_.getRaw(i)); + } + size += dataSize; + size += 1 * getSupportedTaskTypesList().size(); } if (isSync_ != false) { size += com.google.protobuf.CodedOutputStream @@ -8802,8 +8833,8 @@ public boolean equals(final java.lang.Object obj) { if (!getName() .equals(other.getName())) return false; - if (!getSupportedTaskType() - .equals(other.getSupportedTaskType())) return false; + if (!getSupportedTaskTypesList() + .equals(other.getSupportedTaskTypesList())) return false; if (getIsSync() != other.getIsSync()) return false; if (!getSecretNamesList() @@ -8821,8 +8852,10 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (37 * hash) + SUPPORTED_TASK_TYPE_FIELD_NUMBER; - hash = (53 * hash) + getSupportedTaskType().hashCode(); + if (getSupportedTaskTypesCount() > 0) { + hash = (37 * hash) + SUPPORTED_TASK_TYPES_FIELD_NUMBER; + hash = (53 * hash) + getSupportedTaskTypesList().hashCode(); + } hash = (37 * hash) + IS_SYNC_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSync()); @@ -8969,8 +9002,8 @@ public Builder clear() { super.clear(); name_ = ""; - supportedTaskType_ = ""; - + supportedTaskTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000002); isSync_ = false; secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; @@ -9004,7 +9037,11 @@ public flyteidl.admin.AgentOuterClass.Agent buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.name_ = name_; - result.supportedTaskType_ = supportedTaskType_; + if (((bitField0_ & 0x00000002) != 0)) { + supportedTaskTypes_ = supportedTaskTypes_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.supportedTaskTypes_ = supportedTaskTypes_; result.isSync_ = isSync_; if (((bitField0_ & 0x00000008) != 0)) { secretNames_ = secretNames_.getUnmodifiableView(); @@ -9064,8 +9101,14 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Agent other) { name_ = other.name_; onChanged(); } - if (!other.getSupportedTaskType().isEmpty()) { - supportedTaskType_ = other.supportedTaskType_; + if (!other.supportedTaskTypes_.isEmpty()) { + if (supportedTaskTypes_.isEmpty()) { + supportedTaskTypes_ = other.supportedTaskTypes_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureSupportedTaskTypesIsMutable(); + supportedTaskTypes_.addAll(other.supportedTaskTypes_); + } onChanged(); } if (other.getIsSync() != false) { @@ -9200,60 +9243,86 @@ public Builder setNameBytes( return this; } - private java.lang.Object supportedTaskType_ = ""; + private com.google.protobuf.LazyStringList supportedTaskTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private void ensureSupportedTaskTypesIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + supportedTaskTypes_ = new com.google.protobuf.LazyStringArrayList(supportedTaskTypes_); + bitField0_ |= 0x00000002; + } + } /** *
        * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * string supported_task_type = 2; + * repeated string supported_task_types = 2; */ - public java.lang.String getSupportedTaskType() { - java.lang.Object ref = supportedTaskType_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - supportedTaskType_ = s; - return s; - } else { - return (java.lang.String) ref; - } + public com.google.protobuf.ProtocolStringList + getSupportedTaskTypesList() { + return supportedTaskTypes_.getUnmodifiableView(); } /** *
        * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * string supported_task_type = 2; + * repeated string supported_task_types = 2; + */ + public int getSupportedTaskTypesCount() { + return supportedTaskTypes_.size(); + } + /** + *
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
+       * 
+ * + * repeated string supported_task_types = 2; + */ + public java.lang.String getSupportedTaskTypes(int index) { + return supportedTaskTypes_.get(index); + } + /** + *
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
+       * 
+ * + * repeated string supported_task_types = 2; */ public com.google.protobuf.ByteString - getSupportedTaskTypeBytes() { - java.lang.Object ref = supportedTaskType_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - supportedTaskType_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + getSupportedTaskTypesBytes(int index) { + return supportedTaskTypes_.getByteString(index); + } + /** + *
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
+       * 
+ * + * repeated string supported_task_types = 2; + */ + public Builder setSupportedTaskTypes( + int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureSupportedTaskTypesIsMutable(); + supportedTaskTypes_.set(index, value); + onChanged(); + return this; } /** *
        * SupportedTaskTypes are the types of the tasks that the agent can handle.
        * 
* - * string supported_task_type = 2; + * repeated string supported_task_types = 2; */ - public Builder setSupportedTaskType( + public Builder addSupportedTaskTypes( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - - supportedTaskType_ = value; + ensureSupportedTaskTypesIsMutable(); + supportedTaskTypes_.add(value); onChanged(); return this; } @@ -9262,11 +9331,13 @@ public Builder setSupportedTaskType( * SupportedTaskTypes are the types of the tasks that the agent can handle. *
* - * string supported_task_type = 2; + * repeated string supported_task_types = 2; */ - public Builder clearSupportedTaskType() { - - supportedTaskType_ = getDefaultInstance().getSupportedTaskType(); + public Builder addAllSupportedTaskTypes( + java.lang.Iterable values) { + ensureSupportedTaskTypesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, supportedTaskTypes_); onChanged(); return this; } @@ -9275,16 +9346,29 @@ public Builder clearSupportedTaskType() { * SupportedTaskTypes are the types of the tasks that the agent can handle. * * - * string supported_task_type = 2; + * repeated string supported_task_types = 2; */ - public Builder setSupportedTaskTypeBytes( + public Builder clearSupportedTaskTypes() { + supportedTaskTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + *
+       * SupportedTaskTypes are the types of the tasks that the agent can handle.
+       * 
+ * + * repeated string supported_task_types = 2; + */ + public Builder addSupportedTaskTypesBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - - supportedTaskType_ = value; + ensureSupportedTaskTypesIsMutable(); + supportedTaskTypes_.add(value); onChanged(); return this; } @@ -12054,18 +12138,18 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" + "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" + "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + - "\014\"\024\n\022DeleteTaskResponse\"Y\n\005Agent\022\014\n\004name" + - "\030\001 \001(\t\022\033\n\023supported_task_type\030\002 \001(\t\022\017\n\007i" + - "s_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017Ge" + - "tAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgentR" + - "esponse\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin." + - "Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgents" + - "Response\022%\n\006agents\030\001 \003(\0132\025.flyteidl.admi" + - "n.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022" + - "\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007R" + - "UNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/fl" + - "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" + - "/adminb\006proto3" + "\014\"\024\n\022DeleteTaskResponse\"Z\n\005Agent\022\014\n\004name" + + "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \003(\t\022\017\n\007" + + "is_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017G" + + "etAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgent" + + "Response\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin" + + ".Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgent" + + "sResponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.adm" + + "in.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000" + + "\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007" + + "RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/f" + + "lyteorg/flyte/flyteidl/gen/pb-go/flyteid" + + "l/adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -12161,7 +12245,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_Agent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_Agent_descriptor, - new java.lang.String[] { "Name", "SupportedTaskType", "IsSync", "SecretNames", }); + new java.lang.String[] { "Name", "SupportedTaskTypes", "IsSync", "SecretNames", }); internal_static_flyteidl_admin_GetAgentRequest_descriptor = getDescriptor().getMessageTypes().get(9); internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable = new diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index ce99568da7..53b0150d92 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -8365,8 +8365,8 @@ export namespace flyteidl { /** Agent name */ name?: (string|null); - /** Agent supportedTaskType */ - supportedTaskType?: (string|null); + /** Agent supportedTaskTypes */ + supportedTaskTypes?: (string[]|null); /** Agent isSync */ isSync?: (boolean|null); @@ -8387,8 +8387,8 @@ export namespace flyteidl { /** Agent name. */ public name: string; - /** Agent supportedTaskType. */ - public supportedTaskType: string; + /** Agent supportedTaskTypes. */ + public supportedTaskTypes: string[]; /** Agent isSync. */ public isSync: boolean; diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index d9226287f6..586377bd30 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -20417,7 +20417,7 @@ * @memberof flyteidl.admin * @interface IAgent * @property {string|null} [name] Agent name - * @property {string|null} [supportedTaskType] Agent supportedTaskType + * @property {Array.|null} [supportedTaskTypes] Agent supportedTaskTypes * @property {boolean|null} [isSync] Agent isSync * @property {Array.|null} [secretNames] Agent secretNames */ @@ -20431,6 +20431,7 @@ * @param {flyteidl.admin.IAgent=} [properties] Properties to set */ function Agent(properties) { + this.supportedTaskTypes = []; this.secretNames = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) @@ -20447,12 +20448,12 @@ Agent.prototype.name = ""; /** - * Agent supportedTaskType. - * @member {string} supportedTaskType + * Agent supportedTaskTypes. + * @member {Array.} supportedTaskTypes * @memberof flyteidl.admin.Agent * @instance */ - Agent.prototype.supportedTaskType = ""; + Agent.prototype.supportedTaskTypes = $util.emptyArray; /** * Agent isSync. @@ -20496,8 +20497,9 @@ writer = $Writer.create(); if (message.name != null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.supportedTaskType != null && message.hasOwnProperty("supportedTaskType")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.supportedTaskType); + if (message.supportedTaskTypes != null && message.supportedTaskTypes.length) + for (var i = 0; i < message.supportedTaskTypes.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.supportedTaskTypes[i]); if (message.isSync != null && message.hasOwnProperty("isSync")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.isSync); if (message.secretNames != null && message.secretNames.length) @@ -20528,7 +20530,9 @@ message.name = reader.string(); break; case 2: - message.supportedTaskType = reader.string(); + if (!(message.supportedTaskTypes && message.supportedTaskTypes.length)) + message.supportedTaskTypes = []; + message.supportedTaskTypes.push(reader.string()); break; case 3: message.isSync = reader.bool(); @@ -20560,9 +20564,13 @@ if (message.name != null && message.hasOwnProperty("name")) if (!$util.isString(message.name)) return "name: string expected"; - if (message.supportedTaskType != null && message.hasOwnProperty("supportedTaskType")) - if (!$util.isString(message.supportedTaskType)) - return "supportedTaskType: string expected"; + if (message.supportedTaskTypes != null && message.hasOwnProperty("supportedTaskTypes")) { + if (!Array.isArray(message.supportedTaskTypes)) + return "supportedTaskTypes: array expected"; + for (var i = 0; i < message.supportedTaskTypes.length; ++i) + if (!$util.isString(message.supportedTaskTypes[i])) + return "supportedTaskTypes: string[] expected"; + } if (message.isSync != null && message.hasOwnProperty("isSync")) if (typeof message.isSync !== "boolean") return "isSync: boolean expected"; diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index 063e705cfc..55fa65fa8a 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -18,7 +18,7 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x87\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12.\n\x13supported_task_type\x18\x02 \x01(\tR\x11supportedTaskType\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\x12!\n\x0csecret_names\x18\x04 \x03(\tR\x0bsecretNames\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x89\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\x12!\n\x0csecret_names\x18\x04 \x03(\tR\x0bsecretNames\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -35,8 +35,8 @@ _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' _CREATETASKREQUEST_SECRETSENTRY._options = None _CREATETASKREQUEST_SECRETSENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=2107 - _globals['_STATE']._serialized_end=2201 + _globals['_STATE']._serialized_start=2109 + _globals['_STATE']._serialized_end=2203 _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 @@ -62,13 +62,13 @@ _globals['_DELETETASKRESPONSE']._serialized_start=1753 _globals['_DELETETASKRESPONSE']._serialized_end=1773 _globals['_AGENT']._serialized_start=1776 - _globals['_AGENT']._serialized_end=1911 - _globals['_GETAGENTREQUEST']._serialized_start=1913 - _globals['_GETAGENTREQUEST']._serialized_end=1950 - _globals['_GETAGENTRESPONSE']._serialized_start=1952 - _globals['_GETAGENTRESPONSE']._serialized_end=2015 - _globals['_LISTAGENTSREQUEST']._serialized_start=2017 - _globals['_LISTAGENTSREQUEST']._serialized_end=2036 - _globals['_LISTAGENTSRESPONSE']._serialized_start=2038 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2105 + _globals['_AGENT']._serialized_end=1913 + _globals['_GETAGENTREQUEST']._serialized_start=1915 + _globals['_GETAGENTREQUEST']._serialized_end=1952 + _globals['_GETAGENTRESPONSE']._serialized_start=1954 + _globals['_GETAGENTRESPONSE']._serialized_end=2017 + _globals['_LISTAGENTSREQUEST']._serialized_start=2019 + _globals['_LISTAGENTSREQUEST']._serialized_end=2038 + _globals['_LISTAGENTSRESPONSE']._serialized_start=2040 + _globals['_LISTAGENTSRESPONSE']._serialized_end=2107 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi index b176241824..81bca48431 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi @@ -127,16 +127,16 @@ class DeleteTaskResponse(_message.Message): def __init__(self) -> None: ... class Agent(_message.Message): - __slots__ = ["name", "supported_task_type", "is_sync", "secret_names"] + __slots__ = ["name", "supported_task_types", "is_sync", "secret_names"] NAME_FIELD_NUMBER: _ClassVar[int] - SUPPORTED_TASK_TYPE_FIELD_NUMBER: _ClassVar[int] + SUPPORTED_TASK_TYPES_FIELD_NUMBER: _ClassVar[int] IS_SYNC_FIELD_NUMBER: _ClassVar[int] SECRET_NAMES_FIELD_NUMBER: _ClassVar[int] name: str - supported_task_type: str + supported_task_types: _containers.RepeatedScalarFieldContainer[str] is_sync: bool secret_names: _containers.RepeatedScalarFieldContainer[str] - def __init__(self, name: _Optional[str] = ..., supported_task_type: _Optional[str] = ..., is_sync: bool = ..., secret_names: _Optional[_Iterable[str]] = ...) -> None: ... + def __init__(self, name: _Optional[str] = ..., supported_task_types: _Optional[_Iterable[str]] = ..., is_sync: bool = ..., secret_names: _Optional[_Iterable[str]] = ...) -> None: ... class GetAgentRequest(_message.Message): __slots__ = ["name"] diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index fcd8a97601..31d9b3f2b3 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -114,8 +114,8 @@ pub struct Agent { #[prost(string, tag="1")] pub name: ::prost::alloc::string::String, /// SupportedTaskTypes are the types of the tasks that the agent can handle. - #[prost(string, tag="2")] - pub supported_task_type: ::prost::alloc::string::String, + #[prost(string, repeated, tag="2")] + pub supported_task_types: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, /// IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. #[prost(bool, tag="3")] pub is_sync: bool, diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index e81c37ce39..668cb03009 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -102,7 +102,7 @@ message Agent { string name = 1; // SupportedTaskTypes are the types of the tasks that the agent can handle. - string supported_task_type = 2; + repeated string supported_task_types = 2; // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. bool is_sync = 3; diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index ce6a171b67..9536dd9cf4 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -351,10 +351,15 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien agents := res.GetAgents() for _, agent := range agents { - if _, ok := agentRegistry[agent.SupportedTaskType]; !ok { - agentRegistry[agent.SupportedTaskType] = make(map[bool]*Agent) + supportedTaskTypes := agent.SupportedTaskTypes + isSync := agent.IsSync + + for _, supportedTaskType := range supportedTaskTypes { + if _, ok := agentRegistry[supportedTaskType]; !ok { + agentRegistry[supportedTaskType] = make(map[bool]*Agent) + } + agentRegistry[supportedTaskType][isSync] = agentDeployment } - agentRegistry[agent.SupportedTaskType][agent.IsSync] = agentDeployment } } From fb94d3878a675aeb8974652d41a4d1aabc17be8d Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 12 Dec 2023 20:44:53 +0800 Subject: [PATCH 24/47] fileMode Signed-off-by: Future Outlier --- flyteidl/gen/pb-go/flyteidl/service/openapi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flyteidl/gen/pb-go/flyteidl/service/openapi.go b/flyteidl/gen/pb-go/flyteidl/service/openapi.go index 66072a5bf7..94b2afe544 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/openapi.go +++ b/flyteidl/gen/pb-go/flyteidl/service/openapi.go @@ -93,7 +93,7 @@ func adminSwaggerJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "admin.swagger.json", size: 309117, mode: os.FileMode(511), modTime: time.Unix(1562572800, 0)} + info := bindataFileInfo{name: "admin.swagger.json", size: 309117, mode: os.FileMode(420), modTime: time.Unix(1562572800, 0)} a := &asset{bytes: bytes, info: info} return a, nil } From b0daff881614c98c748ca8fa7dc1e931186569a1 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 12 Dec 2023 20:47:53 +0800 Subject: [PATCH 25/47] Better annotation Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 1 + 1 file changed, 1 insertion(+) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 9536dd9cf4..96afd02d0e 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -371,6 +371,7 @@ func newAgentPlugin() webapi.PluginEntry { connectionCache := make(map[*Agent]*grpc.ClientConn) agentRegistry, err := initializeAgentRegistry(cfg, connectionCache) if err != nil { + // We should wait for all agents to be up and running before starting the server panic(err) } From 37095e936c50d0257d1caa1853bb0dc952d78545 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 12 Dec 2023 21:54:21 +0800 Subject: [PATCH 26/47] fix test Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go | 3 +-- flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go index bc9ca03417..f6e026d2e6 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go @@ -120,7 +120,6 @@ func TestEndToEnd(t *testing.T) { template.Type = "spark_job" phase = tests.RunPluginEndToEndTest(t, plugin, &template, inputs, nil, nil, iter) assert.Equal(t, true, phase.Phase().IsSuccess()) - }) t.Run("failed to create a job", func(t *testing.T) { @@ -161,7 +160,7 @@ func TestEndToEnd(t *testing.T) { tr.OnRead(context.Background()).Return(nil, fmt.Errorf("read fail")) tCtx.OnTaskReader().Return(tr) - agentPlugin := newAgentPlugin() + agentPlugin := newMockAgentPlugin() pluginEntry := pluginmachinery.CreateRemotePlugin(agentPlugin) plugin, err := pluginEntry.LoadPlugin(context.TODO(), newFakeSetupContext("test3")) assert.NoError(t, err) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index 446d3563d4..025f4ed3ed 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -45,7 +45,7 @@ func TestPlugin(t *testing.T) { }) t.Run("test newAgentPlugin", func(t *testing.T) { - p := newAgentPlugin() + p := newMockAgentPlugin() assert.NotNil(t, p) assert.Equal(t, "agent-service", p.ID) assert.NotNil(t, p.PluginLoader) From c8d78eb03f140a4d8070455642b0ddfe960d54e2 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 12 Dec 2023 22:50:49 +0800 Subject: [PATCH 27/47] add agent metadata test Signed-off-by: Future Outlier --- .../agent/mocks/AgentMetadataServiceClient.go | 114 ++++++++++++++++++ .../go/tasks/plugins/webapi/agent/plugin.go | 5 +- .../tasks/plugins/webapi/agent/plugin_test.go | 36 ++++++ 3 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 flyteplugins/go/tasks/plugins/webapi/agent/mocks/AgentMetadataServiceClient.go diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/mocks/AgentMetadataServiceClient.go b/flyteplugins/go/tasks/plugins/webapi/agent/mocks/AgentMetadataServiceClient.go new file mode 100644 index 0000000000..51b5d175b4 --- /dev/null +++ b/flyteplugins/go/tasks/plugins/webapi/agent/mocks/AgentMetadataServiceClient.go @@ -0,0 +1,114 @@ +// Code generated by mockery v1.0.1. DO NOT EDIT. + +package mocks + +import ( + context "context" + + admin "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" + + grpc "google.golang.org/grpc" + + mock "github.com/stretchr/testify/mock" +) + +// AgentMetadataServiceClient is an autogenerated mock type for the AgentMetadataServiceClient type +type AgentMetadataServiceClient struct { + mock.Mock +} + +type AgentMetadataServiceClient_GetAgent struct { + *mock.Call +} + +func (_m AgentMetadataServiceClient_GetAgent) Return(_a0 *admin.GetAgentResponse, _a1 error) *AgentMetadataServiceClient_GetAgent { + return &AgentMetadataServiceClient_GetAgent{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *AgentMetadataServiceClient) OnGetAgent(ctx context.Context, in *admin.GetAgentRequest, opts ...grpc.CallOption) *AgentMetadataServiceClient_GetAgent { + c_call := _m.On("GetAgent", ctx, in, opts) + return &AgentMetadataServiceClient_GetAgent{Call: c_call} +} + +func (_m *AgentMetadataServiceClient) OnGetAgentMatch(matchers ...interface{}) *AgentMetadataServiceClient_GetAgent { + c_call := _m.On("GetAgent", matchers...) + return &AgentMetadataServiceClient_GetAgent{Call: c_call} +} + +// GetAgent provides a mock function with given fields: ctx, in, opts +func (_m *AgentMetadataServiceClient) GetAgent(ctx context.Context, in *admin.GetAgentRequest, opts ...grpc.CallOption) (*admin.GetAgentResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *admin.GetAgentResponse + if rf, ok := ret.Get(0).(func(context.Context, *admin.GetAgentRequest, ...grpc.CallOption) *admin.GetAgentResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*admin.GetAgentResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *admin.GetAgentRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +type AgentMetadataServiceClient_ListAgent struct { + *mock.Call +} + +func (_m AgentMetadataServiceClient_ListAgent) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceClient_ListAgent { + return &AgentMetadataServiceClient_ListAgent{Call: _m.Call.Return(_a0, _a1)} +} + +func (_m *AgentMetadataServiceClient) OnListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) *AgentMetadataServiceClient_ListAgent { + c_call := _m.On("ListAgent", ctx, in, opts) + return &AgentMetadataServiceClient_ListAgent{Call: c_call} +} + +func (_m *AgentMetadataServiceClient) OnListAgentMatch(matchers ...interface{}) *AgentMetadataServiceClient_ListAgent { + c_call := _m.On("ListAgent", matchers...) + return &AgentMetadataServiceClient_ListAgent{Call: c_call} +} + +// ListAgent provides a mock function with given fields: ctx, in, opts +func (_m *AgentMetadataServiceClient) ListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *admin.ListAgentsResponse + if rf, ok := ret.Get(0).(func(context.Context, *admin.ListAgentsRequest, ...grpc.CallOption) *admin.ListAgentsResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*admin.ListAgentsResponse) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, *admin.ListAgentsRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 96afd02d0e..069fa5bab4 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -29,6 +29,7 @@ import ( ) type GetAsyncClientFunc func(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) +type GetAgentMetadataClientFunc func(ctx context.Context, agent *Agent, connCache map[*Agent]*grpc.ClientConn) (service.AgentMetadataServiceClient, error) type Plugin struct { metricScope promutils.Scope @@ -325,7 +326,7 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte return context.WithTimeout(ctx, timeout) } -func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn) (map[string]map[bool]*Agent, error) { +func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn, getAgentMetadataClientFunc GetAgentMetadataClientFunc) (map[string]map[bool]*Agent, error) { agentRegistry := make(map[string]map[bool]*Agent) agentDeployments := append([]*Agent{&cfg.DefaultAgent}, maps.Values(cfg.Agents)...) @@ -369,7 +370,7 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien func newAgentPlugin() webapi.PluginEntry { cfg := GetConfig() connectionCache := make(map[*Agent]*grpc.ClientConn) - agentRegistry, err := initializeAgentRegistry(cfg, connectionCache) + agentRegistry, err := initializeAgentRegistry(cfg, connectionCache, getAgentMetadataClientFunc) if err != nil { // We should wait for all agents to be up and running before starting the server panic(err) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index 025f4ed3ed..7ac6df8515 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -2,17 +2,22 @@ package agent import ( "context" + "sort" "testing" "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "golang.org/x/exp/maps" "google.golang.org/grpc" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" flyteidlcore "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service" pluginsCore "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" webapiPlugin "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi/mocks" + agentMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/plugins/webapi/agent/mocks" "github.com/flyteorg/flyte/flytestdlib/config" "github.com/flyteorg/flyte/flytestdlib/promutils" ) @@ -179,3 +184,34 @@ func TestPlugin(t *testing.T) { assert.Equal(t, pluginsCore.PhaseUndefined, phase.Phase()) }) } + +func TestInitializeAgentRegistry(t *testing.T) { + mockClient := new(agentMocks.AgentMetadataServiceClient) + mockRequest := &admin.ListAgentsRequest{} + mockResponse := &admin.ListAgentsResponse{ + Agents: []*admin.Agent{ + { + Name: "test-agent", + SupportedTaskTypes: []string{"task1", "task2", "task3"}, + IsSync: false, + }, + }, + } + + mockClient.On("ListAgent", mock.Anything, mockRequest).Return(mockResponse, nil) + getClientFunc := func(ctx context.Context, agent *Agent, connCache map[*Agent]*grpc.ClientConn) (service.AgentMetadataServiceClient, error) { + return mockClient, nil + } + + cfg := defaultConfig + cfg.AgentForTaskTypes = map[string]string{"task1": "agent-deployment-1", "task2": "agent-deployment-2"} + connectionCache := make(map[*Agent]*grpc.ClientConn) + agentRegistry, err := initializeAgentRegistry(&cfg, connectionCache, getClientFunc) + assert.NoError(t, err) + + // In golang, the order of keys in a map is random. So, we sort the keys before asserting. + agentRegistryKeys := maps.Keys(agentRegistry) + sort.Strings(agentRegistryKeys) + + assert.Equal(t, agentRegistryKeys, []string{"task1", "task2", "task3"}) +} From 693054390b8e70440b873e9c5fcfcb8f1ec8e97d Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Wed, 13 Dec 2023 00:02:58 +0800 Subject: [PATCH 28/47] fix load plugin bug Signed-off-by: Future Outlier --- .../pkg/controller/executors/failure_node_lookup_test.go | 3 ++- flytepropeller/pkg/controller/nodes/task/plugin_config.go | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/flytepropeller/pkg/controller/executors/failure_node_lookup_test.go b/flytepropeller/pkg/controller/executors/failure_node_lookup_test.go index b2dfa32231..e9d6857ec4 100644 --- a/flytepropeller/pkg/controller/executors/failure_node_lookup_test.go +++ b/flytepropeller/pkg/controller/executors/failure_node_lookup_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" + "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1" "github.com/flyteorg/flyte/flytepropeller/pkg/apis/flyteworkflow/v1alpha1/mocks" - "github.com/stretchr/testify/assert" ) type nl struct { diff --git a/flytepropeller/pkg/controller/nodes/task/plugin_config.go b/flytepropeller/pkg/controller/nodes/task/plugin_config.go index 11b4bc6790..5bc72a2feb 100644 --- a/flytepropeller/pkg/controller/nodes/task/plugin_config.go +++ b/flytepropeller/pkg/controller/nodes/task/plugin_config.go @@ -6,6 +6,7 @@ import ( "strings" "sync" + "golang.org/x/exp/slices" "k8s.io/client-go/kubernetes" "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" @@ -25,8 +26,11 @@ func WranglePluginsAndGenerateFinalList(ctx context.Context, cfg *config.TaskPlu } // Register the GRPC plugin after the config is loaded - once.Do(func() { agent.RegisterAgentPlugin() }) pluginsConfigMeta, err := cfg.GetEnabledPlugins() + enabledPluginsList := pluginsConfigMeta.EnabledPlugins.List() + if slices.Contains(enabledPluginsList, "agent-service") { + once.Do(func() { agent.RegisterAgentPlugin() }) + } if err != nil { return nil, nil, err @@ -37,7 +41,7 @@ func WranglePluginsAndGenerateFinalList(ctx context.Context, cfg *config.TaskPlu allPluginsEnabled = true } - logger.Infof(ctx, "Enabled plugins: %v", pluginsConfigMeta.EnabledPlugins.List()) + logger.Infof(ctx, "Enabled plugins: %v", enabledPluginsList) logger.Infof(ctx, "Loading core Plugins, plugin configuration [all plugins enabled: %v]", allPluginsEnabled) for _, cpe := range pr.GetCorePlugins() { id := strings.ToLower(cpe.ID) From 2bf45bd7a0df7fcdb6482a8ca1f0160083eef45f Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Wed, 13 Dec 2023 15:20:28 +0800 Subject: [PATCH 29/47] change default agent Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/config.go | 2 +- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 6 +++++- flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go | 5 +++-- flytepropeller/pkg/controller/nodes/task/plugin_config.go | 8 ++------ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/config.go b/flyteplugins/go/tasks/plugins/webapi/agent/config.go index eb8d3915d3..cb0bd3089f 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/config.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/config.go @@ -40,7 +40,7 @@ var ( }, }, DefaultAgent: Agent{ - Endpoint: "dns:///flyteagent.flyte.svc.cluster.local:80", + Endpoint: "", Insecure: true, DefaultTimeout: config.Duration{Duration: 10 * time.Second}, }, diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 069fa5bab4..3e42fa6d2c 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -328,8 +328,12 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn, getAgentMetadataClientFunc GetAgentMetadataClientFunc) (map[string]map[bool]*Agent, error) { agentRegistry := make(map[string]map[bool]*Agent) - agentDeployments := append([]*Agent{&cfg.DefaultAgent}, maps.Values(cfg.Agents)...) + var agentDeployments []*Agent + if cfg.DefaultAgent.Endpoint != "" { + agentDeployments = append(agentDeployments, &cfg.DefaultAgent) + } + agentDeployments = append(agentDeployments, maps.Values(cfg.Agents)...) // Ensure that the old configuration is backward compatible for taskType, agentID := range cfg.AgentForTaskTypes { agentRegistry[taskType] = make(map[bool]*Agent) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index 7ac6df8515..bc8382ba8b 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -199,14 +199,15 @@ func TestInitializeAgentRegistry(t *testing.T) { } mockClient.On("ListAgent", mock.Anything, mockRequest).Return(mockResponse, nil) - getClientFunc := func(ctx context.Context, agent *Agent, connCache map[*Agent]*grpc.ClientConn) (service.AgentMetadataServiceClient, error) { + getAgentMetadataClientFunc := func(ctx context.Context, agent *Agent, connCache map[*Agent]*grpc.ClientConn) (service.AgentMetadataServiceClient, error) { return mockClient, nil } cfg := defaultConfig + cfg.Agents = map[string]*Agent{"custom_agent": {Endpoint: "localhost:80"}} cfg.AgentForTaskTypes = map[string]string{"task1": "agent-deployment-1", "task2": "agent-deployment-2"} connectionCache := make(map[*Agent]*grpc.ClientConn) - agentRegistry, err := initializeAgentRegistry(&cfg, connectionCache, getClientFunc) + agentRegistry, err := initializeAgentRegistry(&cfg, connectionCache, getAgentMetadataClientFunc) assert.NoError(t, err) // In golang, the order of keys in a map is random. So, we sort the keys before asserting. diff --git a/flytepropeller/pkg/controller/nodes/task/plugin_config.go b/flytepropeller/pkg/controller/nodes/task/plugin_config.go index 5bc72a2feb..11b4bc6790 100644 --- a/flytepropeller/pkg/controller/nodes/task/plugin_config.go +++ b/flytepropeller/pkg/controller/nodes/task/plugin_config.go @@ -6,7 +6,6 @@ import ( "strings" "sync" - "golang.org/x/exp/slices" "k8s.io/client-go/kubernetes" "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core" @@ -26,11 +25,8 @@ func WranglePluginsAndGenerateFinalList(ctx context.Context, cfg *config.TaskPlu } // Register the GRPC plugin after the config is loaded + once.Do(func() { agent.RegisterAgentPlugin() }) pluginsConfigMeta, err := cfg.GetEnabledPlugins() - enabledPluginsList := pluginsConfigMeta.EnabledPlugins.List() - if slices.Contains(enabledPluginsList, "agent-service") { - once.Do(func() { agent.RegisterAgentPlugin() }) - } if err != nil { return nil, nil, err @@ -41,7 +37,7 @@ func WranglePluginsAndGenerateFinalList(ctx context.Context, cfg *config.TaskPlu allPluginsEnabled = true } - logger.Infof(ctx, "Enabled plugins: %v", enabledPluginsList) + logger.Infof(ctx, "Enabled plugins: %v", pluginsConfigMeta.EnabledPlugins.List()) logger.Infof(ctx, "Loading core Plugins, plugin configuration [all plugins enabled: %v]", allPluginsEnabled) for _, cpe := range pr.GetCorePlugins() { id := strings.ToLower(cpe.ID) From 29a2bd45423f4bce825de9f7a17814b38ec9e40d Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Wed, 13 Dec 2023 15:21:43 +0800 Subject: [PATCH 30/47] more readable Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 3e42fa6d2c..dc276097fd 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -330,16 +330,16 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien agentRegistry := make(map[string]map[bool]*Agent) var agentDeployments []*Agent - if cfg.DefaultAgent.Endpoint != "" { - agentDeployments = append(agentDeployments, &cfg.DefaultAgent) - } - agentDeployments = append(agentDeployments, maps.Values(cfg.Agents)...) // Ensure that the old configuration is backward compatible for taskType, agentID := range cfg.AgentForTaskTypes { agentRegistry[taskType] = make(map[bool]*Agent) agentRegistry[taskType][false] = cfg.Agents[agentID] } + if cfg.DefaultAgent.Endpoint != "" { + agentDeployments = append(agentDeployments, &cfg.DefaultAgent) + } + agentDeployments = append(agentDeployments, maps.Values(cfg.Agents)...) for _, agentDeployment := range agentDeployments { client, err := getAgentMetadataClientFunc(context.Background(), agentDeployment, connectionCache) if err != nil { From 2c285c6081a513ae4533577c79447d7777d9916c Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Wed, 13 Dec 2023 23:45:28 +0800 Subject: [PATCH 31/47] move back get client func Signed-off-by: Future Outlier --- .../plugins/webapi/agent/integration_test.go | 27 ++++++++++--------- .../go/tasks/plugins/webapi/agent/plugin.go | 14 +++++----- .../tasks/plugins/webapi/agent/plugin_test.go | 14 +++++----- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go index f6e026d2e6..15375a8580 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/integration_test.go @@ -37,10 +37,10 @@ type MockPlugin struct { Plugin } -type MockAsyncClient struct { +type MockClient struct { } -func (m *MockAsyncClient) CreateTask(_ context.Context, createTaskRequest *admin.CreateTaskRequest, _ ...grpc.CallOption) (*admin.CreateTaskResponse, error) { +func (m *MockClient) CreateTask(_ context.Context, createTaskRequest *admin.CreateTaskRequest, _ ...grpc.CallOption) (*admin.CreateTaskResponse, error) { expectedArgs := []string{"pyflyte-fast-execute", "--output-prefix", "fake://bucket/prefix/nhv"} if slices.Equal(createTaskRequest.Template.GetContainer().Args, expectedArgs) { return nil, fmt.Errorf("args not as expected") @@ -48,7 +48,7 @@ func (m *MockAsyncClient) CreateTask(_ context.Context, createTaskRequest *admin return &admin.CreateTaskResponse{ResourceMeta: []byte{1, 2, 3, 4}}, nil } -func (m *MockAsyncClient) GetTask(_ context.Context, req *admin.GetTaskRequest, _ ...grpc.CallOption) (*admin.GetTaskResponse, error) { +func (m *MockClient) GetTask(_ context.Context, req *admin.GetTaskRequest, _ ...grpc.CallOption) (*admin.GetTaskResponse, error) { if req.GetTaskType() == "bigquery_query_job_task" { return &admin.GetTaskResponse{Resource: &admin.Resource{State: admin.State_SUCCEEDED, Outputs: &flyteIdlCore.LiteralMap{ Literals: map[string]*flyteIdlCore.Literal{ @@ -59,15 +59,15 @@ func (m *MockAsyncClient) GetTask(_ context.Context, req *admin.GetTaskRequest, return &admin.GetTaskResponse{Resource: &admin.Resource{State: admin.State_SUCCEEDED}}, nil } -func (m *MockAsyncClient) DeleteTask(_ context.Context, _ *admin.DeleteTaskRequest, _ ...grpc.CallOption) (*admin.DeleteTaskResponse, error) { +func (m *MockClient) DeleteTask(_ context.Context, _ *admin.DeleteTaskRequest, _ ...grpc.CallOption) (*admin.DeleteTaskResponse, error) { return &admin.DeleteTaskResponse{}, nil } -func mockGetAsyncClientFunc(_ context.Context, _ *Agent, _ map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { - return &MockAsyncClient{}, nil +func mockGetClientFunc(_ context.Context, _ *Agent, _ map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { + return &MockClient{}, nil } -func mockGetAsyncBadClientFunc(_ context.Context, _ *Agent, _ map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { +func mockGetBadClientFunc(_ context.Context, _ *Agent, _ map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { return nil, fmt.Errorf("error") } @@ -120,6 +120,7 @@ func TestEndToEnd(t *testing.T) { template.Type = "spark_job" phase = tests.RunPluginEndToEndTest(t, plugin, &template, inputs, nil, nil, iter) assert.Equal(t, true, phase.Phase().IsSuccess()) + }) t.Run("failed to create a job", func(t *testing.T) { @@ -127,9 +128,9 @@ func TestEndToEnd(t *testing.T) { agentPlugin.PluginLoader = func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { return &MockPlugin{ Plugin{ - metricScope: iCtx.MetricsScope(), - cfg: GetConfig(), - getAsyncClient: mockGetAsyncBadClientFunc, + metricScope: iCtx.MetricsScope(), + cfg: GetConfig(), + getClient: mockGetBadClientFunc, }, }, nil } @@ -262,9 +263,9 @@ func newMockAgentPlugin() webapi.PluginEntry { PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { return &MockPlugin{ Plugin{ - metricScope: iCtx.MetricsScope(), - cfg: GetConfig(), - getAsyncClient: mockGetAsyncClientFunc, + metricScope: iCtx.MetricsScope(), + cfg: GetConfig(), + getClient: mockGetClientFunc, }, }, nil }, diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index dc276097fd..d287784fe3 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -28,13 +28,13 @@ import ( "github.com/flyteorg/flyte/flytestdlib/promutils" ) -type GetAsyncClientFunc func(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) +type GetClientFunc func(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) type GetAgentMetadataClientFunc func(ctx context.Context, agent *Agent, connCache map[*Agent]*grpc.ClientConn) (service.AgentMetadataServiceClient, error) type Plugin struct { metricScope promutils.Scope cfg *Config - getAsyncClient GetAsyncClientFunc + getClient GetClientFunc connectionCache map[*Agent]*grpc.ClientConn agentRegistry map[string]map[bool]*Agent // map[taskType][isSync] => Agent } @@ -97,7 +97,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR return nil, nil, fmt.Errorf("failed to find agent agent with error: %v", err) } - client, err := p.getAsyncClient(ctx, agent, p.connectionCache) + client, err := p.getClient(ctx, agent, p.connectionCache) if err != nil { return nil, nil, fmt.Errorf("failed to connect to agent with error: %v", err) } @@ -132,7 +132,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba return nil, fmt.Errorf("failed to find agent with error: %v", err) } - client, err := p.getAsyncClient(ctx, agent, p.connectionCache) + client, err := p.getClient(ctx, agent, p.connectionCache) if err != nil { return nil, fmt.Errorf("failed to connect to agent with error: %v", err) } @@ -163,7 +163,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error if err != nil { return fmt.Errorf("failed to find agent agent with error: %v", err) } - client, err := p.getAsyncClient(ctx, agent, p.connectionCache) + client, err := p.getClient(ctx, agent, p.connectionCache) if err != nil { return fmt.Errorf("failed to connect to agent with error: %v", err) } @@ -279,7 +279,7 @@ func getGrpcConnection(ctx context.Context, agent *Agent, connectionCache map[*A return conn, nil } -func getAsyncClientFunc(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { +func getClientFunc(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (service.AsyncAgentServiceClient, error) { conn, err := getGrpcConnection(ctx, agent, connectionCache) if err != nil { return nil, err @@ -390,7 +390,7 @@ func newAgentPlugin() webapi.PluginEntry { return &Plugin{ metricScope: iCtx.MetricsScope(), cfg: cfg, - getAsyncClient: getAsyncClientFunc, + getClient: getClientFunc, connectionCache: connectionCache, agentRegistry: agentRegistry, }, nil diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index bc8382ba8b..7dbcaba76e 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -71,28 +71,28 @@ func TestPlugin(t *testing.T) { assert.NotNil(t, client) }) - t.Run("test getAsyncClientFunc", func(t *testing.T) { - client, err := getAsyncClientFunc(context.Background(), &Agent{Endpoint: "localhost:80"}, map[*Agent]*grpc.ClientConn{}) + t.Run("test getClientFunc", func(t *testing.T) { + client, err := getClientFunc(context.Background(), &Agent{Endpoint: "localhost:80"}, map[*Agent]*grpc.ClientConn{}) assert.NoError(t, err) assert.NotNil(t, client) }) - t.Run("test getAsyncClientFunc more config", func(t *testing.T) { - client, err := getAsyncClientFunc(context.Background(), &Agent{Endpoint: "localhost:80", Insecure: true, DefaultServiceConfig: "{\"loadBalancingConfig\": [{\"round_robin\":{}}]}"}, map[*Agent]*grpc.ClientConn{}) + t.Run("test getClientFunc more config", func(t *testing.T) { + client, err := getClientFunc(context.Background(), &Agent{Endpoint: "localhost:80", Insecure: true, DefaultServiceConfig: "{\"loadBalancingConfig\": [{\"round_robin\":{}}]}"}, map[*Agent]*grpc.ClientConn{}) assert.NoError(t, err) assert.NotNil(t, client) }) - t.Run("test getAsyncClientFunc cache hit", func(t *testing.T) { + t.Run("test getClientFunc cache hit", func(t *testing.T) { connectionCache := make(map[*Agent]*grpc.ClientConn) agent := &Agent{Endpoint: "localhost:80", Insecure: true, DefaultServiceConfig: "{\"loadBalancingConfig\": [{\"round_robin\":{}}]}"} - client, err := getAsyncClientFunc(context.Background(), agent, connectionCache) + client, err := getClientFunc(context.Background(), agent, connectionCache) assert.NoError(t, err) assert.NotNil(t, client) assert.NotNil(t, client, connectionCache[agent]) - cachedClient, err := getAsyncClientFunc(context.Background(), agent, connectionCache) + cachedClient, err := getClientFunc(context.Background(), agent, connectionCache) assert.NoError(t, err) assert.NotNil(t, cachedClient) assert.Equal(t, client, cachedClient) From 9755ab44fbd0e85dfee22722a60a4ec41a74b6a2 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sat, 16 Dec 2023 22:50:35 +0800 Subject: [PATCH 32/47] remove secret Signed-off-by: Future Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 102 +------ flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 92 ------ flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 130 ++++---- .../pb-go/flyteidl/service/agent.swagger.json | 7 - .../flyteidl/admin/AgentOuterClass.java | 280 +----------------- flyteidl/gen/pb-js/flyteidl.d.ts | 6 - flyteidl/gen/pb-js/flyteidl.js | 25 -- .../gen/pb_python/flyteidl/admin/agent_pb2.py | 26 +- .../pb_python/flyteidl/admin/agent_pb2.pyi | 6 +- flyteidl/gen/pb_rust/flyteidl.admin.rs | 3 - flyteidl/protos/flyteidl/admin/agent.proto | 3 - 11 files changed, 102 insertions(+), 578 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index 2b88663f8e..b3e897e034 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -476,7 +476,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, name_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_types_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, is_sync_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, secret_names_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetAgentRequest, _internal_metadata_), ~0u, // no _extensions_ @@ -515,10 +514,10 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 85, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, { 92, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, { 97, -1, sizeof(::flyteidl::admin::Agent)}, - { 106, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, - { 112, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, - { 118, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, - { 123, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, + { 105, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, + { 111, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, + { 117, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, + { 122, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -584,23 +583,22 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" - "\014\"\024\n\022DeleteTaskResponse\"Z\n\005Agent\022\014\n\004name" + "\014\"\024\n\022DeleteTaskResponse\"D\n\005Agent\022\014\n\004name" "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \003(\t\022\017\n\007" - "is_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017G" - "etAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgent" - "Response\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin" - ".Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgent" - "sResponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.adm" - "in.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000" - "\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007" - "RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/f" - "lyteorg/flyte/flyteidl/gen/pb-go/flyteid" - "l/adminb\006proto3" + "is_sync\030\003 \001(\010\"\037\n\017GetAgentRequest\022\014\n\004name" + "\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005agent\030\001 \001(" + "\0132\025.flyteidl.admin.Agent\"\023\n\021ListAgentsRe" + "quest\";\n\022ListAgentsResponse\022%\n\006agents\030\001 " + "\003(\0132\025.flyteidl.admin.Agent*^\n\005State\022\025\n\021R" + "ETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILURE\020" + "\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED" + "\020\004B=Z;github.com/flyteorg/flyte/flyteidl" + "/gen/pb-go/flyteidl/adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1895, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1873, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { @@ -4390,7 +4388,6 @@ class Agent::HasBitSetters { const int Agent::kNameFieldNumber; const int Agent::kSupportedTaskTypesFieldNumber; const int Agent::kIsSyncFieldNumber; -const int Agent::kSecretNamesFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 Agent::Agent() @@ -4401,8 +4398,7 @@ Agent::Agent() Agent::Agent(const Agent& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr), - supported_task_types_(from.supported_task_types_), - secret_names_(from.secret_names_) { + supported_task_types_(from.supported_task_types_) { _internal_metadata_.MergeFrom(from._internal_metadata_); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.name().size() > 0) { @@ -4444,7 +4440,6 @@ void Agent::Clear() { (void) cached_has_bits; supported_task_types_.Clear(); - secret_names_.Clear(); name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); is_sync_ = false; _internal_metadata_.Clear(); @@ -4505,25 +4500,6 @@ const char* Agent::_InternalParse(const char* begin, const char* end, void* obje GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); break; } - // repeated string secret_names = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("flyteidl.admin.Agent.secret_names"); - object = msg->add_secret_names(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1)); - break; - } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -4602,22 +4578,6 @@ bool Agent::MergePartialFromCodedStream( break; } - // repeated string secret_names = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->add_secret_names())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->secret_names(this->secret_names_size() - 1).data(), - static_cast(this->secret_names(this->secret_names_size() - 1).length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.Agent.secret_names")); - } else { - goto handle_unusual; - } - break; - } - default: { handle_unusual: if (tag == 0) { @@ -4670,16 +4630,6 @@ void Agent::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->is_sync(), output); } - // repeated string secret_names = 4; - for (int i = 0, n = this->secret_names_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->secret_names(i).data(), static_cast(this->secret_names(i).length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.secret_names"); - ::google::protobuf::internal::WireFormatLite::WriteString( - 4, this->secret_names(i), output); - } - if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -4719,16 +4669,6 @@ ::google::protobuf::uint8* Agent::InternalSerializeWithCachedSizesToArray( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->is_sync(), target); } - // repeated string secret_names = 4; - for (int i = 0, n = this->secret_names_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->secret_names(i).data(), static_cast(this->secret_names(i).length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.Agent.secret_names"); - target = ::google::protobuf::internal::WireFormatLite:: - WriteStringToArray(4, this->secret_names(i), target); - } - if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -4758,14 +4698,6 @@ size_t Agent::ByteSizeLong() const { this->supported_task_types(i)); } - // repeated string secret_names = 4; - total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->secret_names_size()); - for (int i = 0, n = this->secret_names_size(); i < n; i++) { - total_size += ::google::protobuf::internal::WireFormatLite::StringSize( - this->secret_names(i)); - } - // string name = 1; if (this->name().size() > 0) { total_size += 1 + @@ -4806,7 +4738,6 @@ void Agent::MergeFrom(const Agent& from) { (void) cached_has_bits; supported_task_types_.MergeFrom(from.supported_task_types_); - secret_names_.MergeFrom(from.secret_names_); if (from.name().size() > 0) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -4842,7 +4773,6 @@ void Agent::InternalSwap(Agent* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); supported_task_types_.InternalSwap(CastToBase(&other->supported_task_types_)); - secret_names_.InternalSwap(CastToBase(&other->secret_names_)); name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(is_sync_, other->is_sync_); diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index 0e78304e33..09aeb76cf0 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -1492,28 +1492,6 @@ class Agent final : const ::google::protobuf::RepeatedPtrField<::std::string>& supported_task_types() const; ::google::protobuf::RepeatedPtrField<::std::string>* mutable_supported_task_types(); - // repeated string secret_names = 4; - int secret_names_size() const; - void clear_secret_names(); - static const int kSecretNamesFieldNumber = 4; - const ::std::string& secret_names(int index) const; - ::std::string* mutable_secret_names(int index); - void set_secret_names(int index, const ::std::string& value); - #if LANG_CXX11 - void set_secret_names(int index, ::std::string&& value); - #endif - void set_secret_names(int index, const char* value); - void set_secret_names(int index, const char* value, size_t size); - ::std::string* add_secret_names(); - void add_secret_names(const ::std::string& value); - #if LANG_CXX11 - void add_secret_names(::std::string&& value); - #endif - void add_secret_names(const char* value); - void add_secret_names(const char* value, size_t size); - const ::google::protobuf::RepeatedPtrField<::std::string>& secret_names() const; - ::google::protobuf::RepeatedPtrField<::std::string>* mutable_secret_names(); - // string name = 1; void clear_name(); static const int kNameFieldNumber = 1; @@ -1540,7 +1518,6 @@ class Agent final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::RepeatedPtrField<::std::string> supported_task_types_; - ::google::protobuf::RepeatedPtrField<::std::string> secret_names_; ::google::protobuf::internal::ArenaStringPtr name_; bool is_sync_; mutable ::google::protobuf::internal::CachedSize _cached_size_; @@ -3063,75 +3040,6 @@ inline void Agent::set_is_sync(bool value) { // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.is_sync) } -// repeated string secret_names = 4; -inline int Agent::secret_names_size() const { - return secret_names_.size(); -} -inline void Agent::clear_secret_names() { - secret_names_.Clear(); -} -inline const ::std::string& Agent::secret_names(int index) const { - // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.secret_names) - return secret_names_.Get(index); -} -inline ::std::string* Agent::mutable_secret_names(int index) { - // @@protoc_insertion_point(field_mutable:flyteidl.admin.Agent.secret_names) - return secret_names_.Mutable(index); -} -inline void Agent::set_secret_names(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.secret_names) - secret_names_.Mutable(index)->assign(value); -} -#if LANG_CXX11 -inline void Agent::set_secret_names(int index, ::std::string&& value) { - // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.secret_names) - secret_names_.Mutable(index)->assign(std::move(value)); -} -#endif -inline void Agent::set_secret_names(int index, const char* value) { - GOOGLE_DCHECK(value != nullptr); - secret_names_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:flyteidl.admin.Agent.secret_names) -} -inline void Agent::set_secret_names(int index, const char* value, size_t size) { - secret_names_.Mutable(index)->assign( - reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.Agent.secret_names) -} -inline ::std::string* Agent::add_secret_names() { - // @@protoc_insertion_point(field_add_mutable:flyteidl.admin.Agent.secret_names) - return secret_names_.Add(); -} -inline void Agent::add_secret_names(const ::std::string& value) { - secret_names_.Add()->assign(value); - // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.secret_names) -} -#if LANG_CXX11 -inline void Agent::add_secret_names(::std::string&& value) { - secret_names_.Add(std::move(value)); - // @@protoc_insertion_point(field_add:flyteidl.admin.Agent.secret_names) -} -#endif -inline void Agent::add_secret_names(const char* value) { - GOOGLE_DCHECK(value != nullptr); - secret_names_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:flyteidl.admin.Agent.secret_names) -} -inline void Agent::add_secret_names(const char* value, size_t size) { - secret_names_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:flyteidl.admin.Agent.secret_names) -} -inline const ::google::protobuf::RepeatedPtrField<::std::string>& -Agent::secret_names() const { - // @@protoc_insertion_point(field_list:flyteidl.admin.Agent.secret_names) - return secret_names_; -} -inline ::google::protobuf::RepeatedPtrField<::std::string>* -Agent::mutable_secret_names() { - // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.Agent.secret_names) - return &secret_names_; -} - // ------------------------------------------------------------------- // GetAgentRequest diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 38ca368e94..af2e3ecf66 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -512,9 +512,7 @@ type Agent struct { // SupportedTaskTypes are the types of the tasks that the agent can handle. SupportedTaskTypes []string `protobuf:"bytes,2,rep,name=supported_task_types,json=supportedTaskTypes,proto3" json:"supported_task_types,omitempty"` // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. - IsSync bool `protobuf:"varint,3,opt,name=is_sync,json=isSync,proto3" json:"is_sync,omitempty"` - // SecretNames is a list of secrets the agent requires to execute tasks. - SecretNames []string `protobuf:"bytes,4,rep,name=secret_names,json=secretNames,proto3" json:"secret_names,omitempty"` + IsSync bool `protobuf:"varint,3,opt,name=is_sync,json=isSync,proto3" json:"is_sync,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -566,13 +564,6 @@ func (m *Agent) GetIsSync() bool { return false } -func (m *Agent) GetSecretNames() []string { - if m != nil { - return m.SecretNames - } - return nil -} - // A request to get an agent. type GetAgentRequest struct { // The name of the agent. @@ -750,64 +741,63 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 940 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x7f, 0x6f, 0xdb, 0x54, - 0x14, 0x25, 0x4d, 0x93, 0x26, 0x37, 0x59, 0x97, 0xbc, 0x35, 0xcc, 0xcd, 0x06, 0x2a, 0x46, 0x43, - 0x15, 0xd3, 0x1c, 0xd6, 0x22, 0xe8, 0x86, 0x60, 0xca, 0x5a, 0x53, 0x2a, 0xa5, 0x51, 0xf5, 0x92, - 0x22, 0x40, 0x02, 0xeb, 0xc5, 0xb9, 0x0d, 0x56, 0x1c, 0xdb, 0xf8, 0x3d, 0x57, 0x8b, 0xc4, 0xdf, - 0x48, 0xfb, 0x06, 0x7c, 0x5c, 0xe4, 0xf7, 0x9e, 0xdd, 0x24, 0xcb, 0x50, 0xab, 0xfd, 0x67, 0xdf, - 0x73, 0xee, 0xb9, 0xf7, 0xdd, 0x7b, 0xfc, 0x03, 0xda, 0x57, 0xfe, 0x5c, 0xa0, 0x37, 0xf6, 0x3b, - 0x6c, 0x3c, 0xf3, 0x82, 0x0e, 0x9b, 0x60, 0x20, 0xac, 0x28, 0x0e, 0x45, 0x48, 0xb6, 0x33, 0xcc, - 0x92, 0x58, 0xfb, 0x71, 0xce, 0x75, 0xc3, 0x18, 0x3b, 0xbe, 0x27, 0x30, 0x66, 0x3e, 0x57, 0xec, - 0xf6, 0xee, 0x32, 0x2a, 0x18, 0x9f, 0x66, 0xd0, 0x27, 0xcb, 0x90, 0x17, 0x08, 0x8c, 0xaf, 0x98, - 0x8b, 0x1a, 0xfe, 0x74, 0x05, 0x1e, 0x63, 0x20, 0xbc, 0x2b, 0x0f, 0xe3, 0xf5, 0xe9, 0xf8, 0x06, - 0xdd, 0x44, 0x78, 0x61, 0xa0, 0x60, 0xf3, 0xdf, 0x12, 0xb4, 0x86, 0x8c, 0x4f, 0xed, 0x2c, 0x7e, - 0x8e, 0x82, 0x8d, 0x99, 0x60, 0x84, 0x42, 0x33, 0x6d, 0xc3, 0xc9, 0x33, 0x1c, 0x6f, 0x6c, 0x14, - 0xf6, 0x0a, 0xfb, 0xb5, 0x83, 0x2f, 0xac, 0xfc, 0x70, 0xa9, 0xa8, 0xb5, 0x24, 0x70, 0x96, 0x77, - 0x40, 0xef, 0x8b, 0x65, 0x80, 0x3c, 0x86, 0x6a, 0xc0, 0x66, 0xc8, 0x23, 0xe6, 0xa2, 0xb1, 0xb1, - 0x57, 0xd8, 0xaf, 0xd2, 0x9b, 0x00, 0x39, 0x83, 0xb2, 0xcf, 0x46, 0xe8, 0x73, 0xa3, 0xb8, 0x57, - 0xdc, 0xaf, 0x1d, 0x3c, 0xb7, 0x96, 0x67, 0x68, 0xad, 0x6d, 0xd4, 0xea, 0xc9, 0x1c, 0x3b, 0x10, - 0xf1, 0x9c, 0x6a, 0x01, 0xf2, 0x0b, 0xd4, 0x58, 0x10, 0x84, 0x82, 0xa5, 0x4c, 0x6e, 0x6c, 0x4a, - 0xbd, 0x6f, 0x6e, 0xa7, 0xd7, 0xbd, 0x49, 0x54, 0xa2, 0x8b, 0x52, 0xc4, 0x82, 0x07, 0xd3, 0x23, - 0xee, 0x70, 0x8c, 0xaf, 0x3d, 0x17, 0x1d, 0xe6, 0xba, 0x61, 0x12, 0x08, 0xa3, 0x24, 0x0f, 0xd3, - 0x9c, 0x1e, 0xf1, 0x81, 0x42, 0xba, 0x0a, 0x20, 0x02, 0x5a, 0x18, 0x5c, 0x7b, 0x71, 0x18, 0xcc, - 0x30, 0x10, 0xce, 0x35, 0x8b, 0x3d, 0x36, 0xf2, 0x91, 0x1b, 0x65, 0xd9, 0xd3, 0xab, 0xdb, 0xf5, - 0x64, 0xdf, 0x48, 0xfc, 0x9c, 0x29, 0xa8, 0xe6, 0x76, 0x70, 0x0d, 0xd4, 0x7e, 0x01, 0xb5, 0x85, - 0xb1, 0x90, 0x06, 0x14, 0xa7, 0x38, 0x97, 0xdb, 0xab, 0xd2, 0xf4, 0x92, 0xec, 0x40, 0xe9, 0x9a, - 0xf9, 0x49, 0xb6, 0x05, 0x75, 0xf3, 0x72, 0xe3, 0xa8, 0xd0, 0xfe, 0x01, 0x1a, 0xab, 0x13, 0xb8, - 0x53, 0xfe, 0x29, 0xec, 0xbe, 0xb7, 0xdb, 0xbb, 0x08, 0x99, 0x6f, 0x8b, 0xd0, 0x3c, 0x8e, 0x91, - 0x09, 0x4c, 0x67, 0x42, 0xf1, 0xaf, 0x04, 0xb9, 0x20, 0xcf, 0xa1, 0xec, 0x05, 0x51, 0x22, 0xb8, - 0xf6, 0xe2, 0xee, 0x8a, 0x17, 0x7b, 0xea, 0xc1, 0x3a, 0x67, 0x11, 0xd5, 0x44, 0xf2, 0x2d, 0x54, - 0x04, 0xce, 0x22, 0x9f, 0x09, 0x55, 0xa5, 0x76, 0xf0, 0x68, 0x8d, 0x81, 0x87, 0x9a, 0x42, 0x73, - 0x32, 0xf9, 0x1c, 0xee, 0x85, 0x89, 0x88, 0x12, 0xe1, 0x44, 0x31, 0x5e, 0x79, 0x6f, 0x8c, 0xa2, - 0xec, 0xb1, 0xae, 0x82, 0x17, 0x32, 0x46, 0x7e, 0x87, 0x87, 0x2b, 0xcf, 0xc9, 0x4c, 0x6f, 0xcd, - 0xd8, 0x94, 0xc5, 0x9e, 0xdc, 0x6a, 0xc5, 0xb4, 0x25, 0xd6, 0x3e, 0x86, 0x3f, 0xc1, 0x16, 0x47, - 0x37, 0x46, 0xc1, 0x8d, 0x92, 0x74, 0x8c, 0xb5, 0x2a, 0xf7, 0xce, 0x8c, 0xac, 0x81, 0x4a, 0x50, - 0x06, 0xc9, 0xd2, 0xdb, 0x2f, 0xa1, 0xbe, 0x08, 0xdc, 0x69, 0x17, 0x2f, 0x80, 0x2c, 0x96, 0xe1, - 0x51, 0x18, 0x70, 0x39, 0x9f, 0x18, 0x79, 0x98, 0xc4, 0x2e, 0xca, 0x43, 0x4b, 0xad, 0x3a, 0xad, - 0x67, 0xc1, 0xf4, 0x10, 0x26, 0x85, 0xed, 0x53, 0x14, 0x8b, 0x2b, 0x7c, 0x04, 0x55, 0x39, 0x31, - 0x31, 0x8f, 0x50, 0x97, 0xaf, 0xa4, 0x81, 0xe1, 0x3c, 0x5a, 0xa3, 0xb9, 0xb1, 0x46, 0xf3, 0x6f, - 0xb8, 0x9f, 0x6b, 0xea, 0x5e, 0xbe, 0x86, 0x4a, 0x46, 0xd1, 0xce, 0x30, 0x56, 0x07, 0x45, 0x35, - 0x4e, 0x73, 0x26, 0x39, 0x84, 0xaa, 0x1f, 0x4e, 0x1c, 0xdf, 0x0b, 0xa6, 0xdc, 0xd8, 0x90, 0xf3, - 0xfd, 0x78, 0x8d, 0x37, 0x7a, 0xe1, 0x84, 0x56, 0xfc, 0x70, 0xd2, 0x4b, 0x79, 0xe6, 0x3f, 0x05, - 0xa8, 0x64, 0x5a, 0xe4, 0x29, 0x94, 0xb8, 0x48, 0x9d, 0x95, 0x16, 0xdd, 0x3e, 0x68, 0xad, 0x16, - 0x1d, 0xa4, 0x20, 0x55, 0x1c, 0x72, 0x08, 0x5b, 0xca, 0x3b, 0x5c, 0x1b, 0xf1, 0x7f, 0xdc, 0x9b, - 0x31, 0x89, 0x01, 0x5b, 0x33, 0xe4, 0x9c, 0x4d, 0x50, 0xfb, 0x2f, 0xbb, 0x35, 0x2f, 0xa1, 0x79, - 0x82, 0x3e, 0x2e, 0x3f, 0x20, 0x1f, 0x3e, 0xdd, 0x1d, 0x20, 0x8b, 0xb2, 0x6a, 0xc0, 0xe6, 0xdb, - 0x02, 0x94, 0xba, 0xe9, 0x07, 0x8e, 0x10, 0xd8, 0x4c, 0x5f, 0xda, 0x5a, 0x5c, 0x5e, 0x93, 0xaf, - 0x60, 0x87, 0x27, 0x51, 0x14, 0xc6, 0x02, 0xc7, 0x4e, 0x5e, 0x5f, 0xcd, 0xb4, 0x4a, 0x49, 0x8e, - 0x0d, 0x75, 0x27, 0x9c, 0x3c, 0x84, 0x2d, 0x8f, 0x3b, 0x7c, 0x1e, 0xb8, 0xf2, 0x58, 0x15, 0x5a, - 0xf6, 0xf8, 0x60, 0x1e, 0xb8, 0xe4, 0x33, 0xa8, 0x2b, 0xcb, 0x3a, 0xf2, 0xd3, 0x20, 0x5f, 0xde, - 0x55, 0x5a, 0x53, 0xb1, 0x7e, 0x1a, 0x32, 0x9f, 0xc8, 0xfd, 0xcb, 0x6e, 0xb2, 0x63, 0xaf, 0x69, - 0xca, 0x7c, 0x05, 0x8d, 0x1b, 0x9a, 0xf6, 0xc9, 0x53, 0x28, 0xc9, 0xcf, 0xb4, 0x36, 0xc9, 0x3b, - 0xfb, 0x52, 0x6c, 0xc5, 0x31, 0x1f, 0x40, 0xb3, 0xe7, 0x71, 0xa5, 0xc0, 0x75, 0x25, 0xf3, 0x18, - 0xc8, 0x62, 0x50, 0xeb, 0x3e, 0x83, 0xb2, 0xcc, 0x49, 0xdf, 0x4b, 0xc5, 0xf7, 0x0b, 0x6b, 0xd2, - 0x97, 0x7f, 0x40, 0x49, 0x3a, 0x83, 0xb4, 0xa0, 0x49, 0xed, 0x21, 0xfd, 0xb5, 0xfb, 0xba, 0x67, - 0x3b, 0x3f, 0x76, 0xcf, 0x7a, 0x97, 0xd4, 0x6e, 0x7c, 0x94, 0x86, 0x2f, 0x6c, 0x7a, 0xde, 0xed, - 0xdb, 0xfd, 0x61, 0x1e, 0x2e, 0x90, 0x1a, 0x6c, 0x5d, 0xd8, 0xfd, 0x93, 0xb3, 0xfe, 0x69, 0x63, - 0x23, 0xbd, 0xa1, 0x97, 0xfd, 0x7e, 0x7a, 0x53, 0x24, 0xf7, 0xa0, 0x3a, 0xb8, 0x3c, 0x3e, 0xb6, - 0xed, 0x13, 0xfb, 0xa4, 0xb1, 0xf9, 0xfa, 0xfb, 0xdf, 0xbe, 0x9b, 0x78, 0xe2, 0xcf, 0x64, 0x64, - 0xb9, 0xe1, 0xac, 0x23, 0x5b, 0x09, 0xe3, 0x89, 0xba, 0xe8, 0xe4, 0xbf, 0x04, 0x13, 0x0c, 0x3a, - 0xd1, 0xe8, 0xd9, 0x24, 0xec, 0x2c, 0xff, 0xc9, 0x8c, 0xca, 0xf2, 0xef, 0xe0, 0xf0, 0xbf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xf7, 0x75, 0x33, 0xb3, 0xe2, 0x08, 0x00, 0x00, + // 922 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xff, 0x6f, 0xe3, 0xc4, + 0x13, 0xfd, 0xa4, 0x69, 0xbe, 0x4d, 0x7a, 0xbd, 0x64, 0xaf, 0xf9, 0x9c, 0x9b, 0x3b, 0x50, 0x65, + 0x74, 0xa8, 0xe2, 0x74, 0x0e, 0xd7, 0x22, 0xe8, 0x1d, 0x82, 0x53, 0xae, 0x35, 0xa5, 0x52, 0x1a, + 0x55, 0x9b, 0x14, 0x01, 0x12, 0x58, 0x1b, 0x67, 0x12, 0xac, 0x38, 0xb6, 0xf1, 0xae, 0xab, 0x8b, + 0xc4, 0xcf, 0x48, 0xfc, 0x07, 0xfc, 0xb9, 0xc8, 0xbb, 0x6b, 0x37, 0xc9, 0xe5, 0x50, 0x2b, 0x7e, + 0xb3, 0xe7, 0xbd, 0x79, 0x33, 0x3b, 0xf3, 0x9c, 0x0d, 0xb4, 0x27, 0xfe, 0x42, 0xa0, 0x37, 0xf6, + 0x3b, 0x6c, 0x3c, 0xf7, 0x82, 0x0e, 0x9b, 0x62, 0x20, 0xac, 0x28, 0x0e, 0x45, 0x48, 0x76, 0x33, + 0xcc, 0x92, 0x58, 0xfb, 0x69, 0xce, 0x75, 0xc3, 0x18, 0x3b, 0xbe, 0x27, 0x30, 0x66, 0x3e, 0x57, + 0xec, 0xf6, 0xfe, 0x2a, 0x2a, 0x18, 0x9f, 0x65, 0xd0, 0x47, 0xab, 0x90, 0x17, 0x08, 0x8c, 0x27, + 0xcc, 0x45, 0x0d, 0x7f, 0xbc, 0x06, 0x8f, 0x31, 0x10, 0xde, 0xc4, 0xc3, 0x78, 0x73, 0x3a, 0xbe, + 0x43, 0x37, 0x11, 0x5e, 0x18, 0x28, 0xd8, 0xfc, 0xbb, 0x04, 0xad, 0x21, 0xe3, 0x33, 0x3b, 0x8b, + 0x5f, 0xa2, 0x60, 0x63, 0x26, 0x18, 0xa1, 0xd0, 0x4c, 0xdb, 0x70, 0xf2, 0x0c, 0xc7, 0x1b, 0x1b, + 0x85, 0x83, 0xc2, 0x61, 0xfd, 0xe8, 0x53, 0x2b, 0x3f, 0x5c, 0x2a, 0x6a, 0xad, 0x08, 0x5c, 0xe4, + 0x1d, 0xd0, 0x87, 0x62, 0x15, 0x20, 0x4f, 0xa1, 0x16, 0xb0, 0x39, 0xf2, 0x88, 0xb9, 0x68, 0x6c, + 0x1d, 0x14, 0x0e, 0x6b, 0xf4, 0x36, 0x40, 0x2e, 0xa0, 0xec, 0xb3, 0x11, 0xfa, 0xdc, 0x28, 0x1e, + 0x14, 0x0f, 0xeb, 0x47, 0x2f, 0xad, 0xd5, 0x19, 0x5a, 0x1b, 0x1b, 0xb5, 0x7a, 0x32, 0xc7, 0x0e, + 0x44, 0xbc, 0xa0, 0x5a, 0x80, 0xfc, 0x08, 0x75, 0x16, 0x04, 0xa1, 0x60, 0x29, 0x93, 0x1b, 0xdb, + 0x52, 0xef, 0xcb, 0xbb, 0xe9, 0x75, 0x6f, 0x13, 0x95, 0xe8, 0xb2, 0x14, 0xb1, 0xe0, 0xd1, 0xec, + 0x84, 0x3b, 0x1c, 0xe3, 0x1b, 0xcf, 0x45, 0x87, 0xb9, 0x6e, 0x98, 0x04, 0xc2, 0x28, 0xc9, 0xc3, + 0x34, 0x67, 0x27, 0x7c, 0xa0, 0x90, 0xae, 0x02, 0x88, 0x80, 0x16, 0x06, 0x37, 0x5e, 0x1c, 0x06, + 0x73, 0x0c, 0x84, 0x73, 0xc3, 0x62, 0x8f, 0x8d, 0x7c, 0xe4, 0x46, 0x59, 0xf6, 0xf4, 0xe6, 0x6e, + 0x3d, 0xd9, 0xb7, 0x12, 0x3f, 0x64, 0x0a, 0xaa, 0xb9, 0x3d, 0xdc, 0x00, 0xb5, 0x5f, 0x41, 0x7d, + 0x69, 0x2c, 0xa4, 0x01, 0xc5, 0x19, 0x2e, 0xe4, 0xf6, 0x6a, 0x34, 0x7d, 0x24, 0x7b, 0x50, 0xba, + 0x61, 0x7e, 0x92, 0x6d, 0x41, 0xbd, 0xbc, 0xde, 0x3a, 0x29, 0xb4, 0xbf, 0x85, 0xc6, 0xfa, 0x04, + 0xee, 0x95, 0x7f, 0x0e, 0xfb, 0x1f, 0xec, 0xf6, 0x3e, 0x42, 0xe6, 0x5f, 0x45, 0x68, 0x9e, 0xc6, + 0xc8, 0x04, 0xa6, 0x33, 0xa1, 0xf8, 0x7b, 0x82, 0x5c, 0x90, 0x97, 0x50, 0xf6, 0x82, 0x28, 0x11, + 0x5c, 0x7b, 0x71, 0x7f, 0xcd, 0x8b, 0x3d, 0xf5, 0x61, 0x5d, 0xb2, 0x88, 0x6a, 0x22, 0xf9, 0x0a, + 0xaa, 0x02, 0xe7, 0x91, 0xcf, 0x84, 0xaa, 0x52, 0x3f, 0x7a, 0xb2, 0xc1, 0xc0, 0x43, 0x4d, 0xa1, + 0x39, 0x99, 0x7c, 0x02, 0x0f, 0xc2, 0x44, 0x44, 0x89, 0x70, 0xa2, 0x18, 0x27, 0xde, 0x3b, 0xa3, + 0x28, 0x7b, 0xdc, 0x51, 0xc1, 0x2b, 0x19, 0x23, 0xbf, 0xc0, 0xe3, 0xb5, 0xef, 0x64, 0xae, 0xb7, + 0x66, 0x6c, 0xcb, 0x62, 0xcf, 0xee, 0xb4, 0x62, 0xda, 0x12, 0x1b, 0x3f, 0xc3, 0xef, 0xa1, 0xc2, + 0xd1, 0x8d, 0x51, 0x70, 0xa3, 0x24, 0x1d, 0x63, 0xad, 0xcb, 0xbd, 0x37, 0x23, 0x6b, 0xa0, 0x12, + 0x94, 0x41, 0xb2, 0xf4, 0xf6, 0x6b, 0xd8, 0x59, 0x06, 0xee, 0xb5, 0x8b, 0x57, 0x40, 0x96, 0xcb, + 0xf0, 0x28, 0x0c, 0xb8, 0x9c, 0x4f, 0x8c, 0x3c, 0x4c, 0x62, 0x17, 0xe5, 0xa1, 0xa5, 0xd6, 0x0e, + 0xdd, 0xc9, 0x82, 0xe9, 0x21, 0x4c, 0x0a, 0xbb, 0xe7, 0x28, 0x96, 0x57, 0xf8, 0x04, 0x6a, 0x72, + 0x62, 0x62, 0x11, 0xa1, 0x2e, 0x5f, 0x4d, 0x03, 0xc3, 0x45, 0xb4, 0x41, 0x73, 0x6b, 0x83, 0xe6, + 0x1f, 0xf0, 0x30, 0xd7, 0xd4, 0xbd, 0x7c, 0x01, 0xd5, 0x8c, 0xa2, 0x9d, 0x61, 0xac, 0x0f, 0x8a, + 0x6a, 0x9c, 0xe6, 0x4c, 0x72, 0x0c, 0x35, 0x3f, 0x9c, 0x3a, 0xbe, 0x17, 0xcc, 0xb8, 0xb1, 0x25, + 0xe7, 0xfb, 0xff, 0x0d, 0xde, 0xe8, 0x85, 0x53, 0x5a, 0xf5, 0xc3, 0x69, 0x2f, 0xe5, 0x99, 0x7f, + 0x16, 0xa0, 0x9a, 0x69, 0x91, 0xe7, 0x50, 0xe2, 0x22, 0x75, 0x56, 0x5a, 0x74, 0xf7, 0xa8, 0xb5, + 0x5e, 0x74, 0x90, 0x82, 0x54, 0x71, 0xc8, 0x31, 0x54, 0x94, 0x77, 0xb8, 0x36, 0xe2, 0xbf, 0xb8, + 0x37, 0x63, 0x12, 0x03, 0x2a, 0x73, 0xe4, 0x9c, 0x4d, 0x51, 0xfb, 0x2f, 0x7b, 0x35, 0xaf, 0xa1, + 0x79, 0x86, 0x3e, 0xae, 0x7e, 0x20, 0xff, 0x7d, 0xba, 0x7b, 0x40, 0x96, 0x65, 0xd5, 0x80, 0xcd, + 0x09, 0x94, 0xba, 0xe9, 0xfd, 0x46, 0x08, 0x6c, 0xa7, 0xbf, 0xd9, 0x5a, 0x5b, 0x3e, 0x93, 0xcf, + 0x61, 0x8f, 0x27, 0x51, 0x14, 0xc6, 0x02, 0xc7, 0x4e, 0x5e, 0x5e, 0x8d, 0xb4, 0x46, 0x49, 0x8e, + 0x0d, 0x75, 0x23, 0x9c, 0x3c, 0x86, 0x8a, 0xc7, 0x1d, 0xbe, 0x08, 0x5c, 0x79, 0xaa, 0x2a, 0x2d, + 0x7b, 0x7c, 0xb0, 0x08, 0x5c, 0xf3, 0x99, 0xdc, 0xad, 0x2c, 0x95, 0x1d, 0x69, 0x43, 0x45, 0xf3, + 0x0d, 0x34, 0x6e, 0x69, 0xda, 0x03, 0xcf, 0xa1, 0x24, 0xaf, 0x60, 0x6d, 0x80, 0xf7, 0x76, 0xa1, + 0xd8, 0x8a, 0x63, 0x3e, 0x82, 0x66, 0xcf, 0xe3, 0x4a, 0x81, 0xeb, 0x4a, 0xe6, 0x29, 0x90, 0xe5, + 0xa0, 0xd6, 0x7d, 0x01, 0x65, 0x99, 0x93, 0xfe, 0xe6, 0x14, 0x3f, 0x2c, 0xac, 0x49, 0x9f, 0xfd, + 0x0a, 0x25, 0xb9, 0x75, 0xd2, 0x82, 0x26, 0xb5, 0x87, 0xf4, 0xa7, 0xee, 0xdb, 0x9e, 0xed, 0x7c, + 0xd7, 0xbd, 0xe8, 0x5d, 0x53, 0xbb, 0xf1, 0xbf, 0x34, 0x7c, 0x65, 0xd3, 0xcb, 0x6e, 0xdf, 0xee, + 0x0f, 0xf3, 0x70, 0x81, 0xd4, 0xa1, 0x72, 0x65, 0xf7, 0xcf, 0x2e, 0xfa, 0xe7, 0x8d, 0xad, 0xf4, + 0x85, 0x5e, 0xf7, 0xfb, 0xe9, 0x4b, 0x91, 0x3c, 0x80, 0xda, 0xe0, 0xfa, 0xf4, 0xd4, 0xb6, 0xcf, + 0xec, 0xb3, 0xc6, 0xf6, 0xdb, 0x6f, 0x7e, 0xfe, 0x7a, 0xea, 0x89, 0xdf, 0x92, 0x91, 0xe5, 0x86, + 0xf3, 0x8e, 0x6c, 0x25, 0x8c, 0xa7, 0xea, 0xa1, 0x93, 0x5f, 0xf7, 0x53, 0x0c, 0x3a, 0xd1, 0xe8, + 0xc5, 0x34, 0xec, 0xac, 0xfe, 0x4b, 0x19, 0x95, 0xe5, 0xcd, 0x7f, 0xfc, 0x4f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x03, 0x67, 0xc5, 0xc9, 0xbe, 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index e79343c4b5..ea6db19960 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -234,13 +234,6 @@ "type": "boolean", "format": "boolean", "description": "IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress." - }, - "secret_names": { - "type": "array", - "items": { - "type": "string" - }, - "description": "SecretNames is a list of secrets the agent requires to execute tasks." } }, "description": "A message containing the agent metadata." diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index bd940affc5..d77b0d040a 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -8463,41 +8463,6 @@ public interface AgentOrBuilder extends * bool is_sync = 3; */ boolean getIsSync(); - - /** - *
-     * SecretNames is a list of secrets the agent requires to execute tasks.
-     * 
- * - * repeated string secret_names = 4; - */ - java.util.List - getSecretNamesList(); - /** - *
-     * SecretNames is a list of secrets the agent requires to execute tasks.
-     * 
- * - * repeated string secret_names = 4; - */ - int getSecretNamesCount(); - /** - *
-     * SecretNames is a list of secrets the agent requires to execute tasks.
-     * 
- * - * repeated string secret_names = 4; - */ - java.lang.String getSecretNames(int index); - /** - *
-     * SecretNames is a list of secrets the agent requires to execute tasks.
-     * 
- * - * repeated string secret_names = 4; - */ - com.google.protobuf.ByteString - getSecretNamesBytes(int index); } /** *
@@ -8518,7 +8483,6 @@ private Agent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     private Agent() {
       name_ = "";
       supportedTaskTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
@@ -8565,15 +8529,6 @@ private Agent(
               isSync_ = input.readBool();
               break;
             }
-            case 34: {
-              java.lang.String s = input.readStringRequireUtf8();
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                secretNames_ = new com.google.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              secretNames_.add(s);
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -8592,9 +8547,6 @@ private Agent(
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           supportedTaskTypes_ = supportedTaskTypes_.getUnmodifiableView();
         }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          secretNames_ = secretNames_.getUnmodifiableView();
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -8713,51 +8665,6 @@ public boolean getIsSync() {
       return isSync_;
     }
 
-    public static final int SECRET_NAMES_FIELD_NUMBER = 4;
-    private com.google.protobuf.LazyStringList secretNames_;
-    /**
-     * 
-     * SecretNames is a list of secrets the agent requires to execute tasks.
-     * 
- * - * repeated string secret_names = 4; - */ - public com.google.protobuf.ProtocolStringList - getSecretNamesList() { - return secretNames_; - } - /** - *
-     * SecretNames is a list of secrets the agent requires to execute tasks.
-     * 
- * - * repeated string secret_names = 4; - */ - public int getSecretNamesCount() { - return secretNames_.size(); - } - /** - *
-     * SecretNames is a list of secrets the agent requires to execute tasks.
-     * 
- * - * repeated string secret_names = 4; - */ - public java.lang.String getSecretNames(int index) { - return secretNames_.get(index); - } - /** - *
-     * SecretNames is a list of secrets the agent requires to execute tasks.
-     * 
- * - * repeated string secret_names = 4; - */ - public com.google.protobuf.ByteString - getSecretNamesBytes(int index) { - return secretNames_.getByteString(index); - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -8781,9 +8688,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (isSync_ != false) { output.writeBool(3, isSync_); } - for (int i = 0; i < secretNames_.size(); i++) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, secretNames_.getRaw(i)); - } unknownFields.writeTo(output); } @@ -8808,14 +8712,6 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBoolSize(3, isSync_); } - { - int dataSize = 0; - for (int i = 0; i < secretNames_.size(); i++) { - dataSize += computeStringSizeNoTag(secretNames_.getRaw(i)); - } - size += dataSize; - size += 1 * getSecretNamesList().size(); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -8837,8 +8733,6 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getSupportedTaskTypesList())) return false; if (getIsSync() != other.getIsSync()) return false; - if (!getSecretNamesList() - .equals(other.getSecretNamesList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -8859,10 +8753,6 @@ public int hashCode() { hash = (37 * hash) + IS_SYNC_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSync()); - if (getSecretNamesCount() > 0) { - hash = (37 * hash) + SECRET_NAMES_FIELD_NUMBER; - hash = (53 * hash) + getSecretNamesList().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -9006,8 +8896,6 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000002); isSync_ = false; - secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -9043,11 +8931,6 @@ public flyteidl.admin.AgentOuterClass.Agent buildPartial() { } result.supportedTaskTypes_ = supportedTaskTypes_; result.isSync_ = isSync_; - if (((bitField0_ & 0x00000008) != 0)) { - secretNames_ = secretNames_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000008); - } - result.secretNames_ = secretNames_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -9114,16 +8997,6 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Agent other) { if (other.getIsSync() != false) { setIsSync(other.getIsSync()); } - if (!other.secretNames_.isEmpty()) { - if (secretNames_.isEmpty()) { - secretNames_ = other.secretNames_; - bitField0_ = (bitField0_ & ~0x00000008); - } else { - ensureSecretNamesIsMutable(); - secretNames_.addAll(other.secretNames_); - } - onChanged(); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -9410,136 +9283,6 @@ public Builder clearIsSync() { onChanged(); return this; } - - private com.google.protobuf.LazyStringList secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; - private void ensureSecretNamesIsMutable() { - if (!((bitField0_ & 0x00000008) != 0)) { - secretNames_ = new com.google.protobuf.LazyStringArrayList(secretNames_); - bitField0_ |= 0x00000008; - } - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public com.google.protobuf.ProtocolStringList - getSecretNamesList() { - return secretNames_.getUnmodifiableView(); - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public int getSecretNamesCount() { - return secretNames_.size(); - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public java.lang.String getSecretNames(int index) { - return secretNames_.get(index); - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public com.google.protobuf.ByteString - getSecretNamesBytes(int index) { - return secretNames_.getByteString(index); - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public Builder setSecretNames( - int index, java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureSecretNamesIsMutable(); - secretNames_.set(index, value); - onChanged(); - return this; - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public Builder addSecretNames( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureSecretNamesIsMutable(); - secretNames_.add(value); - onChanged(); - return this; - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public Builder addAllSecretNames( - java.lang.Iterable values) { - ensureSecretNamesIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, secretNames_); - onChanged(); - return this; - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public Builder clearSecretNames() { - secretNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); - onChanged(); - return this; - } - /** - *
-       * SecretNames is a list of secrets the agent requires to execute tasks.
-       * 
- * - * repeated string secret_names = 4; - */ - public Builder addSecretNamesBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - ensureSecretNamesIsMutable(); - secretNames_.add(value); - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -12138,18 +11881,17 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" + "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" + "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + - "\014\"\024\n\022DeleteTaskResponse\"Z\n\005Agent\022\014\n\004name" + + "\014\"\024\n\022DeleteTaskResponse\"D\n\005Agent\022\014\n\004name" + "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \003(\t\022\017\n\007" + - "is_sync\030\003 \001(\010\022\024\n\014secret_names\030\004 \003(\t\"\037\n\017G" + - "etAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020GetAgent" + - "Response\022$\n\005agent\030\001 \001(\0132\025.flyteidl.admin" + - ".Agent\"\023\n\021ListAgentsRequest\";\n\022ListAgent" + - "sResponse\022%\n\006agents\030\001 \003(\0132\025.flyteidl.adm" + - "in.Agent*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000" + - "\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007" + - "RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/f" + - "lyteorg/flyte/flyteidl/gen/pb-go/flyteid" + - "l/adminb\006proto3" + "is_sync\030\003 \001(\010\"\037\n\017GetAgentRequest\022\014\n\004name" + + "\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005agent\030\001 \001(" + + "\0132\025.flyteidl.admin.Agent\"\023\n\021ListAgentsRe" + + "quest\";\n\022ListAgentsResponse\022%\n\006agents\030\001 " + + "\003(\0132\025.flyteidl.admin.Agent*^\n\005State\022\025\n\021R" + + "ETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILURE\020" + + "\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED" + + "\020\004B=Z;github.com/flyteorg/flyte/flyteidl" + + "/gen/pb-go/flyteidl/adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -12245,7 +11987,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_Agent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_Agent_descriptor, - new java.lang.String[] { "Name", "SupportedTaskTypes", "IsSync", "SecretNames", }); + new java.lang.String[] { "Name", "SupportedTaskTypes", "IsSync", }); internal_static_flyteidl_admin_GetAgentRequest_descriptor = getDescriptor().getMessageTypes().get(9); internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable = new diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 53b0150d92..e30784dad5 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -8370,9 +8370,6 @@ export namespace flyteidl { /** Agent isSync */ isSync?: (boolean|null); - - /** Agent secretNames */ - secretNames?: (string[]|null); } /** Represents an Agent. */ @@ -8393,9 +8390,6 @@ export namespace flyteidl { /** Agent isSync. */ public isSync: boolean; - /** Agent secretNames. */ - public secretNames: string[]; - /** * Creates a new Agent instance using the specified properties. * @param [properties] Properties to set diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 586377bd30..c8c10034f4 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -20419,7 +20419,6 @@ * @property {string|null} [name] Agent name * @property {Array.|null} [supportedTaskTypes] Agent supportedTaskTypes * @property {boolean|null} [isSync] Agent isSync - * @property {Array.|null} [secretNames] Agent secretNames */ /** @@ -20432,7 +20431,6 @@ */ function Agent(properties) { this.supportedTaskTypes = []; - this.secretNames = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -20463,14 +20461,6 @@ */ Agent.prototype.isSync = false; - /** - * Agent secretNames. - * @member {Array.} secretNames - * @memberof flyteidl.admin.Agent - * @instance - */ - Agent.prototype.secretNames = $util.emptyArray; - /** * Creates a new Agent instance using the specified properties. * @function create @@ -20502,9 +20492,6 @@ writer.uint32(/* id 2, wireType 2 =*/18).string(message.supportedTaskTypes[i]); if (message.isSync != null && message.hasOwnProperty("isSync")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.isSync); - if (message.secretNames != null && message.secretNames.length) - for (var i = 0; i < message.secretNames.length; ++i) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.secretNames[i]); return writer; }; @@ -20537,11 +20524,6 @@ case 3: message.isSync = reader.bool(); break; - case 4: - if (!(message.secretNames && message.secretNames.length)) - message.secretNames = []; - message.secretNames.push(reader.string()); - break; default: reader.skipType(tag & 7); break; @@ -20574,13 +20556,6 @@ if (message.isSync != null && message.hasOwnProperty("isSync")) if (typeof message.isSync !== "boolean") return "isSync: boolean expected"; - if (message.secretNames != null && message.hasOwnProperty("secretNames")) { - if (!Array.isArray(message.secretNames)) - return "secretNames: array expected"; - for (var i = 0; i < message.secretNames.length; ++i) - if (!$util.isString(message.secretNames[i])) - return "secretNames: string[] expected"; - } return null; }; diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index 55fa65fa8a..275e1da82e 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -18,7 +18,7 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"\x89\x01\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\x12!\n\x0csecret_names\x18\x04 \x03(\tR\x0bsecretNames\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"f\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -35,8 +35,8 @@ _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' _CREATETASKREQUEST_SECRETSENTRY._options = None _CREATETASKREQUEST_SECRETSENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=2109 - _globals['_STATE']._serialized_end=2203 + _globals['_STATE']._serialized_start=2073 + _globals['_STATE']._serialized_end=2167 _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 @@ -61,14 +61,14 @@ _globals['_DELETETASKREQUEST']._serialized_end=1751 _globals['_DELETETASKRESPONSE']._serialized_start=1753 _globals['_DELETETASKRESPONSE']._serialized_end=1773 - _globals['_AGENT']._serialized_start=1776 - _globals['_AGENT']._serialized_end=1913 - _globals['_GETAGENTREQUEST']._serialized_start=1915 - _globals['_GETAGENTREQUEST']._serialized_end=1952 - _globals['_GETAGENTRESPONSE']._serialized_start=1954 - _globals['_GETAGENTRESPONSE']._serialized_end=2017 - _globals['_LISTAGENTSREQUEST']._serialized_start=2019 - _globals['_LISTAGENTSREQUEST']._serialized_end=2038 - _globals['_LISTAGENTSRESPONSE']._serialized_start=2040 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2107 + _globals['_AGENT']._serialized_start=1775 + _globals['_AGENT']._serialized_end=1877 + _globals['_GETAGENTREQUEST']._serialized_start=1879 + _globals['_GETAGENTREQUEST']._serialized_end=1916 + _globals['_GETAGENTRESPONSE']._serialized_start=1918 + _globals['_GETAGENTRESPONSE']._serialized_end=1981 + _globals['_LISTAGENTSREQUEST']._serialized_start=1983 + _globals['_LISTAGENTSREQUEST']._serialized_end=2002 + _globals['_LISTAGENTSRESPONSE']._serialized_start=2004 + _globals['_LISTAGENTSRESPONSE']._serialized_end=2071 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi index 81bca48431..30562d12e1 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi @@ -127,16 +127,14 @@ class DeleteTaskResponse(_message.Message): def __init__(self) -> None: ... class Agent(_message.Message): - __slots__ = ["name", "supported_task_types", "is_sync", "secret_names"] + __slots__ = ["name", "supported_task_types", "is_sync"] NAME_FIELD_NUMBER: _ClassVar[int] SUPPORTED_TASK_TYPES_FIELD_NUMBER: _ClassVar[int] IS_SYNC_FIELD_NUMBER: _ClassVar[int] - SECRET_NAMES_FIELD_NUMBER: _ClassVar[int] name: str supported_task_types: _containers.RepeatedScalarFieldContainer[str] is_sync: bool - secret_names: _containers.RepeatedScalarFieldContainer[str] - def __init__(self, name: _Optional[str] = ..., supported_task_types: _Optional[_Iterable[str]] = ..., is_sync: bool = ..., secret_names: _Optional[_Iterable[str]] = ...) -> None: ... + def __init__(self, name: _Optional[str] = ..., supported_task_types: _Optional[_Iterable[str]] = ..., is_sync: bool = ...) -> None: ... class GetAgentRequest(_message.Message): __slots__ = ["name"] diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index 31d9b3f2b3..1e31df455f 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -119,9 +119,6 @@ pub struct Agent { /// IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. #[prost(bool, tag="3")] pub is_sync: bool, - /// SecretNames is a list of secrets the agent requires to execute tasks. - #[prost(string, repeated, tag="4")] - pub secret_names: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } /// A request to get an agent. #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index 668cb03009..7956f4bf62 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -106,9 +106,6 @@ message Agent { // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. bool is_sync = 3; - - // SecretNames is a list of secrets the agent requires to execute tasks. - repeated string secret_names = 4; } // A request to get an agent. From 425b54a7be8e09fe35ec71af29d3120c8a4389d2 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 17 Dec 2023 16:23:09 +0800 Subject: [PATCH 33/47] remove secrets in agent.proto Signed-off-by: Future Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 321 ++---------- flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 92 +--- flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 134 +++-- .../pb-go/flyteidl/admin/agent.pb.validate.go | 2 - .../flyteidl/admin/AgentOuterClass.java | 468 +----------------- flyteidl/gen/pb-js/flyteidl.d.ts | 6 - flyteidl/gen/pb-js/flyteidl.js | 31 +- .../gen/pb_python/flyteidl/admin/agent_pb2.py | 56 +-- .../pb_python/flyteidl/admin/agent_pb2.pyi | 13 +- flyteidl/gen/pb_rust/flyteidl.admin.rs | 5 - flyteidl/protos/flyteidl/admin/agent.proto | 4 - 11 files changed, 165 insertions(+), 967 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index b3e897e034..b23cddfcf9 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -17,7 +17,6 @@ #include extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_CreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fadmin_2fagent_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_TaskExecutionMetadata_LabelsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto; @@ -45,10 +44,6 @@ class TaskExecutionMetadataDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _TaskExecutionMetadata_default_instance_; -class CreateTaskRequest_SecretsEntry_DoNotUseDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_; class CreateTaskRequestDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -156,19 +151,6 @@ ::google::protobuf::internal::SCCInfo<4> scc_info_TaskExecutionMetadata_flyteidl &scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base, &scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base,}}; -static void InitDefaultsCreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - { - void* ptr = &::flyteidl::admin::_CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_; - new (ptr) ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse(); - } - ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse::InitAsDefaultInstance(); -} - -::google::protobuf::internal::SCCInfo<0> scc_info_CreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto}, {}}; - static void InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -180,12 +162,11 @@ static void InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto() { ::flyteidl::admin::CreateTaskRequest::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<4> scc_info_CreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 4, InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto}, { +::google::protobuf::internal::SCCInfo<3> scc_info_CreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsCreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto}, { &scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto.base, &scc_info_TaskTemplate_flyteidl_2fcore_2ftasks_2eproto.base, - &scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto.base, - &scc_info_CreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base,}}; + &scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto.base,}}; static void InitDefaultsCreateTaskResponse_flyteidl_2fadmin_2fagent_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -351,7 +332,6 @@ void InitDefaults_flyteidl_2fadmin_2fagent_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_TaskExecutionMetadata_flyteidl_2fadmin_2fagent_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskRequest_SecretsEntry_DoNotUse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskRequest_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_CreateTaskResponse_flyteidl_2fadmin_2fagent_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_GetTaskRequest_flyteidl_2fadmin_2fagent_2eproto.base); @@ -366,7 +346,7 @@ void InitDefaults_flyteidl_2fadmin_2fagent_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_ListAgentsResponse_flyteidl_2fadmin_2fagent_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[17]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[16]; const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_flyteidl_2fadmin_2fagent_2eproto[1]; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fadmin_2fagent_2eproto = nullptr; @@ -409,15 +389,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, annotations_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, k8s_service_account_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::TaskExecutionMetadata, environment_variables_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse, _has_bits_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse, _internal_metadata_), - ~0u, // no _extensions_ - ~0u, // no _oneof_case_ - ~0u, // no _weak_field_map_ - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse, key_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse, value_), - 0, - 1, ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, _internal_metadata_), ~0u, // no _extensions_ @@ -427,7 +398,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, template__), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, output_prefix_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, task_execution_metadata_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskRequest, secrets_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::CreateTaskResponse, _internal_metadata_), ~0u, // no _extensions_ @@ -505,19 +475,18 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 9, 16, sizeof(::flyteidl::admin::TaskExecutionMetadata_AnnotationsEntry_DoNotUse)}, { 18, 25, sizeof(::flyteidl::admin::TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse)}, { 27, -1, sizeof(::flyteidl::admin::TaskExecutionMetadata)}, - { 38, 45, sizeof(::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse)}, - { 47, -1, sizeof(::flyteidl::admin::CreateTaskRequest)}, - { 57, -1, sizeof(::flyteidl::admin::CreateTaskResponse)}, - { 63, -1, sizeof(::flyteidl::admin::GetTaskRequest)}, - { 70, -1, sizeof(::flyteidl::admin::GetTaskResponse)}, - { 77, -1, sizeof(::flyteidl::admin::Resource)}, - { 85, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, - { 92, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, - { 97, -1, sizeof(::flyteidl::admin::Agent)}, - { 105, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, - { 111, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, - { 117, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, - { 122, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, + { 38, -1, sizeof(::flyteidl::admin::CreateTaskRequest)}, + { 47, -1, sizeof(::flyteidl::admin::CreateTaskResponse)}, + { 53, -1, sizeof(::flyteidl::admin::GetTaskRequest)}, + { 60, -1, sizeof(::flyteidl::admin::GetTaskResponse)}, + { 67, -1, sizeof(::flyteidl::admin::Resource)}, + { 75, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, + { 82, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, + { 87, -1, sizeof(::flyteidl::admin::Agent)}, + { 95, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, + { 101, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, + { 107, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, + { 112, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -525,7 +494,6 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_AnnotationsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_EnvironmentVariablesEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_TaskExecutionMetadata_default_instance_), - reinterpret_cast(&::flyteidl::admin::_CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::admin::_CreateTaskRequest_default_instance_), reinterpret_cast(&::flyteidl::admin::_CreateTaskResponse_default_instance_), reinterpret_cast(&::flyteidl::admin::_GetTaskRequest_default_instance_), @@ -543,7 +511,7 @@ static ::google::protobuf::Message const * const file_default_instances[] = { ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto = { {}, AddDescriptors_flyteidl_2fadmin_2fagent_2eproto, "flyteidl/admin/agent.proto", schemas, file_default_instances, TableStruct_flyteidl_2fadmin_2fagent_2eproto::offsets, - file_level_metadata_flyteidl_2fadmin_2fagent_2eproto, 17, file_level_enum_descriptors_flyteidl_2fadmin_2fagent_2eproto, file_level_service_descriptors_flyteidl_2fadmin_2fagent_2eproto, + file_level_metadata_flyteidl_2fadmin_2fagent_2eproto, 16, file_level_enum_descriptors_flyteidl_2fadmin_2fagent_2eproto, file_level_service_descriptors_flyteidl_2fadmin_2fagent_2eproto, }; const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = @@ -565,40 +533,37 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" - "\005value\030\002 \001(\t:\0028\001\"\275\002\n\021CreateTaskRequest\022)" + "\005value\030\002 \001(\t:\0028\001\"\314\001\n\021CreateTaskRequest\022)" "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" "execution_metadata\030\004 \001(\0132%.flyteidl.admi" - "n.TaskExecutionMetadata\022\?\n\007secrets\030\005 \003(\013" - "2..flyteidl.admin.CreateTaskRequest.Secr" - "etsEntry\032.\n\014SecretsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" - "\005value\030\002 \001(\t:\0028\001\"+\n\022CreateTaskResponse\022\025" - "\n\rresource_meta\030\001 \001(\014\":\n\016GetTaskRequest\022" - "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" - "\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 \001(\0132\030" - ".flyteidl.admin.Resource\022)\n\tlog_links\030\002 " - "\003(\0132\026.flyteidl.core.TaskLog\"m\n\010Resource\022" - "$\n\005state\030\001 \001(\0162\025.flyteidl.admin.State\022*\n" - "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" - "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" - "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" - "\014\"\024\n\022DeleteTaskResponse\"D\n\005Agent\022\014\n\004name" - "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \003(\t\022\017\n\007" - "is_sync\030\003 \001(\010\"\037\n\017GetAgentRequest\022\014\n\004name" - "\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005agent\030\001 \001(" - "\0132\025.flyteidl.admin.Agent\"\023\n\021ListAgentsRe" - "quest\";\n\022ListAgentsResponse\022%\n\006agents\030\001 " - "\003(\0132\025.flyteidl.admin.Agent*^\n\005State\022\025\n\021R" - "ETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILURE\020" - "\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED" - "\020\004B=Z;github.com/flyteorg/flyte/flyteidl" - "/gen/pb-go/flyteidl/adminb\006proto3" + "n.TaskExecutionMetadata\"+\n\022CreateTaskRes" + "ponse\022\025\n\rresource_meta\030\001 \001(\014\":\n\016GetTaskR" + "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" + "ta\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030" + "\001 \001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_l" + "inks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"m\n\010Re" + "source\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.S" + "tate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Li" + "teralMap\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskR" + "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" + "ta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"D\n\005Agent\022" + "\014\n\004name\030\001 \001(\t\022\034\n\024supported_task_types\030\002 " + "\003(\t\022\017\n\007is_sync\030\003 \001(\010\"\037\n\017GetAgentRequest\022" + "\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005age" + "nt\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListA" + "gentsRequest\";\n\022ListAgentsResponse\022%\n\006ag" + "ents\030\001 \003(\0132\025.flyteidl.admin.Agent*^\n\005Sta" + "te\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_F" + "AILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSU" + "CCEEDED\020\004B=Z;github.com/flyteorg/flyte/f" + "lyteidl/gen/pb-go/flyteidl/adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1873, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1760, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { @@ -1687,47 +1652,6 @@ ::google::protobuf::Metadata TaskExecutionMetadata::GetMetadata() const { } -// =================================================================== - -CreateTaskRequest_SecretsEntry_DoNotUse::CreateTaskRequest_SecretsEntry_DoNotUse() {} -CreateTaskRequest_SecretsEntry_DoNotUse::CreateTaskRequest_SecretsEntry_DoNotUse(::google::protobuf::Arena* arena) - : SuperType(arena) {} -void CreateTaskRequest_SecretsEntry_DoNotUse::MergeFrom(const CreateTaskRequest_SecretsEntry_DoNotUse& other) { - MergeFromInternal(other); -} -::google::protobuf::Metadata CreateTaskRequest_SecretsEntry_DoNotUse::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto); - return ::file_level_metadata_flyteidl_2fadmin_2fagent_2eproto[4]; -} -void CreateTaskRequest_SecretsEntry_DoNotUse::MergeFrom( - const ::google::protobuf::Message& other) { - ::google::protobuf::Message::MergeFrom(other); -} - -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool CreateTaskRequest_SecretsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - using MF = ::google::protobuf::internal::MapField< - CreateTaskRequest_SecretsEntry_DoNotUse, EntryKeyType, EntryValueType, - kEntryKeyFieldType, kEntryValueFieldType, - kEntryDefaultEnumValue>; - auto mf = static_cast(object); - Parser> parser(mf); -#define DO_(x) if (!(x)) return false - DO_(parser.ParseMap(begin, end)); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.key().data(), static_cast(parser.key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.CreateTaskRequest.SecretsEntry.key")); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.value().data(), static_cast(parser.value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.CreateTaskRequest.SecretsEntry.value")); -#undef DO_ - return true; -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - - // =================================================================== void CreateTaskRequest::InitAsDefaultInstance() { @@ -1774,7 +1698,6 @@ const int CreateTaskRequest::kInputsFieldNumber; const int CreateTaskRequest::kTemplateFieldNumber; const int CreateTaskRequest::kOutputPrefixFieldNumber; const int CreateTaskRequest::kTaskExecutionMetadataFieldNumber; -const int CreateTaskRequest::kSecretsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 CreateTaskRequest::CreateTaskRequest() @@ -1786,7 +1709,6 @@ CreateTaskRequest::CreateTaskRequest(const CreateTaskRequest& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - secrets_.MergeFrom(from.secrets_); output_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.output_prefix().size() > 0) { output_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_prefix_); @@ -1845,7 +1767,6 @@ void CreateTaskRequest::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - secrets_.Clear(); output_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (GetArenaNoVirtual() == nullptr && inputs_ != nullptr) { delete inputs_; @@ -1930,25 +1851,6 @@ const char* CreateTaskRequest::_InternalParse(const char* begin, const char* end {parser_till_end, object}, ptr - size, ptr)); break; } - // map secrets = 5; - case 5: { - if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; - auto parse_map = ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse::_ParseMap; - ctx->extra_parse_data().payload.clear(); - ctx->extra_parse_data().parse_map = parse_map; - object = &msg->secrets_; - if (size > end - ptr) goto len_delim_till_end; - auto newend = ptr + size; - GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); - ptr = newend; - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 42 && (ptr += 1)); - break; - } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -2031,32 +1933,6 @@ bool CreateTaskRequest::MergePartialFromCodedStream( break; } - // map secrets = 5; - case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { - CreateTaskRequest_SecretsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< - CreateTaskRequest_SecretsEntry_DoNotUse, - ::std::string, ::std::string, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - 0 >, - ::google::protobuf::Map< ::std::string, ::std::string > > parser(&secrets_); - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, &parser)); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.key().data(), static_cast(parser.key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.CreateTaskRequest.SecretsEntry.key")); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.value().data(), static_cast(parser.value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.admin.CreateTaskRequest.SecretsEntry.value")); - } else { - goto handle_unusual; - } - break; - } - default: { handle_unusual: if (tag == 0) { @@ -2112,55 +1988,6 @@ void CreateTaskRequest::SerializeWithCachedSizes( 4, HasBitSetters::task_execution_metadata(this), output); } - // map secrets = 5; - if (!this->secrets().empty()) { - typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer - ConstPtr; - typedef ConstPtr SortItem; - typedef ::google::protobuf::internal::CompareByDerefFirst Less; - struct Utf8Check { - static void Check(ConstPtr p) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->first.data(), static_cast(p->first.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.CreateTaskRequest.SecretsEntry.key"); - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->second.data(), static_cast(p->second.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.CreateTaskRequest.SecretsEntry.value"); - } - }; - - if (output->IsSerializationDeterministic() && - this->secrets().size() > 1) { - ::std::unique_ptr items( - new SortItem[this->secrets().size()]); - typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; - size_type n = 0; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secrets().begin(); - it != this->secrets().end(); ++it, ++n) { - items[static_cast(n)] = SortItem(&*it); - } - ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; - for (size_type i = 0; i < n; i++) { - entry.reset(secrets_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(5, *entry, output); - Utf8Check::Check(&(*items[static_cast(i)])); - } - } else { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secrets().begin(); - it != this->secrets().end(); ++it) { - entry.reset(secrets_.NewEntryWrapper(it->first, it->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(5, *entry, output); - Utf8Check::Check(&(*it)); - } - } - } - if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -2206,55 +2033,6 @@ ::google::protobuf::uint8* CreateTaskRequest::InternalSerializeWithCachedSizesTo 4, HasBitSetters::task_execution_metadata(this), target); } - // map secrets = 5; - if (!this->secrets().empty()) { - typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer - ConstPtr; - typedef ConstPtr SortItem; - typedef ::google::protobuf::internal::CompareByDerefFirst Less; - struct Utf8Check { - static void Check(ConstPtr p) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->first.data(), static_cast(p->first.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.CreateTaskRequest.SecretsEntry.key"); - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->second.data(), static_cast(p->second.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.admin.CreateTaskRequest.SecretsEntry.value"); - } - }; - - if (false && - this->secrets().size() > 1) { - ::std::unique_ptr items( - new SortItem[this->secrets().size()]); - typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; - size_type n = 0; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secrets().begin(); - it != this->secrets().end(); ++it, ++n) { - items[static_cast(n)] = SortItem(&*it); - } - ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; - for (size_type i = 0; i < n; i++) { - entry.reset(secrets_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); - target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(5, *entry, target); - Utf8Check::Check(&(*items[static_cast(i)])); - } - } else { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secrets().begin(); - it != this->secrets().end(); ++it) { - entry.reset(secrets_.NewEntryWrapper(it->first, it->second)); - target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(5, *entry, target); - Utf8Check::Check(&(*it)); - } - } - } - if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -2276,20 +2054,6 @@ size_t CreateTaskRequest::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // map secrets = 5; - total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->secrets_size()); - { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->secrets().begin(); - it != this->secrets().end(); ++it) { - entry.reset(secrets_.NewEntryWrapper(it->first, it->second)); - total_size += ::google::protobuf::internal::WireFormatLite:: - MessageSizeNoVirtual(*entry); - } - } - // string output_prefix = 3; if (this->output_prefix().size() > 0) { total_size += 1 + @@ -2345,7 +2109,6 @@ void CreateTaskRequest::MergeFrom(const CreateTaskRequest& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - secrets_.MergeFrom(from.secrets_); if (from.output_prefix().size() > 0) { output_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_prefix_); @@ -2386,7 +2149,6 @@ void CreateTaskRequest::Swap(CreateTaskRequest* other) { void CreateTaskRequest::InternalSwap(CreateTaskRequest* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - secrets_.Swap(&other->secrets_); output_prefix_.Swap(&other->output_prefix_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(inputs_, other->inputs_); @@ -5874,9 +5636,6 @@ template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata_Environmen template<> PROTOBUF_NOINLINE ::flyteidl::admin::TaskExecutionMetadata* Arena::CreateMaybeMessage< ::flyteidl::admin::TaskExecutionMetadata >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::TaskExecutionMetadata >(arena); } -template<> PROTOBUF_NOINLINE ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse >(arena); -} template<> PROTOBUF_NOINLINE ::flyteidl::admin::CreateTaskRequest* Arena::CreateMaybeMessage< ::flyteidl::admin::CreateTaskRequest >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::admin::CreateTaskRequest >(arena); } diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index 09aeb76cf0..a00f79ae6f 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -50,7 +50,7 @@ struct TableStruct_flyteidl_2fadmin_2fagent_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[17] + static const ::google::protobuf::internal::ParseTable schema[16] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -65,9 +65,6 @@ extern AgentDefaultTypeInternal _Agent_default_instance_; class CreateTaskRequest; class CreateTaskRequestDefaultTypeInternal; extern CreateTaskRequestDefaultTypeInternal _CreateTaskRequest_default_instance_; -class CreateTaskRequest_SecretsEntry_DoNotUse; -class CreateTaskRequest_SecretsEntry_DoNotUseDefaultTypeInternal; -extern CreateTaskRequest_SecretsEntry_DoNotUseDefaultTypeInternal _CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_; class CreateTaskResponse; class CreateTaskResponseDefaultTypeInternal; extern CreateTaskResponseDefaultTypeInternal _CreateTaskResponse_default_instance_; @@ -116,7 +113,6 @@ namespace google { namespace protobuf { template<> ::flyteidl::admin::Agent* Arena::CreateMaybeMessage<::flyteidl::admin::Agent>(Arena*); template<> ::flyteidl::admin::CreateTaskRequest* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskRequest>(Arena*); -template<> ::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskRequest_SecretsEntry_DoNotUse>(Arena*); template<> ::flyteidl::admin::CreateTaskResponse* Arena::CreateMaybeMessage<::flyteidl::admin::CreateTaskResponse>(Arena*); template<> ::flyteidl::admin::DeleteTaskRequest* Arena::CreateMaybeMessage<::flyteidl::admin::DeleteTaskRequest>(Arena*); template<> ::flyteidl::admin::DeleteTaskResponse* Arena::CreateMaybeMessage<::flyteidl::admin::DeleteTaskResponse>(Arena*); @@ -425,30 +421,6 @@ class TaskExecutionMetadata final : }; // ------------------------------------------------------------------- -class CreateTaskRequest_SecretsEntry_DoNotUse : public ::google::protobuf::internal::MapEntry { -public: -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - typedef ::google::protobuf::internal::MapEntry SuperType; - CreateTaskRequest_SecretsEntry_DoNotUse(); - CreateTaskRequest_SecretsEntry_DoNotUse(::google::protobuf::Arena* arena); - void MergeFrom(const CreateTaskRequest_SecretsEntry_DoNotUse& other); - static const CreateTaskRequest_SecretsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_CreateTaskRequest_SecretsEntry_DoNotUse_default_instance_); } - void MergeFrom(const ::google::protobuf::Message& other) final; - ::google::protobuf::Metadata GetMetadata() const; -}; - -// ------------------------------------------------------------------- - class CreateTaskRequest final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.admin.CreateTaskRequest) */ { public: @@ -487,7 +459,7 @@ class CreateTaskRequest final : &_CreateTaskRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 5; + 4; void Swap(CreateTaskRequest* other); friend void swap(CreateTaskRequest& a, CreateTaskRequest& b) { @@ -542,18 +514,8 @@ class CreateTaskRequest final : // nested types ---------------------------------------------------- - // accessors ------------------------------------------------------- - // map secrets = 5; - int secrets_size() const; - void clear_secrets(); - static const int kSecretsFieldNumber = 5; - const ::google::protobuf::Map< ::std::string, ::std::string >& - secrets() const; - ::google::protobuf::Map< ::std::string, ::std::string >* - mutable_secrets(); - // string output_prefix = 3; void clear_output_prefix(); static const int kOutputPrefixFieldNumber = 3; @@ -600,12 +562,6 @@ class CreateTaskRequest final : class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::internal::MapField< - CreateTaskRequest_SecretsEntry_DoNotUse, - ::std::string, ::std::string, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - 0 > secrets_; ::google::protobuf::internal::ArenaStringPtr output_prefix_; ::flyteidl::core::LiteralMap* inputs_; ::flyteidl::core::TaskTemplate* template__; @@ -653,7 +609,7 @@ class CreateTaskResponse final : &_CreateTaskResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 6; + 5; void Swap(CreateTaskResponse* other); friend void swap(CreateTaskResponse& a, CreateTaskResponse& b) { @@ -773,7 +729,7 @@ class GetTaskRequest final : &_GetTaskRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 7; + 6; void Swap(GetTaskRequest* other); friend void swap(GetTaskRequest& a, GetTaskRequest& b) { @@ -908,7 +864,7 @@ class GetTaskResponse final : &_GetTaskResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 8; + 7; void Swap(GetTaskResponse* other); friend void swap(GetTaskResponse& a, GetTaskResponse& b) { @@ -1036,7 +992,7 @@ class Resource final : &_Resource_default_instance_); } static constexpr int kIndexInFileMessages = - 9; + 8; void Swap(Resource* other); friend void swap(Resource& a, Resource& b) { @@ -1173,7 +1129,7 @@ class DeleteTaskRequest final : &_DeleteTaskRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 10; + 9; void Swap(DeleteTaskRequest* other); friend void swap(DeleteTaskRequest& a, DeleteTaskRequest& b) { @@ -1308,7 +1264,7 @@ class DeleteTaskResponse final : &_DeleteTaskResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 11; + 10; void Swap(DeleteTaskResponse* other); friend void swap(DeleteTaskResponse& a, DeleteTaskResponse& b) { @@ -1413,7 +1369,7 @@ class Agent final : &_Agent_default_instance_); } static constexpr int kIndexInFileMessages = - 12; + 11; void Swap(Agent* other); friend void swap(Agent& a, Agent& b) { @@ -1563,7 +1519,7 @@ class GetAgentRequest final : &_GetAgentRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 13; + 12; void Swap(GetAgentRequest* other); friend void swap(GetAgentRequest& a, GetAgentRequest& b) { @@ -1683,7 +1639,7 @@ class GetAgentResponse final : &_GetAgentResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 14; + 13; void Swap(GetAgentResponse* other); friend void swap(GetAgentResponse& a, GetAgentResponse& b) { @@ -1798,7 +1754,7 @@ class ListAgentsRequest final : &_ListAgentsRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 15; + 14; void Swap(ListAgentsRequest* other); friend void swap(ListAgentsRequest& a, ListAgentsRequest& b) { @@ -1903,7 +1859,7 @@ class ListAgentsResponse final : &_ListAgentsResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 16; + 15; void Swap(ListAgentsResponse* other); friend void swap(ListAgentsResponse& a, ListAgentsResponse& b) { @@ -2205,8 +2161,6 @@ TaskExecutionMetadata::mutable_environment_variables() { // ------------------------------------------------------------------- -// ------------------------------------------------------------------- - // CreateTaskRequest // .flyteidl.core.LiteralMap inputs = 1; @@ -2403,24 +2357,6 @@ inline void CreateTaskRequest::set_allocated_task_execution_metadata(::flyteidl: // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.CreateTaskRequest.task_execution_metadata) } -// map secrets = 5; -inline int CreateTaskRequest::secrets_size() const { - return secrets_.size(); -} -inline void CreateTaskRequest::clear_secrets() { - secrets_.Clear(); -} -inline const ::google::protobuf::Map< ::std::string, ::std::string >& -CreateTaskRequest::secrets() const { - // @@protoc_insertion_point(field_map:flyteidl.admin.CreateTaskRequest.secrets) - return secrets_.GetMap(); -} -inline ::google::protobuf::Map< ::std::string, ::std::string >* -CreateTaskRequest::mutable_secrets() { - // @@protoc_insertion_point(field_mutable_map:flyteidl.admin.CreateTaskRequest.secrets) - return secrets_.MutableMap(); -} - // ------------------------------------------------------------------- // CreateTaskResponse @@ -3223,8 +3159,6 @@ ListAgentsResponse::agents() const { // ------------------------------------------------------------------- -// ------------------------------------------------------------------- - // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index af2e3ecf66..5e17ad4994 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -154,13 +154,9 @@ type CreateTaskRequest struct { OutputPrefix string `protobuf:"bytes,3,opt,name=output_prefix,json=outputPrefix,proto3" json:"output_prefix,omitempty"` // subset of runtime task execution metadata. TaskExecutionMetadata *TaskExecutionMetadata `protobuf:"bytes,4,opt,name=task_execution_metadata,json=taskExecutionMetadata,proto3" json:"task_execution_metadata,omitempty"` - // Secret to be passed to the agent. - // Key is the name of the secret in secret manager. - // Value is the actual secret value. - Secrets map[string]string `protobuf:"bytes,5,rep,name=secrets,proto3" json:"secrets,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateTaskRequest) Reset() { *m = CreateTaskRequest{} } @@ -216,13 +212,6 @@ func (m *CreateTaskRequest) GetTaskExecutionMetadata() *TaskExecutionMetadata { return nil } -func (m *CreateTaskRequest) GetSecrets() map[string]string { - if m != nil { - return m.Secrets - } - return nil -} - // Represents a create response structure. type CreateTaskResponse struct { // Metadata is created by the agent. It could be a string (jobId) or a dict (more complex metadata). @@ -724,7 +713,6 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntry") proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.TaskExecutionMetadata.LabelsEntry") proto.RegisterType((*CreateTaskRequest)(nil), "flyteidl.admin.CreateTaskRequest") - proto.RegisterMapType((map[string]string)(nil), "flyteidl.admin.CreateTaskRequest.SecretsEntry") proto.RegisterType((*CreateTaskResponse)(nil), "flyteidl.admin.CreateTaskResponse") proto.RegisterType((*GetTaskRequest)(nil), "flyteidl.admin.GetTaskRequest") proto.RegisterType((*GetTaskResponse)(nil), "flyteidl.admin.GetTaskResponse") @@ -741,63 +729,61 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 922 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xff, 0x6f, 0xe3, 0xc4, - 0x13, 0xfd, 0xa4, 0x69, 0xbe, 0x4d, 0x7a, 0xbd, 0x64, 0xaf, 0xf9, 0x9c, 0x9b, 0x3b, 0x50, 0x65, - 0x74, 0xa8, 0xe2, 0x74, 0x0e, 0xd7, 0x22, 0xe8, 0x1d, 0x82, 0x53, 0xae, 0x35, 0xa5, 0x52, 0x1a, - 0x55, 0x9b, 0x14, 0x01, 0x12, 0x58, 0x1b, 0x67, 0x12, 0xac, 0x38, 0xb6, 0xf1, 0xae, 0xab, 0x8b, - 0xc4, 0xcf, 0x48, 0xfc, 0x07, 0xfc, 0xb9, 0xc8, 0xbb, 0x6b, 0x37, 0xc9, 0xe5, 0x50, 0x2b, 0x7e, - 0xb3, 0xe7, 0xbd, 0x79, 0x33, 0x3b, 0xf3, 0x9c, 0x0d, 0xb4, 0x27, 0xfe, 0x42, 0xa0, 0x37, 0xf6, - 0x3b, 0x6c, 0x3c, 0xf7, 0x82, 0x0e, 0x9b, 0x62, 0x20, 0xac, 0x28, 0x0e, 0x45, 0x48, 0x76, 0x33, - 0xcc, 0x92, 0x58, 0xfb, 0x69, 0xce, 0x75, 0xc3, 0x18, 0x3b, 0xbe, 0x27, 0x30, 0x66, 0x3e, 0x57, - 0xec, 0xf6, 0xfe, 0x2a, 0x2a, 0x18, 0x9f, 0x65, 0xd0, 0x47, 0xab, 0x90, 0x17, 0x08, 0x8c, 0x27, - 0xcc, 0x45, 0x0d, 0x7f, 0xbc, 0x06, 0x8f, 0x31, 0x10, 0xde, 0xc4, 0xc3, 0x78, 0x73, 0x3a, 0xbe, - 0x43, 0x37, 0x11, 0x5e, 0x18, 0x28, 0xd8, 0xfc, 0xbb, 0x04, 0xad, 0x21, 0xe3, 0x33, 0x3b, 0x8b, - 0x5f, 0xa2, 0x60, 0x63, 0x26, 0x18, 0xa1, 0xd0, 0x4c, 0xdb, 0x70, 0xf2, 0x0c, 0xc7, 0x1b, 0x1b, - 0x85, 0x83, 0xc2, 0x61, 0xfd, 0xe8, 0x53, 0x2b, 0x3f, 0x5c, 0x2a, 0x6a, 0xad, 0x08, 0x5c, 0xe4, - 0x1d, 0xd0, 0x87, 0x62, 0x15, 0x20, 0x4f, 0xa1, 0x16, 0xb0, 0x39, 0xf2, 0x88, 0xb9, 0x68, 0x6c, - 0x1d, 0x14, 0x0e, 0x6b, 0xf4, 0x36, 0x40, 0x2e, 0xa0, 0xec, 0xb3, 0x11, 0xfa, 0xdc, 0x28, 0x1e, - 0x14, 0x0f, 0xeb, 0x47, 0x2f, 0xad, 0xd5, 0x19, 0x5a, 0x1b, 0x1b, 0xb5, 0x7a, 0x32, 0xc7, 0x0e, - 0x44, 0xbc, 0xa0, 0x5a, 0x80, 0xfc, 0x08, 0x75, 0x16, 0x04, 0xa1, 0x60, 0x29, 0x93, 0x1b, 0xdb, - 0x52, 0xef, 0xcb, 0xbb, 0xe9, 0x75, 0x6f, 0x13, 0x95, 0xe8, 0xb2, 0x14, 0xb1, 0xe0, 0xd1, 0xec, - 0x84, 0x3b, 0x1c, 0xe3, 0x1b, 0xcf, 0x45, 0x87, 0xb9, 0x6e, 0x98, 0x04, 0xc2, 0x28, 0xc9, 0xc3, - 0x34, 0x67, 0x27, 0x7c, 0xa0, 0x90, 0xae, 0x02, 0x88, 0x80, 0x16, 0x06, 0x37, 0x5e, 0x1c, 0x06, - 0x73, 0x0c, 0x84, 0x73, 0xc3, 0x62, 0x8f, 0x8d, 0x7c, 0xe4, 0x46, 0x59, 0xf6, 0xf4, 0xe6, 0x6e, - 0x3d, 0xd9, 0xb7, 0x12, 0x3f, 0x64, 0x0a, 0xaa, 0xb9, 0x3d, 0xdc, 0x00, 0xb5, 0x5f, 0x41, 0x7d, - 0x69, 0x2c, 0xa4, 0x01, 0xc5, 0x19, 0x2e, 0xe4, 0xf6, 0x6a, 0x34, 0x7d, 0x24, 0x7b, 0x50, 0xba, - 0x61, 0x7e, 0x92, 0x6d, 0x41, 0xbd, 0xbc, 0xde, 0x3a, 0x29, 0xb4, 0xbf, 0x85, 0xc6, 0xfa, 0x04, - 0xee, 0x95, 0x7f, 0x0e, 0xfb, 0x1f, 0xec, 0xf6, 0x3e, 0x42, 0xe6, 0x5f, 0x45, 0x68, 0x9e, 0xc6, - 0xc8, 0x04, 0xa6, 0x33, 0xa1, 0xf8, 0x7b, 0x82, 0x5c, 0x90, 0x97, 0x50, 0xf6, 0x82, 0x28, 0x11, - 0x5c, 0x7b, 0x71, 0x7f, 0xcd, 0x8b, 0x3d, 0xf5, 0x61, 0x5d, 0xb2, 0x88, 0x6a, 0x22, 0xf9, 0x0a, - 0xaa, 0x02, 0xe7, 0x91, 0xcf, 0x84, 0xaa, 0x52, 0x3f, 0x7a, 0xb2, 0xc1, 0xc0, 0x43, 0x4d, 0xa1, - 0x39, 0x99, 0x7c, 0x02, 0x0f, 0xc2, 0x44, 0x44, 0x89, 0x70, 0xa2, 0x18, 0x27, 0xde, 0x3b, 0xa3, - 0x28, 0x7b, 0xdc, 0x51, 0xc1, 0x2b, 0x19, 0x23, 0xbf, 0xc0, 0xe3, 0xb5, 0xef, 0x64, 0xae, 0xb7, - 0x66, 0x6c, 0xcb, 0x62, 0xcf, 0xee, 0xb4, 0x62, 0xda, 0x12, 0x1b, 0x3f, 0xc3, 0xef, 0xa1, 0xc2, - 0xd1, 0x8d, 0x51, 0x70, 0xa3, 0x24, 0x1d, 0x63, 0xad, 0xcb, 0xbd, 0x37, 0x23, 0x6b, 0xa0, 0x12, - 0x94, 0x41, 0xb2, 0xf4, 0xf6, 0x6b, 0xd8, 0x59, 0x06, 0xee, 0xb5, 0x8b, 0x57, 0x40, 0x96, 0xcb, - 0xf0, 0x28, 0x0c, 0xb8, 0x9c, 0x4f, 0x8c, 0x3c, 0x4c, 0x62, 0x17, 0xe5, 0xa1, 0xa5, 0xd6, 0x0e, - 0xdd, 0xc9, 0x82, 0xe9, 0x21, 0x4c, 0x0a, 0xbb, 0xe7, 0x28, 0x96, 0x57, 0xf8, 0x04, 0x6a, 0x72, - 0x62, 0x62, 0x11, 0xa1, 0x2e, 0x5f, 0x4d, 0x03, 0xc3, 0x45, 0xb4, 0x41, 0x73, 0x6b, 0x83, 0xe6, - 0x1f, 0xf0, 0x30, 0xd7, 0xd4, 0xbd, 0x7c, 0x01, 0xd5, 0x8c, 0xa2, 0x9d, 0x61, 0xac, 0x0f, 0x8a, - 0x6a, 0x9c, 0xe6, 0x4c, 0x72, 0x0c, 0x35, 0x3f, 0x9c, 0x3a, 0xbe, 0x17, 0xcc, 0xb8, 0xb1, 0x25, - 0xe7, 0xfb, 0xff, 0x0d, 0xde, 0xe8, 0x85, 0x53, 0x5a, 0xf5, 0xc3, 0x69, 0x2f, 0xe5, 0x99, 0x7f, - 0x16, 0xa0, 0x9a, 0x69, 0x91, 0xe7, 0x50, 0xe2, 0x22, 0x75, 0x56, 0x5a, 0x74, 0xf7, 0xa8, 0xb5, - 0x5e, 0x74, 0x90, 0x82, 0x54, 0x71, 0xc8, 0x31, 0x54, 0x94, 0x77, 0xb8, 0x36, 0xe2, 0xbf, 0xb8, - 0x37, 0x63, 0x12, 0x03, 0x2a, 0x73, 0xe4, 0x9c, 0x4d, 0x51, 0xfb, 0x2f, 0x7b, 0x35, 0xaf, 0xa1, - 0x79, 0x86, 0x3e, 0xae, 0x7e, 0x20, 0xff, 0x7d, 0xba, 0x7b, 0x40, 0x96, 0x65, 0xd5, 0x80, 0xcd, - 0x09, 0x94, 0xba, 0xe9, 0xfd, 0x46, 0x08, 0x6c, 0xa7, 0xbf, 0xd9, 0x5a, 0x5b, 0x3e, 0x93, 0xcf, - 0x61, 0x8f, 0x27, 0x51, 0x14, 0xc6, 0x02, 0xc7, 0x4e, 0x5e, 0x5e, 0x8d, 0xb4, 0x46, 0x49, 0x8e, - 0x0d, 0x75, 0x23, 0x9c, 0x3c, 0x86, 0x8a, 0xc7, 0x1d, 0xbe, 0x08, 0x5c, 0x79, 0xaa, 0x2a, 0x2d, - 0x7b, 0x7c, 0xb0, 0x08, 0x5c, 0xf3, 0x99, 0xdc, 0xad, 0x2c, 0x95, 0x1d, 0x69, 0x43, 0x45, 0xf3, - 0x0d, 0x34, 0x6e, 0x69, 0xda, 0x03, 0xcf, 0xa1, 0x24, 0xaf, 0x60, 0x6d, 0x80, 0xf7, 0x76, 0xa1, - 0xd8, 0x8a, 0x63, 0x3e, 0x82, 0x66, 0xcf, 0xe3, 0x4a, 0x81, 0xeb, 0x4a, 0xe6, 0x29, 0x90, 0xe5, - 0xa0, 0xd6, 0x7d, 0x01, 0x65, 0x99, 0x93, 0xfe, 0xe6, 0x14, 0x3f, 0x2c, 0xac, 0x49, 0x9f, 0xfd, - 0x0a, 0x25, 0xb9, 0x75, 0xd2, 0x82, 0x26, 0xb5, 0x87, 0xf4, 0xa7, 0xee, 0xdb, 0x9e, 0xed, 0x7c, - 0xd7, 0xbd, 0xe8, 0x5d, 0x53, 0xbb, 0xf1, 0xbf, 0x34, 0x7c, 0x65, 0xd3, 0xcb, 0x6e, 0xdf, 0xee, - 0x0f, 0xf3, 0x70, 0x81, 0xd4, 0xa1, 0x72, 0x65, 0xf7, 0xcf, 0x2e, 0xfa, 0xe7, 0x8d, 0xad, 0xf4, - 0x85, 0x5e, 0xf7, 0xfb, 0xe9, 0x4b, 0x91, 0x3c, 0x80, 0xda, 0xe0, 0xfa, 0xf4, 0xd4, 0xb6, 0xcf, - 0xec, 0xb3, 0xc6, 0xf6, 0xdb, 0x6f, 0x7e, 0xfe, 0x7a, 0xea, 0x89, 0xdf, 0x92, 0x91, 0xe5, 0x86, - 0xf3, 0x8e, 0x6c, 0x25, 0x8c, 0xa7, 0xea, 0xa1, 0x93, 0x5f, 0xf7, 0x53, 0x0c, 0x3a, 0xd1, 0xe8, - 0xc5, 0x34, 0xec, 0xac, 0xfe, 0x4b, 0x19, 0x95, 0xe5, 0xcd, 0x7f, 0xfc, 0x4f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x03, 0x67, 0xc5, 0xc9, 0xbe, 0x08, 0x00, 0x00, + // 887 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xf1, 0x6f, 0x22, 0x45, + 0x14, 0x16, 0x28, 0x14, 0x1e, 0xbd, 0x1e, 0xcc, 0x15, 0x6f, 0xcb, 0x9d, 0xa6, 0x59, 0x73, 0xa6, + 0xf1, 0x72, 0xe0, 0xb5, 0x46, 0x7b, 0x1a, 0xbd, 0x70, 0xed, 0xda, 0x34, 0xa1, 0xa4, 0x99, 0x52, + 0xa3, 0x26, 0xba, 0x19, 0x96, 0x07, 0x6e, 0x58, 0x66, 0xd7, 0x9d, 0xd9, 0xe6, 0x48, 0xfc, 0xcd, + 0xc4, 0xbf, 0xc1, 0x3f, 0xd7, 0xec, 0xcc, 0xec, 0x16, 0x90, 0x33, 0xbd, 0xf8, 0xdb, 0xce, 0xfb, + 0xbe, 0xf9, 0xde, 0x9b, 0xf7, 0xbd, 0x61, 0x80, 0xf6, 0x24, 0x58, 0x48, 0xf4, 0xc7, 0x41, 0x97, + 0x8d, 0xe7, 0x3e, 0xef, 0xb2, 0x29, 0x72, 0xd9, 0x89, 0xe2, 0x50, 0x86, 0x64, 0x37, 0xc3, 0x3a, + 0x0a, 0x6b, 0x3f, 0xcd, 0xb9, 0x5e, 0x18, 0x63, 0x37, 0xf0, 0x25, 0xc6, 0x2c, 0x10, 0x9a, 0xdd, + 0xde, 0x5f, 0x45, 0x25, 0x13, 0xb3, 0x0c, 0xfa, 0x68, 0x15, 0xf2, 0xb9, 0xc4, 0x78, 0xc2, 0x3c, + 0x34, 0xf0, 0xc7, 0x6b, 0xf0, 0x18, 0xb9, 0xf4, 0x27, 0x3e, 0xc6, 0x9b, 0xb7, 0xe3, 0x5b, 0xf4, + 0x12, 0xe9, 0x87, 0x5c, 0xc3, 0xf6, 0xdf, 0x65, 0x68, 0x0d, 0x99, 0x98, 0x39, 0x59, 0xfc, 0x12, + 0x25, 0x1b, 0x33, 0xc9, 0x08, 0x85, 0x66, 0x5a, 0x86, 0x9b, 0xef, 0x70, 0xfd, 0xb1, 0x55, 0x38, + 0x28, 0x1c, 0xd6, 0x8f, 0x3e, 0xed, 0xe4, 0x87, 0x4b, 0x45, 0x3b, 0x2b, 0x02, 0x17, 0x79, 0x05, + 0xf4, 0xa1, 0x5c, 0x05, 0xc8, 0x53, 0xa8, 0x71, 0x36, 0x47, 0x11, 0x31, 0x0f, 0xad, 0xe2, 0x41, + 0xe1, 0xb0, 0x46, 0xef, 0x02, 0xe4, 0x02, 0x2a, 0x01, 0x1b, 0x61, 0x20, 0xac, 0xd2, 0x41, 0xe9, + 0xb0, 0x7e, 0xf4, 0xb2, 0xb3, 0xda, 0xc3, 0xce, 0xc6, 0x42, 0x3b, 0x7d, 0xb5, 0xc7, 0xe1, 0x32, + 0x5e, 0x50, 0x23, 0x40, 0x7e, 0x84, 0x3a, 0xe3, 0x3c, 0x94, 0x2c, 0x65, 0x0a, 0x6b, 0x4b, 0xe9, + 0x7d, 0x79, 0x3f, 0xbd, 0xde, 0xdd, 0x46, 0x2d, 0xba, 0x2c, 0x45, 0x3a, 0xf0, 0x68, 0x76, 0x22, + 0x5c, 0x81, 0xf1, 0xad, 0xef, 0xa1, 0xcb, 0x3c, 0x2f, 0x4c, 0xb8, 0xb4, 0xca, 0xea, 0x30, 0xcd, + 0xd9, 0x89, 0xb8, 0xd6, 0x48, 0x4f, 0x03, 0x44, 0x42, 0x0b, 0xf9, 0xad, 0x1f, 0x87, 0x7c, 0x8e, + 0x5c, 0xba, 0xb7, 0x2c, 0xf6, 0xd9, 0x28, 0x40, 0x61, 0x55, 0x54, 0x4d, 0xaf, 0xef, 0x57, 0x93, + 0x73, 0x27, 0xf1, 0x43, 0xa6, 0xa0, 0x8b, 0xdb, 0xc3, 0x0d, 0x50, 0xfb, 0x15, 0xd4, 0x97, 0xda, + 0x42, 0x1a, 0x50, 0x9a, 0xe1, 0x42, 0xb9, 0x57, 0xa3, 0xe9, 0x27, 0xd9, 0x83, 0xf2, 0x2d, 0x0b, + 0x92, 0xcc, 0x05, 0xbd, 0xf8, 0xba, 0x78, 0x52, 0x68, 0x7f, 0x07, 0x8d, 0xf5, 0x0e, 0xbc, 0xd7, + 0xfe, 0x73, 0xd8, 0x7f, 0x67, 0xb5, 0xef, 0x23, 0x64, 0xff, 0x59, 0x84, 0xe6, 0x69, 0x8c, 0x4c, + 0x62, 0xda, 0x13, 0x8a, 0xbf, 0x27, 0x28, 0x24, 0x79, 0x09, 0x15, 0x9f, 0x47, 0x89, 0x14, 0x66, + 0x16, 0xf7, 0xd7, 0x66, 0xb1, 0xaf, 0x2f, 0xd6, 0x25, 0x8b, 0xa8, 0x21, 0x92, 0xaf, 0xa0, 0x2a, + 0x71, 0x1e, 0x05, 0x4c, 0xea, 0x2c, 0xf5, 0xa3, 0x27, 0x1b, 0x06, 0x78, 0x68, 0x28, 0x34, 0x27, + 0x93, 0x4f, 0xe0, 0x41, 0x98, 0xc8, 0x28, 0x91, 0x6e, 0x14, 0xe3, 0xc4, 0x7f, 0x6b, 0x95, 0x54, + 0x8d, 0x3b, 0x3a, 0x78, 0xa5, 0x62, 0xe4, 0x17, 0x78, 0xbc, 0x76, 0x4f, 0xe6, 0xc6, 0x35, 0x6b, + 0x4b, 0x25, 0x7b, 0x76, 0x2f, 0x8b, 0x69, 0x4b, 0x6e, 0x0a, 0xdb, 0xaf, 0x80, 0x2c, 0x37, 0x41, + 0x44, 0x21, 0x17, 0xaa, 0xb2, 0x18, 0x45, 0x98, 0xc4, 0x1e, 0xaa, 0x74, 0xaa, 0x19, 0x3b, 0x74, + 0x27, 0x0b, 0xa6, 0xdb, 0x6d, 0x0a, 0xbb, 0xe7, 0x28, 0x97, 0x9b, 0xf7, 0x04, 0x6a, 0xaa, 0x56, + 0xb9, 0x88, 0xd0, 0x98, 0x50, 0x4d, 0x03, 0xc3, 0x45, 0xb4, 0x41, 0xb3, 0xb8, 0x41, 0xf3, 0x0f, + 0x78, 0x98, 0x6b, 0x9a, 0x5a, 0xbe, 0x80, 0x6a, 0x46, 0x31, 0x9e, 0x58, 0xeb, 0x27, 0xa6, 0x06, + 0xa7, 0x39, 0x93, 0x1c, 0x43, 0x2d, 0x08, 0xa7, 0x6e, 0xe0, 0xf3, 0x99, 0xb0, 0x8a, 0xea, 0x2e, + 0x7c, 0xb8, 0xc1, 0x95, 0x7e, 0x38, 0xa5, 0xd5, 0x20, 0x9c, 0xf6, 0x53, 0x9e, 0xfd, 0x57, 0x01, + 0xaa, 0x99, 0x16, 0x79, 0x0e, 0x65, 0x21, 0x53, 0x4f, 0xd3, 0xa4, 0xbb, 0x47, 0xad, 0xf5, 0xa4, + 0xd7, 0x29, 0x48, 0x35, 0x87, 0x1c, 0xc3, 0xb6, 0x76, 0x4d, 0x98, 0x11, 0xf8, 0x8f, 0xb9, 0xc9, + 0x98, 0xc4, 0x82, 0xed, 0x39, 0x0a, 0xc1, 0xa6, 0x68, 0x9c, 0xcf, 0x96, 0xf6, 0x0d, 0x34, 0xcf, + 0x30, 0xc0, 0xd5, 0xd1, 0xfc, 0xff, 0xdd, 0xdd, 0x03, 0xb2, 0x2c, 0xab, 0x1b, 0x6c, 0x4f, 0xa0, + 0xdc, 0x4b, 0x5f, 0x16, 0x42, 0x60, 0x2b, 0xfd, 0xb5, 0x34, 0xda, 0xea, 0x9b, 0x7c, 0x0e, 0x7b, + 0x22, 0x89, 0xa2, 0x30, 0x96, 0x38, 0x76, 0xf3, 0xf4, 0xba, 0xa5, 0x35, 0x4a, 0x72, 0x6c, 0x68, + 0x0a, 0x11, 0xe4, 0x31, 0x6c, 0xfb, 0xc2, 0x15, 0x0b, 0xee, 0xa9, 0x53, 0x55, 0x69, 0xc5, 0x17, + 0xd7, 0x0b, 0xee, 0xd9, 0xcf, 0x94, 0xb7, 0x2a, 0x55, 0x76, 0xa4, 0x0d, 0x19, 0xed, 0xd7, 0xd0, + 0xb8, 0xa3, 0x99, 0x19, 0x78, 0x0e, 0x65, 0xf5, 0xf8, 0x99, 0x01, 0xf8, 0x97, 0x17, 0x9a, 0xad, + 0x39, 0xf6, 0x23, 0x68, 0xf6, 0x7d, 0xa1, 0x15, 0x84, 0xc9, 0x64, 0x9f, 0x02, 0x59, 0x0e, 0x1a, + 0xdd, 0x17, 0x50, 0x51, 0x7b, 0xd2, 0xdb, 0x5e, 0x7a, 0xb7, 0xb0, 0x21, 0x7d, 0xf6, 0x2b, 0x94, + 0x95, 0xeb, 0xa4, 0x05, 0x4d, 0xea, 0x0c, 0xe9, 0x4f, 0xbd, 0x37, 0x7d, 0xc7, 0xfd, 0xbe, 0x77, + 0xd1, 0xbf, 0xa1, 0x4e, 0xe3, 0x83, 0x34, 0x7c, 0xe5, 0xd0, 0xcb, 0xde, 0xc0, 0x19, 0x0c, 0xf3, + 0x70, 0x81, 0xd4, 0x61, 0xfb, 0xca, 0x19, 0x9c, 0x5d, 0x0c, 0xce, 0x1b, 0xc5, 0x74, 0x41, 0x6f, + 0x06, 0x83, 0x74, 0x51, 0x22, 0x0f, 0xa0, 0x76, 0x7d, 0x73, 0x7a, 0xea, 0x38, 0x67, 0xce, 0x59, + 0x63, 0xeb, 0xcd, 0xb7, 0x3f, 0x7f, 0x33, 0xf5, 0xe5, 0x6f, 0xc9, 0xa8, 0xe3, 0x85, 0xf3, 0xae, + 0x2a, 0x25, 0x8c, 0xa7, 0xfa, 0xa3, 0x9b, 0x3f, 0xb4, 0x53, 0xe4, 0xdd, 0x68, 0xf4, 0x62, 0x1a, + 0x76, 0x57, 0xff, 0x1f, 0x8c, 0x2a, 0xea, 0xcd, 0x3d, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0xfb, + 0xe3, 0xf7, 0x83, 0x38, 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go index 6d0fc36a44..fa6dbe6adb 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go @@ -163,8 +163,6 @@ func (m *CreateTaskRequest) Validate() error { } } - // no validation rules for Secrets - return nil } diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index d77b0d040a..716c2079ff 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -2327,70 +2327,6 @@ public interface CreateTaskRequestOrBuilder extends * .flyteidl.admin.TaskExecutionMetadata task_execution_metadata = 4; */ flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder getTaskExecutionMetadataOrBuilder(); - - /** - *
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - int getSecretsCount(); - /** - *
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - boolean containsSecrets( - java.lang.String key); - /** - * Use {@link #getSecretsMap()} instead. - */ - @java.lang.Deprecated - java.util.Map - getSecrets(); - /** - *
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - java.util.Map - getSecretsMap(); - /** - *
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - - java.lang.String getSecretsOrDefault( - java.lang.String key, - java.lang.String defaultValue); - /** - *
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - - java.lang.String getSecretsOrThrow( - java.lang.String key); } /** *
@@ -2481,19 +2417,6 @@ private CreateTaskRequest(
 
               break;
             }
-            case 42: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                secrets_ = com.google.protobuf.MapField.newMapField(
-                    SecretsDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000010;
-              }
-              com.google.protobuf.MapEntry
-              secrets__ = input.readMessage(
-                  SecretsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              secrets_.getMutableMap().put(
-                  secrets__.getKey(), secrets__.getValue());
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -2518,18 +2441,6 @@ private CreateTaskRequest(
       return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_descriptor;
     }
 
-    @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
-    protected com.google.protobuf.MapField internalGetMapField(
-        int number) {
-      switch (number) {
-        case 5:
-          return internalGetSecrets();
-        default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
-      }
-    }
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
@@ -2538,7 +2449,6 @@ protected com.google.protobuf.MapField internalGetMapField(
               flyteidl.admin.AgentOuterClass.CreateTaskRequest.class, flyteidl.admin.AgentOuterClass.CreateTaskRequest.Builder.class);
     }
 
-    private int bitField0_;
     public static final int INPUTS_FIELD_NUMBER = 1;
     private flyteidl.core.Literals.LiteralMap inputs_;
     /**
@@ -2686,106 +2596,6 @@ public flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder getTaskExec
       return getTaskExecutionMetadata();
     }
 
-    public static final int SECRETS_FIELD_NUMBER = 5;
-    private static final class SecretsDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<
-          java.lang.String, java.lang.String> defaultEntry =
-              com.google.protobuf.MapEntry
-              .newDefaultInstance(
-                  flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_descriptor, 
-                  com.google.protobuf.WireFormat.FieldType.STRING,
-                  "",
-                  com.google.protobuf.WireFormat.FieldType.STRING,
-                  "");
-    }
-    private com.google.protobuf.MapField<
-        java.lang.String, java.lang.String> secrets_;
-    private com.google.protobuf.MapField
-    internalGetSecrets() {
-      if (secrets_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            SecretsDefaultEntryHolder.defaultEntry);
-      }
-      return secrets_;
-    }
-
-    public int getSecretsCount() {
-      return internalGetSecrets().getMap().size();
-    }
-    /**
-     * 
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - - public boolean containsSecrets( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetSecrets().getMap().containsKey(key); - } - /** - * Use {@link #getSecretsMap()} instead. - */ - @java.lang.Deprecated - public java.util.Map getSecrets() { - return getSecretsMap(); - } - /** - *
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - - public java.util.Map getSecretsMap() { - return internalGetSecrets().getMap(); - } - /** - *
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - - public java.lang.String getSecretsOrDefault( - java.lang.String key, - java.lang.String defaultValue) { - if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetSecrets().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; - } - /** - *
-     * Secret to be passed to the agent.
-     * Key is the name of the secret in secret manager.
-     * Value is the actual secret value.
-     * 
- * - * map<string, string> secrets = 5; - */ - - public java.lang.String getSecretsOrThrow( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetSecrets().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -2812,12 +2622,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (taskExecutionMetadata_ != null) { output.writeMessage(4, getTaskExecutionMetadata()); } - com.google.protobuf.GeneratedMessageV3 - .serializeStringMapTo( - output, - internalGetSecrets(), - SecretsDefaultEntryHolder.defaultEntry, - 5); unknownFields.writeTo(output); } @@ -2842,16 +2646,6 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(4, getTaskExecutionMetadata()); } - for (java.util.Map.Entry entry - : internalGetSecrets().getMap().entrySet()) { - com.google.protobuf.MapEntry - secrets__ = SecretsDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, secrets__); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -2884,8 +2678,6 @@ public boolean equals(final java.lang.Object obj) { if (!getTaskExecutionMetadata() .equals(other.getTaskExecutionMetadata())) return false; } - if (!internalGetSecrets().equals( - other.internalGetSecrets())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -2911,10 +2703,6 @@ public int hashCode() { hash = (37 * hash) + TASK_EXECUTION_METADATA_FIELD_NUMBER; hash = (53 * hash) + getTaskExecutionMetadata().hashCode(); } - if (!internalGetSecrets().getMap().isEmpty()) { - hash = (37 * hash) + SECRETS_FIELD_NUMBER; - hash = (53 * hash) + internalGetSecrets().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -3026,28 +2814,6 @@ public static final class Builder extends return flyteidl.admin.AgentOuterClass.internal_static_flyteidl_admin_CreateTaskRequest_descriptor; } - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 5: - return internalGetSecrets(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMutableMapField( - int number) { - switch (number) { - case 5: - return internalGetMutableSecrets(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { @@ -3094,7 +2860,6 @@ public Builder clear() { taskExecutionMetadata_ = null; taskExecutionMetadataBuilder_ = null; } - internalGetMutableSecrets().clear(); return this; } @@ -3121,8 +2886,6 @@ public flyteidl.admin.AgentOuterClass.CreateTaskRequest build() { @java.lang.Override public flyteidl.admin.AgentOuterClass.CreateTaskRequest buildPartial() { flyteidl.admin.AgentOuterClass.CreateTaskRequest result = new flyteidl.admin.AgentOuterClass.CreateTaskRequest(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; if (inputsBuilder_ == null) { result.inputs_ = inputs_; } else { @@ -3139,9 +2902,6 @@ public flyteidl.admin.AgentOuterClass.CreateTaskRequest buildPartial() { } else { result.taskExecutionMetadata_ = taskExecutionMetadataBuilder_.build(); } - result.secrets_ = internalGetSecrets(); - result.secrets_.makeImmutable(); - result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -3203,8 +2963,6 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.CreateTaskRequest other) if (other.hasTaskExecutionMetadata()) { mergeTaskExecutionMetadata(other.getTaskExecutionMetadata()); } - internalGetMutableSecrets().mergeFrom( - other.internalGetSecrets()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -3233,7 +2991,6 @@ public Builder mergeFrom( } return this; } - private int bitField0_; private flyteidl.core.Literals.LiteralMap inputs_; private com.google.protobuf.SingleFieldBuilderV3< @@ -3800,171 +3557,6 @@ public flyteidl.admin.AgentOuterClass.TaskExecutionMetadataOrBuilder getTaskExec } return taskExecutionMetadataBuilder_; } - - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> secrets_; - private com.google.protobuf.MapField - internalGetSecrets() { - if (secrets_ == null) { - return com.google.protobuf.MapField.emptyMapField( - SecretsDefaultEntryHolder.defaultEntry); - } - return secrets_; - } - private com.google.protobuf.MapField - internalGetMutableSecrets() { - onChanged();; - if (secrets_ == null) { - secrets_ = com.google.protobuf.MapField.newMapField( - SecretsDefaultEntryHolder.defaultEntry); - } - if (!secrets_.isMutable()) { - secrets_ = secrets_.copy(); - } - return secrets_; - } - - public int getSecretsCount() { - return internalGetSecrets().getMap().size(); - } - /** - *
-       * Secret to be passed to the agent.
-       * Key is the name of the secret in secret manager.
-       * Value is the actual secret value.
-       * 
- * - * map<string, string> secrets = 5; - */ - - public boolean containsSecrets( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetSecrets().getMap().containsKey(key); - } - /** - * Use {@link #getSecretsMap()} instead. - */ - @java.lang.Deprecated - public java.util.Map getSecrets() { - return getSecretsMap(); - } - /** - *
-       * Secret to be passed to the agent.
-       * Key is the name of the secret in secret manager.
-       * Value is the actual secret value.
-       * 
- * - * map<string, string> secrets = 5; - */ - - public java.util.Map getSecretsMap() { - return internalGetSecrets().getMap(); - } - /** - *
-       * Secret to be passed to the agent.
-       * Key is the name of the secret in secret manager.
-       * Value is the actual secret value.
-       * 
- * - * map<string, string> secrets = 5; - */ - - public java.lang.String getSecretsOrDefault( - java.lang.String key, - java.lang.String defaultValue) { - if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetSecrets().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; - } - /** - *
-       * Secret to be passed to the agent.
-       * Key is the name of the secret in secret manager.
-       * Value is the actual secret value.
-       * 
- * - * map<string, string> secrets = 5; - */ - - public java.lang.String getSecretsOrThrow( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetSecrets().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); - } - - public Builder clearSecrets() { - internalGetMutableSecrets().getMutableMap() - .clear(); - return this; - } - /** - *
-       * Secret to be passed to the agent.
-       * Key is the name of the secret in secret manager.
-       * Value is the actual secret value.
-       * 
- * - * map<string, string> secrets = 5; - */ - - public Builder removeSecrets( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - internalGetMutableSecrets().getMutableMap() - .remove(key); - return this; - } - /** - * Use alternate mutation accessors instead. - */ - @java.lang.Deprecated - public java.util.Map - getMutableSecrets() { - return internalGetMutableSecrets().getMutableMap(); - } - /** - *
-       * Secret to be passed to the agent.
-       * Key is the name of the secret in secret manager.
-       * Value is the actual secret value.
-       * 
- * - * map<string, string> secrets = 5; - */ - public Builder putSecrets( - java.lang.String key, - java.lang.String value) { - if (key == null) { throw new java.lang.NullPointerException(); } - if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableSecrets().getMutableMap() - .put(key, value); - return this; - } - /** - *
-       * Secret to be passed to the agent.
-       * Key is the name of the secret in secret manager.
-       * Value is the actual secret value.
-       * 
- * - * map<string, string> secrets = 5; - */ - - public Builder putAllSecrets( - java.util.Map values) { - internalGetMutableSecrets().getMutableMap() - .putAll(values); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -11776,11 +11368,6 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_admin_CreateTaskResponse_descriptor; private static final @@ -11863,35 +11450,32 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEn" + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031E" + "nvironmentVariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + - "\005value\030\002 \001(\t:\0028\001\"\275\002\n\021CreateTaskRequest\022)" + + "\005value\030\002 \001(\t:\0028\001\"\314\001\n\021CreateTaskRequest\022)" + "\n\006inputs\030\001 \001(\0132\031.flyteidl.core.LiteralMa" + "p\022-\n\010template\030\002 \001(\0132\033.flyteidl.core.Task" + "Template\022\025\n\routput_prefix\030\003 \001(\t\022F\n\027task_" + "execution_metadata\030\004 \001(\0132%.flyteidl.admi" + - "n.TaskExecutionMetadata\022?\n\007secrets\030\005 \003(\013" + - "2..flyteidl.admin.CreateTaskRequest.Secr" + - "etsEntry\032.\n\014SecretsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" + - "\005value\030\002 \001(\t:\0028\001\"+\n\022CreateTaskResponse\022\025" + - "\n\rresource_meta\030\001 \001(\014\":\n\016GetTaskRequest\022" + - "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + - "\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 \001(\0132\030" + - ".flyteidl.admin.Resource\022)\n\tlog_links\030\002 " + - "\003(\0132\026.flyteidl.core.TaskLog\"m\n\010Resource\022" + - "$\n\005state\030\001 \001(\0162\025.flyteidl.admin.State\022*\n" + - "\007outputs\030\002 \001(\0132\031.flyteidl.core.LiteralMa" + - "p\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskRequest\022" + - "\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(" + - "\014\"\024\n\022DeleteTaskResponse\"D\n\005Agent\022\014\n\004name" + - "\030\001 \001(\t\022\034\n\024supported_task_types\030\002 \003(\t\022\017\n\007" + - "is_sync\030\003 \001(\010\"\037\n\017GetAgentRequest\022\014\n\004name" + - "\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005agent\030\001 \001(" + - "\0132\025.flyteidl.admin.Agent\"\023\n\021ListAgentsRe" + - "quest\";\n\022ListAgentsResponse\022%\n\006agents\030\001 " + - "\003(\0132\025.flyteidl.admin.Agent*^\n\005State\022\025\n\021R" + - "ETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILURE\020" + - "\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED" + - "\020\004B=Z;github.com/flyteorg/flyte/flyteidl" + - "/gen/pb-go/flyteidl/adminb\006proto3" + "n.TaskExecutionMetadata\"+\n\022CreateTaskRes" + + "ponse\022\025\n\rresource_meta\030\001 \001(\014\":\n\016GetTaskR" + + "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" + + "ta\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030" + + "\001 \001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_l" + + "inks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"m\n\010Re" + + "source\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.S" + + "tate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Li" + + "teralMap\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskR" + + "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" + + "ta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"D\n\005Agent\022" + + "\014\n\004name\030\001 \001(\t\022\034\n\024supported_task_types\030\002 " + + "\003(\t\022\017\n\007is_sync\030\003 \001(\010\"\037\n\017GetAgentRequest\022" + + "\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005age" + + "nt\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListA" + + "gentsRequest\";\n\022ListAgentsResponse\022%\n\006ag" + + "ents\030\001 \003(\0132\025.flyteidl.admin.Agent*^\n\005Sta" + + "te\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_F" + + "AILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSU" + + "CCEEDED\020\004B=Z;github.com/flyteorg/flyte/f" + + "lyteidl/gen/pb-go/flyteidl/adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -11939,13 +11523,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_CreateTaskRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_CreateTaskRequest_descriptor, - new java.lang.String[] { "Inputs", "Template", "OutputPrefix", "TaskExecutionMetadata", "Secrets", }); - internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_descriptor = - internal_static_flyteidl_admin_CreateTaskRequest_descriptor.getNestedTypes().get(0); - internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_admin_CreateTaskRequest_SecretsEntry_descriptor, - new java.lang.String[] { "Key", "Value", }); + new java.lang.String[] { "Inputs", "Template", "OutputPrefix", "TaskExecutionMetadata", }); internal_static_flyteidl_admin_CreateTaskResponse_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_flyteidl_admin_CreateTaskResponse_fieldAccessorTable = new diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index e30784dad5..12f0beed20 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -7961,9 +7961,6 @@ export namespace flyteidl { /** CreateTaskRequest taskExecutionMetadata */ taskExecutionMetadata?: (flyteidl.admin.ITaskExecutionMetadata|null); - - /** CreateTaskRequest secrets */ - secrets?: ({ [k: string]: string }|null); } /** Represents a CreateTaskRequest. */ @@ -7987,9 +7984,6 @@ export namespace flyteidl { /** CreateTaskRequest taskExecutionMetadata. */ public taskExecutionMetadata?: (flyteidl.admin.ITaskExecutionMetadata|null); - /** CreateTaskRequest secrets. */ - public secrets: { [k: string]: string }; - /** * Creates a new CreateTaskRequest instance using the specified properties. * @param [properties] Properties to set diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index c8c10034f4..9c0f7c5564 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -19474,7 +19474,6 @@ * @property {flyteidl.core.ITaskTemplate|null} [template] CreateTaskRequest template * @property {string|null} [outputPrefix] CreateTaskRequest outputPrefix * @property {flyteidl.admin.ITaskExecutionMetadata|null} [taskExecutionMetadata] CreateTaskRequest taskExecutionMetadata - * @property {Object.|null} [secrets] CreateTaskRequest secrets */ /** @@ -19486,7 +19485,6 @@ * @param {flyteidl.admin.ICreateTaskRequest=} [properties] Properties to set */ function CreateTaskRequest(properties) { - this.secrets = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -19525,14 +19523,6 @@ */ CreateTaskRequest.prototype.taskExecutionMetadata = null; - /** - * CreateTaskRequest secrets. - * @member {Object.} secrets - * @memberof flyteidl.admin.CreateTaskRequest - * @instance - */ - CreateTaskRequest.prototype.secrets = $util.emptyObject; - /** * Creates a new CreateTaskRequest instance using the specified properties. * @function create @@ -19565,9 +19555,6 @@ writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputPrefix); if (message.taskExecutionMetadata != null && message.hasOwnProperty("taskExecutionMetadata")) $root.flyteidl.admin.TaskExecutionMetadata.encode(message.taskExecutionMetadata, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.secrets != null && message.hasOwnProperty("secrets")) - for (var keys = Object.keys(message.secrets), i = 0; i < keys.length; ++i) - writer.uint32(/* id 5, wireType 2 =*/42).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.secrets[keys[i]]).ldelim(); return writer; }; @@ -19585,7 +19572,7 @@ CreateTaskRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.CreateTaskRequest(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.flyteidl.admin.CreateTaskRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -19601,14 +19588,6 @@ case 4: message.taskExecutionMetadata = $root.flyteidl.admin.TaskExecutionMetadata.decode(reader, reader.uint32()); break; - case 5: - reader.skip().pos++; - if (message.secrets === $util.emptyObject) - message.secrets = {}; - key = reader.string(); - reader.pos++; - message.secrets[key] = reader.string(); - break; default: reader.skipType(tag & 7); break; @@ -19646,14 +19625,6 @@ if (error) return "taskExecutionMetadata." + error; } - if (message.secrets != null && message.hasOwnProperty("secrets")) { - if (!$util.isObject(message.secrets)) - return "secrets: object expected"; - var key = Object.keys(message.secrets); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.secrets[key[i]])) - return "secrets: string{k:string} expected"; - } return null; }; diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index 275e1da82e..b103dd1598 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -18,7 +18,7 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x89\x03\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\x12H\n\x07secrets\x18\x05 \x03(\x0b\x32..flyteidl.admin.CreateTaskRequest.SecretsEntryR\x07secrets\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"f\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"f\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -33,10 +33,8 @@ _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001' _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' - _CREATETASKREQUEST_SECRETSENTRY._options = None - _CREATETASKREQUEST_SECRETSENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=2073 - _globals['_STATE']._serialized_end=2167 + _globals['_STATE']._serialized_start=1939 + _globals['_STATE']._serialized_end=2033 _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 @@ -46,29 +44,27 @@ _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_start=791 _globals['_TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY']._serialized_end=862 _globals['_CREATETASKREQUEST']._serialized_start=865 - _globals['_CREATETASKREQUEST']._serialized_end=1258 - _globals['_CREATETASKREQUEST_SECRETSENTRY']._serialized_start=1200 - _globals['_CREATETASKREQUEST_SECRETSENTRY']._serialized_end=1258 - _globals['_CREATETASKRESPONSE']._serialized_start=1260 - _globals['_CREATETASKRESPONSE']._serialized_end=1317 - _globals['_GETTASKREQUEST']._serialized_start=1319 - _globals['_GETTASKREQUEST']._serialized_end=1401 - _globals['_GETTASKRESPONSE']._serialized_start=1403 - _globals['_GETTASKRESPONSE']._serialized_end=1527 - _globals['_RESOURCE']._serialized_start=1530 - _globals['_RESOURCE']._serialized_end=1664 - _globals['_DELETETASKREQUEST']._serialized_start=1666 - _globals['_DELETETASKREQUEST']._serialized_end=1751 - _globals['_DELETETASKRESPONSE']._serialized_start=1753 - _globals['_DELETETASKRESPONSE']._serialized_end=1773 - _globals['_AGENT']._serialized_start=1775 - _globals['_AGENT']._serialized_end=1877 - _globals['_GETAGENTREQUEST']._serialized_start=1879 - _globals['_GETAGENTREQUEST']._serialized_end=1916 - _globals['_GETAGENTRESPONSE']._serialized_start=1918 - _globals['_GETAGENTRESPONSE']._serialized_end=1981 - _globals['_LISTAGENTSREQUEST']._serialized_start=1983 - _globals['_LISTAGENTSREQUEST']._serialized_end=2002 - _globals['_LISTAGENTSRESPONSE']._serialized_start=2004 - _globals['_LISTAGENTSRESPONSE']._serialized_end=2071 + _globals['_CREATETASKREQUEST']._serialized_end=1124 + _globals['_CREATETASKRESPONSE']._serialized_start=1126 + _globals['_CREATETASKRESPONSE']._serialized_end=1183 + _globals['_GETTASKREQUEST']._serialized_start=1185 + _globals['_GETTASKREQUEST']._serialized_end=1267 + _globals['_GETTASKRESPONSE']._serialized_start=1269 + _globals['_GETTASKRESPONSE']._serialized_end=1393 + _globals['_RESOURCE']._serialized_start=1396 + _globals['_RESOURCE']._serialized_end=1530 + _globals['_DELETETASKREQUEST']._serialized_start=1532 + _globals['_DELETETASKREQUEST']._serialized_end=1617 + _globals['_DELETETASKRESPONSE']._serialized_start=1619 + _globals['_DELETETASKRESPONSE']._serialized_end=1639 + _globals['_AGENT']._serialized_start=1641 + _globals['_AGENT']._serialized_end=1743 + _globals['_GETAGENTREQUEST']._serialized_start=1745 + _globals['_GETAGENTREQUEST']._serialized_end=1782 + _globals['_GETAGENTRESPONSE']._serialized_start=1784 + _globals['_GETAGENTRESPONSE']._serialized_end=1847 + _globals['_LISTAGENTSREQUEST']._serialized_start=1849 + _globals['_LISTAGENTSREQUEST']._serialized_end=1868 + _globals['_LISTAGENTSRESPONSE']._serialized_start=1870 + _globals['_LISTAGENTSRESPONSE']._serialized_end=1937 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi index 30562d12e1..d224a51ad5 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi @@ -62,25 +62,16 @@ class TaskExecutionMetadata(_message.Message): def __init__(self, task_execution_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., namespace: _Optional[str] = ..., labels: _Optional[_Mapping[str, str]] = ..., annotations: _Optional[_Mapping[str, str]] = ..., k8s_service_account: _Optional[str] = ..., environment_variables: _Optional[_Mapping[str, str]] = ...) -> None: ... class CreateTaskRequest(_message.Message): - __slots__ = ["inputs", "template", "output_prefix", "task_execution_metadata", "secrets"] - class SecretsEntry(_message.Message): - __slots__ = ["key", "value"] - KEY_FIELD_NUMBER: _ClassVar[int] - VALUE_FIELD_NUMBER: _ClassVar[int] - key: str - value: str - def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ... + __slots__ = ["inputs", "template", "output_prefix", "task_execution_metadata"] INPUTS_FIELD_NUMBER: _ClassVar[int] TEMPLATE_FIELD_NUMBER: _ClassVar[int] OUTPUT_PREFIX_FIELD_NUMBER: _ClassVar[int] TASK_EXECUTION_METADATA_FIELD_NUMBER: _ClassVar[int] - SECRETS_FIELD_NUMBER: _ClassVar[int] inputs: _literals_pb2.LiteralMap template: _tasks_pb2.TaskTemplate output_prefix: str task_execution_metadata: TaskExecutionMetadata - secrets: _containers.ScalarMap[str, str] - def __init__(self, inputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., template: _Optional[_Union[_tasks_pb2.TaskTemplate, _Mapping]] = ..., output_prefix: _Optional[str] = ..., task_execution_metadata: _Optional[_Union[TaskExecutionMetadata, _Mapping]] = ..., secrets: _Optional[_Mapping[str, str]] = ...) -> None: ... + def __init__(self, inputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., template: _Optional[_Union[_tasks_pb2.TaskTemplate, _Mapping]] = ..., output_prefix: _Optional[str] = ..., task_execution_metadata: _Optional[_Union[TaskExecutionMetadata, _Mapping]] = ...) -> None: ... class CreateTaskResponse(_message.Message): __slots__ = ["resource_meta"] diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index 1e31df455f..237ee648ab 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -40,11 +40,6 @@ pub struct CreateTaskRequest { /// subset of runtime task execution metadata. #[prost(message, optional, tag="4")] pub task_execution_metadata: ::core::option::Option, - /// Secret to be passed to the agent. - /// Key is the name of the secret in secret manager. - /// Value is the actual secret value. - #[prost(map="string, string", tag="5")] - pub secrets: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, } /// Represents a create response structure. #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index 7956f4bf62..9c69d733eb 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -46,10 +46,6 @@ message CreateTaskRequest { string output_prefix = 3; // subset of runtime task execution metadata. TaskExecutionMetadata task_execution_metadata = 4; - // Secret to be passed to the agent. - // Key is the name of the secret in secret manager. - // Value is the actual secret value. - map secrets = 5; } // Represents a create response structure. From b3f7c76eff9ff543afaa88ba10fc9393ef109eb5 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 17 Dec 2023 18:17:06 +0800 Subject: [PATCH 34/47] extend sandbox-bundled-functional-tests timeout minutes Signed-off-by: Future Outlier --- .github/workflows/single-binary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml index e693b0d3d1..9a2c19a52c 100644 --- a/.github/workflows/single-binary.yml +++ b/.github/workflows/single-binary.yml @@ -123,7 +123,7 @@ jobs: env: FLYTESNACKS_PRIORITIES: "P0" FLYTESNACKS_VERSION: "" - timeout-minutes: 20 + timeout-minutes: 60 needs: [build-and-push-single-binary-image] steps: - name: Set latest Flytesnacks release From de33fc37f3d986ea886f5140f0769ecc544bf299 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Sun, 17 Dec 2023 18:33:17 +0800 Subject: [PATCH 35/47] Update flyteplugins/go/tasks/plugins/webapi/agent/plugin.go Co-authored-by: Kevin Su Signed-off-by: Future-Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index d287784fe3..d233ca3f5d 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -336,7 +336,7 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien agentRegistry[taskType][false] = cfg.Agents[agentID] } - if cfg.DefaultAgent.Endpoint != "" { + if len(cfg.DefaultAgent.Endpoint) == 0 { agentDeployments = append(agentDeployments, &cfg.DefaultAgent) } agentDeployments = append(agentDeployments, maps.Values(cfg.Agents)...) From 9e5f835cb4cc098593edede83a0b52eeaaabf607 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 17 Dec 2023 18:47:47 +0800 Subject: [PATCH 36/47] fix bug Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index d233ca3f5d..34a950ce39 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -336,7 +336,7 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien agentRegistry[taskType][false] = cfg.Agents[agentID] } - if len(cfg.DefaultAgent.Endpoint) == 0 { + if len(cfg.DefaultAgent.Endpoint) != 0 { agentDeployments = append(agentDeployments, &cfg.DefaultAgent) } agentDeployments = append(agentDeployments, maps.Values(cfg.Agents)...) From 9c8e3cfff33f8ddc398777da6a4820bfe34867a3 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 17 Dec 2023 20:45:34 +0800 Subject: [PATCH 37/47] test disable-agent Signed-off-by: Future Outlier --- .github/workflows/single-binary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml index 9a2c19a52c..b3c924b0f9 100644 --- a/.github/workflows/single-binary.yml +++ b/.github/workflows/single-binary.yml @@ -170,7 +170,7 @@ jobs: cpu: "0" memory: "0" EOF - flytectl demo start --image flyte-sandbox-bundled:local --imagePullPolicy Never + flytectl demo start --image flyte-sandbox-bundled:local --disable-agent --imagePullPolicy Never - name: Install Python dependencies run: | python -m pip install --upgrade pip From 44d1d539807469be578815547a684047a123fe7a Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Sun, 17 Dec 2023 21:01:58 +0800 Subject: [PATCH 38/47] revert --disable-agent Signed-off-by: Future Outlier --- .github/workflows/single-binary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml index b3c924b0f9..9a2c19a52c 100644 --- a/.github/workflows/single-binary.yml +++ b/.github/workflows/single-binary.yml @@ -170,7 +170,7 @@ jobs: cpu: "0" memory: "0" EOF - flytectl demo start --image flyte-sandbox-bundled:local --disable-agent --imagePullPolicy Never + flytectl demo start --image flyte-sandbox-bundled:local --imagePullPolicy Never - name: Install Python dependencies run: | python -m pip install --upgrade pip From 1cd0e4887fa3f98c5d1fcf5ced202cbc36418733 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Mon, 18 Dec 2023 14:09:57 +0800 Subject: [PATCH 39/47] test Signed-off-by: Future Outlier --- .github/workflows/single-binary.yml | 2 +- charts/flyte-binary/README.md | 5 --- charts/flyte-binary/values.yaml | 20 +++++---- .../flyte_sandbox_binary_helm_generated.yaml | 11 +---- ...patch.yaml => add-agent-secret-patch.yaml} | 0 .../enable-agent-service-patch.yaml | 43 +++++++++++++++++++ .../complete-agent/kustomization.yaml | 3 +- .../manifests/complete-agent.yaml | 6 +-- .../sandbox-bundled/manifests/complete.yaml | 15 ++----- docker/sandbox-bundled/manifests/dev.yaml | 4 +- 10 files changed, 66 insertions(+), 43 deletions(-) rename docker/sandbox-bundled/kustomize/complete-agent/{patch.yaml => add-agent-secret-patch.yaml} (100%) create mode 100644 docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml index 9a2c19a52c..b3c924b0f9 100644 --- a/.github/workflows/single-binary.yml +++ b/.github/workflows/single-binary.yml @@ -170,7 +170,7 @@ jobs: cpu: "0" memory: "0" EOF - flytectl demo start --image flyte-sandbox-bundled:local --imagePullPolicy Never + flytectl demo start --image flyte-sandbox-bundled:local --disable-agent --imagePullPolicy Never - name: Install Python dependencies run: | python -m pip install --upgrade pip diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index c4fa8cfc5e..40480c3a19 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -21,11 +21,6 @@ Chart for basic single Flyte executable deployment | clusterResourceTemplates.labels | object | `{}` | | | commonAnnotations | object | `{}` | | | commonLabels | object | `{}` | | -| configuration.agentService.defaultAgent.defaultTimeout | string | `"10s"` | | -| configuration.agentService.defaultAgent.endpoint | string | `"dns:///flyteagent.flyte.svc.cluster.local:8000"` | | -| configuration.agentService.defaultAgent.insecure | bool | `true` | | -| configuration.agentService.defaultAgent.timeouts.GetTask | string | `"10s"` | | -| configuration.agentService.supportedTaskTypes[0] | string | `"default_task"` | | | configuration.annotations | object | `{}` | | | configuration.auth.authorizedUris | list | `[]` | | | configuration.auth.clientSecretsExternalSecretRef | string | `""` | | diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 48ae2c47dd..0caad1f87c 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -161,16 +161,18 @@ configuration: # tag CoPilot sidecar image tag tag: v1.10.6 # FLYTECOPILOT_TAG # agentService Flyte Agent configuration - agentService: - defaultAgent: - endpoint: "dns:///flyteagent.flyte.svc.cluster.local:8000" - insecure: true - timeouts: - GetTask: 10s - defaultTimeout: 10s + # -- Uncomment to enable agentService for Flyte Agent + # Note: You should ensure that the agent server is started, otherwise the Flyte cluster will fail to start. + # agentService: + # defaultAgent: + # endpoint: "dns:///flyteagent.flyte.svc.cluster.local:8000" + # insecure: true + # timeouts: + # GetTask: 10s + # defaultTimeout: 10s # Uncomment and modify to include configuration for Flyte Agent - supportedTaskTypes: - - default_task + # supportedTaskTypes: + # - default_task # externalConfigMap Specify an existing, external ConfigMap to use as configuration for Flyte # If set, no Flyte configuration will be generated by this chart externalConfigMap: "" diff --git a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml index 2e667f1256..2b0d197af3 100644 --- a/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml +++ b/deployment/sandbox-binary/flyte_sandbox_binary_helm_generated.yaml @@ -123,15 +123,6 @@ data: kubernetes-enabled: false cloudwatch-enabled: false stackdriver-enabled: false - agent-service: - defaultAgent: - defaultTimeout: 10s - endpoint: dns:///flyteagent.flyte.svc.cluster.local:8000 - insecure: true - timeouts: - GetTask: 10s - supportedTaskTypes: - - default_task 002-database.yaml: | database: postgres: @@ -367,7 +358,7 @@ spec: app.kubernetes.io/instance: flyte app.kubernetes.io/component: flyte-binary annotations: - checksum/configuration: 51494d8c2f3a6df2711d789217155f1e1b60e782dcbfd4564bfcccda24700576 + checksum/configuration: 94a584c983cfe1077f02569ae00f81c4fddae4505901006eda76d9338bd3dda2 checksum/configuration-secret: d5d93f4e67780b21593dc3799f0f6682aab0765e708e4020939975d14d44f929 checksum/cluster-resource-templates: 7dfa59f3d447e9c099b8f8ffad3af466fecbc9cf9f8c97295d9634254a55d4ae spec: diff --git a/docker/sandbox-bundled/kustomize/complete-agent/patch.yaml b/docker/sandbox-bundled/kustomize/complete-agent/add-agent-secret-patch.yaml similarity index 100% rename from docker/sandbox-bundled/kustomize/complete-agent/patch.yaml rename to docker/sandbox-bundled/kustomize/complete-agent/add-agent-secret-patch.yaml diff --git a/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml b/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml new file mode 100644 index 0000000000..744d4dc174 --- /dev/null +++ b/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml @@ -0,0 +1,43 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: flyte-sandbox-config + namespace: flyte +data: + 001-plugins.yaml: | + tasks: + task-plugins: + default-for-task-types: + container: container + container_array: k8s-array + sidecar: sidecar + enabled-plugins: + - container + - sidecar + - k8s-array + - agent-service + plugins: + logs: + kubernetes-enabled: true + kubernetes-template-uri: http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} + cloudwatch-enabled: false + stackdriver-enabled: false + k8s: + co-pilot: + image: "cr.flyte.org/flyteorg/flytecopilot:v1.10.6" + k8s-array: + logs: + config: + kubernetes-enabled: true + kubernetes-template-uri: http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} + cloudwatch-enabled: false + stackdriver-enabled: false + agent-service: + defaultAgent: + defaultTimeout: 10s + endpoint: dns:///flyteagent.flyte.svc.cluster.local:8000 + insecure: true + timeouts: + GetTask: 10s + supportedTaskTypes: + - default_task diff --git a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml index 145388ca2f..e32b079ebb 100644 --- a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml +++ b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml @@ -12,4 +12,5 @@ resources: - ../namespace.yaml patchesStrategicMerge: - - patch.yaml + - add-agent-secret-patch.yaml + - enable-agent-service-patch.yaml diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 4380b96277..08445fc8de 100644 --- a/docker/sandbox-bundled/manifests/complete-agent.yaml +++ b/docker/sandbox-bundled/manifests/complete-agent.yaml @@ -816,7 +816,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: ZnNFaHlpM01FZjRaQmNJSA== + haSharedSecret: VnNLQkt1MkNRdU5ZNW5Qbg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1246,7 +1246,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: 6755bdc74789d7e2a80161a9f811e41ea3c0cf12bab5cb0820c7c8539b4b88fe + checksum/configuration: e2233c2adb914be363ec4fae808ed60ffb230367503f73643f011e728b853b49 checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1411,7 +1411,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 727daf2e5024ea4e541b87b717e6f9a8706552e0ae461f82b2e5260ad564766c + checksum/secret: 0e36815292c3911f2ddfbc1ff2873e7b4d381137432bcc4170b51998a1aed73f labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 2b5b9d3168..8b5f2dd6d4 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -465,15 +465,6 @@ data: kubernetes-template-uri: http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} cloudwatch-enabled: false stackdriver-enabled: false - agent-service: - defaultAgent: - defaultTimeout: 10s - endpoint: dns:///flyteagent.flyte.svc.cluster.local:8000 - insecure: true - timeouts: - GetTask: 10s - supportedTaskTypes: - - default_task 002-database.yaml: | database: postgres: @@ -805,7 +796,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: UlI4aW9PaVFzcFpyRzhkTA== + haSharedSecret: Nk5nc2I1Z1hUQWNzZlRlZw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1203,7 +1194,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: 6755bdc74789d7e2a80161a9f811e41ea3c0cf12bab5cb0820c7c8539b4b88fe + checksum/configuration: e2233c2adb914be363ec4fae808ed60ffb230367503f73643f011e728b853b49 checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1368,7 +1359,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: cb0b9e32c83fba67eefca5b8cd0a3375b07f5d5d29f6dab9a092f91ccf7bd200 + checksum/secret: 934b019b16c54af8ddc25635c1adb29fce1455104785a83174dd888253d2d7cf labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index b934b7e602..238c49a1d7 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: QzZJWkZlOTBQOUZxTUlvcA== + haSharedSecret: N0ROQTB2SzlwdzhQbGhzZQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: dd543013ea0e17fb3c9b7be54fe7c6063e8f15ad6e0887596011ddd7f22f1540 + checksum/secret: 0bd53dff0e2df9a37450086b3c49f08a1294e704a0839ce2c7ffa3ae2fc8ccf5 labels: app: docker-registry release: flyte-sandbox From ef9cfe8fce9cb99d786eeb738e0679772064bab4 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 19 Dec 2023 10:35:09 +0800 Subject: [PATCH 40/47] use grpc code status to handle case list agent method not implemented Signed-off-by: Future Outlier --- .github/workflows/single-binary.yml | 2 +- .../tasks/plugins/array/awsbatch/executor.go | 2 +- .../go/tasks/plugins/array/k8s/management.go | 8 ++--- .../go/tasks/plugins/webapi/agent/plugin.go | 29 ++++++++++++------- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml index b3c924b0f9..9a2c19a52c 100644 --- a/.github/workflows/single-binary.yml +++ b/.github/workflows/single-binary.yml @@ -170,7 +170,7 @@ jobs: cpu: "0" memory: "0" EOF - flytectl demo start --image flyte-sandbox-bundled:local --disable-agent --imagePullPolicy Never + flytectl demo start --image flyte-sandbox-bundled:local --imagePullPolicy Never - name: Install Python dependencies run: | python -m pip install --upgrade pip diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/executor.go b/flyteplugins/go/tasks/plugins/array/awsbatch/executor.go index 6c7a858be8..1e98736129 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/executor.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/executor.go @@ -78,7 +78,7 @@ func (e Executor) Handle(ctx context.Context, tCtx core.TaskExecutionContext) (c case arrayCore.PhaseAssembleFinalOutput: pluginState.State, err = array.AssembleFinalOutputs(ctx, e.outputAssembler, tCtx, arrayCore.PhaseSuccess, version+1, pluginState.State) - + case arrayCore.PhaseAbortSubTasks: fallthrough diff --git a/flyteplugins/go/tasks/plugins/array/k8s/management.go b/flyteplugins/go/tasks/plugins/array/k8s/management.go index 510f202e1a..d6abaaf74b 100644 --- a/flyteplugins/go/tasks/plugins/array/k8s/management.go +++ b/flyteplugins/go/tasks/plugins/array/k8s/management.go @@ -382,10 +382,10 @@ func TerminateSubTasks(ctx context.Context, tCtx core.TaskExecutionContext, kube messageCollector.Collect(childIdx, err.Error()) } else { externalResources = append(externalResources, &core.ExternalResource{ - ExternalID: stCtx.TaskExecutionMetadata().GetTaskExecutionID().GetGeneratedName(), - Index: uint32(originalIdx), - RetryAttempt: uint32(retryAttempt), - Phase: core.PhaseAborted, + ExternalID: stCtx.TaskExecutionMetadata().GetTaskExecutionID().GetGeneratedName(), + Index: uint32(originalIdx), + RetryAttempt: uint32(retryAttempt), + Phase: core.PhaseAborted, }) } } diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index 34a950ce39..c4f5fa0c70 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -9,9 +9,11 @@ import ( "golang.org/x/exp/maps" "google.golang.org/grpc" + "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/status" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" flyteIdl "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" @@ -36,7 +38,7 @@ type Plugin struct { cfg *Config getClient GetClientFunc connectionCache map[*Agent]*grpc.ClientConn - agentRegistry map[string]map[bool]*Agent // map[taskType][isSync] => Agent + agentRegistry map[string]*Agent // map[taskType] => Agent } type ResourceWrapper struct { @@ -326,14 +328,13 @@ func getFinalContext(ctx context.Context, operation string, agent *Agent) (conte return context.WithTimeout(ctx, timeout) } -func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn, getAgentMetadataClientFunc GetAgentMetadataClientFunc) (map[string]map[bool]*Agent, error) { - agentRegistry := make(map[string]map[bool]*Agent) +func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.ClientConn, getAgentMetadataClientFunc GetAgentMetadataClientFunc) (map[string]*Agent, error) { + agentRegistry := make(map[string]*Agent) var agentDeployments []*Agent // Ensure that the old configuration is backward compatible for taskType, agentID := range cfg.AgentForTaskTypes { - agentRegistry[taskType] = make(map[bool]*Agent) - agentRegistry[taskType][false] = cfg.Agents[agentID] + agentRegistry[taskType] = cfg.Agents[agentID] } if len(cfg.DefaultAgent.Endpoint) != 0 { @@ -351,19 +352,25 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) if err != nil { + grpc_status, ok := status.FromError(err) + if grpc_status.Code() == codes.Unimplemented { + // we should not panic here, as we want to continue to support old agent settings + logger.Infof(context.Background(), "list agent method not implemented for agent: [%v]", agentDeployment) + continue + } + + if !ok { + return nil, fmt.Errorf("failed to list agent with a non-gRPC error : [%v]", err) + } + return nil, fmt.Errorf("failed to list agent with error: [%v]", err) } agents := res.GetAgents() for _, agent := range agents { supportedTaskTypes := agent.SupportedTaskTypes - isSync := agent.IsSync - for _, supportedTaskType := range supportedTaskTypes { - if _, ok := agentRegistry[supportedTaskType]; !ok { - agentRegistry[supportedTaskType] = make(map[bool]*Agent) - } - agentRegistry[supportedTaskType][isSync] = agentDeployment + agentRegistry[supportedTaskType] = agentDeployment } } } From e76d81f27b96f037d7ea4b01ca9bd144af10cb53 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 19 Dec 2023 10:38:31 +0800 Subject: [PATCH 41/47] rename grpc_status to grpcStatus Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index c4f5fa0c70..a67239bf89 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -352,8 +352,8 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) if err != nil { - grpc_status, ok := status.FromError(err) - if grpc_status.Code() == codes.Unimplemented { + grpcStatus, ok := status.FromError(err) + if grpcStatus.Code() == codes.Unimplemented { // we should not panic here, as we want to continue to support old agent settings logger.Infof(context.Background(), "list agent method not implemented for agent: [%v]", agentDeployment) continue From 78eeefd118e1922b3ea9b1f7f097e0ac74461edb Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 19 Dec 2023 11:08:58 +0800 Subject: [PATCH 42/47] remove is_sync proto Signed-off-by: Future Outlier --- .../gen/pb-cpp/flyteidl/admin/agent.pb.cc | 74 +++-------- flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 21 --- flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 124 ++++++++---------- .../pb-go/flyteidl/admin/agent.pb.validate.go | 2 - .../pb-go/flyteidl/service/agent.swagger.json | 5 - .../flyteidl/admin/AgentOuterClass.java | 105 ++------------- flyteidl/gen/pb-js/flyteidl.d.ts | 6 - flyteidl/gen/pb-js/flyteidl.js | 17 --- .../gen/pb_python/flyteidl/admin/agent_pb2.py | 24 ++-- .../pb_python/flyteidl/admin/agent_pb2.pyi | 6 +- flyteidl/gen/pb_rust/flyteidl.admin.rs | 3 - flyteidl/protos/flyteidl/admin/agent.proto | 3 - 12 files changed, 97 insertions(+), 293 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc index b23cddfcf9..84cb28a2fc 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc @@ -445,7 +445,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, name_), PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, supported_task_types_), - PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Agent, is_sync_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetAgentRequest, _internal_metadata_), ~0u, // no _extensions_ @@ -483,10 +482,10 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 75, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)}, { 82, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)}, { 87, -1, sizeof(::flyteidl::admin::Agent)}, - { 95, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, - { 101, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, - { 107, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, - { 112, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, + { 94, -1, sizeof(::flyteidl::admin::GetAgentRequest)}, + { 100, -1, sizeof(::flyteidl::admin::GetAgentResponse)}, + { 106, -1, sizeof(::flyteidl::admin::ListAgentsRequest)}, + { 111, -1, sizeof(::flyteidl::admin::ListAgentsResponse)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -548,22 +547,22 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] = "tate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Li" "teralMap\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskR" "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" - "ta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"D\n\005Agent\022" + "ta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"3\n\005Agent\022" "\014\n\004name\030\001 \001(\t\022\034\n\024supported_task_types\030\002 " - "\003(\t\022\017\n\007is_sync\030\003 \001(\010\"\037\n\017GetAgentRequest\022" - "\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005age" - "nt\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListA" - "gentsRequest\";\n\022ListAgentsResponse\022%\n\006ag" - "ents\030\001 \003(\0132\025.flyteidl.admin.Agent*^\n\005Sta" - "te\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_F" - "AILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSU" - "CCEEDED\020\004B=Z;github.com/flyteorg/flyte/f" - "lyteidl/gen/pb-go/flyteidl/adminb\006proto3" + "\003(\t\"\037\n\017GetAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020" + "GetAgentResponse\022$\n\005agent\030\001 \001(\0132\025.flytei" + "dl.admin.Agent\"\023\n\021ListAgentsRequest\";\n\022L" + "istAgentsResponse\022%\n\006agents\030\001 \003(\0132\025.flyt" + "eidl.admin.Agent*^\n\005State\022\025\n\021RETRYABLE_F" + "AILURE\020\000\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDI" + "NG\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;gith" + "ub.com/flyteorg/flyte/flyteidl/gen/pb-go" + "/flyteidl/adminb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = { false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto, - "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1760, + "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 1743, }; void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() { @@ -4149,7 +4148,6 @@ class Agent::HasBitSetters { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int Agent::kNameFieldNumber; const int Agent::kSupportedTaskTypesFieldNumber; -const int Agent::kIsSyncFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 Agent::Agent() @@ -4166,7 +4164,6 @@ Agent::Agent(const Agent& from) if (from.name().size() > 0) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - is_sync_ = from.is_sync_; // @@protoc_insertion_point(copy_constructor:flyteidl.admin.Agent) } @@ -4174,7 +4171,6 @@ void Agent::SharedCtor() { ::google::protobuf::internal::InitSCC( &scc_info_Agent_flyteidl_2fadmin_2fagent_2eproto.base); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - is_sync_ = false; } Agent::~Agent() { @@ -4203,7 +4199,6 @@ void Agent::Clear() { supported_task_types_.Clear(); name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - is_sync_ = false; _internal_metadata_.Clear(); } @@ -4255,13 +4250,6 @@ const char* Agent::_InternalParse(const char* begin, const char* end, void* obje } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 18 && (ptr += 1)); break; } - // bool is_sync = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual; - msg->set_is_sync(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -4327,19 +4315,6 @@ bool Agent::MergePartialFromCodedStream( break; } - // bool is_sync = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &is_sync_))); - } else { - goto handle_unusual; - } - break; - } - default: { handle_unusual: if (tag == 0) { @@ -4387,11 +4362,6 @@ void Agent::SerializeWithCachedSizes( 2, this->supported_task_types(i), output); } - // bool is_sync = 3; - if (this->is_sync() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->is_sync(), output); - } - if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -4426,11 +4396,6 @@ ::google::protobuf::uint8* Agent::InternalSerializeWithCachedSizesToArray( WriteStringToArray(2, this->supported_task_types(i), target); } - // bool is_sync = 3; - if (this->is_sync() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->is_sync(), target); - } - if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -4467,11 +4432,6 @@ size_t Agent::ByteSizeLong() const { this->name()); } - // bool is_sync = 3; - if (this->is_sync() != 0) { - total_size += 1 + 1; - } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -4504,9 +4464,6 @@ void Agent::MergeFrom(const Agent& from) { name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - if (from.is_sync() != 0) { - set_is_sync(from.is_sync()); - } } void Agent::CopyFrom(const ::google::protobuf::Message& from) { @@ -4537,7 +4494,6 @@ void Agent::InternalSwap(Agent* other) { supported_task_types_.InternalSwap(CastToBase(&other->supported_task_types_)); name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - swap(is_sync_, other->is_sync_); } ::google::protobuf::Metadata Agent::GetMetadata() const { diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h index a00f79ae6f..7360e91d06 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h @@ -1462,12 +1462,6 @@ class Agent final : ::std::string* release_name(); void set_allocated_name(::std::string* name); - // bool is_sync = 3; - void clear_is_sync(); - static const int kIsSyncFieldNumber = 3; - bool is_sync() const; - void set_is_sync(bool value); - // @@protoc_insertion_point(class_scope:flyteidl.admin.Agent) private: class HasBitSetters; @@ -1475,7 +1469,6 @@ class Agent final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::RepeatedPtrField<::std::string> supported_task_types_; ::google::protobuf::internal::ArenaStringPtr name_; - bool is_sync_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto; }; @@ -2962,20 +2955,6 @@ Agent::mutable_supported_task_types() { return &supported_task_types_; } -// bool is_sync = 3; -inline void Agent::clear_is_sync() { - is_sync_ = false; -} -inline bool Agent::is_sync() const { - // @@protoc_insertion_point(field_get:flyteidl.admin.Agent.is_sync) - return is_sync_; -} -inline void Agent::set_is_sync(bool value) { - - is_sync_ = value; - // @@protoc_insertion_point(field_set:flyteidl.admin.Agent.is_sync) -} - // ------------------------------------------------------------------- // GetAgentRequest diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go index 5e17ad4994..aeb5a70ed1 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go @@ -499,9 +499,7 @@ type Agent struct { // Name is the developer-assigned name of the agent. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // SupportedTaskTypes are the types of the tasks that the agent can handle. - SupportedTaskTypes []string `protobuf:"bytes,2,rep,name=supported_task_types,json=supportedTaskTypes,proto3" json:"supported_task_types,omitempty"` - // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. - IsSync bool `protobuf:"varint,3,opt,name=is_sync,json=isSync,proto3" json:"is_sync,omitempty"` + SupportedTaskTypes []string `protobuf:"bytes,2,rep,name=supported_task_types,json=supportedTaskTypes,proto3" json:"supported_task_types,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -546,13 +544,6 @@ func (m *Agent) GetSupportedTaskTypes() []string { return nil } -func (m *Agent) GetIsSync() bool { - if m != nil { - return m.IsSync - } - return false -} - // A request to get an agent. type GetAgentRequest struct { // The name of the agent. @@ -729,61 +720,60 @@ func init() { func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) } var fileDescriptor_c434e52bb0028071 = []byte{ - // 887 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xf1, 0x6f, 0x22, 0x45, - 0x14, 0x16, 0x28, 0x14, 0x1e, 0xbd, 0x1e, 0xcc, 0x15, 0x6f, 0xcb, 0x9d, 0xa6, 0x59, 0x73, 0xa6, - 0xf1, 0x72, 0xe0, 0xb5, 0x46, 0x7b, 0x1a, 0xbd, 0x70, 0xed, 0xda, 0x34, 0xa1, 0xa4, 0x99, 0x52, - 0xa3, 0x26, 0xba, 0x19, 0x96, 0x07, 0x6e, 0x58, 0x66, 0xd7, 0x9d, 0xd9, 0xe6, 0x48, 0xfc, 0xcd, - 0xc4, 0xbf, 0xc1, 0x3f, 0xd7, 0xec, 0xcc, 0xec, 0x16, 0x90, 0x33, 0xbd, 0xf8, 0xdb, 0xce, 0xfb, - 0xbe, 0xf9, 0xde, 0x9b, 0xf7, 0xbd, 0x61, 0x80, 0xf6, 0x24, 0x58, 0x48, 0xf4, 0xc7, 0x41, 0x97, - 0x8d, 0xe7, 0x3e, 0xef, 0xb2, 0x29, 0x72, 0xd9, 0x89, 0xe2, 0x50, 0x86, 0x64, 0x37, 0xc3, 0x3a, - 0x0a, 0x6b, 0x3f, 0xcd, 0xb9, 0x5e, 0x18, 0x63, 0x37, 0xf0, 0x25, 0xc6, 0x2c, 0x10, 0x9a, 0xdd, - 0xde, 0x5f, 0x45, 0x25, 0x13, 0xb3, 0x0c, 0xfa, 0x68, 0x15, 0xf2, 0xb9, 0xc4, 0x78, 0xc2, 0x3c, - 0x34, 0xf0, 0xc7, 0x6b, 0xf0, 0x18, 0xb9, 0xf4, 0x27, 0x3e, 0xc6, 0x9b, 0xb7, 0xe3, 0x5b, 0xf4, - 0x12, 0xe9, 0x87, 0x5c, 0xc3, 0xf6, 0xdf, 0x65, 0x68, 0x0d, 0x99, 0x98, 0x39, 0x59, 0xfc, 0x12, - 0x25, 0x1b, 0x33, 0xc9, 0x08, 0x85, 0x66, 0x5a, 0x86, 0x9b, 0xef, 0x70, 0xfd, 0xb1, 0x55, 0x38, - 0x28, 0x1c, 0xd6, 0x8f, 0x3e, 0xed, 0xe4, 0x87, 0x4b, 0x45, 0x3b, 0x2b, 0x02, 0x17, 0x79, 0x05, - 0xf4, 0xa1, 0x5c, 0x05, 0xc8, 0x53, 0xa8, 0x71, 0x36, 0x47, 0x11, 0x31, 0x0f, 0xad, 0xe2, 0x41, - 0xe1, 0xb0, 0x46, 0xef, 0x02, 0xe4, 0x02, 0x2a, 0x01, 0x1b, 0x61, 0x20, 0xac, 0xd2, 0x41, 0xe9, - 0xb0, 0x7e, 0xf4, 0xb2, 0xb3, 0xda, 0xc3, 0xce, 0xc6, 0x42, 0x3b, 0x7d, 0xb5, 0xc7, 0xe1, 0x32, - 0x5e, 0x50, 0x23, 0x40, 0x7e, 0x84, 0x3a, 0xe3, 0x3c, 0x94, 0x2c, 0x65, 0x0a, 0x6b, 0x4b, 0xe9, - 0x7d, 0x79, 0x3f, 0xbd, 0xde, 0xdd, 0x46, 0x2d, 0xba, 0x2c, 0x45, 0x3a, 0xf0, 0x68, 0x76, 0x22, - 0x5c, 0x81, 0xf1, 0xad, 0xef, 0xa1, 0xcb, 0x3c, 0x2f, 0x4c, 0xb8, 0xb4, 0xca, 0xea, 0x30, 0xcd, - 0xd9, 0x89, 0xb8, 0xd6, 0x48, 0x4f, 0x03, 0x44, 0x42, 0x0b, 0xf9, 0xad, 0x1f, 0x87, 0x7c, 0x8e, - 0x5c, 0xba, 0xb7, 0x2c, 0xf6, 0xd9, 0x28, 0x40, 0x61, 0x55, 0x54, 0x4d, 0xaf, 0xef, 0x57, 0x93, - 0x73, 0x27, 0xf1, 0x43, 0xa6, 0xa0, 0x8b, 0xdb, 0xc3, 0x0d, 0x50, 0xfb, 0x15, 0xd4, 0x97, 0xda, - 0x42, 0x1a, 0x50, 0x9a, 0xe1, 0x42, 0xb9, 0x57, 0xa3, 0xe9, 0x27, 0xd9, 0x83, 0xf2, 0x2d, 0x0b, - 0x92, 0xcc, 0x05, 0xbd, 0xf8, 0xba, 0x78, 0x52, 0x68, 0x7f, 0x07, 0x8d, 0xf5, 0x0e, 0xbc, 0xd7, - 0xfe, 0x73, 0xd8, 0x7f, 0x67, 0xb5, 0xef, 0x23, 0x64, 0xff, 0x59, 0x84, 0xe6, 0x69, 0x8c, 0x4c, - 0x62, 0xda, 0x13, 0x8a, 0xbf, 0x27, 0x28, 0x24, 0x79, 0x09, 0x15, 0x9f, 0x47, 0x89, 0x14, 0x66, - 0x16, 0xf7, 0xd7, 0x66, 0xb1, 0xaf, 0x2f, 0xd6, 0x25, 0x8b, 0xa8, 0x21, 0x92, 0xaf, 0xa0, 0x2a, - 0x71, 0x1e, 0x05, 0x4c, 0xea, 0x2c, 0xf5, 0xa3, 0x27, 0x1b, 0x06, 0x78, 0x68, 0x28, 0x34, 0x27, - 0x93, 0x4f, 0xe0, 0x41, 0x98, 0xc8, 0x28, 0x91, 0x6e, 0x14, 0xe3, 0xc4, 0x7f, 0x6b, 0x95, 0x54, - 0x8d, 0x3b, 0x3a, 0x78, 0xa5, 0x62, 0xe4, 0x17, 0x78, 0xbc, 0x76, 0x4f, 0xe6, 0xc6, 0x35, 0x6b, - 0x4b, 0x25, 0x7b, 0x76, 0x2f, 0x8b, 0x69, 0x4b, 0x6e, 0x0a, 0xdb, 0xaf, 0x80, 0x2c, 0x37, 0x41, - 0x44, 0x21, 0x17, 0xaa, 0xb2, 0x18, 0x45, 0x98, 0xc4, 0x1e, 0xaa, 0x74, 0xaa, 0x19, 0x3b, 0x74, - 0x27, 0x0b, 0xa6, 0xdb, 0x6d, 0x0a, 0xbb, 0xe7, 0x28, 0x97, 0x9b, 0xf7, 0x04, 0x6a, 0xaa, 0x56, - 0xb9, 0x88, 0xd0, 0x98, 0x50, 0x4d, 0x03, 0xc3, 0x45, 0xb4, 0x41, 0xb3, 0xb8, 0x41, 0xf3, 0x0f, - 0x78, 0x98, 0x6b, 0x9a, 0x5a, 0xbe, 0x80, 0x6a, 0x46, 0x31, 0x9e, 0x58, 0xeb, 0x27, 0xa6, 0x06, - 0xa7, 0x39, 0x93, 0x1c, 0x43, 0x2d, 0x08, 0xa7, 0x6e, 0xe0, 0xf3, 0x99, 0xb0, 0x8a, 0xea, 0x2e, - 0x7c, 0xb8, 0xc1, 0x95, 0x7e, 0x38, 0xa5, 0xd5, 0x20, 0x9c, 0xf6, 0x53, 0x9e, 0xfd, 0x57, 0x01, - 0xaa, 0x99, 0x16, 0x79, 0x0e, 0x65, 0x21, 0x53, 0x4f, 0xd3, 0xa4, 0xbb, 0x47, 0xad, 0xf5, 0xa4, - 0xd7, 0x29, 0x48, 0x35, 0x87, 0x1c, 0xc3, 0xb6, 0x76, 0x4d, 0x98, 0x11, 0xf8, 0x8f, 0xb9, 0xc9, - 0x98, 0xc4, 0x82, 0xed, 0x39, 0x0a, 0xc1, 0xa6, 0x68, 0x9c, 0xcf, 0x96, 0xf6, 0x0d, 0x34, 0xcf, - 0x30, 0xc0, 0xd5, 0xd1, 0xfc, 0xff, 0xdd, 0xdd, 0x03, 0xb2, 0x2c, 0xab, 0x1b, 0x6c, 0x4f, 0xa0, - 0xdc, 0x4b, 0x5f, 0x16, 0x42, 0x60, 0x2b, 0xfd, 0xb5, 0x34, 0xda, 0xea, 0x9b, 0x7c, 0x0e, 0x7b, - 0x22, 0x89, 0xa2, 0x30, 0x96, 0x38, 0x76, 0xf3, 0xf4, 0xba, 0xa5, 0x35, 0x4a, 0x72, 0x6c, 0x68, - 0x0a, 0x11, 0xe4, 0x31, 0x6c, 0xfb, 0xc2, 0x15, 0x0b, 0xee, 0xa9, 0x53, 0x55, 0x69, 0xc5, 0x17, - 0xd7, 0x0b, 0xee, 0xd9, 0xcf, 0x94, 0xb7, 0x2a, 0x55, 0x76, 0xa4, 0x0d, 0x19, 0xed, 0xd7, 0xd0, - 0xb8, 0xa3, 0x99, 0x19, 0x78, 0x0e, 0x65, 0xf5, 0xf8, 0x99, 0x01, 0xf8, 0x97, 0x17, 0x9a, 0xad, - 0x39, 0xf6, 0x23, 0x68, 0xf6, 0x7d, 0xa1, 0x15, 0x84, 0xc9, 0x64, 0x9f, 0x02, 0x59, 0x0e, 0x1a, - 0xdd, 0x17, 0x50, 0x51, 0x7b, 0xd2, 0xdb, 0x5e, 0x7a, 0xb7, 0xb0, 0x21, 0x7d, 0xf6, 0x2b, 0x94, - 0x95, 0xeb, 0xa4, 0x05, 0x4d, 0xea, 0x0c, 0xe9, 0x4f, 0xbd, 0x37, 0x7d, 0xc7, 0xfd, 0xbe, 0x77, - 0xd1, 0xbf, 0xa1, 0x4e, 0xe3, 0x83, 0x34, 0x7c, 0xe5, 0xd0, 0xcb, 0xde, 0xc0, 0x19, 0x0c, 0xf3, - 0x70, 0x81, 0xd4, 0x61, 0xfb, 0xca, 0x19, 0x9c, 0x5d, 0x0c, 0xce, 0x1b, 0xc5, 0x74, 0x41, 0x6f, - 0x06, 0x83, 0x74, 0x51, 0x22, 0x0f, 0xa0, 0x76, 0x7d, 0x73, 0x7a, 0xea, 0x38, 0x67, 0xce, 0x59, - 0x63, 0xeb, 0xcd, 0xb7, 0x3f, 0x7f, 0x33, 0xf5, 0xe5, 0x6f, 0xc9, 0xa8, 0xe3, 0x85, 0xf3, 0xae, - 0x2a, 0x25, 0x8c, 0xa7, 0xfa, 0xa3, 0x9b, 0x3f, 0xb4, 0x53, 0xe4, 0xdd, 0x68, 0xf4, 0x62, 0x1a, - 0x76, 0x57, 0xff, 0x1f, 0x8c, 0x2a, 0xea, 0xcd, 0x3d, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0xfb, - 0xe3, 0xf7, 0x83, 0x38, 0x08, 0x00, 0x00, + // 869 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xf1, 0x6f, 0xdb, 0x44, + 0x14, 0x26, 0x49, 0xd3, 0x26, 0x2f, 0x5d, 0x97, 0xdc, 0x1a, 0x70, 0xb3, 0x81, 0x2a, 0xa3, 0xa1, + 0x8a, 0x69, 0x0e, 0x6b, 0x11, 0x74, 0x20, 0x98, 0xb2, 0xd6, 0x54, 0x95, 0xd2, 0xa8, 0xba, 0xa6, + 0x08, 0x90, 0xc0, 0xba, 0x38, 0xaf, 0xc6, 0x8a, 0x63, 0x1b, 0xdf, 0xb9, 0x5a, 0x24, 0x7e, 0x43, + 0xe2, 0x6f, 0xe0, 0xcf, 0x45, 0xbe, 0x3b, 0xbb, 0x49, 0xf0, 0x50, 0xa7, 0xfd, 0x66, 0xbf, 0xef, + 0xbb, 0xef, 0x7d, 0x7e, 0xdf, 0x5d, 0x2e, 0xd0, 0xbb, 0x09, 0x16, 0x02, 0xfd, 0x69, 0xd0, 0x67, + 0xd3, 0xb9, 0x1f, 0xf6, 0x99, 0x87, 0xa1, 0xb0, 0xe2, 0x24, 0x12, 0x11, 0xd9, 0xc9, 0x31, 0x4b, + 0x62, 0xbd, 0x27, 0x05, 0xd7, 0x8d, 0x12, 0xec, 0x07, 0xbe, 0xc0, 0x84, 0x05, 0x5c, 0xb1, 0x7b, + 0x7b, 0xab, 0xa8, 0x60, 0x7c, 0x96, 0x43, 0x1f, 0xaf, 0x42, 0x7e, 0x28, 0x30, 0xb9, 0x61, 0x2e, + 0x6a, 0xf8, 0x93, 0x35, 0x78, 0x8a, 0xa1, 0xf0, 0x6f, 0x7c, 0x4c, 0xca, 0x97, 0xe3, 0x1b, 0x74, + 0x53, 0xe1, 0x47, 0xa1, 0x82, 0xcd, 0x7f, 0xea, 0xd0, 0x1d, 0x33, 0x3e, 0xb3, 0xf3, 0xfa, 0x05, + 0x0a, 0x36, 0x65, 0x82, 0x11, 0x0a, 0x9d, 0xcc, 0x86, 0x53, 0xac, 0x70, 0xfc, 0xa9, 0x51, 0xd9, + 0xaf, 0x1c, 0xb4, 0x0e, 0x3f, 0xb3, 0x8a, 0x8f, 0xcb, 0x44, 0xad, 0x15, 0x81, 0xf3, 0xc2, 0x01, + 0x7d, 0x28, 0x56, 0x01, 0xf2, 0x04, 0x9a, 0x21, 0x9b, 0x23, 0x8f, 0x99, 0x8b, 0x46, 0x75, 0xbf, + 0x72, 0xd0, 0xa4, 0x77, 0x05, 0x72, 0x0e, 0x9b, 0x01, 0x9b, 0x60, 0xc0, 0x8d, 0xda, 0x7e, 0xed, + 0xa0, 0x75, 0xf8, 0xc2, 0x5a, 0x9d, 0xa1, 0x55, 0x6a, 0xd4, 0x1a, 0xca, 0x35, 0x76, 0x28, 0x92, + 0x05, 0xd5, 0x02, 0xe4, 0x27, 0x68, 0xb1, 0x30, 0x8c, 0x04, 0xcb, 0x98, 0xdc, 0xd8, 0x90, 0x7a, + 0x5f, 0xdd, 0x4f, 0x6f, 0x70, 0xb7, 0x50, 0x89, 0x2e, 0x4b, 0x11, 0x0b, 0x1e, 0xcd, 0x8e, 0xb9, + 0xc3, 0x31, 0xb9, 0xf5, 0x5d, 0x74, 0x98, 0xeb, 0x46, 0x69, 0x28, 0x8c, 0xba, 0xfc, 0x98, 0xce, + 0xec, 0x98, 0x5f, 0x29, 0x64, 0xa0, 0x00, 0x22, 0xa0, 0x8b, 0xe1, 0xad, 0x9f, 0x44, 0xe1, 0x1c, + 0x43, 0xe1, 0xdc, 0xb2, 0xc4, 0x67, 0x93, 0x00, 0xb9, 0xb1, 0x29, 0x3d, 0xbd, 0xba, 0x9f, 0x27, + 0xfb, 0x4e, 0xe2, 0xc7, 0x5c, 0x41, 0x99, 0xdb, 0xc5, 0x12, 0xa8, 0xf7, 0x12, 0x5a, 0x4b, 0x63, + 0x21, 0x6d, 0xa8, 0xcd, 0x70, 0x21, 0xd3, 0x6b, 0xd2, 0xec, 0x91, 0xec, 0x42, 0xfd, 0x96, 0x05, + 0x69, 0x9e, 0x82, 0x7a, 0xf9, 0xa6, 0x7a, 0x5c, 0xe9, 0x7d, 0x0f, 0xed, 0xf5, 0x09, 0xbc, 0xd3, + 0xfa, 0x33, 0xd8, 0x7b, 0xab, 0xdb, 0x77, 0x11, 0x32, 0xff, 0xaa, 0x42, 0xe7, 0x24, 0x41, 0x26, + 0x30, 0x9b, 0x09, 0xc5, 0x3f, 0x52, 0xe4, 0x82, 0xbc, 0x80, 0x4d, 0x3f, 0x8c, 0x53, 0xc1, 0xf5, + 0x5e, 0xdc, 0x5b, 0xdb, 0x8b, 0x43, 0x75, 0xb0, 0x2e, 0x58, 0x4c, 0x35, 0x91, 0x7c, 0x0d, 0x0d, + 0x81, 0xf3, 0x38, 0x60, 0x42, 0x75, 0x69, 0x1d, 0x3e, 0x2e, 0xd9, 0xc0, 0x63, 0x4d, 0xa1, 0x05, + 0x99, 0x7c, 0x0a, 0x0f, 0xa2, 0x54, 0xc4, 0xa9, 0x70, 0xe2, 0x04, 0x6f, 0xfc, 0x37, 0x46, 0x4d, + 0x7a, 0xdc, 0x56, 0xc5, 0x4b, 0x59, 0x23, 0xbf, 0xc2, 0x47, 0x6b, 0xe7, 0x64, 0xae, 0x53, 0x33, + 0x36, 0x64, 0xb3, 0xa7, 0xf7, 0x8a, 0x98, 0x76, 0x45, 0x59, 0xd9, 0x7c, 0x09, 0x64, 0x79, 0x08, + 0x3c, 0x8e, 0x42, 0x2e, 0x9d, 0x25, 0xc8, 0xa3, 0x34, 0x71, 0x51, 0xb6, 0x93, 0xc3, 0xd8, 0xa6, + 0xdb, 0x79, 0x31, 0x5b, 0x6e, 0x52, 0xd8, 0x39, 0x43, 0xb1, 0x3c, 0xbc, 0xc7, 0xd0, 0x94, 0x5e, + 0xc5, 0x22, 0x46, 0x1d, 0x42, 0x23, 0x2b, 0x8c, 0x17, 0x71, 0x89, 0x66, 0xb5, 0x44, 0xf3, 0x4f, + 0x78, 0x58, 0x68, 0x6a, 0x2f, 0x5f, 0x42, 0x23, 0xa7, 0xe8, 0x4c, 0x8c, 0xf5, 0x2f, 0xa6, 0x1a, + 0xa7, 0x05, 0x93, 0x1c, 0x41, 0x33, 0x88, 0x3c, 0x27, 0xf0, 0xc3, 0x19, 0x37, 0xaa, 0xf2, 0x2c, + 0x7c, 0x58, 0x92, 0xca, 0x30, 0xf2, 0x68, 0x23, 0x88, 0xbc, 0x61, 0xc6, 0x33, 0xff, 0xae, 0x40, + 0x23, 0xd7, 0x22, 0xcf, 0xa0, 0xce, 0x45, 0x96, 0x69, 0xd6, 0x74, 0xe7, 0xb0, 0xbb, 0xde, 0xf4, + 0x2a, 0x03, 0xa9, 0xe2, 0x90, 0x23, 0xd8, 0x52, 0xa9, 0x71, 0xbd, 0x05, 0xfe, 0x67, 0xdf, 0xe4, + 0x4c, 0x62, 0xc0, 0xd6, 0x1c, 0x39, 0x67, 0x1e, 0xea, 0xe4, 0xf3, 0x57, 0xf3, 0x1a, 0x3a, 0xa7, + 0x18, 0xe0, 0xea, 0xd6, 0x7c, 0xff, 0xe9, 0xee, 0x02, 0x59, 0x96, 0x55, 0x03, 0x36, 0x2f, 0xa0, + 0x3e, 0xc8, 0x6e, 0x16, 0x42, 0x60, 0x23, 0xfb, 0xb5, 0xd4, 0xda, 0xf2, 0x99, 0x7c, 0x01, 0xbb, + 0x3c, 0x8d, 0xe3, 0x28, 0x11, 0x38, 0x75, 0x8a, 0xf6, 0x6a, 0xa4, 0x4d, 0x4a, 0x0a, 0x6c, 0xac, + 0x8d, 0x70, 0xf3, 0xa9, 0x8c, 0x50, 0x2a, 0xe6, 0xce, 0x4b, 0x84, 0xcd, 0x57, 0xd0, 0xbe, 0xa3, + 0xe9, 0xa8, 0x9f, 0x41, 0x5d, 0xde, 0x71, 0x3a, 0xe7, 0xff, 0x8c, 0x5c, 0xb1, 0x15, 0xc7, 0x7c, + 0x04, 0x9d, 0xa1, 0xcf, 0x95, 0x02, 0xd7, 0x9d, 0xcc, 0x13, 0x20, 0xcb, 0x45, 0xad, 0xfb, 0x1c, + 0x36, 0xe5, 0x9a, 0xec, 0x50, 0xd7, 0xde, 0x2e, 0xac, 0x49, 0x9f, 0xff, 0x06, 0x75, 0x19, 0x2e, + 0xe9, 0x42, 0x87, 0xda, 0x63, 0xfa, 0xf3, 0xe0, 0xf5, 0xd0, 0x76, 0x7e, 0x18, 0x9c, 0x0f, 0xaf, + 0xa9, 0xdd, 0xfe, 0x20, 0x2b, 0x5f, 0xda, 0xf4, 0x62, 0x30, 0xb2, 0x47, 0xe3, 0xa2, 0x5c, 0x21, + 0x2d, 0xd8, 0xba, 0xb4, 0x47, 0xa7, 0xe7, 0xa3, 0xb3, 0x76, 0x35, 0x7b, 0xa1, 0xd7, 0xa3, 0x51, + 0xf6, 0x52, 0x23, 0x0f, 0xa0, 0x79, 0x75, 0x7d, 0x72, 0x62, 0xdb, 0xa7, 0xf6, 0x69, 0x7b, 0xe3, + 0xf5, 0x77, 0xbf, 0x7c, 0xeb, 0xf9, 0xe2, 0xf7, 0x74, 0x62, 0xb9, 0xd1, 0xbc, 0x2f, 0xad, 0x44, + 0x89, 0xa7, 0x1e, 0xfa, 0xc5, 0x7d, 0xea, 0x61, 0xd8, 0x8f, 0x27, 0xcf, 0xbd, 0xa8, 0xbf, 0xfa, + 0x37, 0x60, 0xb2, 0x29, 0xaf, 0xd6, 0xa3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x81, 0xa7, 0x12, + 0x0e, 0x1f, 0x08, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go index fa6dbe6adb..c4767d006c 100644 --- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.validate.go @@ -675,8 +675,6 @@ func (m *Agent) Validate() error { // no validation rules for Name - // no validation rules for IsSync - return nil } diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index ea6db19960..ce431a28ef 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -229,11 +229,6 @@ "type": "string" }, "description": "SupportedTaskTypes are the types of the tasks that the agent can handle." - }, - "is_sync": { - "type": "boolean", - "format": "boolean", - "description": "IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress." } }, "description": "A message containing the agent metadata." diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java index 716c2079ff..a6fa424d2a 100644 --- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java +++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java @@ -8046,15 +8046,6 @@ public interface AgentOrBuilder extends */ com.google.protobuf.ByteString getSupportedTaskTypesBytes(int index); - - /** - *
-     * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
-     * 
- * - * bool is_sync = 3; - */ - boolean getIsSync(); } /** *
@@ -8116,11 +8107,6 @@ private Agent(
               supportedTaskTypes_.add(s);
               break;
             }
-            case 24: {
-
-              isSync_ = input.readBool();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -8244,19 +8230,6 @@ public java.lang.String getSupportedTaskTypes(int index) {
       return supportedTaskTypes_.getByteString(index);
     }
 
-    public static final int IS_SYNC_FIELD_NUMBER = 3;
-    private boolean isSync_;
-    /**
-     * 
-     * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
-     * 
- * - * bool is_sync = 3; - */ - public boolean getIsSync() { - return isSync_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -8277,9 +8250,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < supportedTaskTypes_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, supportedTaskTypes_.getRaw(i)); } - if (isSync_ != false) { - output.writeBool(3, isSync_); - } unknownFields.writeTo(output); } @@ -8300,10 +8270,6 @@ public int getSerializedSize() { size += dataSize; size += 1 * getSupportedTaskTypesList().size(); } - if (isSync_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, isSync_); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -8323,8 +8289,6 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getName())) return false; if (!getSupportedTaskTypesList() .equals(other.getSupportedTaskTypesList())) return false; - if (getIsSync() - != other.getIsSync()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -8342,9 +8306,6 @@ public int hashCode() { hash = (37 * hash) + SUPPORTED_TASK_TYPES_FIELD_NUMBER; hash = (53 * hash) + getSupportedTaskTypesList().hashCode(); } - hash = (37 * hash) + IS_SYNC_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsSync()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -8486,8 +8447,6 @@ public Builder clear() { supportedTaskTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); - isSync_ = false; - return this; } @@ -8522,7 +8481,6 @@ public flyteidl.admin.AgentOuterClass.Agent buildPartial() { bitField0_ = (bitField0_ & ~0x00000002); } result.supportedTaskTypes_ = supportedTaskTypes_; - result.isSync_ = isSync_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -8586,9 +8544,6 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Agent other) { } onChanged(); } - if (other.getIsSync() != false) { - setIsSync(other.getIsSync()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -8837,44 +8792,6 @@ public Builder addSupportedTaskTypesBytes( onChanged(); return this; } - - private boolean isSync_ ; - /** - *
-       * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
-       * 
- * - * bool is_sync = 3; - */ - public boolean getIsSync() { - return isSync_; - } - /** - *
-       * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
-       * 
- * - * bool is_sync = 3; - */ - public Builder setIsSync(boolean value) { - - isSync_ = value; - onChanged(); - return this; - } - /** - *
-       * IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress.
-       * 
- * - * bool is_sync = 3; - */ - public Builder clearIsSync() { - - isSync_ = false; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -11465,17 +11382,17 @@ public flyteidl.admin.AgentOuterClass.ListAgentsResponse getDefaultInstanceForTy "tate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Li" + "teralMap\022\017\n\007message\030\003 \001(\t\"=\n\021DeleteTaskR" + "equest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_me" + - "ta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"D\n\005Agent\022" + + "ta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"3\n\005Agent\022" + "\014\n\004name\030\001 \001(\t\022\034\n\024supported_task_types\030\002 " + - "\003(\t\022\017\n\007is_sync\030\003 \001(\010\"\037\n\017GetAgentRequest\022" + - "\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005age" + - "nt\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListA" + - "gentsRequest\";\n\022ListAgentsResponse\022%\n\006ag" + - "ents\030\001 \003(\0132\025.flyteidl.admin.Agent*^\n\005Sta" + - "te\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_F" + - "AILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSU" + - "CCEEDED\020\004B=Z;github.com/flyteorg/flyte/f" + - "lyteidl/gen/pb-go/flyteidl/adminb\006proto3" + "\003(\t\"\037\n\017GetAgentRequest\022\014\n\004name\030\001 \001(\t\"8\n\020" + + "GetAgentResponse\022$\n\005agent\030\001 \001(\0132\025.flytei" + + "dl.admin.Agent\"\023\n\021ListAgentsRequest\";\n\022L" + + "istAgentsResponse\022%\n\006agents\030\001 \003(\0132\025.flyt" + + "eidl.admin.Agent*^\n\005State\022\025\n\021RETRYABLE_F" + + "AILURE\020\000\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007PENDI" + + "NG\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;gith" + + "ub.com/flyteorg/flyte/flyteidl/gen/pb-go" + + "/flyteidl/adminb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -11565,7 +11482,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_admin_Agent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_admin_Agent_descriptor, - new java.lang.String[] { "Name", "SupportedTaskTypes", "IsSync", }); + new java.lang.String[] { "Name", "SupportedTaskTypes", }); internal_static_flyteidl_admin_GetAgentRequest_descriptor = getDescriptor().getMessageTypes().get(9); internal_static_flyteidl_admin_GetAgentRequest_fieldAccessorTable = new diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 12f0beed20..b55b84894a 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -8361,9 +8361,6 @@ export namespace flyteidl { /** Agent supportedTaskTypes */ supportedTaskTypes?: (string[]|null); - - /** Agent isSync */ - isSync?: (boolean|null); } /** Represents an Agent. */ @@ -8381,9 +8378,6 @@ export namespace flyteidl { /** Agent supportedTaskTypes. */ public supportedTaskTypes: string[]; - /** Agent isSync. */ - public isSync: boolean; - /** * Creates a new Agent instance using the specified properties. * @param [properties] Properties to set diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 9c0f7c5564..6845a64bbc 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -20389,7 +20389,6 @@ * @interface IAgent * @property {string|null} [name] Agent name * @property {Array.|null} [supportedTaskTypes] Agent supportedTaskTypes - * @property {boolean|null} [isSync] Agent isSync */ /** @@ -20424,14 +20423,6 @@ */ Agent.prototype.supportedTaskTypes = $util.emptyArray; - /** - * Agent isSync. - * @member {boolean} isSync - * @memberof flyteidl.admin.Agent - * @instance - */ - Agent.prototype.isSync = false; - /** * Creates a new Agent instance using the specified properties. * @function create @@ -20461,8 +20452,6 @@ if (message.supportedTaskTypes != null && message.supportedTaskTypes.length) for (var i = 0; i < message.supportedTaskTypes.length; ++i) writer.uint32(/* id 2, wireType 2 =*/18).string(message.supportedTaskTypes[i]); - if (message.isSync != null && message.hasOwnProperty("isSync")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.isSync); return writer; }; @@ -20492,9 +20481,6 @@ message.supportedTaskTypes = []; message.supportedTaskTypes.push(reader.string()); break; - case 3: - message.isSync = reader.bool(); - break; default: reader.skipType(tag & 7); break; @@ -20524,9 +20510,6 @@ if (!$util.isString(message.supportedTaskTypes[i])) return "supportedTaskTypes: string[] expected"; } - if (message.isSync != null && message.hasOwnProperty("isSync")) - if (typeof message.isSync !== "boolean") - return "isSync: boolean expected"; return null; }; diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py index b103dd1598..baceaf16c6 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py @@ -18,7 +18,7 @@ from flyteidl.core import execution_pb2 as flyteidl_dot_core_dot_execution__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"f\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\x12\x17\n\x07is_sync\x18\x03 \x01(\x08R\x06isSync\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"9\n\x12\x43reateTaskResponse\x12#\n\rresource_meta\x18\x01 \x01(\x0cR\x0cresourceMeta\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\x86\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -33,8 +33,8 @@ _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001' _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001' - _globals['_STATE']._serialized_start=1939 - _globals['_STATE']._serialized_end=2033 + _globals['_STATE']._serialized_start=1914 + _globals['_STATE']._serialized_end=2008 _globals['_TASKEXECUTIONMETADATA']._serialized_start=198 _globals['_TASKEXECUTIONMETADATA']._serialized_end=862 _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=668 @@ -58,13 +58,13 @@ _globals['_DELETETASKRESPONSE']._serialized_start=1619 _globals['_DELETETASKRESPONSE']._serialized_end=1639 _globals['_AGENT']._serialized_start=1641 - _globals['_AGENT']._serialized_end=1743 - _globals['_GETAGENTREQUEST']._serialized_start=1745 - _globals['_GETAGENTREQUEST']._serialized_end=1782 - _globals['_GETAGENTRESPONSE']._serialized_start=1784 - _globals['_GETAGENTRESPONSE']._serialized_end=1847 - _globals['_LISTAGENTSREQUEST']._serialized_start=1849 - _globals['_LISTAGENTSREQUEST']._serialized_end=1868 - _globals['_LISTAGENTSRESPONSE']._serialized_start=1870 - _globals['_LISTAGENTSRESPONSE']._serialized_end=1937 + _globals['_AGENT']._serialized_end=1718 + _globals['_GETAGENTREQUEST']._serialized_start=1720 + _globals['_GETAGENTREQUEST']._serialized_end=1757 + _globals['_GETAGENTRESPONSE']._serialized_start=1759 + _globals['_GETAGENTRESPONSE']._serialized_end=1822 + _globals['_LISTAGENTSREQUEST']._serialized_start=1824 + _globals['_LISTAGENTSREQUEST']._serialized_end=1843 + _globals['_LISTAGENTSRESPONSE']._serialized_start=1845 + _globals['_LISTAGENTSRESPONSE']._serialized_end=1912 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi index d224a51ad5..d184c997b7 100644 --- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi @@ -118,14 +118,12 @@ class DeleteTaskResponse(_message.Message): def __init__(self) -> None: ... class Agent(_message.Message): - __slots__ = ["name", "supported_task_types", "is_sync"] + __slots__ = ["name", "supported_task_types"] NAME_FIELD_NUMBER: _ClassVar[int] SUPPORTED_TASK_TYPES_FIELD_NUMBER: _ClassVar[int] - IS_SYNC_FIELD_NUMBER: _ClassVar[int] name: str supported_task_types: _containers.RepeatedScalarFieldContainer[str] - is_sync: bool - def __init__(self, name: _Optional[str] = ..., supported_task_types: _Optional[_Iterable[str]] = ..., is_sync: bool = ...) -> None: ... + def __init__(self, name: _Optional[str] = ..., supported_task_types: _Optional[_Iterable[str]] = ...) -> None: ... class GetAgentRequest(_message.Message): __slots__ = ["name"] diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs index 237ee648ab..3758f6d90e 100644 --- a/flyteidl/gen/pb_rust/flyteidl.admin.rs +++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs @@ -111,9 +111,6 @@ pub struct Agent { /// SupportedTaskTypes are the types of the tasks that the agent can handle. #[prost(string, repeated, tag="2")] pub supported_task_types: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. - #[prost(bool, tag="3")] - pub is_sync: bool, } /// A request to get an agent. #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto index 9c69d733eb..98ab21cd07 100644 --- a/flyteidl/protos/flyteidl/admin/agent.proto +++ b/flyteidl/protos/flyteidl/admin/agent.proto @@ -99,9 +99,6 @@ message Agent { // SupportedTaskTypes are the types of the tasks that the agent can handle. repeated string supported_task_types = 2; - - // IsSync indicates whether this agent is a sync agent. Sync agents are expected to return their results synchronously when called by propeller. Given that sync agents can affect the performance of the system, it's important to enforce strict timeout policies. An Async agent, on the other hand, is required to be able to identify jobs by an identifier and query for job statuses as jobs progress. - bool is_sync = 3; } // A request to get an agent. From 1d512e63557ca9ab17e51e51d6bdba48f0e83881 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Tue, 19 Dec 2023 11:17:34 +0800 Subject: [PATCH 43/47] remove is_sync Signed-off-by: Future Outlier --- flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index 7dbcaba76e..bd5ab12a83 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -193,7 +193,6 @@ func TestInitializeAgentRegistry(t *testing.T) { { Name: "test-agent", SupportedTaskTypes: []string{"task1", "task2", "task3"}, - IsSync: false, }, }, } From 64325854b4bc488d3414b5feaf66b35ec48b77fb Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 18 Dec 2023 23:45:21 -0800 Subject: [PATCH 44/47] Update complete-agent.yaml Signed-off-by: Kevin Su --- charts/flyte-binary/README.md | 5 +++ charts/flyte-binary/templates/configmap.yaml | 9 +--- charts/flyte-binary/values.yaml | 21 ++++----- .../enable-agent-service-patch.yaml | 43 ------------------- .../complete-agent/kustomization.yaml | 8 ++-- .../manifests/complete-agent.yaml | 18 ++++---- .../sandbox-bundled/manifests/complete.yaml | 4 +- docker/sandbox-bundled/manifests/dev.yaml | 4 +- 8 files changed, 32 insertions(+), 80 deletions(-) delete mode 100644 docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index 40480c3a19..c4fa8cfc5e 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -21,6 +21,11 @@ Chart for basic single Flyte executable deployment | clusterResourceTemplates.labels | object | `{}` | | | commonAnnotations | object | `{}` | | | commonLabels | object | `{}` | | +| configuration.agentService.defaultAgent.defaultTimeout | string | `"10s"` | | +| configuration.agentService.defaultAgent.endpoint | string | `"dns:///flyteagent.flyte.svc.cluster.local:8000"` | | +| configuration.agentService.defaultAgent.insecure | bool | `true` | | +| configuration.agentService.defaultAgent.timeouts.GetTask | string | `"10s"` | | +| configuration.agentService.supportedTaskTypes[0] | string | `"default_task"` | | | configuration.annotations | object | `{}` | | | configuration.auth.authorizedUris | list | `[]` | | | configuration.auth.clientSecretsExternalSecretRef | string | `""` | | diff --git a/charts/flyte-binary/templates/configmap.yaml b/charts/flyte-binary/templates/configmap.yaml index 4c55bf34e3..255da9fdf3 100644 --- a/charts/flyte-binary/templates/configmap.yaml +++ b/charts/flyte-binary/templates/configmap.yaml @@ -61,16 +61,9 @@ data: k8s-array: logs: config: {{- include "flyte-binary.configuration.logging.plugins" . | nindent 12 }} - {{- if .Values.configuration.agentService }} + {{- if .Values.flyteagent.enabled }} agent-service: {{- tpl ( .Values.configuration.agentService | toYaml ) . | nindent 8 }} - {{- else if .Values.flyteagent.enabled }} - agent-service: - defaultAgent: - endpoint: {{ include "flyteagent.name" . }}:{{ include "flyteagent.servicePort" . }} - insecure: true - supportedTaskTypes: - - bigquery_query_job_task {{- end }} 002-database.yaml: | {{- with .Values.configuration.database }} diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml index 0caad1f87c..b8a8b58c3c 100644 --- a/charts/flyte-binary/values.yaml +++ b/charts/flyte-binary/values.yaml @@ -161,18 +161,15 @@ configuration: # tag CoPilot sidecar image tag tag: v1.10.6 # FLYTECOPILOT_TAG # agentService Flyte Agent configuration - # -- Uncomment to enable agentService for Flyte Agent - # Note: You should ensure that the agent server is started, otherwise the Flyte cluster will fail to start. - # agentService: - # defaultAgent: - # endpoint: "dns:///flyteagent.flyte.svc.cluster.local:8000" - # insecure: true - # timeouts: - # GetTask: 10s - # defaultTimeout: 10s - # Uncomment and modify to include configuration for Flyte Agent - # supportedTaskTypes: - # - default_task + agentService: + defaultAgent: + endpoint: "dns:///flyteagent.flyte.svc.cluster.local:8000" + insecure: true + timeouts: + GetTask: 10s + defaultTimeout: 10s + supportedTaskTypes: + - default_task # externalConfigMap Specify an existing, external ConfigMap to use as configuration for Flyte # If set, no Flyte configuration will be generated by this chart externalConfigMap: "" diff --git a/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml b/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml deleted file mode 100644 index 744d4dc174..0000000000 --- a/docker/sandbox-bundled/kustomize/complete-agent/enable-agent-service-patch.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: flyte-sandbox-config - namespace: flyte -data: - 001-plugins.yaml: | - tasks: - task-plugins: - default-for-task-types: - container: container - container_array: k8s-array - sidecar: sidecar - enabled-plugins: - - container - - sidecar - - k8s-array - - agent-service - plugins: - logs: - kubernetes-enabled: true - kubernetes-template-uri: http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} - cloudwatch-enabled: false - stackdriver-enabled: false - k8s: - co-pilot: - image: "cr.flyte.org/flyteorg/flytecopilot:v1.10.6" - k8s-array: - logs: - config: - kubernetes-enabled: true - kubernetes-template-uri: http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} - cloudwatch-enabled: false - stackdriver-enabled: false - agent-service: - defaultAgent: - defaultTimeout: 10s - endpoint: dns:///flyteagent.flyte.svc.cluster.local:8000 - insecure: true - timeouts: - GetTask: 10s - supportedTaskTypes: - - default_task diff --git a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml index e32b079ebb..111ae05ca8 100644 --- a/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml +++ b/docker/sandbox-bundled/kustomize/complete-agent/kustomization.yaml @@ -4,13 +4,13 @@ helmCharts: - name: flyte-sandbox releaseName: flyte-sandbox namespace: flyte -- name: flyteagent - releaseName: flyteagent - namespace: flyte + valuesInline: + flyte-binary: + flyteagent: + enabled: True namespace: flyte resources: - ../namespace.yaml patchesStrategicMerge: - add-agent-secret-patch.yaml - - enable-agent-service-patch.yaml diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 08445fc8de..c2843ad5d3 100644 --- a/docker/sandbox-bundled/manifests/complete-agent.yaml +++ b/docker/sandbox-bundled/manifests/complete-agent.yaml @@ -45,7 +45,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/instance: flyteagent + app.kubernetes.io/instance: flyte-sandbox app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: flyteagent helm.sh/chart: flyteagent-v0.1.10 @@ -816,7 +816,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: VnNLQkt1MkNRdU5ZNW5Qbg== + haSharedSecret: cHNOS0lPZmw0andDczdaaA== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1125,7 +1125,7 @@ metadata: annotations: projectcontour.io/upstream-protocol.h2c: grpc labels: - app.kubernetes.io/instance: flyteagent + app.kubernetes.io/instance: flyte-sandbox app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: flyteagent helm.sh/chart: flyteagent-v0.1.10 @@ -1138,7 +1138,7 @@ spec: protocol: TCP targetPort: agent-grpc selector: - app.kubernetes.io/instance: flyteagent + app.kubernetes.io/instance: flyte-sandbox app.kubernetes.io/name: flyteagent type: ClusterIP --- @@ -1246,7 +1246,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: e2233c2adb914be363ec4fae808ed60ffb230367503f73643f011e728b853b49 + checksum/configuration: 6755bdc74789d7e2a80161a9f811e41ea3c0cf12bab5cb0820c7c8539b4b88fe checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1411,7 +1411,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 0e36815292c3911f2ddfbc1ff2873e7b4d381137432bcc4170b51998a1aed73f + checksum/secret: ce47bbc1f3ca2d8673128f8efd226bd9c7ac4f32a6ded68e54e2ebb3a843065b labels: app: docker-registry release: flyte-sandbox @@ -1722,7 +1722,7 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/instance: flyteagent + app.kubernetes.io/instance: flyte-sandbox app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: flyteagent helm.sh/chart: flyteagent-v0.1.10 @@ -1732,12 +1732,12 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/instance: flyteagent + app.kubernetes.io/instance: flyte-sandbox app.kubernetes.io/name: flyteagent template: metadata: labels: - app.kubernetes.io/instance: flyteagent + app.kubernetes.io/instance: flyte-sandbox app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: flyteagent helm.sh/chart: flyteagent-v0.1.10 diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 8b5f2dd6d4..c2d507b0f2 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -796,7 +796,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: Nk5nc2I1Z1hUQWNzZlRlZw== + haSharedSecret: RjR3Qnc0dWtGbHE3S3pnbA== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1359,7 +1359,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 934b019b16c54af8ddc25635c1adb29fce1455104785a83174dd888253d2d7cf + checksum/secret: d027248867ca693de77339af17e89c22e7ad604b7abe616e40ca947ad0626a83 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 238c49a1d7..5061057ee9 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: N0ROQTB2SzlwdzhQbGhzZQ== + haSharedSecret: RWxBOE5BV0lIeEJ2d1c3ZA== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 0bd53dff0e2df9a37450086b3c49f08a1294e704a0839ce2c7ffa3ae2fc8ccf5 + checksum/secret: a2181c7387731100215f7ae94400f7330557b063f01f807d5aa2f333f266126e labels: app: docker-registry release: flyte-sandbox From 3b07407a1a50e158f933d33dd41a6543609fea04 Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Wed, 20 Dec 2023 06:36:35 +0800 Subject: [PATCH 45/47] change getFinalAgent implementation and interface Signed-off-by: Future Outlier --- .../go/tasks/plugins/webapi/agent/plugin.go | 24 +++++++------------ .../tasks/plugins/webapi/agent/plugin_test.go | 13 +++++----- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index a67239bf89..d8e5b3651c 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -94,10 +94,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR } outputPrefix := taskCtx.OutputWriter().GetOutputPrefixPath().String() - agent, err := getFinalAgent(taskTemplate.Type, p.cfg) - if err != nil { - return nil, nil, fmt.Errorf("failed to find agent agent with error: %v", err) - } + agent := getFinalAgent(taskTemplate.Type, p.cfg, p.agentRegistry) client, err := p.getClient(ctx, agent, p.connectionCache) if err != nil { @@ -129,7 +126,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest webapi.Resource, err error) { metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) - agent, err := getFinalAgent(metadata.TaskType, p.cfg) + agent := getFinalAgent(metadata.TaskType, p.cfg, p.agentRegistry) if err != nil { return nil, fmt.Errorf("failed to find agent with error: %v", err) } @@ -161,10 +158,8 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error } metadata := taskCtx.ResourceMeta().(ResourceMetaWrapper) - agent, err := getFinalAgent(metadata.TaskType, p.cfg) - if err != nil { - return fmt.Errorf("failed to find agent agent with error: %v", err) - } + agent := getFinalAgent(metadata.TaskType, p.cfg, p.agentRegistry) + client, err := p.getClient(ctx, agent, p.connectionCache) if err != nil { return fmt.Errorf("failed to connect to agent with error: %v", err) @@ -223,15 +218,12 @@ func writeOutput(ctx context.Context, taskCtx webapi.StatusContext, resource Res return taskCtx.OutputWriter().Put(ctx, opReader) } -func getFinalAgent(taskType string, cfg *Config) (*Agent, error) { - if id, exists := cfg.AgentForTaskTypes[taskType]; exists { - if agent, exists := cfg.Agents[id]; exists { - return agent, nil - } - return nil, fmt.Errorf("no agent definition found for ID %s that matches task type %s", id, taskType) +func getFinalAgent(taskType string, cfg *Config, agentRegistry map[string]*Agent) *Agent { + if agent, exists := agentRegistry[taskType]; exists { + return agent } - return &cfg.DefaultAgent, nil + return &cfg.DefaultAgent } func getGrpcConnection(ctx context.Context, agent *Agent, connectionCache map[*Agent]*grpc.ClientConn) (*grpc.ClientConn, error) { diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index bd5ab12a83..c6da80a99c 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -57,12 +57,13 @@ func TestPlugin(t *testing.T) { }) t.Run("test getFinalAgent", func(t *testing.T) { - agent, _ := getFinalAgent("spark", &cfg) - assert.Equal(t, cfg.Agents["spark_agent"].Endpoint, agent.Endpoint) - agent, _ = getFinalAgent("foo", &cfg) - assert.Equal(t, cfg.DefaultAgent.Endpoint, agent.Endpoint) - _, err := getFinalAgent("bar", &cfg) - assert.NotNil(t, err) + agentRegistry := map[string]*Agent{"spark": {Endpoint: "localhost:80"}} + agent := getFinalAgent("spark", &cfg, agentRegistry) + assert.Equal(t, agent.Endpoint, "localhost:80") + agent = getFinalAgent("foo", &cfg, agentRegistry) + assert.Equal(t, agent.Endpoint, cfg.DefaultAgent.Endpoint) + agent = getFinalAgent("bar", &cfg, agentRegistry) + assert.Equal(t, agent.Endpoint, cfg.DefaultAgent.Endpoint) }) t.Run("test getAgentMetadataClientFunc", func(t *testing.T) { From 8f464777d7948df3768a80af70f6097ea51bbd14 Mon Sep 17 00:00:00 2001 From: Future-Outlier Date: Wed, 20 Dec 2023 10:17:36 +0800 Subject: [PATCH 46/47] Update flyteidl/protos/flyteidl/service/agent.proto Co-authored-by: Haytham Abuelfutuh Signed-off-by: Future-Outlier --- flyteidl/protos/flyteidl/service/agent.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flyteidl/protos/flyteidl/service/agent.proto b/flyteidl/protos/flyteidl/service/agent.proto index d8ff91f29e..a4be7c1720 100644 --- a/flyteidl/protos/flyteidl/service/agent.proto +++ b/flyteidl/protos/flyteidl/service/agent.proto @@ -27,7 +27,7 @@ service AgentMetadataService { }; // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. - rpc ListAgent (flyteidl.admin.ListAgentsRequest) returns (flyteidl.admin.ListAgentsResponse){ + rpc ListAgents (flyteidl.admin.ListAgentsRequest) returns (flyteidl.admin.ListAgentsResponse){ option (google.api.http) = { get: "/api/v1/agents" }; From c1e3492314d0d2ca85a7067066e31ab53b77b42a Mon Sep 17 00:00:00 2001 From: Future Outlier Date: Wed, 20 Dec 2023 10:47:13 +0800 Subject: [PATCH 47/47] rename ListAgent to ListAgents method Signed-off-by: Future Outlier --- .../admin/mocks/AgentMetadataServiceClient.go | 22 ++-- .../admin/mocks/AgentMetadataServiceServer.go | 22 ++-- .../pb-cpp/flyteidl/service/agent.grpc.pb.cc | 36 +++--- .../pb-cpp/flyteidl/service/agent.grpc.pb.h | 122 +++++++++--------- .../gen/pb-cpp/flyteidl/service/agent.pb.cc | 6 +- .../gen/pb-go/flyteidl/service/agent.pb.go | 68 +++++----- .../gen/pb-go/flyteidl/service/agent.pb.gw.go | 16 +-- .../pb-go/flyteidl/service/agent.swagger.json | 34 ++--- .../gen/pb-java/flyteidl/service/Agent.java | 6 +- flyteidl/gen/pb-js/flyteidl.d.ts | 12 +- flyteidl/gen/pb-js/flyteidl.js | 20 +-- .../pb_python/flyteidl/service/agent_pb2.py | 8 +- .../flyteidl/service/agent_pb2_grpc.py | 14 +- flyteidl/protos/flyteidl/service/agent.proto | 2 +- .../agent/mocks/AgentMetadataServiceClient.go | 22 ++-- .../go/tasks/plugins/webapi/agent/plugin.go | 4 +- .../tasks/plugins/webapi/agent/plugin_test.go | 2 +- 17 files changed, 208 insertions(+), 208 deletions(-) diff --git a/flyteidl/clients/go/admin/mocks/AgentMetadataServiceClient.go b/flyteidl/clients/go/admin/mocks/AgentMetadataServiceClient.go index 51b5d175b4..d7f40932b7 100644 --- a/flyteidl/clients/go/admin/mocks/AgentMetadataServiceClient.go +++ b/flyteidl/clients/go/admin/mocks/AgentMetadataServiceClient.go @@ -65,26 +65,26 @@ func (_m *AgentMetadataServiceClient) GetAgent(ctx context.Context, in *admin.Ge return r0, r1 } -type AgentMetadataServiceClient_ListAgent struct { +type AgentMetadataServiceClient_ListAgents struct { *mock.Call } -func (_m AgentMetadataServiceClient_ListAgent) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceClient_ListAgent { - return &AgentMetadataServiceClient_ListAgent{Call: _m.Call.Return(_a0, _a1)} +func (_m AgentMetadataServiceClient_ListAgents) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceClient_ListAgents { + return &AgentMetadataServiceClient_ListAgents{Call: _m.Call.Return(_a0, _a1)} } -func (_m *AgentMetadataServiceClient) OnListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) *AgentMetadataServiceClient_ListAgent { - c_call := _m.On("ListAgent", ctx, in, opts) - return &AgentMetadataServiceClient_ListAgent{Call: c_call} +func (_m *AgentMetadataServiceClient) OnListAgents(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) *AgentMetadataServiceClient_ListAgents { + c_call := _m.On("ListAgents", ctx, in, opts) + return &AgentMetadataServiceClient_ListAgents{Call: c_call} } -func (_m *AgentMetadataServiceClient) OnListAgentMatch(matchers ...interface{}) *AgentMetadataServiceClient_ListAgent { - c_call := _m.On("ListAgent", matchers...) - return &AgentMetadataServiceClient_ListAgent{Call: c_call} +func (_m *AgentMetadataServiceClient) OnListAgentsMatch(matchers ...interface{}) *AgentMetadataServiceClient_ListAgents { + c_call := _m.On("ListAgents", matchers...) + return &AgentMetadataServiceClient_ListAgents{Call: c_call} } -// ListAgent provides a mock function with given fields: ctx, in, opts -func (_m *AgentMetadataServiceClient) ListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { +// ListAgents provides a mock function with given fields: ctx, in, opts +func (_m *AgentMetadataServiceClient) ListAgents(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] diff --git a/flyteidl/clients/go/admin/mocks/AgentMetadataServiceServer.go b/flyteidl/clients/go/admin/mocks/AgentMetadataServiceServer.go index 6a3aa6448e..d45a5f788d 100644 --- a/flyteidl/clients/go/admin/mocks/AgentMetadataServiceServer.go +++ b/flyteidl/clients/go/admin/mocks/AgentMetadataServiceServer.go @@ -56,26 +56,26 @@ func (_m *AgentMetadataServiceServer) GetAgent(_a0 context.Context, _a1 *admin.G return r0, r1 } -type AgentMetadataServiceServer_ListAgent struct { +type AgentMetadataServiceServer_ListAgents struct { *mock.Call } -func (_m AgentMetadataServiceServer_ListAgent) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceServer_ListAgent { - return &AgentMetadataServiceServer_ListAgent{Call: _m.Call.Return(_a0, _a1)} +func (_m AgentMetadataServiceServer_ListAgents) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceServer_ListAgents { + return &AgentMetadataServiceServer_ListAgents{Call: _m.Call.Return(_a0, _a1)} } -func (_m *AgentMetadataServiceServer) OnListAgent(_a0 context.Context, _a1 *admin.ListAgentsRequest) *AgentMetadataServiceServer_ListAgent { - c_call := _m.On("ListAgent", _a0, _a1) - return &AgentMetadataServiceServer_ListAgent{Call: c_call} +func (_m *AgentMetadataServiceServer) OnListAgents(_a0 context.Context, _a1 *admin.ListAgentsRequest) *AgentMetadataServiceServer_ListAgents { + c_call := _m.On("ListAgents", _a0, _a1) + return &AgentMetadataServiceServer_ListAgents{Call: c_call} } -func (_m *AgentMetadataServiceServer) OnListAgentMatch(matchers ...interface{}) *AgentMetadataServiceServer_ListAgent { - c_call := _m.On("ListAgent", matchers...) - return &AgentMetadataServiceServer_ListAgent{Call: c_call} +func (_m *AgentMetadataServiceServer) OnListAgentsMatch(matchers ...interface{}) *AgentMetadataServiceServer_ListAgents { + c_call := _m.On("ListAgents", matchers...) + return &AgentMetadataServiceServer_ListAgents{Call: c_call} } -// ListAgent provides a mock function with given fields: _a0, _a1 -func (_m *AgentMetadataServiceServer) ListAgent(_a0 context.Context, _a1 *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) { +// ListAgents provides a mock function with given fields: _a0, _a1 +func (_m *AgentMetadataServiceServer) ListAgents(_a0 context.Context, _a1 *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) { ret := _m.Called(_a0, _a1) var r0 *admin.ListAgentsResponse diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.cc index de150fe2b7..0dd9e3d2d1 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.cc @@ -166,7 +166,7 @@ ::grpc::Status AsyncAgentService::Service::DeleteTask(::grpc::ServerContext* con static const char* AgentMetadataService_method_names[] = { "/flyteidl.service.AgentMetadataService/GetAgent", - "/flyteidl.service.AgentMetadataService/ListAgent", + "/flyteidl.service.AgentMetadataService/ListAgents", }; std::unique_ptr< AgentMetadataService::Stub> AgentMetadataService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) { @@ -177,7 +177,7 @@ std::unique_ptr< AgentMetadataService::Stub> AgentMetadataService::NewStub(const AgentMetadataService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel) : channel_(channel), rpcmethod_GetAgent_(AgentMetadataService_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ListAgent_(AgentMetadataService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ListAgents_(AgentMetadataService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} ::grpc::Status AgentMetadataService::Stub::GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::flyteidl::admin::GetAgentResponse* response) { @@ -208,32 +208,32 @@ ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>* AgentMe return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::GetAgentResponse>::Create(channel_.get(), cq, rpcmethod_GetAgent_, context, request, false); } -::grpc::Status AgentMetadataService::Stub::ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) { - return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_ListAgent_, context, request, response); +::grpc::Status AgentMetadataService::Stub::ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) { + return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_ListAgents_, context, request, response); } -void AgentMetadataService::Stub::experimental_async::ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ListAgent_, context, request, response, std::move(f)); +void AgentMetadataService::Stub::experimental_async::ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ListAgents_, context, request, response, std::move(f)); } -void AgentMetadataService::Stub::experimental_async::ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ListAgent_, context, request, response, std::move(f)); +void AgentMetadataService::Stub::experimental_async::ListAgents(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_ListAgents_, context, request, response, std::move(f)); } -void AgentMetadataService::Stub::experimental_async::ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ListAgent_, context, request, response, reactor); +void AgentMetadataService::Stub::experimental_async::ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ListAgents_, context, request, response, reactor); } -void AgentMetadataService::Stub::experimental_async::ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ListAgent_, context, request, response, reactor); +void AgentMetadataService::Stub::experimental_async::ListAgents(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create(stub_->channel_.get(), stub_->rpcmethod_ListAgents_, context, request, response, reactor); } -::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AgentMetadataService::Stub::AsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::ListAgentsResponse>::Create(channel_.get(), cq, rpcmethod_ListAgent_, context, request, true); +::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AgentMetadataService::Stub::AsyncListAgentsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::ListAgentsResponse>::Create(channel_.get(), cq, rpcmethod_ListAgents_, context, request, true); } -::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AgentMetadataService::Stub::PrepareAsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::ListAgentsResponse>::Create(channel_.get(), cq, rpcmethod_ListAgent_, context, request, false); +::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AgentMetadataService::Stub::PrepareAsyncListAgentsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderFactory< ::flyteidl::admin::ListAgentsResponse>::Create(channel_.get(), cq, rpcmethod_ListAgents_, context, request, false); } AgentMetadataService::Service::Service() { @@ -246,7 +246,7 @@ AgentMetadataService::Service::Service() { AgentMetadataService_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< AgentMetadataService::Service, ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>( - std::mem_fn(&AgentMetadataService::Service::ListAgent), this))); + std::mem_fn(&AgentMetadataService::Service::ListAgents), this))); } AgentMetadataService::Service::~Service() { @@ -259,7 +259,7 @@ ::grpc::Status AgentMetadataService::Service::GetAgent(::grpc::ServerContext* co return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } -::grpc::Status AgentMetadataService::Service::ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) { +::grpc::Status AgentMetadataService::Service::ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) { (void) context; (void) request; (void) response; diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.h b/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.h index d70c8bb44f..e1cb5da223 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/service/agent.grpc.pb.h @@ -599,12 +599,12 @@ class AgentMetadataService final { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>>(PrepareAsyncGetAgentRaw(context, request, cq)); } // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. - virtual ::grpc::Status ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>> AsyncListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>>(AsyncListAgentRaw(context, request, cq)); + virtual ::grpc::Status ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>> AsyncListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>>(AsyncListAgentsRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>> PrepareAsyncListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>>(PrepareAsyncListAgentRaw(context, request, cq)); + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>> PrepareAsyncListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>>(PrepareAsyncListAgentsRaw(context, request, cq)); } class experimental_async_interface { public: @@ -615,17 +615,17 @@ class AgentMetadataService final { virtual void GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; virtual void GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. - virtual void ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) = 0; - virtual void ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) = 0; - virtual void ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; - virtual void ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) = 0; + virtual void ListAgents(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) = 0; + virtual void ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; + virtual void ListAgents(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) = 0; }; virtual class experimental_async_interface* experimental_async() { return nullptr; } private: virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>* AsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::GetAgentResponse>* PrepareAsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>* AsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>* PrepareAsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>* AsyncListAgentsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::flyteidl::admin::ListAgentsResponse>* PrepareAsyncListAgentsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) = 0; }; class Stub final : public StubInterface { public: @@ -637,12 +637,12 @@ class AgentMetadataService final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>> PrepareAsyncGetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>>(PrepareAsyncGetAgentRaw(context, request, cq)); } - ::grpc::Status ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>> AsyncListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>>(AsyncListAgentRaw(context, request, cq)); + ::grpc::Status ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::flyteidl::admin::ListAgentsResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>> AsyncListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>>(AsyncListAgentsRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>> PrepareAsyncListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>>(PrepareAsyncListAgentRaw(context, request, cq)); + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>> PrepareAsyncListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>>(PrepareAsyncListAgentsRaw(context, request, cq)); } class experimental_async final : public StubInterface::experimental_async_interface { @@ -651,10 +651,10 @@ class AgentMetadataService final { void GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, std::function) override; void GetAgent(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; void GetAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) override; - void ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) override; - void ListAgent(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; - void ListAgent(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) override; + void ListAgents(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, std::function) override; + void ListAgents(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; + void ListAgents(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ClientUnaryReactor* reactor) override; private: friend class Stub; explicit experimental_async(Stub* stub): stub_(stub) { } @@ -668,10 +668,10 @@ class AgentMetadataService final { class experimental_async async_stub_{this}; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>* AsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::GetAgentResponse>* PrepareAsyncGetAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::GetAgentRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* PrepareAsyncListAgentRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* AsyncListAgentsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::flyteidl::admin::ListAgentsResponse>* PrepareAsyncListAgentsRaw(::grpc::ClientContext* context, const ::flyteidl::admin::ListAgentsRequest& request, ::grpc::CompletionQueue* cq) override; const ::grpc::internal::RpcMethod rpcmethod_GetAgent_; - const ::grpc::internal::RpcMethod rpcmethod_ListAgent_; + const ::grpc::internal::RpcMethod rpcmethod_ListAgents_; }; static std::unique_ptr NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions()); @@ -682,7 +682,7 @@ class AgentMetadataService final { // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. virtual ::grpc::Status GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response); // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. - virtual ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response); + virtual ::grpc::Status ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response); }; template class WithAsyncMethod_GetAgent : public BaseClass { @@ -705,26 +705,26 @@ class AgentMetadataService final { } }; template - class WithAsyncMethod_ListAgent : public BaseClass { + class WithAsyncMethod_ListAgents : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithAsyncMethod_ListAgent() { + WithAsyncMethod_ListAgents() { ::grpc::Service::MarkMethodAsync(1); } - ~WithAsyncMethod_ListAgent() override { + ~WithAsyncMethod_ListAgents() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + ::grpc::Status ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestListAgent(::grpc::ServerContext* context, ::flyteidl::admin::ListAgentsRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ListAgentsResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestListAgents(::grpc::ServerContext* context, ::flyteidl::admin::ListAgentsRequest* request, ::grpc::ServerAsyncResponseWriter< ::flyteidl::admin::ListAgentsResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); } }; - typedef WithAsyncMethod_GetAgent > AsyncService; + typedef WithAsyncMethod_GetAgent > AsyncService; template class ExperimentalWithCallbackMethod_GetAgent : public BaseClass { private: @@ -757,37 +757,37 @@ class AgentMetadataService final { virtual void GetAgent(::grpc::ServerContext* context, const ::flyteidl::admin::GetAgentRequest* request, ::flyteidl::admin::GetAgentResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template - class ExperimentalWithCallbackMethod_ListAgent : public BaseClass { + class ExperimentalWithCallbackMethod_ListAgents : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - ExperimentalWithCallbackMethod_ListAgent() { + ExperimentalWithCallbackMethod_ListAgents() { ::grpc::Service::experimental().MarkMethodCallback(1, new ::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>( [this](::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { - return this->ListAgent(context, request, response, controller); + return this->ListAgents(context, request, response, controller); })); } - void SetMessageAllocatorFor_ListAgent( + void SetMessageAllocatorFor_ListAgents( ::grpc::experimental::MessageAllocator< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>* allocator) { static_cast<::grpc::internal::CallbackUnaryHandler< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>*>( ::grpc::Service::experimental().GetHandler(1)) ->SetMessageAllocator(allocator); } - ~ExperimentalWithCallbackMethod_ListAgent() override { + ~ExperimentalWithCallbackMethod_ListAgents() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + ::grpc::Status ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual void ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + virtual void ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; - typedef ExperimentalWithCallbackMethod_GetAgent > ExperimentalCallbackService; + typedef ExperimentalWithCallbackMethod_GetAgent > ExperimentalCallbackService; template class WithGenericMethod_GetAgent : public BaseClass { private: @@ -806,18 +806,18 @@ class AgentMetadataService final { } }; template - class WithGenericMethod_ListAgent : public BaseClass { + class WithGenericMethod_ListAgents : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithGenericMethod_ListAgent() { + WithGenericMethod_ListAgents() { ::grpc::Service::MarkMethodGeneric(1); } - ~WithGenericMethod_ListAgent() override { + ~WithGenericMethod_ListAgents() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + ::grpc::Status ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } @@ -843,22 +843,22 @@ class AgentMetadataService final { } }; template - class WithRawMethod_ListAgent : public BaseClass { + class WithRawMethod_ListAgents : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithRawMethod_ListAgent() { + WithRawMethod_ListAgents() { ::grpc::Service::MarkMethodRaw(1); } - ~WithRawMethod_ListAgent() override { + ~WithRawMethod_ListAgents() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + ::grpc::Status ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestListAgent(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestListAgents(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag); } }; @@ -888,29 +888,29 @@ class AgentMetadataService final { virtual void GetAgent(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template - class ExperimentalWithRawCallbackMethod_ListAgent : public BaseClass { + class ExperimentalWithRawCallbackMethod_ListAgents : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - ExperimentalWithRawCallbackMethod_ListAgent() { + ExperimentalWithRawCallbackMethod_ListAgents() { ::grpc::Service::experimental().MarkMethodRawCallback(1, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this](::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { - this->ListAgent(context, request, response, controller); + this->ListAgents(context, request, response, controller); })); } - ~ExperimentalWithRawCallbackMethod_ListAgent() override { + ~ExperimentalWithRawCallbackMethod_ListAgents() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + ::grpc::Status ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual void ListAgent(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + virtual void ListAgents(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } }; template class WithStreamedUnaryMethod_GetAgent : public BaseClass { @@ -933,28 +933,28 @@ class AgentMetadataService final { virtual ::grpc::Status StreamedGetAgent(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::GetAgentRequest,::flyteidl::admin::GetAgentResponse>* server_unary_streamer) = 0; }; template - class WithStreamedUnaryMethod_ListAgent : public BaseClass { + class WithStreamedUnaryMethod_ListAgents : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} public: - WithStreamedUnaryMethod_ListAgent() { + WithStreamedUnaryMethod_ListAgents() { ::grpc::Service::MarkMethodStreamed(1, - new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>(std::bind(&WithStreamedUnaryMethod_ListAgent::StreamedListAgent, this, std::placeholders::_1, std::placeholders::_2))); + new ::grpc::internal::StreamedUnaryHandler< ::flyteidl::admin::ListAgentsRequest, ::flyteidl::admin::ListAgentsResponse>(std::bind(&WithStreamedUnaryMethod_ListAgents::StreamedListAgents, this, std::placeholders::_1, std::placeholders::_2))); } - ~WithStreamedUnaryMethod_ListAgent() override { + ~WithStreamedUnaryMethod_ListAgents() override { BaseClassMustBeDerivedFromService(this); } // disable regular version of this method - ::grpc::Status ListAgent(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { + ::grpc::Status ListAgents(::grpc::ServerContext* context, const ::flyteidl::admin::ListAgentsRequest* request, ::flyteidl::admin::ListAgentsResponse* response) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } // replace default version of method with streamed unary - virtual ::grpc::Status StreamedListAgent(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::ListAgentsRequest,::flyteidl::admin::ListAgentsResponse>* server_unary_streamer) = 0; + virtual ::grpc::Status StreamedListAgents(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::flyteidl::admin::ListAgentsRequest,::flyteidl::admin::ListAgentsResponse>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_GetAgent > StreamedUnaryService; + typedef WithStreamedUnaryMethod_GetAgent > StreamedUnaryService; typedef Service SplitStreamedService; - typedef WithStreamedUnaryMethod_GetAgent > StreamedService; + typedef WithStreamedUnaryMethod_GetAgent > StreamedService; }; } // namespace service diff --git a/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.cc index cee8c63e19..4b7c5d0557 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/service/agent.pb.cc @@ -47,10 +47,10 @@ const char descriptor_table_protodef_flyteidl_2fservice_2fagent_2eproto[] = "askResponse\"\000\022U\n\nDeleteTask\022!.flyteidl.a" "dmin.DeleteTaskRequest\032\".flyteidl.admin." "DeleteTaskResponse\"\0002\360\001\n\024AgentMetadataSe" - "rvice\022l\n\010GetAgent\022\037.flyteidl.admin.GetAg" + "rvice\022k\n\010GetAgent\022\037.flyteidl.admin.GetAg" "entRequest\032 .flyteidl.admin.GetAgentResp" - "onse\"\035\202\323\344\223\002\027\022\025/api/v1/agents/{name}\022j\n\tL" - "istAgent\022!.flyteidl.admin.ListAgentsRequ" + "onse\"\034\202\323\344\223\002\026\022\024/api/v1/agent/{name}\022k\n\nLi" + "stAgents\022!.flyteidl.admin.ListAgentsRequ" "est\032\".flyteidl.admin.ListAgentsResponse\"" "\026\202\323\344\223\002\020\022\016/api/v1/agentsB\?Z=github.com/fl" "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/service/agent.pb.go index be2f4c8da3..c816a1f3ac 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.pb.go @@ -29,28 +29,28 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("flyteidl/service/agent.proto", fileDescriptor_f7d1dfd1fb77d2ef) } var fileDescriptor_f7d1dfd1fb77d2ef = []byte{ - // 326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xbb, 0x4e, 0xf3, 0x30, - 0x14, 0xc7, 0xbf, 0xaf, 0x03, 0x17, 0x0f, 0xa8, 0x58, 0x5c, 0xa4, 0xa8, 0xdc, 0xba, 0x13, 0x8b, - 0x32, 0x23, 0x54, 0x40, 0xea, 0x52, 0x16, 0xa0, 0x0b, 0xdb, 0x49, 0x72, 0x30, 0x86, 0xc4, 0x0e, - 0xf1, 0x69, 0xa5, 0x0a, 0xb1, 0xf0, 0x02, 0x0c, 0x3c, 0x1a, 0xaf, 0xc0, 0x03, 0xf0, 0x08, 0x08, - 0xe7, 0xd2, 0x50, 0x08, 0x5b, 0xd5, 0xdf, 0x3f, 0xbf, 0xff, 0xb1, 0x7d, 0x58, 0xe7, 0x26, 0x9e, - 0x12, 0xaa, 0x28, 0x16, 0x16, 0xb3, 0x89, 0x0a, 0x51, 0x80, 0x44, 0x4d, 0x7e, 0x9a, 0x19, 0x32, - 0xbc, 0x5d, 0x52, 0xbf, 0xa0, 0x5e, 0x47, 0x1a, 0x23, 0x63, 0x14, 0x90, 0x2a, 0x01, 0x5a, 0x1b, - 0x02, 0x52, 0x46, 0xdb, 0x3c, 0xef, 0x79, 0x95, 0x0d, 0xa2, 0x44, 0xe9, 0xba, 0xab, 0xf7, 0xd2, - 0x62, 0xab, 0x7d, 0x3b, 0xd5, 0x61, 0xff, 0xeb, 0xcf, 0xcb, 0xdc, 0xc7, 0x47, 0x8c, 0x9d, 0x66, - 0x08, 0x84, 0x57, 0x60, 0xef, 0xf9, 0x9e, 0x5f, 0x15, 0x3a, 0x81, 0x3f, 0x63, 0x17, 0xf8, 0x30, - 0x46, 0x4b, 0x5e, 0xf7, 0xaf, 0x88, 0x4d, 0x8d, 0xb6, 0xd8, 0xfd, 0xc7, 0x87, 0x6c, 0x71, 0x80, - 0xe4, 0x9c, 0xdb, 0xf3, 0x1f, 0x14, 0xa0, 0x14, 0xee, 0x34, 0xf2, 0xca, 0x36, 0x62, 0xec, 0x0c, - 0x63, 0x6c, 0x1a, 0x72, 0xc6, 0x1a, 0x87, 0xac, 0x47, 0x4a, 0x6d, 0xef, 0xe3, 0x3f, 0x5b, 0x73, - 0x97, 0x71, 0x8e, 0x04, 0x11, 0x10, 0x94, 0x97, 0x12, 0xb3, 0xa5, 0x01, 0x92, 0x43, 0xfc, 0xb7, - 0xf1, 0x1c, 0x29, 0xbb, 0x76, 0x9b, 0x03, 0x45, 0xd3, 0xd6, 0xf3, 0xdb, 0xfb, 0x6b, 0x6b, 0x93, - 0xaf, 0xbb, 0x57, 0x9b, 0x1c, 0xe4, 0xcf, 0x62, 0xc5, 0xa3, 0x86, 0x04, 0x9f, 0xf8, 0x1d, 0x5b, - 0x1e, 0x2a, 0x5b, 0xd4, 0xfd, 0x38, 0x5c, 0x85, 0x6c, 0xe3, 0xe1, 0xea, 0x91, 0xa2, 0x72, 0xc3, - 0x55, 0xb6, 0xf9, 0xca, 0xf7, 0xca, 0x93, 0xe3, 0xeb, 0x23, 0xa9, 0xe8, 0x76, 0x1c, 0xf8, 0xa1, - 0x49, 0x84, 0xf3, 0x98, 0x4c, 0xe6, 0x3f, 0x44, 0xb5, 0x3c, 0x12, 0xb5, 0x48, 0x83, 0x7d, 0x69, - 0xc4, 0xfc, 0x76, 0x06, 0x0b, 0x6e, 0x99, 0x0e, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x33, 0x19, - 0x8c, 0xff, 0xb8, 0x02, 0x00, 0x00, + // 324 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xbd, 0x4e, 0xf3, 0x30, + 0x14, 0x86, 0xbf, 0xaf, 0x03, 0x20, 0x0f, 0xa8, 0x58, 0x55, 0x87, 0xa8, 0xe2, 0xa7, 0x3b, 0xb1, + 0x28, 0x33, 0x42, 0x05, 0xa4, 0x2e, 0x65, 0x01, 0xba, 0xb0, 0x9d, 0x26, 0x07, 0x63, 0x25, 0xb1, + 0x43, 0x7c, 0x5a, 0xa9, 0x42, 0x2c, 0xdc, 0x00, 0x03, 0x97, 0xc6, 0x2d, 0x70, 0x01, 0x5c, 0x02, + 0xc2, 0xf9, 0xa5, 0x10, 0xb6, 0x28, 0xcf, 0xeb, 0xe7, 0xf5, 0xcf, 0x61, 0x83, 0xbb, 0x78, 0x45, + 0xa8, 0xc2, 0x58, 0x58, 0xcc, 0x96, 0x2a, 0x40, 0x01, 0x12, 0x35, 0xf9, 0x69, 0x66, 0xc8, 0xf0, + 0x6e, 0x49, 0xfd, 0x82, 0x7a, 0x03, 0x69, 0x8c, 0x8c, 0x51, 0x40, 0xaa, 0x04, 0x68, 0x6d, 0x08, + 0x48, 0x19, 0x6d, 0xf3, 0xbc, 0xe7, 0x55, 0x36, 0x08, 0x13, 0xa5, 0x9b, 0xae, 0xd1, 0x4b, 0x87, + 0xed, 0x8c, 0xed, 0x4a, 0x07, 0xe3, 0xaf, 0x9f, 0xd7, 0xb9, 0x8f, 0xcf, 0x18, 0x3b, 0xcf, 0x10, + 0x08, 0x6f, 0xc0, 0x46, 0xfc, 0xc0, 0xaf, 0x0a, 0x9d, 0xc0, 0xaf, 0xd9, 0x15, 0x3e, 0x2c, 0xd0, + 0x92, 0x37, 0xfc, 0x2b, 0x62, 0x53, 0xa3, 0x2d, 0x0e, 0xff, 0xf1, 0x29, 0xdb, 0x9c, 0x20, 0x39, + 0xe7, 0xee, 0xfa, 0x82, 0x02, 0x94, 0xc2, 0xbd, 0x56, 0x5e, 0xd9, 0x66, 0x8c, 0x5d, 0x60, 0x8c, + 0x6d, 0x9b, 0xac, 0x59, 0xeb, 0x26, 0x9b, 0x91, 0x52, 0x3b, 0xfa, 0xf8, 0xcf, 0x7a, 0xee, 0x32, + 0x2e, 0x91, 0x20, 0x04, 0x82, 0xf2, 0x52, 0x22, 0xb6, 0x35, 0x41, 0x72, 0x88, 0xff, 0xb6, 0x3d, + 0x47, 0xca, 0xae, 0xfd, 0xf6, 0x40, 0xd1, 0x34, 0x78, 0x7e, 0x7b, 0x7f, 0xed, 0xf4, 0x79, 0xcf, + 0xbd, 0xda, 0xf2, 0x28, 0x7f, 0x16, 0xf1, 0xa8, 0x21, 0xc1, 0x27, 0x1e, 0x31, 0x36, 0x55, 0x36, + 0x5f, 0x62, 0x7f, 0x1e, 0xae, 0x66, 0xad, 0x87, 0x6b, 0x46, 0x8a, 0xca, 0xbe, 0xab, 0xec, 0xf2, + 0xed, 0x6f, 0x95, 0xf6, 0xec, 0xf4, 0xf6, 0x44, 0x2a, 0xba, 0x5f, 0xcc, 0xfd, 0xc0, 0x24, 0xc2, + 0x79, 0x4c, 0x26, 0xf3, 0x0f, 0x51, 0x0d, 0x8f, 0x44, 0x2d, 0xd2, 0xf9, 0xa1, 0x34, 0x62, 0x7d, + 0x3a, 0xe7, 0x1b, 0x6e, 0x98, 0x8e, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x2d, 0xd1, 0xd9, + 0xb8, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -218,7 +218,7 @@ type AgentMetadataServiceClient interface { // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. GetAgent(ctx context.Context, in *admin.GetAgentRequest, opts ...grpc.CallOption) (*admin.GetAgentResponse, error) // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. - ListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) + ListAgents(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) } type agentMetadataServiceClient struct { @@ -238,9 +238,9 @@ func (c *agentMetadataServiceClient) GetAgent(ctx context.Context, in *admin.Get return out, nil } -func (c *agentMetadataServiceClient) ListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { +func (c *agentMetadataServiceClient) ListAgents(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { out := new(admin.ListAgentsResponse) - err := c.cc.Invoke(ctx, "/flyteidl.service.AgentMetadataService/ListAgent", in, out, opts...) + err := c.cc.Invoke(ctx, "/flyteidl.service.AgentMetadataService/ListAgents", in, out, opts...) if err != nil { return nil, err } @@ -252,7 +252,7 @@ type AgentMetadataServiceServer interface { // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. GetAgent(context.Context, *admin.GetAgentRequest) (*admin.GetAgentResponse, error) // Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. - ListAgent(context.Context, *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) + ListAgents(context.Context, *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) } // UnimplementedAgentMetadataServiceServer can be embedded to have forward compatible implementations. @@ -262,8 +262,8 @@ type UnimplementedAgentMetadataServiceServer struct { func (*UnimplementedAgentMetadataServiceServer) GetAgent(ctx context.Context, req *admin.GetAgentRequest) (*admin.GetAgentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetAgent not implemented") } -func (*UnimplementedAgentMetadataServiceServer) ListAgent(ctx context.Context, req *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ListAgent not implemented") +func (*UnimplementedAgentMetadataServiceServer) ListAgents(ctx context.Context, req *admin.ListAgentsRequest) (*admin.ListAgentsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListAgents not implemented") } func RegisterAgentMetadataServiceServer(s *grpc.Server, srv AgentMetadataServiceServer) { @@ -288,20 +288,20 @@ func _AgentMetadataService_GetAgent_Handler(srv interface{}, ctx context.Context return interceptor(ctx, in, info, handler) } -func _AgentMetadataService_ListAgent_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AgentMetadataService_ListAgents_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(admin.ListAgentsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AgentMetadataServiceServer).ListAgent(ctx, in) + return srv.(AgentMetadataServiceServer).ListAgents(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/flyteidl.service.AgentMetadataService/ListAgent", + FullMethod: "/flyteidl.service.AgentMetadataService/ListAgents", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AgentMetadataServiceServer).ListAgent(ctx, req.(*admin.ListAgentsRequest)) + return srv.(AgentMetadataServiceServer).ListAgents(ctx, req.(*admin.ListAgentsRequest)) } return interceptor(ctx, in, info, handler) } @@ -315,8 +315,8 @@ var _AgentMetadataService_serviceDesc = grpc.ServiceDesc{ Handler: _AgentMetadataService_GetAgent_Handler, }, { - MethodName: "ListAgent", - Handler: _AgentMetadataService_ListAgent_Handler, + MethodName: "ListAgents", + Handler: _AgentMetadataService_ListAgents_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.pb.gw.go b/flyteidl/gen/pb-go/flyteidl/service/agent.pb.gw.go index 34543b2e20..33e7c2fb7f 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.pb.gw.go +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.pb.gw.go @@ -56,11 +56,11 @@ func request_AgentMetadataService_GetAgent_0(ctx context.Context, marshaler runt } -func request_AgentMetadataService_ListAgent_0(ctx context.Context, marshaler runtime.Marshaler, client AgentMetadataServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { +func request_AgentMetadataService_ListAgents_0(ctx context.Context, marshaler runtime.Marshaler, client AgentMetadataServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq admin.ListAgentsRequest var metadata runtime.ServerMetadata - msg, err := client.ListAgent(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.ListAgents(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } @@ -123,7 +123,7 @@ func RegisterAgentMetadataServiceHandlerClient(ctx context.Context, mux *runtime }) - mux.Handle("GET", pattern_AgentMetadataService_ListAgent_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_AgentMetadataService_ListAgents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -132,14 +132,14 @@ func RegisterAgentMetadataServiceHandlerClient(ctx context.Context, mux *runtime runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_AgentMetadataService_ListAgent_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_AgentMetadataService_ListAgents_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_AgentMetadataService_ListAgent_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_AgentMetadataService_ListAgents_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -147,13 +147,13 @@ func RegisterAgentMetadataServiceHandlerClient(ctx context.Context, mux *runtime } var ( - pattern_AgentMetadataService_GetAgent_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "agents", "name"}, "")) + pattern_AgentMetadataService_GetAgent_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "agent", "name"}, "")) - pattern_AgentMetadataService_ListAgent_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "agents"}, "")) + pattern_AgentMetadataService_ListAgents_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "agents"}, "")) ) var ( forward_AgentMetadataService_GetAgent_0 = runtime.ForwardResponseMessage - forward_AgentMetadataService_ListAgent_0 = runtime.ForwardResponseMessage + forward_AgentMetadataService_ListAgents_0 = runtime.ForwardResponseMessage ) diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json index 6b2108247b..b9cb5d6b5b 100644 --- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json +++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json @@ -15,44 +15,44 @@ "application/json" ], "paths": { - "/api/v1/agents": { + "/api/v1/agent/{name}": { "get": { - "summary": "Get job status.", - "operationId": "ListAgent", + "summary": "Send a task create request to the agent server.", + "operationId": "GetAgent", "responses": { "200": { "description": "A successful response.", "schema": { - "$ref": "#/definitions/adminListAgentsResponse" + "$ref": "#/definitions/adminGetAgentResponse" } } }, + "parameters": [ + { + "name": "name", + "description": "The name of the agent.", + "in": "path", + "required": true, + "type": "string" + } + ], "tags": [ "AgentMetadataService" ] } }, - "/api/v1/agents/{name}": { + "/api/v1/agents": { "get": { - "summary": "Send a task create request to the agent server.", - "operationId": "GetAgent", + "summary": "Get job status.", + "operationId": "ListAgents", "responses": { "200": { "description": "A successful response.", "schema": { - "$ref": "#/definitions/adminGetAgentResponse" + "$ref": "#/definitions/adminListAgentsResponse" } } }, - "parameters": [ - { - "name": "name", - "description": "The name of the agent.", - "in": "path", - "required": true, - "type": "string" - } - ], "tags": [ "AgentMetadataService" ] diff --git a/flyteidl/gen/pb-java/flyteidl/service/Agent.java b/flyteidl/gen/pb-java/flyteidl/service/Agent.java index 42032174a1..a4d582fab0 100644 --- a/flyteidl/gen/pb-java/flyteidl/service/Agent.java +++ b/flyteidl/gen/pb-java/flyteidl/service/Agent.java @@ -33,10 +33,10 @@ public static void registerAllExtensions( "askResponse\"\000\022U\n\nDeleteTask\022!.flyteidl.a" + "dmin.DeleteTaskRequest\032\".flyteidl.admin." + "DeleteTaskResponse\"\0002\360\001\n\024AgentMetadataSe" + - "rvice\022l\n\010GetAgent\022\037.flyteidl.admin.GetAg" + + "rvice\022k\n\010GetAgent\022\037.flyteidl.admin.GetAg" + "entRequest\032 .flyteidl.admin.GetAgentResp" + - "onse\"\035\202\323\344\223\002\027\022\025/api/v1/agents/{name}\022j\n\tL" + - "istAgent\022!.flyteidl.admin.ListAgentsRequ" + + "onse\"\034\202\323\344\223\002\026\022\024/api/v1/agent/{name}\022k\n\nLi" + + "stAgents\022!.flyteidl.admin.ListAgentsRequ" + "est\032\".flyteidl.admin.ListAgentsResponse\"" + "\026\202\323\344\223\002\020\022\016/api/v1/agentsB?Z=github.com/fl" + "yteorg/flyte/flyteidl/gen/pb-go/flyteidl" + diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 008de164ba..2e0ff4e76c 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -20031,18 +20031,18 @@ export namespace flyteidl { public getAgent(request: flyteidl.admin.IGetAgentRequest): Promise; /** - * Calls ListAgent. + * Calls ListAgents. * @param request ListAgentsRequest message or plain object * @param callback Node-style callback called with the error, if any, and ListAgentsResponse */ - public listAgent(request: flyteidl.admin.IListAgentsRequest, callback: flyteidl.service.AgentMetadataService.ListAgentCallback): void; + public listAgents(request: flyteidl.admin.IListAgentsRequest, callback: flyteidl.service.AgentMetadataService.ListAgentsCallback): void; /** - * Calls ListAgent. + * Calls ListAgents. * @param request ListAgentsRequest message or plain object * @returns Promise */ - public listAgent(request: flyteidl.admin.IListAgentsRequest): Promise; + public listAgents(request: flyteidl.admin.IListAgentsRequest): Promise; } namespace AgentMetadataService { @@ -20055,11 +20055,11 @@ export namespace flyteidl { type GetAgentCallback = (error: (Error|null), response?: flyteidl.admin.GetAgentResponse) => void; /** - * Callback as used by {@link flyteidl.service.AgentMetadataService#listAgent}. + * Callback as used by {@link flyteidl.service.AgentMetadataService#listAgents}. * @param error Error, if any * @param [response] ListAgentsResponse */ - type ListAgentCallback = (error: (Error|null), response?: flyteidl.admin.ListAgentsResponse) => void; + type ListAgentsCallback = (error: (Error|null), response?: flyteidl.admin.ListAgentsResponse) => void; } /** Properties of a OAuth2MetadataRequest. */ diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index bc76a500e5..95f887c3ba 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -46810,31 +46810,31 @@ */ /** - * Callback as used by {@link flyteidl.service.AgentMetadataService#listAgent}. + * Callback as used by {@link flyteidl.service.AgentMetadataService#listAgents}. * @memberof flyteidl.service.AgentMetadataService - * @typedef ListAgentCallback + * @typedef ListAgentsCallback * @type {function} * @param {Error|null} error Error, if any * @param {flyteidl.admin.ListAgentsResponse} [response] ListAgentsResponse */ /** - * Calls ListAgent. - * @function listAgent + * Calls ListAgents. + * @function listAgents * @memberof flyteidl.service.AgentMetadataService * @instance * @param {flyteidl.admin.IListAgentsRequest} request ListAgentsRequest message or plain object - * @param {flyteidl.service.AgentMetadataService.ListAgentCallback} callback Node-style callback called with the error, if any, and ListAgentsResponse + * @param {flyteidl.service.AgentMetadataService.ListAgentsCallback} callback Node-style callback called with the error, if any, and ListAgentsResponse * @returns {undefined} * @variation 1 */ - Object.defineProperty(AgentMetadataService.prototype.listAgent = function listAgent(request, callback) { - return this.rpcCall(listAgent, $root.flyteidl.admin.ListAgentsRequest, $root.flyteidl.admin.ListAgentsResponse, request, callback); - }, "name", { value: "ListAgent" }); + Object.defineProperty(AgentMetadataService.prototype.listAgents = function listAgents(request, callback) { + return this.rpcCall(listAgents, $root.flyteidl.admin.ListAgentsRequest, $root.flyteidl.admin.ListAgentsResponse, request, callback); + }, "name", { value: "ListAgents" }); /** - * Calls ListAgent. - * @function listAgent + * Calls ListAgents. + * @function listAgents * @memberof flyteidl.service.AgentMetadataService * @instance * @param {flyteidl.admin.IListAgentsRequest} request ListAgentsRequest message or plain object diff --git a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.py index 866d4c893e..f1234012be 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2.py @@ -15,7 +15,7 @@ from flyteidl.admin import agent_pb2 as flyteidl_dot_admin_dot_agent__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/agent.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/admin/agent.proto2\x8f\x02\n\x11\x41syncAgentService\x12U\n\nCreateTask\x12!.flyteidl.admin.CreateTaskRequest\x1a\".flyteidl.admin.CreateTaskResponse\"\x00\x12L\n\x07GetTask\x12\x1e.flyteidl.admin.GetTaskRequest\x1a\x1f.flyteidl.admin.GetTaskResponse\"\x00\x12U\n\nDeleteTask\x12!.flyteidl.admin.DeleteTaskRequest\x1a\".flyteidl.admin.DeleteTaskResponse\"\x00\x32\xf0\x01\n\x14\x41gentMetadataService\x12l\n\x08GetAgent\x12\x1f.flyteidl.admin.GetAgentRequest\x1a .flyteidl.admin.GetAgentResponse\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/api/v1/agents/{name}\x12j\n\tListAgent\x12!.flyteidl.admin.ListAgentsRequest\x1a\".flyteidl.admin.ListAgentsResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/api/v1/agentsB\xc2\x01\n\x14\x63om.flyteidl.serviceB\nAgentProtoP\x01Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lyteidl/service/agent.proto\x12\x10\x66lyteidl.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1a\x66lyteidl/admin/agent.proto2\x8f\x02\n\x11\x41syncAgentService\x12U\n\nCreateTask\x12!.flyteidl.admin.CreateTaskRequest\x1a\".flyteidl.admin.CreateTaskResponse\"\x00\x12L\n\x07GetTask\x12\x1e.flyteidl.admin.GetTaskRequest\x1a\x1f.flyteidl.admin.GetTaskResponse\"\x00\x12U\n\nDeleteTask\x12!.flyteidl.admin.DeleteTaskRequest\x1a\".flyteidl.admin.DeleteTaskResponse\"\x00\x32\xf0\x01\n\x14\x41gentMetadataService\x12k\n\x08GetAgent\x12\x1f.flyteidl.admin.GetAgentRequest\x1a .flyteidl.admin.GetAgentResponse\"\x1c\x82\xd3\xe4\x93\x02\x16\x12\x14/api/v1/agent/{name}\x12k\n\nListAgents\x12!.flyteidl.admin.ListAgentsRequest\x1a\".flyteidl.admin.ListAgentsResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/api/v1/agentsB\xc2\x01\n\x14\x63om.flyteidl.serviceB\nAgentProtoP\x01Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\xa2\x02\x03\x46SX\xaa\x02\x10\x46lyteidl.Service\xca\x02\x10\x46lyteidl\\Service\xe2\x02\x1c\x46lyteidl\\Service\\GPBMetadata\xea\x02\x11\x46lyteidl::Serviceb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -25,9 +25,9 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.serviceB\nAgentProtoP\001Z=github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service\242\002\003FSX\252\002\020Flyteidl.Service\312\002\020Flyteidl\\Service\342\002\034Flyteidl\\Service\\GPBMetadata\352\002\021Flyteidl::Service' _AGENTMETADATASERVICE.methods_by_name['GetAgent']._options = None - _AGENTMETADATASERVICE.methods_by_name['GetAgent']._serialized_options = b'\202\323\344\223\002\027\022\025/api/v1/agents/{name}' - _AGENTMETADATASERVICE.methods_by_name['ListAgent']._options = None - _AGENTMETADATASERVICE.methods_by_name['ListAgent']._serialized_options = b'\202\323\344\223\002\020\022\016/api/v1/agents' + _AGENTMETADATASERVICE.methods_by_name['GetAgent']._serialized_options = b'\202\323\344\223\002\026\022\024/api/v1/agent/{name}' + _AGENTMETADATASERVICE.methods_by_name['ListAgents']._options = None + _AGENTMETADATASERVICE.methods_by_name['ListAgents']._serialized_options = b'\202\323\344\223\002\020\022\016/api/v1/agents' _globals['_ASYNCAGENTSERVICE']._serialized_start=109 _globals['_ASYNCAGENTSERVICE']._serialized_end=380 _globals['_AGENTMETADATASERVICE']._serialized_start=383 diff --git a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2_grpc.py b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2_grpc.py index abf411c034..94f75b1682 100644 --- a/flyteidl/gen/pb_python/flyteidl/service/agent_pb2_grpc.py +++ b/flyteidl/gen/pb_python/flyteidl/service/agent_pb2_grpc.py @@ -154,8 +154,8 @@ def __init__(self, channel): request_serializer=flyteidl_dot_admin_dot_agent__pb2.GetAgentRequest.SerializeToString, response_deserializer=flyteidl_dot_admin_dot_agent__pb2.GetAgentResponse.FromString, ) - self.ListAgent = channel.unary_unary( - '/flyteidl.service.AgentMetadataService/ListAgent', + self.ListAgents = channel.unary_unary( + '/flyteidl.service.AgentMetadataService/ListAgents', request_serializer=flyteidl_dot_admin_dot_agent__pb2.ListAgentsRequest.SerializeToString, response_deserializer=flyteidl_dot_admin_dot_agent__pb2.ListAgentsResponse.FromString, ) @@ -173,7 +173,7 @@ def GetAgent(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') - def ListAgent(self, request, context): + def ListAgents(self, request, context): """Fetch a list of :ref:`ref_flyteidl.admin.Agent` definitions. """ context.set_code(grpc.StatusCode.UNIMPLEMENTED) @@ -188,8 +188,8 @@ def add_AgentMetadataServiceServicer_to_server(servicer, server): request_deserializer=flyteidl_dot_admin_dot_agent__pb2.GetAgentRequest.FromString, response_serializer=flyteidl_dot_admin_dot_agent__pb2.GetAgentResponse.SerializeToString, ), - 'ListAgent': grpc.unary_unary_rpc_method_handler( - servicer.ListAgent, + 'ListAgents': grpc.unary_unary_rpc_method_handler( + servicer.ListAgents, request_deserializer=flyteidl_dot_admin_dot_agent__pb2.ListAgentsRequest.FromString, response_serializer=flyteidl_dot_admin_dot_agent__pb2.ListAgentsResponse.SerializeToString, ), @@ -223,7 +223,7 @@ def GetAgent(request, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod - def ListAgent(request, + def ListAgents(request, target, options=(), channel_credentials=None, @@ -233,7 +233,7 @@ def ListAgent(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flyteidl.service.AgentMetadataService/ListAgent', + return grpc.experimental.unary_unary(request, target, '/flyteidl.service.AgentMetadataService/ListAgents', flyteidl_dot_admin_dot_agent__pb2.ListAgentsRequest.SerializeToString, flyteidl_dot_admin_dot_agent__pb2.ListAgentsResponse.FromString, options, channel_credentials, diff --git a/flyteidl/protos/flyteidl/service/agent.proto b/flyteidl/protos/flyteidl/service/agent.proto index a4be7c1720..eba19e496c 100644 --- a/flyteidl/protos/flyteidl/service/agent.proto +++ b/flyteidl/protos/flyteidl/service/agent.proto @@ -22,7 +22,7 @@ service AgentMetadataService { // Fetch a :ref:`ref_flyteidl.admin.Agent` definition. rpc GetAgent (flyteidl.admin.GetAgentRequest) returns (flyteidl.admin.GetAgentResponse){ option (google.api.http) = { - get: "/api/v1/agents/{name}" + get: "/api/v1/agent/{name}" }; }; diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/mocks/AgentMetadataServiceClient.go b/flyteplugins/go/tasks/plugins/webapi/agent/mocks/AgentMetadataServiceClient.go index 51b5d175b4..d7f40932b7 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/mocks/AgentMetadataServiceClient.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/mocks/AgentMetadataServiceClient.go @@ -65,26 +65,26 @@ func (_m *AgentMetadataServiceClient) GetAgent(ctx context.Context, in *admin.Ge return r0, r1 } -type AgentMetadataServiceClient_ListAgent struct { +type AgentMetadataServiceClient_ListAgents struct { *mock.Call } -func (_m AgentMetadataServiceClient_ListAgent) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceClient_ListAgent { - return &AgentMetadataServiceClient_ListAgent{Call: _m.Call.Return(_a0, _a1)} +func (_m AgentMetadataServiceClient_ListAgents) Return(_a0 *admin.ListAgentsResponse, _a1 error) *AgentMetadataServiceClient_ListAgents { + return &AgentMetadataServiceClient_ListAgents{Call: _m.Call.Return(_a0, _a1)} } -func (_m *AgentMetadataServiceClient) OnListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) *AgentMetadataServiceClient_ListAgent { - c_call := _m.On("ListAgent", ctx, in, opts) - return &AgentMetadataServiceClient_ListAgent{Call: c_call} +func (_m *AgentMetadataServiceClient) OnListAgents(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) *AgentMetadataServiceClient_ListAgents { + c_call := _m.On("ListAgents", ctx, in, opts) + return &AgentMetadataServiceClient_ListAgents{Call: c_call} } -func (_m *AgentMetadataServiceClient) OnListAgentMatch(matchers ...interface{}) *AgentMetadataServiceClient_ListAgent { - c_call := _m.On("ListAgent", matchers...) - return &AgentMetadataServiceClient_ListAgent{Call: c_call} +func (_m *AgentMetadataServiceClient) OnListAgentsMatch(matchers ...interface{}) *AgentMetadataServiceClient_ListAgents { + c_call := _m.On("ListAgents", matchers...) + return &AgentMetadataServiceClient_ListAgents{Call: c_call} } -// ListAgent provides a mock function with given fields: ctx, in, opts -func (_m *AgentMetadataServiceClient) ListAgent(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { +// ListAgents provides a mock function with given fields: ctx, in, opts +func (_m *AgentMetadataServiceClient) ListAgents(ctx context.Context, in *admin.ListAgentsRequest, opts ...grpc.CallOption) (*admin.ListAgentsResponse, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go index d8e5b3651c..6230dc14f8 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go @@ -339,10 +339,10 @@ func initializeAgentRegistry(cfg *Config, connectionCache map[*Agent]*grpc.Clien return nil, fmt.Errorf("failed to connect to agent [%v] with error: [%v]", agentDeployment, err) } - finalCtx, cancel := getFinalContext(context.Background(), "ListAgent", agentDeployment) + finalCtx, cancel := getFinalContext(context.Background(), "ListAgents", agentDeployment) defer cancel() - res, err := client.ListAgent(finalCtx, &admin.ListAgentsRequest{}) + res, err := client.ListAgents(finalCtx, &admin.ListAgentsRequest{}) if err != nil { grpcStatus, ok := status.FromError(err) if grpcStatus.Code() == codes.Unimplemented { diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go index c6da80a99c..779fb597c1 100644 --- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go @@ -198,7 +198,7 @@ func TestInitializeAgentRegistry(t *testing.T) { }, } - mockClient.On("ListAgent", mock.Anything, mockRequest).Return(mockResponse, nil) + mockClient.On("ListAgents", mock.Anything, mockRequest).Return(mockResponse, nil) getAgentMetadataClientFunc := func(ctx context.Context, agent *Agent, connCache map[*Agent]*grpc.ClientConn) (service.AgentMetadataServiceClient, error) { return mockClient, nil }