From afa59ed422d16775fd263de7d76d4e9f3f2246e8 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Thu, 28 Dec 2023 20:57:43 +0800 Subject: [PATCH 01/15] remove inputs and outputs data from the cloud event, these will blow up the event Signed-off-by: Yee Hing Tong --- .../protos/flyteidl/event/cloudevents.proto | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/flyteidl/protos/flyteidl/event/cloudevents.proto b/flyteidl/protos/flyteidl/event/cloudevents.proto index 0c628d52d4..8736e70cb3 100644 --- a/flyteidl/protos/flyteidl/event/cloudevents.proto +++ b/flyteidl/protos/flyteidl/event/cloudevents.proto @@ -16,22 +16,18 @@ import "google/protobuf/timestamp.proto"; message CloudEventWorkflowExecution { event.WorkflowExecutionEvent raw_event = 1; - core.LiteralMap output_data = 2; - - core.TypedInterface output_interface = 3; - - core.LiteralMap input_data = 4; + core.TypedInterface output_interface = 2; // The following are ExecutionMetadata fields // We can't have the ExecutionMetadata object directly because of import cycle - repeated core.ArtifactID artifact_ids = 5; - core.WorkflowExecutionIdentifier reference_execution = 6; - string principal = 7; + repeated core.ArtifactID artifact_ids = 3; + core.WorkflowExecutionIdentifier reference_execution = 4; + string principal = 5; // The ID of the LP that generated the execution that generated the Artifact. // Here for provenance information. // Launch plan IDs are easier to get than workflow IDs so we'll use these for now. - core.Identifier launch_plan_id = 8; + core.Identifier launch_plan_id = 6; } message CloudEventNodeExecution { @@ -40,23 +36,18 @@ message CloudEventNodeExecution { // The relevant task execution if applicable core.TaskExecutionIdentifier task_exec_id = 2; - // Hydrated output - core.LiteralMap output_data = 3; - // The typed interface for the task that produced the event. - core.TypedInterface output_interface = 4; - - core.LiteralMap input_data = 5; + core.TypedInterface output_interface = 3; // The following are ExecutionMetadata fields // We can't have the ExecutionMetadata object directly because of import cycle - repeated core.ArtifactID artifact_ids = 6; - string principal = 7; + repeated core.ArtifactID artifact_ids = 4; + string principal = 5; // The ID of the LP that generated the execution that generated the Artifact. // Here for provenance information. // Launch plan IDs are easier to get than workflow IDs so we'll use these for now. - core.Identifier launch_plan_id = 8; + core.Identifier launch_plan_id = 6; } message CloudEventTaskExecution { From a53134830199d035a308b9f4f3f32082306ad543 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Thu, 28 Dec 2023 22:51:21 +0800 Subject: [PATCH 02/15] make generate Signed-off-by: Yee Hing Tong --- .../pb-cpp/flyteidl/event/cloudevents.pb.cc | 546 ++----- .../pb-cpp/flyteidl/event/cloudevents.pb.h | 274 +--- .../pb-go/flyteidl/event/cloudevents.pb.go | 126 +- .../pb-java/flyteidl/event/Cloudevents.java | 1313 +++-------------- flyteidl/gen/pb-js/flyteidl.d.ts | 24 - flyteidl/gen/pb-js/flyteidl.js | 108 +- .../flyteidl/event/cloudevents_pb2.py | 16 +- .../flyteidl/event/cloudevents_pb2.pyi | 16 +- flyteidl/gen/pb_rust/flyteidl.event.rs | 25 +- flytestdlib/cache/mocks/AutoRefresh.go | 32 +- flytestdlib/cache/mocks/Item.go | 32 + flytestdlib/cache/mocks/ItemWrapper.go | 16 +- flytestdlib/fastcheck/mocks/filter.go | 16 +- flytestdlib/random/mocks/comparable.go | 8 +- .../random/mocks/weighted_random_list.go | 32 +- .../storage/mocks/composed_protobuf_store.go | 72 +- flytestdlib/storage/mocks/raw_store.go | 56 +- .../storage/mocks/reference_constructor.go | 8 +- flytestdlib/utils/mocks/auto_refresh_cache.go | 16 +- flytestdlib/utils/mocks/cache_item.go | 8 +- flytestdlib/utils/mocks/rate_limiter.go | 8 +- flytestdlib/utils/mocks/sequencer.go | 16 +- 22 files changed, 643 insertions(+), 2125 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.cc index 5200354c7b..2a8a020c9d 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.cc @@ -21,7 +21,6 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::p extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fidentifier_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_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_2finterface_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_TypedInterface_flyteidl_2fcore_2finterface_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2fliterals_2eproto ::google::protobuf::internal::SCCInfo<10> scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fevent_2fevent_2eproto ::google::protobuf::internal::SCCInfo<4> scc_info_WorkflowExecutionEvent_flyteidl_2fevent_2fevent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fevent_2fevent_2eproto ::google::protobuf::internal::SCCInfo<8> scc_info_NodeExecutionEvent_flyteidl_2fevent_2fevent_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fevent_2fevent_2eproto ::google::protobuf::internal::SCCInfo<9> scc_info_TaskExecutionEvent_flyteidl_2fevent_2fevent_2eproto; @@ -56,10 +55,9 @@ static void InitDefaultsCloudEventWorkflowExecution_flyteidl_2fevent_2fcloudeven ::flyteidl::event::CloudEventWorkflowExecution::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<6> scc_info_CloudEventWorkflowExecution_flyteidl_2fevent_2fcloudevents_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 6, InitDefaultsCloudEventWorkflowExecution_flyteidl_2fevent_2fcloudevents_2eproto}, { +::google::protobuf::internal::SCCInfo<5> scc_info_CloudEventWorkflowExecution_flyteidl_2fevent_2fcloudevents_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 5, InitDefaultsCloudEventWorkflowExecution_flyteidl_2fevent_2fcloudevents_2eproto}, { &scc_info_WorkflowExecutionEvent_flyteidl_2fevent_2fevent_2eproto.base, - &scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto.base, &scc_info_TypedInterface_flyteidl_2fcore_2finterface_2eproto.base, &scc_info_ArtifactID_flyteidl_2fcore_2fartifact_5fid_2eproto.base, &scc_info_WorkflowExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base, @@ -76,11 +74,10 @@ static void InitDefaultsCloudEventNodeExecution_flyteidl_2fevent_2fcloudevents_2 ::flyteidl::event::CloudEventNodeExecution::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<6> scc_info_CloudEventNodeExecution_flyteidl_2fevent_2fcloudevents_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 6, InitDefaultsCloudEventNodeExecution_flyteidl_2fevent_2fcloudevents_2eproto}, { +::google::protobuf::internal::SCCInfo<5> scc_info_CloudEventNodeExecution_flyteidl_2fevent_2fcloudevents_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 5, InitDefaultsCloudEventNodeExecution_flyteidl_2fevent_2fcloudevents_2eproto}, { &scc_info_NodeExecutionEvent_flyteidl_2fevent_2fevent_2eproto.base, &scc_info_TaskExecutionIdentifier_flyteidl_2fcore_2fidentifier_2eproto.base, - &scc_info_Literal_flyteidl_2fcore_2fliterals_2eproto.base, &scc_info_TypedInterface_flyteidl_2fcore_2finterface_2eproto.base, &scc_info_ArtifactID_flyteidl_2fcore_2fartifact_5fid_2eproto.base, &scc_info_Identifier_flyteidl_2fcore_2fidentifier_2eproto.base,}}; @@ -135,9 +132,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fevent_2fcloudevents_2epr ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventWorkflowExecution, raw_event_), - PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventWorkflowExecution, output_data_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventWorkflowExecution, output_interface_), - PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventWorkflowExecution, input_data_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventWorkflowExecution, artifact_ids_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventWorkflowExecution, reference_execution_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventWorkflowExecution, principal_), @@ -149,9 +144,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fevent_2fcloudevents_2epr ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventNodeExecution, raw_event_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventNodeExecution, task_exec_id_), - PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventNodeExecution, output_data_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventNodeExecution, output_interface_), - PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventNodeExecution, input_data_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventNodeExecution, artifact_ids_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventNodeExecution, principal_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventNodeExecution, launch_plan_id_), @@ -175,9 +168,9 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fevent_2fcloudevents_2epr }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::flyteidl::event::CloudEventWorkflowExecution)}, - { 13, -1, sizeof(::flyteidl::event::CloudEventNodeExecution)}, - { 26, -1, sizeof(::flyteidl::event::CloudEventTaskExecution)}, - { 32, -1, sizeof(::flyteidl::event::CloudEventExecutionStart)}, + { 11, -1, sizeof(::flyteidl::event::CloudEventNodeExecution)}, + { 22, -1, sizeof(::flyteidl::event::CloudEventTaskExecution)}, + { 28, -1, sizeof(::flyteidl::event::CloudEventExecutionStart)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { @@ -199,45 +192,40 @@ const char descriptor_table_protodef_flyteidl_2fevent_2fcloudevents_2eproto[] = "flyteidl/core/literals.proto\032\035flyteidl/c" "ore/interface.proto\032\037flyteidl/core/artif" "act_id.proto\032\036flyteidl/core/identifier.p" - "roto\032\037google/protobuf/timestamp.proto\"\260\003" + "roto\032\037google/protobuf/timestamp.proto\"\321\002" "\n\033CloudEventWorkflowExecution\0229\n\traw_eve" "nt\030\001 \001(\0132&.flyteidl.event.WorkflowExecut" - "ionEvent\022.\n\013output_data\030\002 \001(\0132\031.flyteidl" - ".core.LiteralMap\0227\n\020output_interface\030\003 \001" - "(\0132\035.flyteidl.core.TypedInterface\022-\n\ninp" - "ut_data\030\004 \001(\0132\031.flyteidl.core.LiteralMap" - "\022/\n\014artifact_ids\030\005 \003(\0132\031.flyteidl.core.A" - "rtifactID\022G\n\023reference_execution\030\006 \001(\0132*" - ".flyteidl.core.WorkflowExecutionIdentifi" - "er\022\021\n\tprincipal\030\007 \001(\t\0221\n\016launch_plan_id\030" - "\010 \001(\0132\031.flyteidl.core.Identifier\"\235\003\n\027Clo" - "udEventNodeExecution\0225\n\traw_event\030\001 \001(\0132" - "\".flyteidl.event.NodeExecutionEvent\022<\n\014t" - "ask_exec_id\030\002 \001(\0132&.flyteidl.core.TaskEx" - "ecutionIdentifier\022.\n\013output_data\030\003 \001(\0132\031" - ".flyteidl.core.LiteralMap\0227\n\020output_inte" - "rface\030\004 \001(\0132\035.flyteidl.core.TypedInterfa" - "ce\022-\n\ninput_data\030\005 \001(\0132\031.flyteidl.core.L" - "iteralMap\022/\n\014artifact_ids\030\006 \003(\0132\031.flytei" - "dl.core.ArtifactID\022\021\n\tprincipal\030\007 \001(\t\0221\n" - "\016launch_plan_id\030\010 \001(\0132\031.flyteidl.core.Id" - "entifier\"P\n\027CloudEventTaskExecution\0225\n\tr" - "aw_event\030\001 \001(\0132\".flyteidl.event.TaskExec" - "utionEvent\"\232\002\n\030CloudEventExecutionStart\022" - "@\n\014execution_id\030\001 \001(\0132*.flyteidl.core.Wo" - "rkflowExecutionIdentifier\0221\n\016launch_plan" - "_id\030\002 \001(\0132\031.flyteidl.core.Identifier\022.\n\013" - "workflow_id\030\003 \001(\0132\031.flyteidl.core.Identi" - "fier\022/\n\014artifact_ids\030\004 \003(\0132\031.flyteidl.co" - "re.ArtifactID\022\025\n\rartifact_keys\030\005 \003(\t\022\021\n\t" - "principal\030\006 \001(\tB=Z;github.com/flyteorg/f" - "lyte/flyteidl/gen/pb-go/flyteidl/eventb\006" - "proto3" + "ionEvent\0227\n\020output_interface\030\002 \001(\0132\035.fly" + "teidl.core.TypedInterface\022/\n\014artifact_id" + "s\030\003 \003(\0132\031.flyteidl.core.ArtifactID\022G\n\023re" + "ference_execution\030\004 \001(\0132*.flyteidl.core." + "WorkflowExecutionIdentifier\022\021\n\tprincipal" + "\030\005 \001(\t\0221\n\016launch_plan_id\030\006 \001(\0132\031.flyteid" + "l.core.Identifier\"\276\002\n\027CloudEventNodeExec" + "ution\0225\n\traw_event\030\001 \001(\0132\".flyteidl.even" + "t.NodeExecutionEvent\022<\n\014task_exec_id\030\002 \001" + "(\0132&.flyteidl.core.TaskExecutionIdentifi" + "er\0227\n\020output_interface\030\003 \001(\0132\035.flyteidl." + "core.TypedInterface\022/\n\014artifact_ids\030\004 \003(" + "\0132\031.flyteidl.core.ArtifactID\022\021\n\tprincipa" + "l\030\005 \001(\t\0221\n\016launch_plan_id\030\006 \001(\0132\031.flytei" + "dl.core.Identifier\"P\n\027CloudEventTaskExec" + "ution\0225\n\traw_event\030\001 \001(\0132\".flyteidl.even" + "t.TaskExecutionEvent\"\232\002\n\030CloudEventExecu" + "tionStart\022@\n\014execution_id\030\001 \001(\0132*.flytei" + "dl.core.WorkflowExecutionIdentifier\0221\n\016l" + "aunch_plan_id\030\002 \001(\0132\031.flyteidl.core.Iden" + "tifier\022.\n\013workflow_id\030\003 \001(\0132\031.flyteidl.c" + "ore.Identifier\022/\n\014artifact_ids\030\004 \003(\0132\031.f" + "lyteidl.core.ArtifactID\022\025\n\rartifact_keys" + "\030\005 \003(\t\022\021\n\tprincipal\030\006 \001(\tB=Z;github.com/" + "flyteorg/flyte/flyteidl/gen/pb-go/flytei" + "dl/eventb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fevent_2fcloudevents_2eproto = { false, InitDefaults_flyteidl_2fevent_2fcloudevents_2eproto, descriptor_table_protodef_flyteidl_2fevent_2fcloudevents_2eproto, - "flyteidl/event/cloudevents.proto", &assign_descriptors_table_flyteidl_2fevent_2fcloudevents_2eproto, 1526, + "flyteidl/event/cloudevents.proto", &assign_descriptors_table_flyteidl_2fevent_2fcloudevents_2eproto, 1336, }; void AddDescriptors_flyteidl_2fevent_2fcloudevents_2eproto() { @@ -263,12 +251,8 @@ namespace event { void CloudEventWorkflowExecution::InitAsDefaultInstance() { ::flyteidl::event::_CloudEventWorkflowExecution_default_instance_._instance.get_mutable()->raw_event_ = const_cast< ::flyteidl::event::WorkflowExecutionEvent*>( ::flyteidl::event::WorkflowExecutionEvent::internal_default_instance()); - ::flyteidl::event::_CloudEventWorkflowExecution_default_instance_._instance.get_mutable()->output_data_ = const_cast< ::flyteidl::core::LiteralMap*>( - ::flyteidl::core::LiteralMap::internal_default_instance()); ::flyteidl::event::_CloudEventWorkflowExecution_default_instance_._instance.get_mutable()->output_interface_ = const_cast< ::flyteidl::core::TypedInterface*>( ::flyteidl::core::TypedInterface::internal_default_instance()); - ::flyteidl::event::_CloudEventWorkflowExecution_default_instance_._instance.get_mutable()->input_data_ = const_cast< ::flyteidl::core::LiteralMap*>( - ::flyteidl::core::LiteralMap::internal_default_instance()); ::flyteidl::event::_CloudEventWorkflowExecution_default_instance_._instance.get_mutable()->reference_execution_ = const_cast< ::flyteidl::core::WorkflowExecutionIdentifier*>( ::flyteidl::core::WorkflowExecutionIdentifier::internal_default_instance()); ::flyteidl::event::_CloudEventWorkflowExecution_default_instance_._instance.get_mutable()->launch_plan_id_ = const_cast< ::flyteidl::core::Identifier*>( @@ -277,9 +261,7 @@ void CloudEventWorkflowExecution::InitAsDefaultInstance() { class CloudEventWorkflowExecution::HasBitSetters { public: static const ::flyteidl::event::WorkflowExecutionEvent& raw_event(const CloudEventWorkflowExecution* msg); - static const ::flyteidl::core::LiteralMap& output_data(const CloudEventWorkflowExecution* msg); static const ::flyteidl::core::TypedInterface& output_interface(const CloudEventWorkflowExecution* msg); - static const ::flyteidl::core::LiteralMap& input_data(const CloudEventWorkflowExecution* msg); static const ::flyteidl::core::WorkflowExecutionIdentifier& reference_execution(const CloudEventWorkflowExecution* msg); static const ::flyteidl::core::Identifier& launch_plan_id(const CloudEventWorkflowExecution* msg); }; @@ -288,18 +270,10 @@ const ::flyteidl::event::WorkflowExecutionEvent& CloudEventWorkflowExecution::HasBitSetters::raw_event(const CloudEventWorkflowExecution* msg) { return *msg->raw_event_; } -const ::flyteidl::core::LiteralMap& -CloudEventWorkflowExecution::HasBitSetters::output_data(const CloudEventWorkflowExecution* msg) { - return *msg->output_data_; -} const ::flyteidl::core::TypedInterface& CloudEventWorkflowExecution::HasBitSetters::output_interface(const CloudEventWorkflowExecution* msg) { return *msg->output_interface_; } -const ::flyteidl::core::LiteralMap& -CloudEventWorkflowExecution::HasBitSetters::input_data(const CloudEventWorkflowExecution* msg) { - return *msg->input_data_; -} const ::flyteidl::core::WorkflowExecutionIdentifier& CloudEventWorkflowExecution::HasBitSetters::reference_execution(const CloudEventWorkflowExecution* msg) { return *msg->reference_execution_; @@ -314,24 +288,12 @@ void CloudEventWorkflowExecution::clear_raw_event() { } raw_event_ = nullptr; } -void CloudEventWorkflowExecution::clear_output_data() { - if (GetArenaNoVirtual() == nullptr && output_data_ != nullptr) { - delete output_data_; - } - output_data_ = nullptr; -} void CloudEventWorkflowExecution::clear_output_interface() { if (GetArenaNoVirtual() == nullptr && output_interface_ != nullptr) { delete output_interface_; } output_interface_ = nullptr; } -void CloudEventWorkflowExecution::clear_input_data() { - if (GetArenaNoVirtual() == nullptr && input_data_ != nullptr) { - delete input_data_; - } - input_data_ = nullptr; -} void CloudEventWorkflowExecution::clear_artifact_ids() { artifact_ids_.Clear(); } @@ -349,9 +311,7 @@ void CloudEventWorkflowExecution::clear_launch_plan_id() { } #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int CloudEventWorkflowExecution::kRawEventFieldNumber; -const int CloudEventWorkflowExecution::kOutputDataFieldNumber; const int CloudEventWorkflowExecution::kOutputInterfaceFieldNumber; -const int CloudEventWorkflowExecution::kInputDataFieldNumber; const int CloudEventWorkflowExecution::kArtifactIdsFieldNumber; const int CloudEventWorkflowExecution::kReferenceExecutionFieldNumber; const int CloudEventWorkflowExecution::kPrincipalFieldNumber; @@ -377,21 +337,11 @@ CloudEventWorkflowExecution::CloudEventWorkflowExecution(const CloudEventWorkflo } else { raw_event_ = nullptr; } - if (from.has_output_data()) { - output_data_ = new ::flyteidl::core::LiteralMap(*from.output_data_); - } else { - output_data_ = nullptr; - } if (from.has_output_interface()) { output_interface_ = new ::flyteidl::core::TypedInterface(*from.output_interface_); } else { output_interface_ = nullptr; } - if (from.has_input_data()) { - input_data_ = new ::flyteidl::core::LiteralMap(*from.input_data_); - } else { - input_data_ = nullptr; - } if (from.has_reference_execution()) { reference_execution_ = new ::flyteidl::core::WorkflowExecutionIdentifier(*from.reference_execution_); } else { @@ -422,9 +372,7 @@ CloudEventWorkflowExecution::~CloudEventWorkflowExecution() { void CloudEventWorkflowExecution::SharedDtor() { principal_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (this != internal_default_instance()) delete raw_event_; - if (this != internal_default_instance()) delete output_data_; if (this != internal_default_instance()) delete output_interface_; - if (this != internal_default_instance()) delete input_data_; if (this != internal_default_instance()) delete reference_execution_; if (this != internal_default_instance()) delete launch_plan_id_; } @@ -450,18 +398,10 @@ void CloudEventWorkflowExecution::Clear() { delete raw_event_; } raw_event_ = nullptr; - if (GetArenaNoVirtual() == nullptr && output_data_ != nullptr) { - delete output_data_; - } - output_data_ = nullptr; if (GetArenaNoVirtual() == nullptr && output_interface_ != nullptr) { delete output_interface_; } output_interface_ = nullptr; - if (GetArenaNoVirtual() == nullptr && input_data_ != nullptr) { - delete input_data_; - } - input_data_ = nullptr; if (GetArenaNoVirtual() == nullptr && reference_execution_ != nullptr) { delete reference_execution_; } @@ -499,24 +439,11 @@ const char* CloudEventWorkflowExecution::_InternalParse(const char* begin, const {parser_till_end, object}, ptr - size, ptr)); break; } - // .flyteidl.core.LiteralMap output_data = 2; + // .flyteidl.core.TypedInterface output_interface = 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); - parser_till_end = ::flyteidl::core::LiteralMap::_InternalParse; - object = msg->mutable_output_data(); - 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; - } - // .flyteidl.core.TypedInterface output_interface = 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); parser_till_end = ::flyteidl::core::TypedInterface::_InternalParse; object = msg->mutable_output_interface(); if (size > end - ptr) goto len_delim_till_end; @@ -525,22 +452,9 @@ const char* CloudEventWorkflowExecution::_InternalParse(const char* begin, const {parser_till_end, object}, ptr - size, ptr)); break; } - // .flyteidl.core.LiteralMap input_data = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::flyteidl::core::LiteralMap::_InternalParse; - object = msg->mutable_input_data(); - 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; - } - // repeated .flyteidl.core.ArtifactID artifact_ids = 5; - case 5: { - if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; + // repeated .flyteidl.core.ArtifactID artifact_ids = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; do { ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); @@ -551,12 +465,12 @@ const char* CloudEventWorkflowExecution::_InternalParse(const char* begin, const 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) == 42 && (ptr += 1)); + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1)); break; } - // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; - case 6: { - if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; + // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::WorkflowExecutionIdentifier::_InternalParse; @@ -567,9 +481,9 @@ const char* CloudEventWorkflowExecution::_InternalParse(const char* begin, const {parser_till_end, object}, ptr - size, ptr)); break; } - // string principal = 7; - case 7: { - if (static_cast<::google::protobuf::uint8>(tag) != 58) goto handle_unusual; + // string principal = 5; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); ctx->extra_parse_data().SetFieldName("flyteidl.event.CloudEventWorkflowExecution.principal"); @@ -583,9 +497,9 @@ const char* CloudEventWorkflowExecution::_InternalParse(const char* begin, const ptr += size; break; } - // .flyteidl.core.Identifier launch_plan_id = 8; - case 8: { - if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual; + // .flyteidl.core.Identifier launch_plan_id = 6; + case 6: { + if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::Identifier::_InternalParse; @@ -641,64 +555,42 @@ bool CloudEventWorkflowExecution::MergePartialFromCodedStream( break; } - // .flyteidl.core.LiteralMap output_data = 2; + // .flyteidl.core.TypedInterface output_interface = 2; case 2: { if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_output_data())); + input, mutable_output_interface())); } else { goto handle_unusual; } break; } - // .flyteidl.core.TypedInterface output_interface = 3; + // repeated .flyteidl.core.ArtifactID artifact_ids = 3; case 3: { if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_output_interface())); + input, add_artifact_ids())); } else { goto handle_unusual; } break; } - // .flyteidl.core.LiteralMap input_data = 4; + // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; case 4: { if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_input_data())); + input, mutable_reference_execution())); } else { goto handle_unusual; } break; } - // repeated .flyteidl.core.ArtifactID artifact_ids = 5; + // string principal = 5; case 5: { if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, add_artifact_ids())); - } else { - goto handle_unusual; - } - break; - } - - // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_reference_execution())); - } else { - goto handle_unusual; - } - break; - } - - // string principal = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == (58 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_principal())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -711,9 +603,9 @@ bool CloudEventWorkflowExecution::MergePartialFromCodedStream( break; } - // .flyteidl.core.Identifier launch_plan_id = 8; - case 8: { - if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) { + // .flyteidl.core.Identifier launch_plan_id = 6; + case 6: { + if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_launch_plan_id())); } else { @@ -755,53 +647,41 @@ void CloudEventWorkflowExecution::SerializeWithCachedSizes( 1, HasBitSetters::raw_event(this), output); } - // .flyteidl.core.LiteralMap output_data = 2; - if (this->has_output_data()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, HasBitSetters::output_data(this), output); - } - - // .flyteidl.core.TypedInterface output_interface = 3; + // .flyteidl.core.TypedInterface output_interface = 2; if (this->has_output_interface()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, HasBitSetters::output_interface(this), output); - } - - // .flyteidl.core.LiteralMap input_data = 4; - if (this->has_input_data()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 4, HasBitSetters::input_data(this), output); + 2, HasBitSetters::output_interface(this), output); } - // repeated .flyteidl.core.ArtifactID artifact_ids = 5; + // repeated .flyteidl.core.ArtifactID artifact_ids = 3; for (unsigned int i = 0, n = static_cast(this->artifact_ids_size()); i < n; i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 5, + 3, this->artifact_ids(static_cast(i)), output); } - // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; if (this->has_reference_execution()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 6, HasBitSetters::reference_execution(this), output); + 4, HasBitSetters::reference_execution(this), output); } - // string principal = 7; + // string principal = 5; if (this->principal().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->principal().data(), static_cast(this->principal().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "flyteidl.event.CloudEventWorkflowExecution.principal"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 7, this->principal(), output); + 5, this->principal(), output); } - // .flyteidl.core.Identifier launch_plan_id = 8; + // .flyteidl.core.Identifier launch_plan_id = 6; if (this->has_launch_plan_id()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 8, HasBitSetters::launch_plan_id(this), output); + 6, HasBitSetters::launch_plan_id(this), output); } if (_internal_metadata_.have_unknown_fields()) { @@ -824,43 +704,29 @@ ::google::protobuf::uint8* CloudEventWorkflowExecution::InternalSerializeWithCac 1, HasBitSetters::raw_event(this), target); } - // .flyteidl.core.LiteralMap output_data = 2; - if (this->has_output_data()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 2, HasBitSetters::output_data(this), target); - } - - // .flyteidl.core.TypedInterface output_interface = 3; + // .flyteidl.core.TypedInterface output_interface = 2; if (this->has_output_interface()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 3, HasBitSetters::output_interface(this), target); - } - - // .flyteidl.core.LiteralMap input_data = 4; - if (this->has_input_data()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 4, HasBitSetters::input_data(this), target); + 2, HasBitSetters::output_interface(this), target); } - // repeated .flyteidl.core.ArtifactID artifact_ids = 5; + // repeated .flyteidl.core.ArtifactID artifact_ids = 3; for (unsigned int i = 0, n = static_cast(this->artifact_ids_size()); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 5, this->artifact_ids(static_cast(i)), target); + 3, this->artifact_ids(static_cast(i)), target); } - // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; if (this->has_reference_execution()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 6, HasBitSetters::reference_execution(this), target); + 4, HasBitSetters::reference_execution(this), target); } - // string principal = 7; + // string principal = 5; if (this->principal().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->principal().data(), static_cast(this->principal().length()), @@ -868,14 +734,14 @@ ::google::protobuf::uint8* CloudEventWorkflowExecution::InternalSerializeWithCac "flyteidl.event.CloudEventWorkflowExecution.principal"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 7, this->principal(), target); + 5, this->principal(), target); } - // .flyteidl.core.Identifier launch_plan_id = 8; + // .flyteidl.core.Identifier launch_plan_id = 6; if (this->has_launch_plan_id()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 8, HasBitSetters::launch_plan_id(this), target); + 6, HasBitSetters::launch_plan_id(this), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -899,7 +765,7 @@ size_t CloudEventWorkflowExecution::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated .flyteidl.core.ArtifactID artifact_ids = 5; + // repeated .flyteidl.core.ArtifactID artifact_ids = 3; { unsigned int count = static_cast(this->artifact_ids_size()); total_size += 1UL * count; @@ -910,7 +776,7 @@ size_t CloudEventWorkflowExecution::ByteSizeLong() const { } } - // string principal = 7; + // string principal = 5; if (this->principal().size() > 0) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( @@ -924,35 +790,21 @@ size_t CloudEventWorkflowExecution::ByteSizeLong() const { *raw_event_); } - // .flyteidl.core.LiteralMap output_data = 2; - if (this->has_output_data()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *output_data_); - } - - // .flyteidl.core.TypedInterface output_interface = 3; + // .flyteidl.core.TypedInterface output_interface = 2; if (this->has_output_interface()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize( *output_interface_); } - // .flyteidl.core.LiteralMap input_data = 4; - if (this->has_input_data()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *input_data_); - } - - // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; if (this->has_reference_execution()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize( *reference_execution_); } - // .flyteidl.core.Identifier launch_plan_id = 8; + // .flyteidl.core.Identifier launch_plan_id = 6; if (this->has_launch_plan_id()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize( @@ -994,15 +846,9 @@ void CloudEventWorkflowExecution::MergeFrom(const CloudEventWorkflowExecution& f if (from.has_raw_event()) { mutable_raw_event()->::flyteidl::event::WorkflowExecutionEvent::MergeFrom(from.raw_event()); } - if (from.has_output_data()) { - mutable_output_data()->::flyteidl::core::LiteralMap::MergeFrom(from.output_data()); - } if (from.has_output_interface()) { mutable_output_interface()->::flyteidl::core::TypedInterface::MergeFrom(from.output_interface()); } - if (from.has_input_data()) { - mutable_input_data()->::flyteidl::core::LiteralMap::MergeFrom(from.input_data()); - } if (from.has_reference_execution()) { mutable_reference_execution()->::flyteidl::core::WorkflowExecutionIdentifier::MergeFrom(from.reference_execution()); } @@ -1040,9 +886,7 @@ void CloudEventWorkflowExecution::InternalSwap(CloudEventWorkflowExecution* othe principal_.Swap(&other->principal_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(raw_event_, other->raw_event_); - swap(output_data_, other->output_data_); swap(output_interface_, other->output_interface_); - swap(input_data_, other->input_data_); swap(reference_execution_, other->reference_execution_); swap(launch_plan_id_, other->launch_plan_id_); } @@ -1060,12 +904,8 @@ void CloudEventNodeExecution::InitAsDefaultInstance() { ::flyteidl::event::NodeExecutionEvent::internal_default_instance()); ::flyteidl::event::_CloudEventNodeExecution_default_instance_._instance.get_mutable()->task_exec_id_ = const_cast< ::flyteidl::core::TaskExecutionIdentifier*>( ::flyteidl::core::TaskExecutionIdentifier::internal_default_instance()); - ::flyteidl::event::_CloudEventNodeExecution_default_instance_._instance.get_mutable()->output_data_ = const_cast< ::flyteidl::core::LiteralMap*>( - ::flyteidl::core::LiteralMap::internal_default_instance()); ::flyteidl::event::_CloudEventNodeExecution_default_instance_._instance.get_mutable()->output_interface_ = const_cast< ::flyteidl::core::TypedInterface*>( ::flyteidl::core::TypedInterface::internal_default_instance()); - ::flyteidl::event::_CloudEventNodeExecution_default_instance_._instance.get_mutable()->input_data_ = const_cast< ::flyteidl::core::LiteralMap*>( - ::flyteidl::core::LiteralMap::internal_default_instance()); ::flyteidl::event::_CloudEventNodeExecution_default_instance_._instance.get_mutable()->launch_plan_id_ = const_cast< ::flyteidl::core::Identifier*>( ::flyteidl::core::Identifier::internal_default_instance()); } @@ -1073,9 +913,7 @@ class CloudEventNodeExecution::HasBitSetters { public: static const ::flyteidl::event::NodeExecutionEvent& raw_event(const CloudEventNodeExecution* msg); static const ::flyteidl::core::TaskExecutionIdentifier& task_exec_id(const CloudEventNodeExecution* msg); - static const ::flyteidl::core::LiteralMap& output_data(const CloudEventNodeExecution* msg); static const ::flyteidl::core::TypedInterface& output_interface(const CloudEventNodeExecution* msg); - static const ::flyteidl::core::LiteralMap& input_data(const CloudEventNodeExecution* msg); static const ::flyteidl::core::Identifier& launch_plan_id(const CloudEventNodeExecution* msg); }; @@ -1087,18 +925,10 @@ const ::flyteidl::core::TaskExecutionIdentifier& CloudEventNodeExecution::HasBitSetters::task_exec_id(const CloudEventNodeExecution* msg) { return *msg->task_exec_id_; } -const ::flyteidl::core::LiteralMap& -CloudEventNodeExecution::HasBitSetters::output_data(const CloudEventNodeExecution* msg) { - return *msg->output_data_; -} const ::flyteidl::core::TypedInterface& CloudEventNodeExecution::HasBitSetters::output_interface(const CloudEventNodeExecution* msg) { return *msg->output_interface_; } -const ::flyteidl::core::LiteralMap& -CloudEventNodeExecution::HasBitSetters::input_data(const CloudEventNodeExecution* msg) { - return *msg->input_data_; -} const ::flyteidl::core::Identifier& CloudEventNodeExecution::HasBitSetters::launch_plan_id(const CloudEventNodeExecution* msg) { return *msg->launch_plan_id_; @@ -1115,24 +945,12 @@ void CloudEventNodeExecution::clear_task_exec_id() { } task_exec_id_ = nullptr; } -void CloudEventNodeExecution::clear_output_data() { - if (GetArenaNoVirtual() == nullptr && output_data_ != nullptr) { - delete output_data_; - } - output_data_ = nullptr; -} void CloudEventNodeExecution::clear_output_interface() { if (GetArenaNoVirtual() == nullptr && output_interface_ != nullptr) { delete output_interface_; } output_interface_ = nullptr; } -void CloudEventNodeExecution::clear_input_data() { - if (GetArenaNoVirtual() == nullptr && input_data_ != nullptr) { - delete input_data_; - } - input_data_ = nullptr; -} void CloudEventNodeExecution::clear_artifact_ids() { artifact_ids_.Clear(); } @@ -1145,9 +963,7 @@ void CloudEventNodeExecution::clear_launch_plan_id() { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int CloudEventNodeExecution::kRawEventFieldNumber; const int CloudEventNodeExecution::kTaskExecIdFieldNumber; -const int CloudEventNodeExecution::kOutputDataFieldNumber; const int CloudEventNodeExecution::kOutputInterfaceFieldNumber; -const int CloudEventNodeExecution::kInputDataFieldNumber; const int CloudEventNodeExecution::kArtifactIdsFieldNumber; const int CloudEventNodeExecution::kPrincipalFieldNumber; const int CloudEventNodeExecution::kLaunchPlanIdFieldNumber; @@ -1177,21 +993,11 @@ CloudEventNodeExecution::CloudEventNodeExecution(const CloudEventNodeExecution& } else { task_exec_id_ = nullptr; } - if (from.has_output_data()) { - output_data_ = new ::flyteidl::core::LiteralMap(*from.output_data_); - } else { - output_data_ = nullptr; - } if (from.has_output_interface()) { output_interface_ = new ::flyteidl::core::TypedInterface(*from.output_interface_); } else { output_interface_ = nullptr; } - if (from.has_input_data()) { - input_data_ = new ::flyteidl::core::LiteralMap(*from.input_data_); - } else { - input_data_ = nullptr; - } if (from.has_launch_plan_id()) { launch_plan_id_ = new ::flyteidl::core::Identifier(*from.launch_plan_id_); } else { @@ -1218,9 +1024,7 @@ void CloudEventNodeExecution::SharedDtor() { principal_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (this != internal_default_instance()) delete raw_event_; if (this != internal_default_instance()) delete task_exec_id_; - if (this != internal_default_instance()) delete output_data_; if (this != internal_default_instance()) delete output_interface_; - if (this != internal_default_instance()) delete input_data_; if (this != internal_default_instance()) delete launch_plan_id_; } @@ -1249,18 +1053,10 @@ void CloudEventNodeExecution::Clear() { delete task_exec_id_; } task_exec_id_ = nullptr; - if (GetArenaNoVirtual() == nullptr && output_data_ != nullptr) { - delete output_data_; - } - output_data_ = nullptr; if (GetArenaNoVirtual() == nullptr && output_interface_ != nullptr) { delete output_interface_; } output_interface_ = nullptr; - if (GetArenaNoVirtual() == nullptr && input_data_ != nullptr) { - delete input_data_; - } - input_data_ = nullptr; if (GetArenaNoVirtual() == nullptr && launch_plan_id_ != nullptr) { delete launch_plan_id_; } @@ -1307,24 +1103,11 @@ const char* CloudEventNodeExecution::_InternalParse(const char* begin, const cha {parser_till_end, object}, ptr - size, ptr)); break; } - // .flyteidl.core.LiteralMap output_data = 3; + // .flyteidl.core.TypedInterface output_interface = 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); - parser_till_end = ::flyteidl::core::LiteralMap::_InternalParse; - object = msg->mutable_output_data(); - 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; - } - // .flyteidl.core.TypedInterface output_interface = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::TypedInterface::_InternalParse; object = msg->mutable_output_interface(); if (size > end - ptr) goto len_delim_till_end; @@ -1333,22 +1116,9 @@ const char* CloudEventNodeExecution::_InternalParse(const char* begin, const cha {parser_till_end, object}, ptr - size, ptr)); break; } - // .flyteidl.core.LiteralMap input_data = 5; - case 5: { - if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::flyteidl::core::LiteralMap::_InternalParse; - object = msg->mutable_input_data(); - 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; - } - // repeated .flyteidl.core.ArtifactID artifact_ids = 6; - case 6: { - if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; + // repeated .flyteidl.core.ArtifactID artifact_ids = 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); @@ -1359,12 +1129,12 @@ const char* CloudEventNodeExecution::_InternalParse(const char* begin, const cha 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) == 50 && (ptr += 1)); + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1)); break; } - // string principal = 7; - case 7: { - if (static_cast<::google::protobuf::uint8>(tag) != 58) goto handle_unusual; + // string principal = 5; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); ctx->extra_parse_data().SetFieldName("flyteidl.event.CloudEventNodeExecution.principal"); @@ -1378,9 +1148,9 @@ const char* CloudEventNodeExecution::_InternalParse(const char* begin, const cha ptr += size; break; } - // .flyteidl.core.Identifier launch_plan_id = 8; - case 8: { - if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual; + // .flyteidl.core.Identifier launch_plan_id = 6; + case 6: { + if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::Identifier::_InternalParse; @@ -1447,53 +1217,31 @@ bool CloudEventNodeExecution::MergePartialFromCodedStream( break; } - // .flyteidl.core.LiteralMap output_data = 3; + // .flyteidl.core.TypedInterface output_interface = 3; case 3: { if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_output_data())); + input, mutable_output_interface())); } else { goto handle_unusual; } break; } - // .flyteidl.core.TypedInterface output_interface = 4; + // repeated .flyteidl.core.ArtifactID artifact_ids = 4; case 4: { if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_output_interface())); + input, add_artifact_ids())); } else { goto handle_unusual; } break; } - // .flyteidl.core.LiteralMap input_data = 5; + // string principal = 5; case 5: { if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_input_data())); - } else { - goto handle_unusual; - } - break; - } - - // repeated .flyteidl.core.ArtifactID artifact_ids = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, add_artifact_ids())); - } else { - goto handle_unusual; - } - break; - } - - // string principal = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == (58 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_principal())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -1506,9 +1254,9 @@ bool CloudEventNodeExecution::MergePartialFromCodedStream( break; } - // .flyteidl.core.Identifier launch_plan_id = 8; - case 8: { - if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) { + // .flyteidl.core.Identifier launch_plan_id = 6; + case 6: { + if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_launch_plan_id())); } else { @@ -1556,47 +1304,35 @@ void CloudEventNodeExecution::SerializeWithCachedSizes( 2, HasBitSetters::task_exec_id(this), output); } - // .flyteidl.core.LiteralMap output_data = 3; - if (this->has_output_data()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, HasBitSetters::output_data(this), output); - } - - // .flyteidl.core.TypedInterface output_interface = 4; + // .flyteidl.core.TypedInterface output_interface = 3; if (this->has_output_interface()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 4, HasBitSetters::output_interface(this), output); - } - - // .flyteidl.core.LiteralMap input_data = 5; - if (this->has_input_data()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 5, HasBitSetters::input_data(this), output); + 3, HasBitSetters::output_interface(this), output); } - // repeated .flyteidl.core.ArtifactID artifact_ids = 6; + // repeated .flyteidl.core.ArtifactID artifact_ids = 4; for (unsigned int i = 0, n = static_cast(this->artifact_ids_size()); i < n; i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 6, + 4, this->artifact_ids(static_cast(i)), output); } - // string principal = 7; + // string principal = 5; if (this->principal().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->principal().data(), static_cast(this->principal().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "flyteidl.event.CloudEventNodeExecution.principal"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 7, this->principal(), output); + 5, this->principal(), output); } - // .flyteidl.core.Identifier launch_plan_id = 8; + // .flyteidl.core.Identifier launch_plan_id = 6; if (this->has_launch_plan_id()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 8, HasBitSetters::launch_plan_id(this), output); + 6, HasBitSetters::launch_plan_id(this), output); } if (_internal_metadata_.have_unknown_fields()) { @@ -1626,36 +1362,22 @@ ::google::protobuf::uint8* CloudEventNodeExecution::InternalSerializeWithCachedS 2, HasBitSetters::task_exec_id(this), target); } - // .flyteidl.core.LiteralMap output_data = 3; - if (this->has_output_data()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 3, HasBitSetters::output_data(this), target); - } - - // .flyteidl.core.TypedInterface output_interface = 4; + // .flyteidl.core.TypedInterface output_interface = 3; if (this->has_output_interface()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 4, HasBitSetters::output_interface(this), target); - } - - // .flyteidl.core.LiteralMap input_data = 5; - if (this->has_input_data()) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 5, HasBitSetters::input_data(this), target); + 3, HasBitSetters::output_interface(this), target); } - // repeated .flyteidl.core.ArtifactID artifact_ids = 6; + // repeated .flyteidl.core.ArtifactID artifact_ids = 4; for (unsigned int i = 0, n = static_cast(this->artifact_ids_size()); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 6, this->artifact_ids(static_cast(i)), target); + 4, this->artifact_ids(static_cast(i)), target); } - // string principal = 7; + // string principal = 5; if (this->principal().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->principal().data(), static_cast(this->principal().length()), @@ -1663,14 +1385,14 @@ ::google::protobuf::uint8* CloudEventNodeExecution::InternalSerializeWithCachedS "flyteidl.event.CloudEventNodeExecution.principal"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 7, this->principal(), target); + 5, this->principal(), target); } - // .flyteidl.core.Identifier launch_plan_id = 8; + // .flyteidl.core.Identifier launch_plan_id = 6; if (this->has_launch_plan_id()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 8, HasBitSetters::launch_plan_id(this), target); + 6, HasBitSetters::launch_plan_id(this), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -1694,7 +1416,7 @@ size_t CloudEventNodeExecution::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated .flyteidl.core.ArtifactID artifact_ids = 6; + // repeated .flyteidl.core.ArtifactID artifact_ids = 4; { unsigned int count = static_cast(this->artifact_ids_size()); total_size += 1UL * count; @@ -1705,7 +1427,7 @@ size_t CloudEventNodeExecution::ByteSizeLong() const { } } - // string principal = 7; + // string principal = 5; if (this->principal().size() > 0) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( @@ -1726,28 +1448,14 @@ size_t CloudEventNodeExecution::ByteSizeLong() const { *task_exec_id_); } - // .flyteidl.core.LiteralMap output_data = 3; - if (this->has_output_data()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *output_data_); - } - - // .flyteidl.core.TypedInterface output_interface = 4; + // .flyteidl.core.TypedInterface output_interface = 3; if (this->has_output_interface()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize( *output_interface_); } - // .flyteidl.core.LiteralMap input_data = 5; - if (this->has_input_data()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( - *input_data_); - } - - // .flyteidl.core.Identifier launch_plan_id = 8; + // .flyteidl.core.Identifier launch_plan_id = 6; if (this->has_launch_plan_id()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize( @@ -1792,15 +1500,9 @@ void CloudEventNodeExecution::MergeFrom(const CloudEventNodeExecution& from) { if (from.has_task_exec_id()) { mutable_task_exec_id()->::flyteidl::core::TaskExecutionIdentifier::MergeFrom(from.task_exec_id()); } - if (from.has_output_data()) { - mutable_output_data()->::flyteidl::core::LiteralMap::MergeFrom(from.output_data()); - } if (from.has_output_interface()) { mutable_output_interface()->::flyteidl::core::TypedInterface::MergeFrom(from.output_interface()); } - if (from.has_input_data()) { - mutable_input_data()->::flyteidl::core::LiteralMap::MergeFrom(from.input_data()); - } if (from.has_launch_plan_id()) { mutable_launch_plan_id()->::flyteidl::core::Identifier::MergeFrom(from.launch_plan_id()); } @@ -1836,9 +1538,7 @@ void CloudEventNodeExecution::InternalSwap(CloudEventNodeExecution* other) { GetArenaNoVirtual()); swap(raw_event_, other->raw_event_); swap(task_exec_id_, other->task_exec_id_); - swap(output_data_, other->output_data_); swap(output_interface_, other->output_interface_); - swap(input_data_, other->input_data_); swap(launch_plan_id_, other->launch_plan_id_); } diff --git a/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.h b/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.h index 999d5a1137..96e908e105 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.h @@ -178,10 +178,10 @@ class CloudEventWorkflowExecution final : // accessors ------------------------------------------------------- - // repeated .flyteidl.core.ArtifactID artifact_ids = 5; + // repeated .flyteidl.core.ArtifactID artifact_ids = 3; int artifact_ids_size() const; void clear_artifact_ids(); - static const int kArtifactIdsFieldNumber = 5; + static const int kArtifactIdsFieldNumber = 3; ::flyteidl::core::ArtifactID* mutable_artifact_ids(int index); ::google::protobuf::RepeatedPtrField< ::flyteidl::core::ArtifactID >* mutable_artifact_ids(); @@ -190,9 +190,9 @@ class CloudEventWorkflowExecution final : const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::ArtifactID >& artifact_ids() const; - // string principal = 7; + // string principal = 5; void clear_principal(); - static const int kPrincipalFieldNumber = 7; + static const int kPrincipalFieldNumber = 5; const ::std::string& principal() const; void set_principal(const ::std::string& value); #if LANG_CXX11 @@ -213,46 +213,28 @@ class CloudEventWorkflowExecution final : ::flyteidl::event::WorkflowExecutionEvent* mutable_raw_event(); void set_allocated_raw_event(::flyteidl::event::WorkflowExecutionEvent* raw_event); - // .flyteidl.core.LiteralMap output_data = 2; - bool has_output_data() const; - void clear_output_data(); - static const int kOutputDataFieldNumber = 2; - const ::flyteidl::core::LiteralMap& output_data() const; - ::flyteidl::core::LiteralMap* release_output_data(); - ::flyteidl::core::LiteralMap* mutable_output_data(); - void set_allocated_output_data(::flyteidl::core::LiteralMap* output_data); - - // .flyteidl.core.TypedInterface output_interface = 3; + // .flyteidl.core.TypedInterface output_interface = 2; bool has_output_interface() const; void clear_output_interface(); - static const int kOutputInterfaceFieldNumber = 3; + static const int kOutputInterfaceFieldNumber = 2; const ::flyteidl::core::TypedInterface& output_interface() const; ::flyteidl::core::TypedInterface* release_output_interface(); ::flyteidl::core::TypedInterface* mutable_output_interface(); void set_allocated_output_interface(::flyteidl::core::TypedInterface* output_interface); - // .flyteidl.core.LiteralMap input_data = 4; - bool has_input_data() const; - void clear_input_data(); - static const int kInputDataFieldNumber = 4; - const ::flyteidl::core::LiteralMap& input_data() const; - ::flyteidl::core::LiteralMap* release_input_data(); - ::flyteidl::core::LiteralMap* mutable_input_data(); - void set_allocated_input_data(::flyteidl::core::LiteralMap* input_data); - - // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + // .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; bool has_reference_execution() const; void clear_reference_execution(); - static const int kReferenceExecutionFieldNumber = 6; + static const int kReferenceExecutionFieldNumber = 4; const ::flyteidl::core::WorkflowExecutionIdentifier& reference_execution() const; ::flyteidl::core::WorkflowExecutionIdentifier* release_reference_execution(); ::flyteidl::core::WorkflowExecutionIdentifier* mutable_reference_execution(); void set_allocated_reference_execution(::flyteidl::core::WorkflowExecutionIdentifier* reference_execution); - // .flyteidl.core.Identifier launch_plan_id = 8; + // .flyteidl.core.Identifier launch_plan_id = 6; bool has_launch_plan_id() const; void clear_launch_plan_id(); - static const int kLaunchPlanIdFieldNumber = 8; + static const int kLaunchPlanIdFieldNumber = 6; const ::flyteidl::core::Identifier& launch_plan_id() const; ::flyteidl::core::Identifier* release_launch_plan_id(); ::flyteidl::core::Identifier* mutable_launch_plan_id(); @@ -266,9 +248,7 @@ class CloudEventWorkflowExecution final : ::google::protobuf::RepeatedPtrField< ::flyteidl::core::ArtifactID > artifact_ids_; ::google::protobuf::internal::ArenaStringPtr principal_; ::flyteidl::event::WorkflowExecutionEvent* raw_event_; - ::flyteidl::core::LiteralMap* output_data_; ::flyteidl::core::TypedInterface* output_interface_; - ::flyteidl::core::LiteralMap* input_data_; ::flyteidl::core::WorkflowExecutionIdentifier* reference_execution_; ::flyteidl::core::Identifier* launch_plan_id_; mutable ::google::protobuf::internal::CachedSize _cached_size_; @@ -371,10 +351,10 @@ class CloudEventNodeExecution final : // accessors ------------------------------------------------------- - // repeated .flyteidl.core.ArtifactID artifact_ids = 6; + // repeated .flyteidl.core.ArtifactID artifact_ids = 4; int artifact_ids_size() const; void clear_artifact_ids(); - static const int kArtifactIdsFieldNumber = 6; + static const int kArtifactIdsFieldNumber = 4; ::flyteidl::core::ArtifactID* mutable_artifact_ids(int index); ::google::protobuf::RepeatedPtrField< ::flyteidl::core::ArtifactID >* mutable_artifact_ids(); @@ -383,9 +363,9 @@ class CloudEventNodeExecution final : const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::ArtifactID >& artifact_ids() const; - // string principal = 7; + // string principal = 5; void clear_principal(); - static const int kPrincipalFieldNumber = 7; + static const int kPrincipalFieldNumber = 5; const ::std::string& principal() const; void set_principal(const ::std::string& value); #if LANG_CXX11 @@ -415,37 +395,19 @@ class CloudEventNodeExecution final : ::flyteidl::core::TaskExecutionIdentifier* mutable_task_exec_id(); void set_allocated_task_exec_id(::flyteidl::core::TaskExecutionIdentifier* task_exec_id); - // .flyteidl.core.LiteralMap output_data = 3; - bool has_output_data() const; - void clear_output_data(); - static const int kOutputDataFieldNumber = 3; - const ::flyteidl::core::LiteralMap& output_data() const; - ::flyteidl::core::LiteralMap* release_output_data(); - ::flyteidl::core::LiteralMap* mutable_output_data(); - void set_allocated_output_data(::flyteidl::core::LiteralMap* output_data); - - // .flyteidl.core.TypedInterface output_interface = 4; + // .flyteidl.core.TypedInterface output_interface = 3; bool has_output_interface() const; void clear_output_interface(); - static const int kOutputInterfaceFieldNumber = 4; + static const int kOutputInterfaceFieldNumber = 3; const ::flyteidl::core::TypedInterface& output_interface() const; ::flyteidl::core::TypedInterface* release_output_interface(); ::flyteidl::core::TypedInterface* mutable_output_interface(); void set_allocated_output_interface(::flyteidl::core::TypedInterface* output_interface); - // .flyteidl.core.LiteralMap input_data = 5; - bool has_input_data() const; - void clear_input_data(); - static const int kInputDataFieldNumber = 5; - const ::flyteidl::core::LiteralMap& input_data() const; - ::flyteidl::core::LiteralMap* release_input_data(); - ::flyteidl::core::LiteralMap* mutable_input_data(); - void set_allocated_input_data(::flyteidl::core::LiteralMap* input_data); - - // .flyteidl.core.Identifier launch_plan_id = 8; + // .flyteidl.core.Identifier launch_plan_id = 6; bool has_launch_plan_id() const; void clear_launch_plan_id(); - static const int kLaunchPlanIdFieldNumber = 8; + static const int kLaunchPlanIdFieldNumber = 6; const ::flyteidl::core::Identifier& launch_plan_id() const; ::flyteidl::core::Identifier* release_launch_plan_id(); ::flyteidl::core::Identifier* mutable_launch_plan_id(); @@ -460,9 +422,7 @@ class CloudEventNodeExecution final : ::google::protobuf::internal::ArenaStringPtr principal_; ::flyteidl::event::NodeExecutionEvent* raw_event_; ::flyteidl::core::TaskExecutionIdentifier* task_exec_id_; - ::flyteidl::core::LiteralMap* output_data_; ::flyteidl::core::TypedInterface* output_interface_; - ::flyteidl::core::LiteralMap* input_data_; ::flyteidl::core::Identifier* launch_plan_id_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fevent_2fcloudevents_2eproto; @@ -824,52 +784,7 @@ inline void CloudEventWorkflowExecution::set_allocated_raw_event(::flyteidl::eve // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventWorkflowExecution.raw_event) } -// .flyteidl.core.LiteralMap output_data = 2; -inline bool CloudEventWorkflowExecution::has_output_data() const { - return this != internal_default_instance() && output_data_ != nullptr; -} -inline const ::flyteidl::core::LiteralMap& CloudEventWorkflowExecution::output_data() const { - const ::flyteidl::core::LiteralMap* p = output_data_; - // @@protoc_insertion_point(field_get:flyteidl.event.CloudEventWorkflowExecution.output_data) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_LiteralMap_default_instance_); -} -inline ::flyteidl::core::LiteralMap* CloudEventWorkflowExecution::release_output_data() { - // @@protoc_insertion_point(field_release:flyteidl.event.CloudEventWorkflowExecution.output_data) - - ::flyteidl::core::LiteralMap* temp = output_data_; - output_data_ = nullptr; - return temp; -} -inline ::flyteidl::core::LiteralMap* CloudEventWorkflowExecution::mutable_output_data() { - - if (output_data_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::LiteralMap>(GetArenaNoVirtual()); - output_data_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.event.CloudEventWorkflowExecution.output_data) - return output_data_; -} -inline void CloudEventWorkflowExecution::set_allocated_output_data(::flyteidl::core::LiteralMap* output_data) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(output_data_); - } - if (output_data) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - output_data = ::google::protobuf::internal::GetOwnedMessage( - message_arena, output_data, submessage_arena); - } - - } else { - - } - output_data_ = output_data; - // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventWorkflowExecution.output_data) -} - -// .flyteidl.core.TypedInterface output_interface = 3; +// .flyteidl.core.TypedInterface output_interface = 2; inline bool CloudEventWorkflowExecution::has_output_interface() const { return this != internal_default_instance() && output_interface_ != nullptr; } @@ -914,52 +829,7 @@ inline void CloudEventWorkflowExecution::set_allocated_output_interface(::flytei // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventWorkflowExecution.output_interface) } -// .flyteidl.core.LiteralMap input_data = 4; -inline bool CloudEventWorkflowExecution::has_input_data() const { - return this != internal_default_instance() && input_data_ != nullptr; -} -inline const ::flyteidl::core::LiteralMap& CloudEventWorkflowExecution::input_data() const { - const ::flyteidl::core::LiteralMap* p = input_data_; - // @@protoc_insertion_point(field_get:flyteidl.event.CloudEventWorkflowExecution.input_data) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_LiteralMap_default_instance_); -} -inline ::flyteidl::core::LiteralMap* CloudEventWorkflowExecution::release_input_data() { - // @@protoc_insertion_point(field_release:flyteidl.event.CloudEventWorkflowExecution.input_data) - - ::flyteidl::core::LiteralMap* temp = input_data_; - input_data_ = nullptr; - return temp; -} -inline ::flyteidl::core::LiteralMap* CloudEventWorkflowExecution::mutable_input_data() { - - if (input_data_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::LiteralMap>(GetArenaNoVirtual()); - input_data_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.event.CloudEventWorkflowExecution.input_data) - return input_data_; -} -inline void CloudEventWorkflowExecution::set_allocated_input_data(::flyteidl::core::LiteralMap* input_data) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(input_data_); - } - if (input_data) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - input_data = ::google::protobuf::internal::GetOwnedMessage( - message_arena, input_data, submessage_arena); - } - - } else { - - } - input_data_ = input_data; - // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventWorkflowExecution.input_data) -} - -// repeated .flyteidl.core.ArtifactID artifact_ids = 5; +// repeated .flyteidl.core.ArtifactID artifact_ids = 3; inline int CloudEventWorkflowExecution::artifact_ids_size() const { return artifact_ids_.size(); } @@ -986,7 +856,7 @@ CloudEventWorkflowExecution::artifact_ids() const { return artifact_ids_; } -// .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; +// .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; inline bool CloudEventWorkflowExecution::has_reference_execution() const { return this != internal_default_instance() && reference_execution_ != nullptr; } @@ -1031,7 +901,7 @@ inline void CloudEventWorkflowExecution::set_allocated_reference_execution(::fly // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventWorkflowExecution.reference_execution) } -// string principal = 7; +// string principal = 5; inline void CloudEventWorkflowExecution::clear_principal() { principal_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1084,7 +954,7 @@ inline void CloudEventWorkflowExecution::set_allocated_principal(::std::string* // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventWorkflowExecution.principal) } -// .flyteidl.core.Identifier launch_plan_id = 8; +// .flyteidl.core.Identifier launch_plan_id = 6; inline bool CloudEventWorkflowExecution::has_launch_plan_id() const { return this != internal_default_instance() && launch_plan_id_ != nullptr; } @@ -1223,52 +1093,7 @@ inline void CloudEventNodeExecution::set_allocated_task_exec_id(::flyteidl::core // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventNodeExecution.task_exec_id) } -// .flyteidl.core.LiteralMap output_data = 3; -inline bool CloudEventNodeExecution::has_output_data() const { - return this != internal_default_instance() && output_data_ != nullptr; -} -inline const ::flyteidl::core::LiteralMap& CloudEventNodeExecution::output_data() const { - const ::flyteidl::core::LiteralMap* p = output_data_; - // @@protoc_insertion_point(field_get:flyteidl.event.CloudEventNodeExecution.output_data) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_LiteralMap_default_instance_); -} -inline ::flyteidl::core::LiteralMap* CloudEventNodeExecution::release_output_data() { - // @@protoc_insertion_point(field_release:flyteidl.event.CloudEventNodeExecution.output_data) - - ::flyteidl::core::LiteralMap* temp = output_data_; - output_data_ = nullptr; - return temp; -} -inline ::flyteidl::core::LiteralMap* CloudEventNodeExecution::mutable_output_data() { - - if (output_data_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::LiteralMap>(GetArenaNoVirtual()); - output_data_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.event.CloudEventNodeExecution.output_data) - return output_data_; -} -inline void CloudEventNodeExecution::set_allocated_output_data(::flyteidl::core::LiteralMap* output_data) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(output_data_); - } - if (output_data) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - output_data = ::google::protobuf::internal::GetOwnedMessage( - message_arena, output_data, submessage_arena); - } - - } else { - - } - output_data_ = output_data; - // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventNodeExecution.output_data) -} - -// .flyteidl.core.TypedInterface output_interface = 4; +// .flyteidl.core.TypedInterface output_interface = 3; inline bool CloudEventNodeExecution::has_output_interface() const { return this != internal_default_instance() && output_interface_ != nullptr; } @@ -1313,52 +1138,7 @@ inline void CloudEventNodeExecution::set_allocated_output_interface(::flyteidl:: // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventNodeExecution.output_interface) } -// .flyteidl.core.LiteralMap input_data = 5; -inline bool CloudEventNodeExecution::has_input_data() const { - return this != internal_default_instance() && input_data_ != nullptr; -} -inline const ::flyteidl::core::LiteralMap& CloudEventNodeExecution::input_data() const { - const ::flyteidl::core::LiteralMap* p = input_data_; - // @@protoc_insertion_point(field_get:flyteidl.event.CloudEventNodeExecution.input_data) - return p != nullptr ? *p : *reinterpret_cast( - &::flyteidl::core::_LiteralMap_default_instance_); -} -inline ::flyteidl::core::LiteralMap* CloudEventNodeExecution::release_input_data() { - // @@protoc_insertion_point(field_release:flyteidl.event.CloudEventNodeExecution.input_data) - - ::flyteidl::core::LiteralMap* temp = input_data_; - input_data_ = nullptr; - return temp; -} -inline ::flyteidl::core::LiteralMap* CloudEventNodeExecution::mutable_input_data() { - - if (input_data_ == nullptr) { - auto* p = CreateMaybeMessage<::flyteidl::core::LiteralMap>(GetArenaNoVirtual()); - input_data_ = p; - } - // @@protoc_insertion_point(field_mutable:flyteidl.event.CloudEventNodeExecution.input_data) - return input_data_; -} -inline void CloudEventNodeExecution::set_allocated_input_data(::flyteidl::core::LiteralMap* input_data) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::google::protobuf::MessageLite*>(input_data_); - } - if (input_data) { - ::google::protobuf::Arena* submessage_arena = nullptr; - if (message_arena != submessage_arena) { - input_data = ::google::protobuf::internal::GetOwnedMessage( - message_arena, input_data, submessage_arena); - } - - } else { - - } - input_data_ = input_data; - // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventNodeExecution.input_data) -} - -// repeated .flyteidl.core.ArtifactID artifact_ids = 6; +// repeated .flyteidl.core.ArtifactID artifact_ids = 4; inline int CloudEventNodeExecution::artifact_ids_size() const { return artifact_ids_.size(); } @@ -1385,7 +1165,7 @@ CloudEventNodeExecution::artifact_ids() const { return artifact_ids_; } -// string principal = 7; +// string principal = 5; inline void CloudEventNodeExecution::clear_principal() { principal_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1438,7 +1218,7 @@ inline void CloudEventNodeExecution::set_allocated_principal(::std::string* prin // @@protoc_insertion_point(field_set_allocated:flyteidl.event.CloudEventNodeExecution.principal) } -// .flyteidl.core.Identifier launch_plan_id = 8; +// .flyteidl.core.Identifier launch_plan_id = 6; inline bool CloudEventNodeExecution::has_launch_plan_id() const { return this != internal_default_instance() && launch_plan_id_ != nullptr; } diff --git a/flyteidl/gen/pb-go/flyteidl/event/cloudevents.pb.go b/flyteidl/gen/pb-go/flyteidl/event/cloudevents.pb.go index b692594368..f89296ebf9 100644 --- a/flyteidl/gen/pb-go/flyteidl/event/cloudevents.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/event/cloudevents.pb.go @@ -26,18 +26,16 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // information that downstream consumers may find useful. type CloudEventWorkflowExecution struct { RawEvent *WorkflowExecutionEvent `protobuf:"bytes,1,opt,name=raw_event,json=rawEvent,proto3" json:"raw_event,omitempty"` - OutputData *core.LiteralMap `protobuf:"bytes,2,opt,name=output_data,json=outputData,proto3" json:"output_data,omitempty"` - OutputInterface *core.TypedInterface `protobuf:"bytes,3,opt,name=output_interface,json=outputInterface,proto3" json:"output_interface,omitempty"` - InputData *core.LiteralMap `protobuf:"bytes,4,opt,name=input_data,json=inputData,proto3" json:"input_data,omitempty"` + OutputInterface *core.TypedInterface `protobuf:"bytes,2,opt,name=output_interface,json=outputInterface,proto3" json:"output_interface,omitempty"` // The following are ExecutionMetadata fields // We can't have the ExecutionMetadata object directly because of import cycle - ArtifactIds []*core.ArtifactID `protobuf:"bytes,5,rep,name=artifact_ids,json=artifactIds,proto3" json:"artifact_ids,omitempty"` - ReferenceExecution *core.WorkflowExecutionIdentifier `protobuf:"bytes,6,opt,name=reference_execution,json=referenceExecution,proto3" json:"reference_execution,omitempty"` - Principal string `protobuf:"bytes,7,opt,name=principal,proto3" json:"principal,omitempty"` + ArtifactIds []*core.ArtifactID `protobuf:"bytes,3,rep,name=artifact_ids,json=artifactIds,proto3" json:"artifact_ids,omitempty"` + ReferenceExecution *core.WorkflowExecutionIdentifier `protobuf:"bytes,4,opt,name=reference_execution,json=referenceExecution,proto3" json:"reference_execution,omitempty"` + Principal string `protobuf:"bytes,5,opt,name=principal,proto3" json:"principal,omitempty"` // The ID of the LP that generated the execution that generated the Artifact. // Here for provenance information. // Launch plan IDs are easier to get than workflow IDs so we'll use these for now. - LaunchPlanId *core.Identifier `protobuf:"bytes,8,opt,name=launch_plan_id,json=launchPlanId,proto3" json:"launch_plan_id,omitempty"` + LaunchPlanId *core.Identifier `protobuf:"bytes,6,opt,name=launch_plan_id,json=launchPlanId,proto3" json:"launch_plan_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -75,13 +73,6 @@ func (m *CloudEventWorkflowExecution) GetRawEvent() *WorkflowExecutionEvent { return nil } -func (m *CloudEventWorkflowExecution) GetOutputData() *core.LiteralMap { - if m != nil { - return m.OutputData - } - return nil -} - func (m *CloudEventWorkflowExecution) GetOutputInterface() *core.TypedInterface { if m != nil { return m.OutputInterface @@ -89,13 +80,6 @@ func (m *CloudEventWorkflowExecution) GetOutputInterface() *core.TypedInterface return nil } -func (m *CloudEventWorkflowExecution) GetInputData() *core.LiteralMap { - if m != nil { - return m.InputData - } - return nil -} - func (m *CloudEventWorkflowExecution) GetArtifactIds() []*core.ArtifactID { if m != nil { return m.ArtifactIds @@ -128,19 +112,16 @@ type CloudEventNodeExecution struct { RawEvent *NodeExecutionEvent `protobuf:"bytes,1,opt,name=raw_event,json=rawEvent,proto3" json:"raw_event,omitempty"` // The relevant task execution if applicable TaskExecId *core.TaskExecutionIdentifier `protobuf:"bytes,2,opt,name=task_exec_id,json=taskExecId,proto3" json:"task_exec_id,omitempty"` - // Hydrated output - OutputData *core.LiteralMap `protobuf:"bytes,3,opt,name=output_data,json=outputData,proto3" json:"output_data,omitempty"` // The typed interface for the task that produced the event. - OutputInterface *core.TypedInterface `protobuf:"bytes,4,opt,name=output_interface,json=outputInterface,proto3" json:"output_interface,omitempty"` - InputData *core.LiteralMap `protobuf:"bytes,5,opt,name=input_data,json=inputData,proto3" json:"input_data,omitempty"` + OutputInterface *core.TypedInterface `protobuf:"bytes,3,opt,name=output_interface,json=outputInterface,proto3" json:"output_interface,omitempty"` // The following are ExecutionMetadata fields // We can't have the ExecutionMetadata object directly because of import cycle - ArtifactIds []*core.ArtifactID `protobuf:"bytes,6,rep,name=artifact_ids,json=artifactIds,proto3" json:"artifact_ids,omitempty"` - Principal string `protobuf:"bytes,7,opt,name=principal,proto3" json:"principal,omitempty"` + ArtifactIds []*core.ArtifactID `protobuf:"bytes,4,rep,name=artifact_ids,json=artifactIds,proto3" json:"artifact_ids,omitempty"` + Principal string `protobuf:"bytes,5,opt,name=principal,proto3" json:"principal,omitempty"` // The ID of the LP that generated the execution that generated the Artifact. // Here for provenance information. // Launch plan IDs are easier to get than workflow IDs so we'll use these for now. - LaunchPlanId *core.Identifier `protobuf:"bytes,8,opt,name=launch_plan_id,json=launchPlanId,proto3" json:"launch_plan_id,omitempty"` + LaunchPlanId *core.Identifier `protobuf:"bytes,6,opt,name=launch_plan_id,json=launchPlanId,proto3" json:"launch_plan_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -185,13 +166,6 @@ func (m *CloudEventNodeExecution) GetTaskExecId() *core.TaskExecutionIdentifier return nil } -func (m *CloudEventNodeExecution) GetOutputData() *core.LiteralMap { - if m != nil { - return m.OutputData - } - return nil -} - func (m *CloudEventNodeExecution) GetOutputInterface() *core.TypedInterface { if m != nil { return m.OutputInterface @@ -199,13 +173,6 @@ func (m *CloudEventNodeExecution) GetOutputInterface() *core.TypedInterface { return nil } -func (m *CloudEventNodeExecution) GetInputData() *core.LiteralMap { - if m != nil { - return m.InputData - } - return nil -} - func (m *CloudEventNodeExecution) GetArtifactIds() []*core.ArtifactID { if m != nil { return m.ArtifactIds @@ -360,43 +327,40 @@ func init() { func init() { proto.RegisterFile("flyteidl/event/cloudevents.proto", fileDescriptor_f8af3ecc827e5d5e) } var fileDescriptor_f8af3ecc827e5d5e = []byte{ - // 595 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x5d, 0x6f, 0xd3, 0x30, - 0x14, 0x55, 0x3f, 0x56, 0x56, 0xb7, 0x0c, 0x14, 0x1e, 0x08, 0x65, 0x83, 0xaa, 0x48, 0x68, 0x42, - 0x22, 0x91, 0xe0, 0x05, 0xf1, 0xa1, 0x09, 0xb6, 0x49, 0x8b, 0x60, 0x08, 0x05, 0x24, 0xa4, 0xf1, - 0x10, 0xb9, 0xf1, 0x4d, 0x66, 0x35, 0x8d, 0x23, 0xc7, 0xa1, 0xf4, 0x91, 0xff, 0xc1, 0xff, 0xe3, - 0x6f, 0xa0, 0x38, 0x89, 0xd3, 0xb8, 0x95, 0x46, 0x35, 0x78, 0x99, 0x3c, 0xdf, 0x73, 0x8e, 0xaf, - 0xcf, 0x3d, 0xa9, 0xd1, 0x38, 0x88, 0x96, 0x02, 0x28, 0x89, 0x6c, 0xf8, 0x0e, 0xb1, 0xb0, 0xfd, - 0x88, 0x65, 0x44, 0x2e, 0x53, 0x2b, 0xe1, 0x4c, 0x30, 0x63, 0xaf, 0x42, 0x58, 0x72, 0x7b, 0x34, - 0xd2, 0x18, 0xf2, 0x6f, 0x81, 0x1d, 0xed, 0xab, 0x9a, 0xcf, 0x38, 0xd8, 0x11, 0x15, 0xc0, 0x71, - 0x54, 0x2a, 0x8d, 0x0e, 0x9a, 0x55, 0x1a, 0x0b, 0xe0, 0x01, 0xf6, 0xa1, 0x2c, 0x3f, 0x6c, 0x96, - 0x31, 0x17, 0x34, 0xc0, 0xbe, 0xf0, 0x28, 0x29, 0x01, 0x0f, 0x34, 0x3e, 0x81, 0x58, 0xd0, 0x80, - 0x02, 0xaf, 0x04, 0x42, 0xc6, 0xc2, 0x08, 0x6c, 0xf9, 0xdf, 0x34, 0x0b, 0x6c, 0x41, 0xe7, 0x90, - 0x0a, 0x3c, 0x4f, 0x0a, 0xc0, 0xe4, 0x57, 0x17, 0xdd, 0x3f, 0xce, 0x2f, 0x78, 0x9a, 0xf7, 0xfc, - 0x95, 0xf1, 0x59, 0x10, 0xb1, 0xc5, 0xe9, 0x0f, 0xf0, 0x33, 0x41, 0x59, 0x6c, 0x1c, 0xa3, 0x3e, - 0xc7, 0x0b, 0x4f, 0xde, 0xc8, 0x6c, 0x8d, 0x5b, 0x87, 0x83, 0x67, 0x8f, 0xad, 0xe6, 0xf5, 0xad, - 0x35, 0x96, 0xd4, 0x72, 0x77, 0x39, 0x5e, 0xc8, 0x95, 0xf1, 0x12, 0x0d, 0x58, 0x26, 0x92, 0x4c, - 0x78, 0x04, 0x0b, 0x6c, 0xb6, 0xa5, 0xcc, 0xbd, 0x5a, 0x26, 0xef, 0xdd, 0xfa, 0x50, 0x38, 0x73, - 0x8e, 0x13, 0x17, 0x15, 0xe8, 0x13, 0x2c, 0xb0, 0x71, 0x86, 0x6e, 0x97, 0x5c, 0x65, 0x8e, 0xd9, - 0x91, 0x02, 0x07, 0x9a, 0xc0, 0x97, 0x65, 0x02, 0xc4, 0xa9, 0x40, 0xee, 0xad, 0x82, 0xa6, 0x36, - 0x8c, 0x17, 0x08, 0xd1, 0x58, 0x35, 0xd1, 0xbd, 0xaa, 0x89, 0xbe, 0x04, 0xcb, 0x1e, 0x5e, 0xa3, - 0xe1, 0x8a, 0xf5, 0xa9, 0xb9, 0x33, 0xee, 0x6c, 0xe0, 0xbe, 0x2d, 0x21, 0xce, 0x89, 0x3b, 0xa8, - 0xe0, 0x0e, 0x49, 0x8d, 0x6f, 0xe8, 0x0e, 0x87, 0x00, 0x38, 0xc4, 0x3e, 0x78, 0x50, 0x79, 0x64, - 0xf6, 0x64, 0x03, 0x4f, 0x34, 0x91, 0x35, 0x2f, 0x1d, 0x35, 0x52, 0xd7, 0x50, 0x32, 0xf5, 0x7c, - 0xf6, 0x51, 0x3f, 0xe1, 0x34, 0xf6, 0x69, 0x82, 0x23, 0xf3, 0xc6, 0xb8, 0x75, 0xd8, 0x77, 0xeb, - 0x0d, 0xe3, 0x08, 0xed, 0x45, 0x38, 0x8b, 0xfd, 0x4b, 0x2f, 0x89, 0x70, 0xec, 0x51, 0x62, 0xee, - 0x6e, 0xbc, 0xf6, 0xca, 0x21, 0xc3, 0x82, 0xf0, 0x29, 0xc2, 0xb1, 0x43, 0x26, 0x3f, 0xbb, 0xe8, - 0x6e, 0x1d, 0x8f, 0x8f, 0x8c, 0xac, 0x1c, 0x7d, 0xb4, 0x1e, 0x8d, 0x89, 0x1e, 0x8d, 0x06, 0x43, - 0x8f, 0xc5, 0x19, 0x1a, 0x0a, 0x9c, 0xce, 0xa4, 0x27, 0x79, 0x6f, 0x6d, 0x3d, 0x5e, 0xc5, 0x58, - 0x71, 0x3a, 0xdb, 0xe4, 0x06, 0x12, 0x65, 0xc1, 0x21, 0x7a, 0xc0, 0x3a, 0xd7, 0x0d, 0x58, 0xf7, - 0x1f, 0x04, 0x6c, 0xe7, 0x1a, 0x01, 0xeb, 0x6d, 0x15, 0xb0, 0xff, 0x9c, 0x81, 0x8b, 0xd5, 0x08, - 0x34, 0xa6, 0xf1, 0x57, 0x11, 0x68, 0x30, 0xb4, 0x08, 0x4c, 0x7e, 0xb7, 0x91, 0x59, 0x8b, 0x2b, - 0xd8, 0x67, 0x81, 0xb9, 0x30, 0xce, 0xd1, 0x50, 0x7d, 0x2e, 0x79, 0xdf, 0xad, 0xad, 0xbf, 0x98, - 0x01, 0xd4, 0x9b, 0x1b, 0x8c, 0x68, 0x6f, 0x65, 0x44, 0x9e, 0xb2, 0x45, 0x79, 0x58, 0xce, 0xee, - 0x5c, 0xc5, 0x46, 0x15, 0xda, 0x21, 0x6b, 0x13, 0xee, 0x6e, 0x35, 0xe1, 0x47, 0xe8, 0xa6, 0x62, - 0xcf, 0x60, 0x59, 0xfc, 0x02, 0xf5, 0x5d, 0x25, 0xf9, 0x1e, 0x96, 0x5a, 0x0c, 0x7a, 0x5a, 0x0c, - 0xde, 0xbd, 0xb9, 0x78, 0x15, 0x52, 0x71, 0x99, 0x4d, 0x2d, 0x9f, 0xcd, 0x6d, 0x79, 0x2c, 0xe3, - 0x61, 0xb1, 0xb0, 0xd5, 0x2b, 0x12, 0x42, 0x6c, 0x27, 0xd3, 0xa7, 0x21, 0xb3, 0x9b, 0x4f, 0xda, - 0xb4, 0x27, 0x9f, 0x8b, 0xe7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x96, 0x62, 0x9e, 0x02, 0x1d, - 0x07, 0x00, 0x00, + // 547 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xdd, 0x8a, 0xd3, 0x40, + 0x14, 0xa6, 0xcd, 0x6e, 0xb1, 0xd3, 0xba, 0x4a, 0xbc, 0x30, 0xd6, 0x5d, 0x0d, 0x15, 0xa4, 0x08, + 0x26, 0xb0, 0xde, 0xf9, 0xc3, 0xa2, 0xeb, 0x82, 0x41, 0x14, 0x89, 0x82, 0xb0, 0x5e, 0x84, 0x69, + 0xe6, 0x24, 0x3b, 0x74, 0x9a, 0x09, 0x93, 0x89, 0xb5, 0xcf, 0xe0, 0x7b, 0xf8, 0x6a, 0xbe, 0x86, + 0x64, 0xf2, 0xd7, 0x4c, 0x0b, 0x5a, 0xd4, 0x9b, 0x30, 0x99, 0xf3, 0x7d, 0xdf, 0xf9, 0xf9, 0x0e, + 0x83, 0xec, 0x88, 0xad, 0x25, 0x50, 0xc2, 0x5c, 0xf8, 0x0a, 0x89, 0x74, 0x43, 0xc6, 0x73, 0xa2, + 0x8e, 0x99, 0x93, 0x0a, 0x2e, 0xb9, 0x79, 0x54, 0x23, 0x1c, 0x75, 0x3d, 0x99, 0x68, 0x0c, 0xf5, + 0x2d, 0xb1, 0x93, 0xe3, 0x26, 0x16, 0x72, 0x01, 0x2e, 0xa3, 0x12, 0x04, 0x66, 0x95, 0xd2, 0xe4, + 0xa4, 0x1b, 0xa5, 0x89, 0x04, 0x11, 0xe1, 0x10, 0xaa, 0xf0, 0xfd, 0x6e, 0x18, 0x0b, 0x49, 0x23, + 0x1c, 0xca, 0x80, 0x92, 0x0a, 0x70, 0x4f, 0xe3, 0x13, 0x48, 0x24, 0x8d, 0x28, 0x88, 0x5a, 0x20, + 0xe6, 0x3c, 0x66, 0xe0, 0xaa, 0xbf, 0x79, 0x1e, 0xb9, 0x92, 0x2e, 0x21, 0x93, 0x78, 0x99, 0x96, + 0x80, 0xe9, 0x0f, 0x03, 0xdd, 0x3d, 0x2f, 0x1a, 0xbc, 0x28, 0x6a, 0xfe, 0xcc, 0xc5, 0x22, 0x62, + 0x7c, 0x75, 0xf1, 0x0d, 0xc2, 0x5c, 0x52, 0x9e, 0x98, 0xe7, 0x68, 0x28, 0xf0, 0x2a, 0x50, 0x1d, + 0x59, 0x3d, 0xbb, 0x37, 0x1b, 0x9d, 0x3e, 0x74, 0xba, 0xed, 0x3b, 0x5b, 0x2c, 0xa5, 0xe5, 0x5f, + 0x13, 0x78, 0xa5, 0x4e, 0xe6, 0x1b, 0x74, 0x93, 0xe7, 0x32, 0xcd, 0x65, 0xd0, 0x34, 0x68, 0xf5, + 0x95, 0xd6, 0x49, 0xab, 0x55, 0x34, 0xe0, 0x7c, 0x5a, 0xa7, 0x40, 0xbc, 0x1a, 0xe4, 0xdf, 0x28, + 0x69, 0xcd, 0x85, 0xf9, 0x1c, 0x8d, 0x37, 0x86, 0x90, 0x59, 0x86, 0x6d, 0xcc, 0x46, 0xa7, 0x77, + 0x34, 0x95, 0x97, 0x15, 0xc4, 0x7b, 0xed, 0x8f, 0x6a, 0xb8, 0x47, 0x32, 0xf3, 0x0b, 0xba, 0x25, + 0x20, 0x02, 0x01, 0x49, 0x08, 0x01, 0xd4, 0xd5, 0x5a, 0x07, 0xaa, 0x94, 0x47, 0x9a, 0xc8, 0x56, + 0x57, 0x5e, 0x33, 0x5c, 0xdf, 0x6c, 0x64, 0xda, 0x49, 0x1d, 0xa3, 0x61, 0x2a, 0x68, 0x12, 0xd2, + 0x14, 0x33, 0xeb, 0xd0, 0xee, 0xcd, 0x86, 0x7e, 0x7b, 0x61, 0x9e, 0xa1, 0x23, 0x86, 0xf3, 0x24, + 0xbc, 0x0a, 0x52, 0x86, 0x93, 0x80, 0x12, 0x6b, 0xa0, 0xb2, 0xea, 0xa5, 0x6f, 0x24, 0x19, 0x97, + 0x84, 0x0f, 0x0c, 0x27, 0x1e, 0x99, 0x7e, 0x37, 0xd0, 0xed, 0xd6, 0xa8, 0xf7, 0x9c, 0x6c, 0xa4, + 0x3e, 0xdb, 0x36, 0x69, 0xaa, 0x9b, 0xd4, 0x61, 0x6c, 0x1b, 0x34, 0x96, 0x38, 0x5b, 0xa8, 0x99, + 0x14, 0xb5, 0xf5, 0x75, 0xa3, 0x4b, 0x73, 0x70, 0xb6, 0xd8, 0x35, 0x0d, 0x24, 0xab, 0x80, 0x47, + 0x76, 0x5a, 0x6d, 0xfc, 0x13, 0xab, 0x0f, 0xf6, 0xb2, 0xfa, 0x3f, 0xbb, 0x71, 0xb9, 0x69, 0x46, + 0x67, 0x2e, 0x7f, 0x64, 0x46, 0x87, 0xa1, 0x99, 0x31, 0xfd, 0xd9, 0x47, 0x56, 0x2b, 0xde, 0xc0, + 0x3e, 0x4a, 0x2c, 0xa4, 0xf9, 0x0e, 0x8d, 0x9b, 0xc5, 0x2d, 0xea, 0xee, 0xed, 0xbd, 0xbb, 0x23, + 0x68, 0x2f, 0x77, 0x0c, 0xa2, 0xbf, 0xd7, 0x20, 0xcc, 0xa7, 0x68, 0xb4, 0xaa, 0x92, 0x15, 0x6c, + 0xe3, 0x77, 0x6c, 0x54, 0xa3, 0x3d, 0xf2, 0x97, 0x0e, 0x3f, 0x40, 0xd7, 0x1b, 0xf6, 0x02, 0xd6, + 0x99, 0x75, 0x68, 0x1b, 0xb3, 0xa1, 0xdf, 0x48, 0xbe, 0x85, 0xb5, 0xb6, 0x06, 0x03, 0x6d, 0x0d, + 0x5e, 0xbd, 0xb8, 0x7c, 0x16, 0x53, 0x79, 0x95, 0xcf, 0x9d, 0x90, 0x2f, 0x5d, 0x95, 0x96, 0x8b, + 0xb8, 0x3c, 0xb8, 0xcd, 0xcb, 0x1a, 0x43, 0xe2, 0xa6, 0xf3, 0xc7, 0x31, 0x77, 0xbb, 0xcf, 0xfc, + 0x7c, 0xa0, 0x9e, 0xd0, 0x27, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x64, 0xaa, 0xf5, 0xf2, 0x31, + 0x06, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-java/flyteidl/event/Cloudevents.java b/flyteidl/gen/pb-java/flyteidl/event/Cloudevents.java index 65bdf5ab1f..6ca66d432e 100644 --- a/flyteidl/gen/pb-java/flyteidl/event/Cloudevents.java +++ b/flyteidl/gen/pb-java/flyteidl/event/Cloudevents.java @@ -32,51 +32,25 @@ public interface CloudEventWorkflowExecutionOrBuilder extends flyteidl.event.Event.WorkflowExecutionEventOrBuilder getRawEventOrBuilder(); /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - boolean hasOutputData(); - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - flyteidl.core.Literals.LiteralMap getOutputData(); - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - flyteidl.core.Literals.LiteralMapOrBuilder getOutputDataOrBuilder(); - - /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ boolean hasOutputInterface(); /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ flyteidl.core.Interface.TypedInterface getOutputInterface(); /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuilder(); - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - boolean hasInputData(); - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - flyteidl.core.Literals.LiteralMap getInputData(); - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - flyteidl.core.Literals.LiteralMapOrBuilder getInputDataOrBuilder(); - /** * 
      * The following are ExecutionMetadata fields
      * We can't have the ExecutionMetadata object directly because of import cycle
      *
* - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ java.util.List getArtifactIdsList(); @@ -86,7 +60,7 @@ public interface CloudEventWorkflowExecutionOrBuilder extends * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index); /** @@ -95,7 +69,7 @@ public interface CloudEventWorkflowExecutionOrBuilder extends * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ int getArtifactIdsCount(); /** @@ -104,7 +78,7 @@ public interface CloudEventWorkflowExecutionOrBuilder extends * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ java.util.List getArtifactIdsOrBuilderList(); @@ -114,30 +88,30 @@ public interface CloudEventWorkflowExecutionOrBuilder extends * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( int index); /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ boolean hasReferenceExecution(); /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getReferenceExecution(); /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getReferenceExecutionOrBuilder(); /** - * string principal = 7; + * string principal = 5; */ java.lang.String getPrincipal(); /** - * string principal = 7; + * string principal = 5; */ com.google.protobuf.ByteString getPrincipalBytes(); @@ -149,7 +123,7 @@ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ boolean hasLaunchPlanId(); /** @@ -159,7 +133,7 @@ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId(); /** @@ -169,7 +143,7 @@ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getLaunchPlanIdOrBuilder(); } @@ -233,19 +207,6 @@ private CloudEventWorkflowExecution( break; } case 18: { - flyteidl.core.Literals.LiteralMap.Builder subBuilder = null; - if (outputData_ != null) { - subBuilder = outputData_.toBuilder(); - } - outputData_ = input.readMessage(flyteidl.core.Literals.LiteralMap.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(outputData_); - outputData_ = subBuilder.buildPartial(); - } - - break; - } - case 26: { flyteidl.core.Interface.TypedInterface.Builder subBuilder = null; if (outputInterface_ != null) { subBuilder = outputInterface_.toBuilder(); @@ -258,29 +219,16 @@ private CloudEventWorkflowExecution( break; } - case 34: { - flyteidl.core.Literals.LiteralMap.Builder subBuilder = null; - if (inputData_ != null) { - subBuilder = inputData_.toBuilder(); - } - inputData_ = input.readMessage(flyteidl.core.Literals.LiteralMap.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(inputData_); - inputData_ = subBuilder.buildPartial(); - } - - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { + case 26: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { artifactIds_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; + mutable_bitField0_ |= 0x00000004; } artifactIds_.add( input.readMessage(flyteidl.core.ArtifactId.ArtifactID.parser(), extensionRegistry)); break; } - case 50: { + case 34: { flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder subBuilder = null; if (referenceExecution_ != null) { subBuilder = referenceExecution_.toBuilder(); @@ -293,13 +241,13 @@ private CloudEventWorkflowExecution( break; } - case 58: { + case 42: { java.lang.String s = input.readStringRequireUtf8(); principal_ = s; break; } - case 66: { + case 50: { flyteidl.core.IdentifierOuterClass.Identifier.Builder subBuilder = null; if (launchPlanId_ != null) { subBuilder = launchPlanId_.toBuilder(); @@ -327,7 +275,7 @@ private CloudEventWorkflowExecution( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) != 0)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { artifactIds_ = java.util.Collections.unmodifiableList(artifactIds_); } this.unknownFields = unknownFields.build(); @@ -369,70 +317,28 @@ public flyteidl.event.Event.WorkflowExecutionEventOrBuilder getRawEventOrBuilder return getRawEvent(); } - public static final int OUTPUT_DATA_FIELD_NUMBER = 2; - private flyteidl.core.Literals.LiteralMap outputData_; - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public boolean hasOutputData() { - return outputData_ != null; - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public flyteidl.core.Literals.LiteralMap getOutputData() { - return outputData_ == null ? flyteidl.core.Literals.LiteralMap.getDefaultInstance() : outputData_; - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public flyteidl.core.Literals.LiteralMapOrBuilder getOutputDataOrBuilder() { - return getOutputData(); - } - - public static final int OUTPUT_INTERFACE_FIELD_NUMBER = 3; + public static final int OUTPUT_INTERFACE_FIELD_NUMBER = 2; private flyteidl.core.Interface.TypedInterface outputInterface_; /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public boolean hasOutputInterface() { return outputInterface_ != null; } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public flyteidl.core.Interface.TypedInterface getOutputInterface() { return outputInterface_ == null ? flyteidl.core.Interface.TypedInterface.getDefaultInstance() : outputInterface_; } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuilder() { return getOutputInterface(); } - public static final int INPUT_DATA_FIELD_NUMBER = 4; - private flyteidl.core.Literals.LiteralMap inputData_; - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public boolean hasInputData() { - return inputData_ != null; - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public flyteidl.core.Literals.LiteralMap getInputData() { - return inputData_ == null ? flyteidl.core.Literals.LiteralMap.getDefaultInstance() : inputData_; - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public flyteidl.core.Literals.LiteralMapOrBuilder getInputDataOrBuilder() { - return getInputData(); - } - - public static final int ARTIFACT_IDS_FIELD_NUMBER = 5; + public static final int ARTIFACT_IDS_FIELD_NUMBER = 3; private java.util.List artifactIds_; /** * 
@@ -440,7 +346,7 @@ public flyteidl.core.Literals.LiteralMapOrBuilder getInputDataOrBuilder() {
      * We can't have the ExecutionMetadata object directly because of import cycle
      *
* - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public java.util.List getArtifactIdsList() { return artifactIds_; @@ -451,7 +357,7 @@ public java.util.List getArtifactIdsList() * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public java.util.List getArtifactIdsOrBuilderList() { @@ -463,7 +369,7 @@ public java.util.List getArtifactIdsList() * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public int getArtifactIdsCount() { return artifactIds_.size(); @@ -474,7 +380,7 @@ public int getArtifactIdsCount() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { return artifactIds_.get(index); @@ -485,38 +391,38 @@ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( int index) { return artifactIds_.get(index); } - public static final int REFERENCE_EXECUTION_FIELD_NUMBER = 6; + public static final int REFERENCE_EXECUTION_FIELD_NUMBER = 4; private flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier referenceExecution_; /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public boolean hasReferenceExecution() { return referenceExecution_ != null; } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getReferenceExecution() { return referenceExecution_ == null ? flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.getDefaultInstance() : referenceExecution_; } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getReferenceExecutionOrBuilder() { return getReferenceExecution(); } - public static final int PRINCIPAL_FIELD_NUMBER = 7; + public static final int PRINCIPAL_FIELD_NUMBER = 5; private volatile java.lang.Object principal_; /** - * string principal = 7; + * string principal = 5; */ public java.lang.String getPrincipal() { java.lang.Object ref = principal_; @@ -531,7 +437,7 @@ public java.lang.String getPrincipal() { } } /** - * string principal = 7; + * string principal = 5; */ public com.google.protobuf.ByteString getPrincipalBytes() { @@ -547,7 +453,7 @@ public java.lang.String getPrincipal() { } } - public static final int LAUNCH_PLAN_ID_FIELD_NUMBER = 8; + public static final int LAUNCH_PLAN_ID_FIELD_NUMBER = 6; private flyteidl.core.IdentifierOuterClass.Identifier launchPlanId_; /** * 
@@ -556,7 +462,7 @@ public java.lang.String getPrincipal() {
      * Launch plan IDs are easier to get than workflow IDs so we'll use these for now.
      *
* - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public boolean hasLaunchPlanId() { return launchPlanId_ != null; @@ -568,7 +474,7 @@ public boolean hasLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId() { return launchPlanId_ == null ? flyteidl.core.IdentifierOuterClass.Identifier.getDefaultInstance() : launchPlanId_; @@ -580,7 +486,7 @@ public flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getLaunchPlanIdOrBuilder() { return getLaunchPlanId(); @@ -603,26 +509,20 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (rawEvent_ != null) { output.writeMessage(1, getRawEvent()); } - if (outputData_ != null) { - output.writeMessage(2, getOutputData()); - } if (outputInterface_ != null) { - output.writeMessage(3, getOutputInterface()); - } - if (inputData_ != null) { - output.writeMessage(4, getInputData()); + output.writeMessage(2, getOutputInterface()); } for (int i = 0; i < artifactIds_.size(); i++) { - output.writeMessage(5, artifactIds_.get(i)); + output.writeMessage(3, artifactIds_.get(i)); } if (referenceExecution_ != null) { - output.writeMessage(6, getReferenceExecution()); + output.writeMessage(4, getReferenceExecution()); } if (!getPrincipalBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, principal_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, principal_); } if (launchPlanId_ != null) { - output.writeMessage(8, getLaunchPlanId()); + output.writeMessage(6, getLaunchPlanId()); } unknownFields.writeTo(output); } @@ -637,32 +537,24 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getRawEvent()); } - if (outputData_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getOutputData()); - } if (outputInterface_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getOutputInterface()); - } - if (inputData_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getInputData()); + .computeMessageSize(2, getOutputInterface()); } for (int i = 0; i < artifactIds_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, artifactIds_.get(i)); + .computeMessageSize(3, artifactIds_.get(i)); } if (referenceExecution_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getReferenceExecution()); + .computeMessageSize(4, getReferenceExecution()); } if (!getPrincipalBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, principal_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, principal_); } if (launchPlanId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, getLaunchPlanId()); + .computeMessageSize(6, getLaunchPlanId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -684,21 +576,11 @@ public boolean equals(final java.lang.Object obj) { if (!getRawEvent() .equals(other.getRawEvent())) return false; } - if (hasOutputData() != other.hasOutputData()) return false; - if (hasOutputData()) { - if (!getOutputData() - .equals(other.getOutputData())) return false; - } if (hasOutputInterface() != other.hasOutputInterface()) return false; if (hasOutputInterface()) { if (!getOutputInterface() .equals(other.getOutputInterface())) return false; } - if (hasInputData() != other.hasInputData()) return false; - if (hasInputData()) { - if (!getInputData() - .equals(other.getInputData())) return false; - } if (!getArtifactIdsList() .equals(other.getArtifactIdsList())) return false; if (hasReferenceExecution() != other.hasReferenceExecution()) return false; @@ -728,18 +610,10 @@ public int hashCode() { hash = (37 * hash) + RAW_EVENT_FIELD_NUMBER; hash = (53 * hash) + getRawEvent().hashCode(); } - if (hasOutputData()) { - hash = (37 * hash) + OUTPUT_DATA_FIELD_NUMBER; - hash = (53 * hash) + getOutputData().hashCode(); - } if (hasOutputInterface()) { hash = (37 * hash) + OUTPUT_INTERFACE_FIELD_NUMBER; hash = (53 * hash) + getOutputInterface().hashCode(); } - if (hasInputData()) { - hash = (37 * hash) + INPUT_DATA_FIELD_NUMBER; - hash = (53 * hash) + getInputData().hashCode(); - } if (getArtifactIdsCount() > 0) { hash = (37 * hash) + ARTIFACT_IDS_FIELD_NUMBER; hash = (53 * hash) + getArtifactIdsList().hashCode(); @@ -899,27 +773,15 @@ public Builder clear() { rawEvent_ = null; rawEventBuilder_ = null; } - if (outputDataBuilder_ == null) { - outputData_ = null; - } else { - outputData_ = null; - outputDataBuilder_ = null; - } if (outputInterfaceBuilder_ == null) { outputInterface_ = null; } else { outputInterface_ = null; outputInterfaceBuilder_ = null; } - if (inputDataBuilder_ == null) { - inputData_ = null; - } else { - inputData_ = null; - inputDataBuilder_ = null; - } if (artifactIdsBuilder_ == null) { artifactIds_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000004); } else { artifactIdsBuilder_.clear(); } @@ -970,25 +832,15 @@ public flyteidl.event.Cloudevents.CloudEventWorkflowExecution buildPartial() { } else { result.rawEvent_ = rawEventBuilder_.build(); } - if (outputDataBuilder_ == null) { - result.outputData_ = outputData_; - } else { - result.outputData_ = outputDataBuilder_.build(); - } if (outputInterfaceBuilder_ == null) { result.outputInterface_ = outputInterface_; } else { result.outputInterface_ = outputInterfaceBuilder_.build(); } - if (inputDataBuilder_ == null) { - result.inputData_ = inputData_; - } else { - result.inputData_ = inputDataBuilder_.build(); - } if (artifactIdsBuilder_ == null) { - if (((bitField0_ & 0x00000010) != 0)) { + if (((bitField0_ & 0x00000004) != 0)) { artifactIds_ = java.util.Collections.unmodifiableList(artifactIds_); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000004); } result.artifactIds_ = artifactIds_; } else { @@ -1057,20 +909,14 @@ public Builder mergeFrom(flyteidl.event.Cloudevents.CloudEventWorkflowExecution if (other.hasRawEvent()) { mergeRawEvent(other.getRawEvent()); } - if (other.hasOutputData()) { - mergeOutputData(other.getOutputData()); - } if (other.hasOutputInterface()) { mergeOutputInterface(other.getOutputInterface()); } - if (other.hasInputData()) { - mergeInputData(other.getInputData()); - } if (artifactIdsBuilder_ == null) { if (!other.artifactIds_.isEmpty()) { if (artifactIds_.isEmpty()) { artifactIds_ = other.artifactIds_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000004); } else { ensureArtifactIdsIsMutable(); artifactIds_.addAll(other.artifactIds_); @@ -1083,7 +929,7 @@ public Builder mergeFrom(flyteidl.event.Cloudevents.CloudEventWorkflowExecution artifactIdsBuilder_.dispose(); artifactIdsBuilder_ = null; artifactIds_ = other.artifactIds_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000004); artifactIdsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getArtifactIdsFieldBuilder() : null; @@ -1249,134 +1095,17 @@ public flyteidl.event.Event.WorkflowExecutionEventOrBuilder getRawEventOrBuilder return rawEventBuilder_; } - private flyteidl.core.Literals.LiteralMap outputData_; - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder> outputDataBuilder_; - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public boolean hasOutputData() { - return outputDataBuilder_ != null || outputData_ != null; - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public flyteidl.core.Literals.LiteralMap getOutputData() { - if (outputDataBuilder_ == null) { - return outputData_ == null ? flyteidl.core.Literals.LiteralMap.getDefaultInstance() : outputData_; - } else { - return outputDataBuilder_.getMessage(); - } - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public Builder setOutputData(flyteidl.core.Literals.LiteralMap value) { - if (outputDataBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - outputData_ = value; - onChanged(); - } else { - outputDataBuilder_.setMessage(value); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public Builder setOutputData( - flyteidl.core.Literals.LiteralMap.Builder builderForValue) { - if (outputDataBuilder_ == null) { - outputData_ = builderForValue.build(); - onChanged(); - } else { - outputDataBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public Builder mergeOutputData(flyteidl.core.Literals.LiteralMap value) { - if (outputDataBuilder_ == null) { - if (outputData_ != null) { - outputData_ = - flyteidl.core.Literals.LiteralMap.newBuilder(outputData_).mergeFrom(value).buildPartial(); - } else { - outputData_ = value; - } - onChanged(); - } else { - outputDataBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public Builder clearOutputData() { - if (outputDataBuilder_ == null) { - outputData_ = null; - onChanged(); - } else { - outputData_ = null; - outputDataBuilder_ = null; - } - - return this; - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public flyteidl.core.Literals.LiteralMap.Builder getOutputDataBuilder() { - - onChanged(); - return getOutputDataFieldBuilder().getBuilder(); - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - public flyteidl.core.Literals.LiteralMapOrBuilder getOutputDataOrBuilder() { - if (outputDataBuilder_ != null) { - return outputDataBuilder_.getMessageOrBuilder(); - } else { - return outputData_ == null ? - flyteidl.core.Literals.LiteralMap.getDefaultInstance() : outputData_; - } - } - /** - * .flyteidl.core.LiteralMap output_data = 2; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder> - getOutputDataFieldBuilder() { - if (outputDataBuilder_ == null) { - outputDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder>( - getOutputData(), - getParentForChildren(), - isClean()); - outputData_ = null; - } - return outputDataBuilder_; - } - private flyteidl.core.Interface.TypedInterface outputInterface_; private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.Interface.TypedInterface, flyteidl.core.Interface.TypedInterface.Builder, flyteidl.core.Interface.TypedInterfaceOrBuilder> outputInterfaceBuilder_; /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public boolean hasOutputInterface() { return outputInterfaceBuilder_ != null || outputInterface_ != null; } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public flyteidl.core.Interface.TypedInterface getOutputInterface() { if (outputInterfaceBuilder_ == null) { @@ -1386,7 +1115,7 @@ public flyteidl.core.Interface.TypedInterface getOutputInterface() { } } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public Builder setOutputInterface(flyteidl.core.Interface.TypedInterface value) { if (outputInterfaceBuilder_ == null) { @@ -1402,7 +1131,7 @@ public Builder setOutputInterface(flyteidl.core.Interface.TypedInterface value) return this; } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public Builder setOutputInterface( flyteidl.core.Interface.TypedInterface.Builder builderForValue) { @@ -1416,7 +1145,7 @@ public Builder setOutputInterface( return this; } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public Builder mergeOutputInterface(flyteidl.core.Interface.TypedInterface value) { if (outputInterfaceBuilder_ == null) { @@ -1434,7 +1163,7 @@ public Builder mergeOutputInterface(flyteidl.core.Interface.TypedInterface value return this; } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public Builder clearOutputInterface() { if (outputInterfaceBuilder_ == null) { @@ -1448,7 +1177,7 @@ public Builder clearOutputInterface() { return this; } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public flyteidl.core.Interface.TypedInterface.Builder getOutputInterfaceBuilder() { @@ -1456,7 +1185,7 @@ public flyteidl.core.Interface.TypedInterface.Builder getOutputInterfaceBuilder( return getOutputInterfaceFieldBuilder().getBuilder(); } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ public flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuilder() { if (outputInterfaceBuilder_ != null) { @@ -1467,7 +1196,7 @@ public flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuild } } /** - * .flyteidl.core.TypedInterface output_interface = 3; + * .flyteidl.core.TypedInterface output_interface = 2; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.Interface.TypedInterface, flyteidl.core.Interface.TypedInterface.Builder, flyteidl.core.Interface.TypedInterfaceOrBuilder> @@ -1483,129 +1212,12 @@ public flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuild return outputInterfaceBuilder_; } - private flyteidl.core.Literals.LiteralMap inputData_; - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder> inputDataBuilder_; - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public boolean hasInputData() { - return inputDataBuilder_ != null || inputData_ != null; - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public flyteidl.core.Literals.LiteralMap getInputData() { - if (inputDataBuilder_ == null) { - return inputData_ == null ? flyteidl.core.Literals.LiteralMap.getDefaultInstance() : inputData_; - } else { - return inputDataBuilder_.getMessage(); - } - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public Builder setInputData(flyteidl.core.Literals.LiteralMap value) { - if (inputDataBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - inputData_ = value; - onChanged(); - } else { - inputDataBuilder_.setMessage(value); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public Builder setInputData( - flyteidl.core.Literals.LiteralMap.Builder builderForValue) { - if (inputDataBuilder_ == null) { - inputData_ = builderForValue.build(); - onChanged(); - } else { - inputDataBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public Builder mergeInputData(flyteidl.core.Literals.LiteralMap value) { - if (inputDataBuilder_ == null) { - if (inputData_ != null) { - inputData_ = - flyteidl.core.Literals.LiteralMap.newBuilder(inputData_).mergeFrom(value).buildPartial(); - } else { - inputData_ = value; - } - onChanged(); - } else { - inputDataBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public Builder clearInputData() { - if (inputDataBuilder_ == null) { - inputData_ = null; - onChanged(); - } else { - inputData_ = null; - inputDataBuilder_ = null; - } - - return this; - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public flyteidl.core.Literals.LiteralMap.Builder getInputDataBuilder() { - - onChanged(); - return getInputDataFieldBuilder().getBuilder(); - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - public flyteidl.core.Literals.LiteralMapOrBuilder getInputDataOrBuilder() { - if (inputDataBuilder_ != null) { - return inputDataBuilder_.getMessageOrBuilder(); - } else { - return inputData_ == null ? - flyteidl.core.Literals.LiteralMap.getDefaultInstance() : inputData_; - } - } - /** - * .flyteidl.core.LiteralMap input_data = 4; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder> - getInputDataFieldBuilder() { - if (inputDataBuilder_ == null) { - inputDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder>( - getInputData(), - getParentForChildren(), - isClean()); - inputData_ = null; - } - return inputDataBuilder_; - } - private java.util.List artifactIds_ = java.util.Collections.emptyList(); private void ensureArtifactIdsIsMutable() { - if (!((bitField0_ & 0x00000010) != 0)) { + if (!((bitField0_ & 0x00000004) != 0)) { artifactIds_ = new java.util.ArrayList(artifactIds_); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; } } @@ -1618,7 +1230,7 @@ private void ensureArtifactIdsIsMutable() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public java.util.List getArtifactIdsList() { if (artifactIdsBuilder_ == null) { @@ -1633,7 +1245,7 @@ public java.util.List getArtifactIdsList() * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public int getArtifactIdsCount() { if (artifactIdsBuilder_ == null) { @@ -1648,7 +1260,7 @@ public int getArtifactIdsCount() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { if (artifactIdsBuilder_ == null) { @@ -1663,7 +1275,7 @@ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder setArtifactIds( int index, flyteidl.core.ArtifactId.ArtifactID value) { @@ -1685,7 +1297,7 @@ public Builder setArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder setArtifactIds( int index, flyteidl.core.ArtifactId.ArtifactID.Builder builderForValue) { @@ -1704,7 +1316,7 @@ public Builder setArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder addArtifactIds(flyteidl.core.ArtifactId.ArtifactID value) { if (artifactIdsBuilder_ == null) { @@ -1725,7 +1337,7 @@ public Builder addArtifactIds(flyteidl.core.ArtifactId.ArtifactID value) { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder addArtifactIds( int index, flyteidl.core.ArtifactId.ArtifactID value) { @@ -1747,7 +1359,7 @@ public Builder addArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder addArtifactIds( flyteidl.core.ArtifactId.ArtifactID.Builder builderForValue) { @@ -1766,7 +1378,7 @@ public Builder addArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder addArtifactIds( int index, flyteidl.core.ArtifactId.ArtifactID.Builder builderForValue) { @@ -1785,7 +1397,7 @@ public Builder addArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder addAllArtifactIds( java.lang.Iterable values) { @@ -1805,12 +1417,12 @@ public Builder addAllArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder clearArtifactIds() { if (artifactIdsBuilder_ == null) { artifactIds_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); } else { artifactIdsBuilder_.clear(); @@ -1823,7 +1435,7 @@ public Builder clearArtifactIds() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public Builder removeArtifactIds(int index) { if (artifactIdsBuilder_ == null) { @@ -1841,7 +1453,7 @@ public Builder removeArtifactIds(int index) { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public flyteidl.core.ArtifactId.ArtifactID.Builder getArtifactIdsBuilder( int index) { @@ -1853,7 +1465,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder getArtifactIdsBuilder( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( int index) { @@ -1868,7 +1480,7 @@ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public java.util.List getArtifactIdsOrBuilderList() { @@ -1884,7 +1496,7 @@ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder() { return getArtifactIdsFieldBuilder().addBuilder( @@ -1896,7 +1508,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( int index) { @@ -1909,7 +1521,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 5; + * repeated .flyteidl.core.ArtifactID artifact_ids = 3; */ public java.util.List getArtifactIdsBuilderList() { @@ -1922,7 +1534,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( artifactIdsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< flyteidl.core.ArtifactId.ArtifactID, flyteidl.core.ArtifactId.ArtifactID.Builder, flyteidl.core.ArtifactId.ArtifactIDOrBuilder>( artifactIds_, - ((bitField0_ & 0x00000010) != 0), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); artifactIds_ = null; @@ -1934,13 +1546,13 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> referenceExecutionBuilder_; /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public boolean hasReferenceExecution() { return referenceExecutionBuilder_ != null || referenceExecution_ != null; } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getReferenceExecution() { if (referenceExecutionBuilder_ == null) { @@ -1950,7 +1562,7 @@ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier getReferen } } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public Builder setReferenceExecution(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { if (referenceExecutionBuilder_ == null) { @@ -1966,7 +1578,7 @@ public Builder setReferenceExecution(flyteidl.core.IdentifierOuterClass.Workflow return this; } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public Builder setReferenceExecution( flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder builderForValue) { @@ -1980,7 +1592,7 @@ public Builder setReferenceExecution( return this; } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public Builder mergeReferenceExecution(flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier value) { if (referenceExecutionBuilder_ == null) { @@ -1998,7 +1610,7 @@ public Builder mergeReferenceExecution(flyteidl.core.IdentifierOuterClass.Workfl return this; } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public Builder clearReferenceExecution() { if (referenceExecutionBuilder_ == null) { @@ -2012,7 +1624,7 @@ public Builder clearReferenceExecution() { return this; } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder getReferenceExecutionBuilder() { @@ -2020,7 +1632,7 @@ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder ge return getReferenceExecutionFieldBuilder().getBuilder(); } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder getReferenceExecutionOrBuilder() { if (referenceExecutionBuilder_ != null) { @@ -2031,7 +1643,7 @@ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder g } } /** - * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 6; + * .flyteidl.core.WorkflowExecutionIdentifier reference_execution = 4; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifier.Builder, flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder> @@ -2049,7 +1661,7 @@ public flyteidl.core.IdentifierOuterClass.WorkflowExecutionIdentifierOrBuilder g private java.lang.Object principal_ = ""; /** - * string principal = 7; + * string principal = 5; */ public java.lang.String getPrincipal() { java.lang.Object ref = principal_; @@ -2064,7 +1676,7 @@ public java.lang.String getPrincipal() { } } /** - * string principal = 7; + * string principal = 5; */ public com.google.protobuf.ByteString getPrincipalBytes() { @@ -2080,7 +1692,7 @@ public java.lang.String getPrincipal() { } } /** - * string principal = 7; + * string principal = 5; */ public Builder setPrincipal( java.lang.String value) { @@ -2093,7 +1705,7 @@ public Builder setPrincipal( return this; } /** - * string principal = 7; + * string principal = 5; */ public Builder clearPrincipal() { @@ -2102,7 +1714,7 @@ public Builder clearPrincipal() { return this; } /** - * string principal = 7; + * string principal = 5; */ public Builder setPrincipalBytes( com.google.protobuf.ByteString value) { @@ -2126,7 +1738,7 @@ public Builder setPrincipalBytes( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public boolean hasLaunchPlanId() { return launchPlanIdBuilder_ != null || launchPlanId_ != null; @@ -2138,7 +1750,7 @@ public boolean hasLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId() { if (launchPlanIdBuilder_ == null) { @@ -2154,7 +1766,7 @@ public flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public Builder setLaunchPlanId(flyteidl.core.IdentifierOuterClass.Identifier value) { if (launchPlanIdBuilder_ == null) { @@ -2176,7 +1788,7 @@ public Builder setLaunchPlanId(flyteidl.core.IdentifierOuterClass.Identifier val * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public Builder setLaunchPlanId( flyteidl.core.IdentifierOuterClass.Identifier.Builder builderForValue) { @@ -2196,7 +1808,7 @@ public Builder setLaunchPlanId( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public Builder mergeLaunchPlanId(flyteidl.core.IdentifierOuterClass.Identifier value) { if (launchPlanIdBuilder_ == null) { @@ -2220,7 +1832,7 @@ public Builder mergeLaunchPlanId(flyteidl.core.IdentifierOuterClass.Identifier v * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public Builder clearLaunchPlanId() { if (launchPlanIdBuilder_ == null) { @@ -2240,7 +1852,7 @@ public Builder clearLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.Identifier.Builder getLaunchPlanIdBuilder() { @@ -2254,7 +1866,7 @@ public flyteidl.core.IdentifierOuterClass.Identifier.Builder getLaunchPlanIdBuil * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getLaunchPlanIdOrBuilder() { if (launchPlanIdBuilder_ != null) { @@ -2271,7 +1883,7 @@ public flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getLaunchPlanIdOrB * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.Identifier, flyteidl.core.IdentifierOuterClass.Identifier.Builder, flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder> @@ -2381,37 +1993,12 @@ public interface CloudEventNodeExecutionOrBuilder extends */ flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTaskExecIdOrBuilder(); - /** - * 
-     * Hydrated output
-     *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - boolean hasOutputData(); - /** - * 
-     * Hydrated output
-     *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - flyteidl.core.Literals.LiteralMap getOutputData(); - /** - * 
-     * Hydrated output
-     *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - flyteidl.core.Literals.LiteralMapOrBuilder getOutputDataOrBuilder(); - /** * 
      * The typed interface for the task that produced the event.
      *
* - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ boolean hasOutputInterface(); /** @@ -2419,7 +2006,7 @@ public interface CloudEventNodeExecutionOrBuilder extends * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ flyteidl.core.Interface.TypedInterface getOutputInterface(); /** @@ -2427,30 +2014,17 @@ public interface CloudEventNodeExecutionOrBuilder extends * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuilder(); - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - boolean hasInputData(); - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - flyteidl.core.Literals.LiteralMap getInputData(); - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - flyteidl.core.Literals.LiteralMapOrBuilder getInputDataOrBuilder(); - /** * 
      * The following are ExecutionMetadata fields
      * We can't have the ExecutionMetadata object directly because of import cycle
      *
* - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ java.util.List getArtifactIdsList(); @@ -2460,7 +2034,7 @@ public interface CloudEventNodeExecutionOrBuilder extends * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index); /** @@ -2469,7 +2043,7 @@ public interface CloudEventNodeExecutionOrBuilder extends * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ int getArtifactIdsCount(); /** @@ -2478,7 +2052,7 @@ public interface CloudEventNodeExecutionOrBuilder extends * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ java.util.List getArtifactIdsOrBuilderList(); @@ -2488,17 +2062,17 @@ public interface CloudEventNodeExecutionOrBuilder extends * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( int index); /** - * string principal = 7; + * string principal = 5; */ java.lang.String getPrincipal(); /** - * string principal = 7; + * string principal = 5; */ com.google.protobuf.ByteString getPrincipalBytes(); @@ -2510,7 +2084,7 @@ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ boolean hasLaunchPlanId(); /** @@ -2520,7 +2094,7 @@ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId(); /** @@ -2530,7 +2104,7 @@ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getLaunchPlanIdOrBuilder(); } @@ -2602,19 +2176,6 @@ private CloudEventNodeExecution( break; } case 26: { - flyteidl.core.Literals.LiteralMap.Builder subBuilder = null; - if (outputData_ != null) { - subBuilder = outputData_.toBuilder(); - } - outputData_ = input.readMessage(flyteidl.core.Literals.LiteralMap.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(outputData_); - outputData_ = subBuilder.buildPartial(); - } - - break; - } - case 34: { flyteidl.core.Interface.TypedInterface.Builder subBuilder = null; if (outputInterface_ != null) { subBuilder = outputInterface_.toBuilder(); @@ -2627,35 +2188,22 @@ private CloudEventNodeExecution( break; } - case 42: { - flyteidl.core.Literals.LiteralMap.Builder subBuilder = null; - if (inputData_ != null) { - subBuilder = inputData_.toBuilder(); - } - inputData_ = input.readMessage(flyteidl.core.Literals.LiteralMap.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(inputData_); - inputData_ = subBuilder.buildPartial(); - } - - break; - } - case 50: { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { + case 34: { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { artifactIds_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; + mutable_bitField0_ |= 0x00000008; } artifactIds_.add( input.readMessage(flyteidl.core.ArtifactId.ArtifactID.parser(), extensionRegistry)); break; } - case 58: { + case 42: { java.lang.String s = input.readStringRequireUtf8(); principal_ = s; break; } - case 66: { + case 50: { flyteidl.core.IdentifierOuterClass.Identifier.Builder subBuilder = null; if (launchPlanId_ != null) { subBuilder = launchPlanId_.toBuilder(); @@ -2683,7 +2231,7 @@ private CloudEventNodeExecution( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) != 0)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { artifactIds_ = java.util.Collections.unmodifiableList(artifactIds_); } this.unknownFields = unknownFields.build(); @@ -2758,47 +2306,14 @@ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTa return getTaskExecId(); } - public static final int OUTPUT_DATA_FIELD_NUMBER = 3; - private flyteidl.core.Literals.LiteralMap outputData_; - /** - * 
-     * Hydrated output
-     *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public boolean hasOutputData() { - return outputData_ != null; - } - /** - * 
-     * Hydrated output
-     *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public flyteidl.core.Literals.LiteralMap getOutputData() { - return outputData_ == null ? flyteidl.core.Literals.LiteralMap.getDefaultInstance() : outputData_; - } - /** - * 
-     * Hydrated output
-     *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public flyteidl.core.Literals.LiteralMapOrBuilder getOutputDataOrBuilder() { - return getOutputData(); - } - - public static final int OUTPUT_INTERFACE_FIELD_NUMBER = 4; + public static final int OUTPUT_INTERFACE_FIELD_NUMBER = 3; private flyteidl.core.Interface.TypedInterface outputInterface_; /** * 
      * The typed interface for the task that produced the event.
      *
* - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public boolean hasOutputInterface() { return outputInterface_ != null; @@ -2808,7 +2323,7 @@ public boolean hasOutputInterface() { * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public flyteidl.core.Interface.TypedInterface getOutputInterface() { return outputInterface_ == null ? flyteidl.core.Interface.TypedInterface.getDefaultInstance() : outputInterface_; @@ -2818,34 +2333,13 @@ public flyteidl.core.Interface.TypedInterface getOutputInterface() { * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuilder() { return getOutputInterface(); } - public static final int INPUT_DATA_FIELD_NUMBER = 5; - private flyteidl.core.Literals.LiteralMap inputData_; - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public boolean hasInputData() { - return inputData_ != null; - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public flyteidl.core.Literals.LiteralMap getInputData() { - return inputData_ == null ? flyteidl.core.Literals.LiteralMap.getDefaultInstance() : inputData_; - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public flyteidl.core.Literals.LiteralMapOrBuilder getInputDataOrBuilder() { - return getInputData(); - } - - public static final int ARTIFACT_IDS_FIELD_NUMBER = 6; + public static final int ARTIFACT_IDS_FIELD_NUMBER = 4; private java.util.List artifactIds_; /** * 
@@ -2853,7 +2347,7 @@ public flyteidl.core.Literals.LiteralMapOrBuilder getInputDataOrBuilder() {
      * We can't have the ExecutionMetadata object directly because of import cycle
      *
* - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public java.util.List getArtifactIdsList() { return artifactIds_; @@ -2864,7 +2358,7 @@ public java.util.List getArtifactIdsList() * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public java.util.List getArtifactIdsOrBuilderList() { @@ -2876,7 +2370,7 @@ public java.util.List getArtifactIdsList() * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public int getArtifactIdsCount() { return artifactIds_.size(); @@ -2887,7 +2381,7 @@ public int getArtifactIdsCount() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { return artifactIds_.get(index); @@ -2898,17 +2392,17 @@ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( int index) { return artifactIds_.get(index); } - public static final int PRINCIPAL_FIELD_NUMBER = 7; + public static final int PRINCIPAL_FIELD_NUMBER = 5; private volatile java.lang.Object principal_; /** - * string principal = 7; + * string principal = 5; */ public java.lang.String getPrincipal() { java.lang.Object ref = principal_; @@ -2923,7 +2417,7 @@ public java.lang.String getPrincipal() { } } /** - * string principal = 7; + * string principal = 5; */ public com.google.protobuf.ByteString getPrincipalBytes() { @@ -2939,7 +2433,7 @@ public java.lang.String getPrincipal() { } } - public static final int LAUNCH_PLAN_ID_FIELD_NUMBER = 8; + public static final int LAUNCH_PLAN_ID_FIELD_NUMBER = 6; private flyteidl.core.IdentifierOuterClass.Identifier launchPlanId_; /** * 
@@ -2948,7 +2442,7 @@ public java.lang.String getPrincipal() {
      * Launch plan IDs are easier to get than workflow IDs so we'll use these for now.
      *
* - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public boolean hasLaunchPlanId() { return launchPlanId_ != null; @@ -2960,7 +2454,7 @@ public boolean hasLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId() { return launchPlanId_ == null ? flyteidl.core.IdentifierOuterClass.Identifier.getDefaultInstance() : launchPlanId_; @@ -2972,7 +2466,7 @@ public flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getLaunchPlanIdOrBuilder() { return getLaunchPlanId(); @@ -2998,23 +2492,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (taskExecId_ != null) { output.writeMessage(2, getTaskExecId()); } - if (outputData_ != null) { - output.writeMessage(3, getOutputData()); - } if (outputInterface_ != null) { - output.writeMessage(4, getOutputInterface()); - } - if (inputData_ != null) { - output.writeMessage(5, getInputData()); + output.writeMessage(3, getOutputInterface()); } for (int i = 0; i < artifactIds_.size(); i++) { - output.writeMessage(6, artifactIds_.get(i)); + output.writeMessage(4, artifactIds_.get(i)); } if (!getPrincipalBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, principal_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, principal_); } if (launchPlanId_ != null) { - output.writeMessage(8, getLaunchPlanId()); + output.writeMessage(6, getLaunchPlanId()); } unknownFields.writeTo(output); } @@ -3033,28 +2521,20 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, getTaskExecId()); } - if (outputData_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getOutputData()); - } if (outputInterface_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getOutputInterface()); - } - if (inputData_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getInputData()); + .computeMessageSize(3, getOutputInterface()); } for (int i = 0; i < artifactIds_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, artifactIds_.get(i)); + .computeMessageSize(4, artifactIds_.get(i)); } if (!getPrincipalBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, principal_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, principal_); } if (launchPlanId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, getLaunchPlanId()); + .computeMessageSize(6, getLaunchPlanId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -3081,21 +2561,11 @@ public boolean equals(final java.lang.Object obj) { if (!getTaskExecId() .equals(other.getTaskExecId())) return false; } - if (hasOutputData() != other.hasOutputData()) return false; - if (hasOutputData()) { - if (!getOutputData() - .equals(other.getOutputData())) return false; - } if (hasOutputInterface() != other.hasOutputInterface()) return false; if (hasOutputInterface()) { if (!getOutputInterface() .equals(other.getOutputInterface())) return false; } - if (hasInputData() != other.hasInputData()) return false; - if (hasInputData()) { - if (!getInputData() - .equals(other.getInputData())) return false; - } if (!getArtifactIdsList() .equals(other.getArtifactIdsList())) return false; if (!getPrincipal() @@ -3124,18 +2594,10 @@ public int hashCode() { hash = (37 * hash) + TASK_EXEC_ID_FIELD_NUMBER; hash = (53 * hash) + getTaskExecId().hashCode(); } - if (hasOutputData()) { - hash = (37 * hash) + OUTPUT_DATA_FIELD_NUMBER; - hash = (53 * hash) + getOutputData().hashCode(); - } if (hasOutputInterface()) { hash = (37 * hash) + OUTPUT_INTERFACE_FIELD_NUMBER; hash = (53 * hash) + getOutputInterface().hashCode(); } - if (hasInputData()) { - hash = (37 * hash) + INPUT_DATA_FIELD_NUMBER; - hash = (53 * hash) + getInputData().hashCode(); - } if (getArtifactIdsCount() > 0) { hash = (37 * hash) + ARTIFACT_IDS_FIELD_NUMBER; hash = (53 * hash) + getArtifactIdsList().hashCode(); @@ -3292,27 +2754,15 @@ public Builder clear() { taskExecId_ = null; taskExecIdBuilder_ = null; } - if (outputDataBuilder_ == null) { - outputData_ = null; - } else { - outputData_ = null; - outputDataBuilder_ = null; - } if (outputInterfaceBuilder_ == null) { outputInterface_ = null; } else { outputInterface_ = null; outputInterfaceBuilder_ = null; } - if (inputDataBuilder_ == null) { - inputData_ = null; - } else { - inputData_ = null; - inputDataBuilder_ = null; - } if (artifactIdsBuilder_ == null) { artifactIds_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000008); } else { artifactIdsBuilder_.clear(); } @@ -3362,25 +2812,15 @@ public flyteidl.event.Cloudevents.CloudEventNodeExecution buildPartial() { } else { result.taskExecId_ = taskExecIdBuilder_.build(); } - if (outputDataBuilder_ == null) { - result.outputData_ = outputData_; - } else { - result.outputData_ = outputDataBuilder_.build(); - } if (outputInterfaceBuilder_ == null) { result.outputInterface_ = outputInterface_; } else { result.outputInterface_ = outputInterfaceBuilder_.build(); } - if (inputDataBuilder_ == null) { - result.inputData_ = inputData_; - } else { - result.inputData_ = inputDataBuilder_.build(); - } if (artifactIdsBuilder_ == null) { - if (((bitField0_ & 0x00000020) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { artifactIds_ = java.util.Collections.unmodifiableList(artifactIds_); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000008); } result.artifactIds_ = artifactIds_; } else { @@ -3447,20 +2887,14 @@ public Builder mergeFrom(flyteidl.event.Cloudevents.CloudEventNodeExecution othe if (other.hasTaskExecId()) { mergeTaskExecId(other.getTaskExecId()); } - if (other.hasOutputData()) { - mergeOutputData(other.getOutputData()); - } if (other.hasOutputInterface()) { mergeOutputInterface(other.getOutputInterface()); } - if (other.hasInputData()) { - mergeInputData(other.getInputData()); - } if (artifactIdsBuilder_ == null) { if (!other.artifactIds_.isEmpty()) { if (artifactIds_.isEmpty()) { artifactIds_ = other.artifactIds_; - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureArtifactIdsIsMutable(); artifactIds_.addAll(other.artifactIds_); @@ -3473,7 +2907,7 @@ public Builder mergeFrom(flyteidl.event.Cloudevents.CloudEventNodeExecution othe artifactIdsBuilder_.dispose(); artifactIdsBuilder_ = null; artifactIds_ = other.artifactIds_; - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000008); artifactIdsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getArtifactIdsFieldBuilder() : null; @@ -3789,159 +3223,6 @@ public flyteidl.core.IdentifierOuterClass.TaskExecutionIdentifierOrBuilder getTa return taskExecIdBuilder_; } - private flyteidl.core.Literals.LiteralMap outputData_; - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder> outputDataBuilder_; - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public boolean hasOutputData() { - return outputDataBuilder_ != null || outputData_ != null; - } - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public flyteidl.core.Literals.LiteralMap getOutputData() { - if (outputDataBuilder_ == null) { - return outputData_ == null ? flyteidl.core.Literals.LiteralMap.getDefaultInstance() : outputData_; - } else { - return outputDataBuilder_.getMessage(); - } - } - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public Builder setOutputData(flyteidl.core.Literals.LiteralMap value) { - if (outputDataBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - outputData_ = value; - onChanged(); - } else { - outputDataBuilder_.setMessage(value); - } - - return this; - } - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public Builder setOutputData( - flyteidl.core.Literals.LiteralMap.Builder builderForValue) { - if (outputDataBuilder_ == null) { - outputData_ = builderForValue.build(); - onChanged(); - } else { - outputDataBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public Builder mergeOutputData(flyteidl.core.Literals.LiteralMap value) { - if (outputDataBuilder_ == null) { - if (outputData_ != null) { - outputData_ = - flyteidl.core.Literals.LiteralMap.newBuilder(outputData_).mergeFrom(value).buildPartial(); - } else { - outputData_ = value; - } - onChanged(); - } else { - outputDataBuilder_.mergeFrom(value); - } - - return this; - } - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public Builder clearOutputData() { - if (outputDataBuilder_ == null) { - outputData_ = null; - onChanged(); - } else { - outputData_ = null; - outputDataBuilder_ = null; - } - - return this; - } - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public flyteidl.core.Literals.LiteralMap.Builder getOutputDataBuilder() { - - onChanged(); - return getOutputDataFieldBuilder().getBuilder(); - } - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - public flyteidl.core.Literals.LiteralMapOrBuilder getOutputDataOrBuilder() { - if (outputDataBuilder_ != null) { - return outputDataBuilder_.getMessageOrBuilder(); - } else { - return outputData_ == null ? - flyteidl.core.Literals.LiteralMap.getDefaultInstance() : outputData_; - } - } - /** - * 
-       * Hydrated output
-       *
- * - * .flyteidl.core.LiteralMap output_data = 3; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder> - getOutputDataFieldBuilder() { - if (outputDataBuilder_ == null) { - outputDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder>( - getOutputData(), - getParentForChildren(), - isClean()); - outputData_ = null; - } - return outputDataBuilder_; - } - private flyteidl.core.Interface.TypedInterface outputInterface_; private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.Interface.TypedInterface, flyteidl.core.Interface.TypedInterface.Builder, flyteidl.core.Interface.TypedInterfaceOrBuilder> outputInterfaceBuilder_; @@ -3950,7 +3231,7 @@ public flyteidl.core.Literals.LiteralMapOrBuilder getOutputDataOrBuilder() { * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public boolean hasOutputInterface() { return outputInterfaceBuilder_ != null || outputInterface_ != null; @@ -3960,7 +3241,7 @@ public boolean hasOutputInterface() { * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public flyteidl.core.Interface.TypedInterface getOutputInterface() { if (outputInterfaceBuilder_ == null) { @@ -3974,7 +3255,7 @@ public flyteidl.core.Interface.TypedInterface getOutputInterface() { * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public Builder setOutputInterface(flyteidl.core.Interface.TypedInterface value) { if (outputInterfaceBuilder_ == null) { @@ -3994,7 +3275,7 @@ public Builder setOutputInterface(flyteidl.core.Interface.TypedInterface value) * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public Builder setOutputInterface( flyteidl.core.Interface.TypedInterface.Builder builderForValue) { @@ -4012,7 +3293,7 @@ public Builder setOutputInterface( * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public Builder mergeOutputInterface(flyteidl.core.Interface.TypedInterface value) { if (outputInterfaceBuilder_ == null) { @@ -4034,7 +3315,7 @@ public Builder mergeOutputInterface(flyteidl.core.Interface.TypedInterface value * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public Builder clearOutputInterface() { if (outputInterfaceBuilder_ == null) { @@ -4052,7 +3333,7 @@ public Builder clearOutputInterface() { * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public flyteidl.core.Interface.TypedInterface.Builder getOutputInterfaceBuilder() { @@ -4064,7 +3345,7 @@ public flyteidl.core.Interface.TypedInterface.Builder getOutputInterfaceBuilder( * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ public flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuilder() { if (outputInterfaceBuilder_ != null) { @@ -4079,7 +3360,7 @@ public flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuild * The typed interface for the task that produced the event. * * - * .flyteidl.core.TypedInterface output_interface = 4; + * .flyteidl.core.TypedInterface output_interface = 3; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.Interface.TypedInterface, flyteidl.core.Interface.TypedInterface.Builder, flyteidl.core.Interface.TypedInterfaceOrBuilder> @@ -4095,129 +3376,12 @@ public flyteidl.core.Interface.TypedInterfaceOrBuilder getOutputInterfaceOrBuild return outputInterfaceBuilder_; } - private flyteidl.core.Literals.LiteralMap inputData_; - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder> inputDataBuilder_; - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public boolean hasInputData() { - return inputDataBuilder_ != null || inputData_ != null; - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public flyteidl.core.Literals.LiteralMap getInputData() { - if (inputDataBuilder_ == null) { - return inputData_ == null ? flyteidl.core.Literals.LiteralMap.getDefaultInstance() : inputData_; - } else { - return inputDataBuilder_.getMessage(); - } - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public Builder setInputData(flyteidl.core.Literals.LiteralMap value) { - if (inputDataBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - inputData_ = value; - onChanged(); - } else { - inputDataBuilder_.setMessage(value); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public Builder setInputData( - flyteidl.core.Literals.LiteralMap.Builder builderForValue) { - if (inputDataBuilder_ == null) { - inputData_ = builderForValue.build(); - onChanged(); - } else { - inputDataBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public Builder mergeInputData(flyteidl.core.Literals.LiteralMap value) { - if (inputDataBuilder_ == null) { - if (inputData_ != null) { - inputData_ = - flyteidl.core.Literals.LiteralMap.newBuilder(inputData_).mergeFrom(value).buildPartial(); - } else { - inputData_ = value; - } - onChanged(); - } else { - inputDataBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public Builder clearInputData() { - if (inputDataBuilder_ == null) { - inputData_ = null; - onChanged(); - } else { - inputData_ = null; - inputDataBuilder_ = null; - } - - return this; - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public flyteidl.core.Literals.LiteralMap.Builder getInputDataBuilder() { - - onChanged(); - return getInputDataFieldBuilder().getBuilder(); - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - public flyteidl.core.Literals.LiteralMapOrBuilder getInputDataOrBuilder() { - if (inputDataBuilder_ != null) { - return inputDataBuilder_.getMessageOrBuilder(); - } else { - return inputData_ == null ? - flyteidl.core.Literals.LiteralMap.getDefaultInstance() : inputData_; - } - } - /** - * .flyteidl.core.LiteralMap input_data = 5; - */ - private com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder> - getInputDataFieldBuilder() { - if (inputDataBuilder_ == null) { - inputDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - flyteidl.core.Literals.LiteralMap, flyteidl.core.Literals.LiteralMap.Builder, flyteidl.core.Literals.LiteralMapOrBuilder>( - getInputData(), - getParentForChildren(), - isClean()); - inputData_ = null; - } - return inputDataBuilder_; - } - private java.util.List artifactIds_ = java.util.Collections.emptyList(); private void ensureArtifactIdsIsMutable() { - if (!((bitField0_ & 0x00000020) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { artifactIds_ = new java.util.ArrayList(artifactIds_); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; } } @@ -4230,7 +3394,7 @@ private void ensureArtifactIdsIsMutable() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public java.util.List getArtifactIdsList() { if (artifactIdsBuilder_ == null) { @@ -4245,7 +3409,7 @@ public java.util.List getArtifactIdsList() * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public int getArtifactIdsCount() { if (artifactIdsBuilder_ == null) { @@ -4260,7 +3424,7 @@ public int getArtifactIdsCount() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { if (artifactIdsBuilder_ == null) { @@ -4275,7 +3439,7 @@ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder setArtifactIds( int index, flyteidl.core.ArtifactId.ArtifactID value) { @@ -4297,7 +3461,7 @@ public Builder setArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder setArtifactIds( int index, flyteidl.core.ArtifactId.ArtifactID.Builder builderForValue) { @@ -4316,7 +3480,7 @@ public Builder setArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder addArtifactIds(flyteidl.core.ArtifactId.ArtifactID value) { if (artifactIdsBuilder_ == null) { @@ -4337,7 +3501,7 @@ public Builder addArtifactIds(flyteidl.core.ArtifactId.ArtifactID value) { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder addArtifactIds( int index, flyteidl.core.ArtifactId.ArtifactID value) { @@ -4359,7 +3523,7 @@ public Builder addArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder addArtifactIds( flyteidl.core.ArtifactId.ArtifactID.Builder builderForValue) { @@ -4378,7 +3542,7 @@ public Builder addArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder addArtifactIds( int index, flyteidl.core.ArtifactId.ArtifactID.Builder builderForValue) { @@ -4397,7 +3561,7 @@ public Builder addArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder addAllArtifactIds( java.lang.Iterable values) { @@ -4417,12 +3581,12 @@ public Builder addAllArtifactIds( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder clearArtifactIds() { if (artifactIdsBuilder_ == null) { artifactIds_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { artifactIdsBuilder_.clear(); @@ -4435,7 +3599,7 @@ public Builder clearArtifactIds() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public Builder removeArtifactIds(int index) { if (artifactIdsBuilder_ == null) { @@ -4453,7 +3617,7 @@ public Builder removeArtifactIds(int index) { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public flyteidl.core.ArtifactId.ArtifactID.Builder getArtifactIdsBuilder( int index) { @@ -4465,7 +3629,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder getArtifactIdsBuilder( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( int index) { @@ -4480,7 +3644,7 @@ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public java.util.List getArtifactIdsOrBuilderList() { @@ -4496,7 +3660,7 @@ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder() { return getArtifactIdsFieldBuilder().addBuilder( @@ -4508,7 +3672,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder() { * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( int index) { @@ -4521,7 +3685,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( * We can't have the ExecutionMetadata object directly because of import cycle * * - * repeated .flyteidl.core.ArtifactID artifact_ids = 6; + * repeated .flyteidl.core.ArtifactID artifact_ids = 4; */ public java.util.List getArtifactIdsBuilderList() { @@ -4534,7 +3698,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( artifactIdsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< flyteidl.core.ArtifactId.ArtifactID, flyteidl.core.ArtifactId.ArtifactID.Builder, flyteidl.core.ArtifactId.ArtifactIDOrBuilder>( artifactIds_, - ((bitField0_ & 0x00000020) != 0), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); artifactIds_ = null; @@ -4544,7 +3708,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( private java.lang.Object principal_ = ""; /** - * string principal = 7; + * string principal = 5; */ public java.lang.String getPrincipal() { java.lang.Object ref = principal_; @@ -4559,7 +3723,7 @@ public java.lang.String getPrincipal() { } } /** - * string principal = 7; + * string principal = 5; */ public com.google.protobuf.ByteString getPrincipalBytes() { @@ -4575,7 +3739,7 @@ public java.lang.String getPrincipal() { } } /** - * string principal = 7; + * string principal = 5; */ public Builder setPrincipal( java.lang.String value) { @@ -4588,7 +3752,7 @@ public Builder setPrincipal( return this; } /** - * string principal = 7; + * string principal = 5; */ public Builder clearPrincipal() { @@ -4597,7 +3761,7 @@ public Builder clearPrincipal() { return this; } /** - * string principal = 7; + * string principal = 5; */ public Builder setPrincipalBytes( com.google.protobuf.ByteString value) { @@ -4621,7 +3785,7 @@ public Builder setPrincipalBytes( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public boolean hasLaunchPlanId() { return launchPlanIdBuilder_ != null || launchPlanId_ != null; @@ -4633,7 +3797,7 @@ public boolean hasLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId() { if (launchPlanIdBuilder_ == null) { @@ -4649,7 +3813,7 @@ public flyteidl.core.IdentifierOuterClass.Identifier getLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public Builder setLaunchPlanId(flyteidl.core.IdentifierOuterClass.Identifier value) { if (launchPlanIdBuilder_ == null) { @@ -4671,7 +3835,7 @@ public Builder setLaunchPlanId(flyteidl.core.IdentifierOuterClass.Identifier val * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public Builder setLaunchPlanId( flyteidl.core.IdentifierOuterClass.Identifier.Builder builderForValue) { @@ -4691,7 +3855,7 @@ public Builder setLaunchPlanId( * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public Builder mergeLaunchPlanId(flyteidl.core.IdentifierOuterClass.Identifier value) { if (launchPlanIdBuilder_ == null) { @@ -4715,7 +3879,7 @@ public Builder mergeLaunchPlanId(flyteidl.core.IdentifierOuterClass.Identifier v * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public Builder clearLaunchPlanId() { if (launchPlanIdBuilder_ == null) { @@ -4735,7 +3899,7 @@ public Builder clearLaunchPlanId() { * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.Identifier.Builder getLaunchPlanIdBuilder() { @@ -4749,7 +3913,7 @@ public flyteidl.core.IdentifierOuterClass.Identifier.Builder getLaunchPlanIdBuil * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ public flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getLaunchPlanIdOrBuilder() { if (launchPlanIdBuilder_ != null) { @@ -4766,7 +3930,7 @@ public flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getLaunchPlanIdOrB * Launch plan IDs are easier to get than workflow IDs so we'll use these for now. * * - * .flyteidl.core.Identifier launch_plan_id = 8; + * .flyteidl.core.Identifier launch_plan_id = 6; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.IdentifierOuterClass.Identifier, flyteidl.core.IdentifierOuterClass.Identifier.Builder, flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder> @@ -7474,40 +6638,35 @@ public flyteidl.event.Cloudevents.CloudEventExecutionStart getDefaultInstanceFor "flyteidl/core/literals.proto\032\035flyteidl/c" + "ore/interface.proto\032\037flyteidl/core/artif" + "act_id.proto\032\036flyteidl/core/identifier.p" + - "roto\032\037google/protobuf/timestamp.proto\"\260\003" + + "roto\032\037google/protobuf/timestamp.proto\"\321\002" + "\n\033CloudEventWorkflowExecution\0229\n\traw_eve" + "nt\030\001 \001(\0132&.flyteidl.event.WorkflowExecut" + - "ionEvent\022.\n\013output_data\030\002 \001(\0132\031.flyteidl" + - ".core.LiteralMap\0227\n\020output_interface\030\003 \001" + - "(\0132\035.flyteidl.core.TypedInterface\022-\n\ninp" + - "ut_data\030\004 \001(\0132\031.flyteidl.core.LiteralMap" + - "\022/\n\014artifact_ids\030\005 \003(\0132\031.flyteidl.core.A" + - "rtifactID\022G\n\023reference_execution\030\006 \001(\0132*" + - ".flyteidl.core.WorkflowExecutionIdentifi" + - "er\022\021\n\tprincipal\030\007 \001(\t\0221\n\016launch_plan_id\030" + - "\010 \001(\0132\031.flyteidl.core.Identifier\"\235\003\n\027Clo" + - "udEventNodeExecution\0225\n\traw_event\030\001 \001(\0132" + - "\".flyteidl.event.NodeExecutionEvent\022<\n\014t" + - "ask_exec_id\030\002 \001(\0132&.flyteidl.core.TaskEx" + - "ecutionIdentifier\022.\n\013output_data\030\003 \001(\0132\031" + - ".flyteidl.core.LiteralMap\0227\n\020output_inte" + - "rface\030\004 \001(\0132\035.flyteidl.core.TypedInterfa" + - "ce\022-\n\ninput_data\030\005 \001(\0132\031.flyteidl.core.L" + - "iteralMap\022/\n\014artifact_ids\030\006 \003(\0132\031.flytei" + - "dl.core.ArtifactID\022\021\n\tprincipal\030\007 \001(\t\0221\n" + - "\016launch_plan_id\030\010 \001(\0132\031.flyteidl.core.Id" + - "entifier\"P\n\027CloudEventTaskExecution\0225\n\tr" + - "aw_event\030\001 \001(\0132\".flyteidl.event.TaskExec" + - "utionEvent\"\232\002\n\030CloudEventExecutionStart\022" + - "@\n\014execution_id\030\001 \001(\0132*.flyteidl.core.Wo" + - "rkflowExecutionIdentifier\0221\n\016launch_plan" + - "_id\030\002 \001(\0132\031.flyteidl.core.Identifier\022.\n\013" + - "workflow_id\030\003 \001(\0132\031.flyteidl.core.Identi" + - "fier\022/\n\014artifact_ids\030\004 \003(\0132\031.flyteidl.co" + - "re.ArtifactID\022\025\n\rartifact_keys\030\005 \003(\t\022\021\n\t" + - "principal\030\006 \001(\tB=Z;github.com/flyteorg/f" + - "lyte/flyteidl/gen/pb-go/flyteidl/eventb\006" + - "proto3" + "ionEvent\0227\n\020output_interface\030\002 \001(\0132\035.fly" + + "teidl.core.TypedInterface\022/\n\014artifact_id" + + "s\030\003 \003(\0132\031.flyteidl.core.ArtifactID\022G\n\023re" + + "ference_execution\030\004 \001(\0132*.flyteidl.core." + + "WorkflowExecutionIdentifier\022\021\n\tprincipal" + + "\030\005 \001(\t\0221\n\016launch_plan_id\030\006 \001(\0132\031.flyteid" + + "l.core.Identifier\"\276\002\n\027CloudEventNodeExec" + + "ution\0225\n\traw_event\030\001 \001(\0132\".flyteidl.even" + + "t.NodeExecutionEvent\022<\n\014task_exec_id\030\002 \001" + + "(\0132&.flyteidl.core.TaskExecutionIdentifi" + + "er\0227\n\020output_interface\030\003 \001(\0132\035.flyteidl." + + "core.TypedInterface\022/\n\014artifact_ids\030\004 \003(" + + "\0132\031.flyteidl.core.ArtifactID\022\021\n\tprincipa" + + "l\030\005 \001(\t\0221\n\016launch_plan_id\030\006 \001(\0132\031.flytei" + + "dl.core.Identifier\"P\n\027CloudEventTaskExec" + + "ution\0225\n\traw_event\030\001 \001(\0132\".flyteidl.even" + + "t.TaskExecutionEvent\"\232\002\n\030CloudEventExecu" + + "tionStart\022@\n\014execution_id\030\001 \001(\0132*.flytei" + + "dl.core.WorkflowExecutionIdentifier\0221\n\016l" + + "aunch_plan_id\030\002 \001(\0132\031.flyteidl.core.Iden" + + "tifier\022.\n\013workflow_id\030\003 \001(\0132\031.flyteidl.c" + + "ore.Identifier\022/\n\014artifact_ids\030\004 \003(\0132\031.f" + + "lyteidl.core.ArtifactID\022\025\n\rartifact_keys" + + "\030\005 \003(\t\022\021\n\tprincipal\030\006 \001(\tB=Z;github.com/" + + "flyteorg/flyte/flyteidl/gen/pb-go/flytei" + + "dl/eventb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -7532,13 +6691,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_event_CloudEventWorkflowExecution_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_event_CloudEventWorkflowExecution_descriptor, - new java.lang.String[] { "RawEvent", "OutputData", "OutputInterface", "InputData", "ArtifactIds", "ReferenceExecution", "Principal", "LaunchPlanId", }); + new java.lang.String[] { "RawEvent", "OutputInterface", "ArtifactIds", "ReferenceExecution", "Principal", "LaunchPlanId", }); internal_static_flyteidl_event_CloudEventNodeExecution_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_flyteidl_event_CloudEventNodeExecution_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_event_CloudEventNodeExecution_descriptor, - new java.lang.String[] { "RawEvent", "TaskExecId", "OutputData", "OutputInterface", "InputData", "ArtifactIds", "Principal", "LaunchPlanId", }); + new java.lang.String[] { "RawEvent", "TaskExecId", "OutputInterface", "ArtifactIds", "Principal", "LaunchPlanId", }); internal_static_flyteidl_event_CloudEventTaskExecution_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_flyteidl_event_CloudEventTaskExecution_fieldAccessorTable = new diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index af564753d4..94c1dd4bb5 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -7420,15 +7420,9 @@ export namespace flyteidl { /** CloudEventWorkflowExecution rawEvent */ rawEvent?: (flyteidl.event.IWorkflowExecutionEvent|null); - /** CloudEventWorkflowExecution outputData */ - outputData?: (flyteidl.core.ILiteralMap|null); - /** CloudEventWorkflowExecution outputInterface */ outputInterface?: (flyteidl.core.ITypedInterface|null); - /** CloudEventWorkflowExecution inputData */ - inputData?: (flyteidl.core.ILiteralMap|null); - /** CloudEventWorkflowExecution artifactIds */ artifactIds?: (flyteidl.core.IArtifactID[]|null); @@ -7454,15 +7448,9 @@ export namespace flyteidl { /** CloudEventWorkflowExecution rawEvent. */ public rawEvent?: (flyteidl.event.IWorkflowExecutionEvent|null); - /** CloudEventWorkflowExecution outputData. */ - public outputData?: (flyteidl.core.ILiteralMap|null); - /** CloudEventWorkflowExecution outputInterface. */ public outputInterface?: (flyteidl.core.ITypedInterface|null); - /** CloudEventWorkflowExecution inputData. */ - public inputData?: (flyteidl.core.ILiteralMap|null); - /** CloudEventWorkflowExecution artifactIds. */ public artifactIds: flyteidl.core.IArtifactID[]; @@ -7517,15 +7505,9 @@ export namespace flyteidl { /** CloudEventNodeExecution taskExecId */ taskExecId?: (flyteidl.core.ITaskExecutionIdentifier|null); - /** CloudEventNodeExecution outputData */ - outputData?: (flyteidl.core.ILiteralMap|null); - /** CloudEventNodeExecution outputInterface */ outputInterface?: (flyteidl.core.ITypedInterface|null); - /** CloudEventNodeExecution inputData */ - inputData?: (flyteidl.core.ILiteralMap|null); - /** CloudEventNodeExecution artifactIds */ artifactIds?: (flyteidl.core.IArtifactID[]|null); @@ -7551,15 +7533,9 @@ export namespace flyteidl { /** CloudEventNodeExecution taskExecId. */ public taskExecId?: (flyteidl.core.ITaskExecutionIdentifier|null); - /** CloudEventNodeExecution outputData. */ - public outputData?: (flyteidl.core.ILiteralMap|null); - /** CloudEventNodeExecution outputInterface. */ public outputInterface?: (flyteidl.core.ITypedInterface|null); - /** CloudEventNodeExecution inputData. */ - public inputData?: (flyteidl.core.ILiteralMap|null); - /** CloudEventNodeExecution artifactIds. */ public artifactIds: flyteidl.core.IArtifactID[]; diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index 8375c630e7..d3c90762e7 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -17947,9 +17947,7 @@ * @memberof flyteidl.event * @interface ICloudEventWorkflowExecution * @property {flyteidl.event.IWorkflowExecutionEvent|null} [rawEvent] CloudEventWorkflowExecution rawEvent - * @property {flyteidl.core.ILiteralMap|null} [outputData] CloudEventWorkflowExecution outputData * @property {flyteidl.core.ITypedInterface|null} [outputInterface] CloudEventWorkflowExecution outputInterface - * @property {flyteidl.core.ILiteralMap|null} [inputData] CloudEventWorkflowExecution inputData * @property {Array.|null} [artifactIds] CloudEventWorkflowExecution artifactIds * @property {flyteidl.core.IWorkflowExecutionIdentifier|null} [referenceExecution] CloudEventWorkflowExecution referenceExecution * @property {string|null} [principal] CloudEventWorkflowExecution principal @@ -17980,14 +17978,6 @@ */ CloudEventWorkflowExecution.prototype.rawEvent = null; - /** - * CloudEventWorkflowExecution outputData. - * @member {flyteidl.core.ILiteralMap|null|undefined} outputData - * @memberof flyteidl.event.CloudEventWorkflowExecution - * @instance - */ - CloudEventWorkflowExecution.prototype.outputData = null; - /** * CloudEventWorkflowExecution outputInterface. * @member {flyteidl.core.ITypedInterface|null|undefined} outputInterface @@ -17996,14 +17986,6 @@ */ CloudEventWorkflowExecution.prototype.outputInterface = null; - /** - * CloudEventWorkflowExecution inputData. - * @member {flyteidl.core.ILiteralMap|null|undefined} inputData - * @memberof flyteidl.event.CloudEventWorkflowExecution - * @instance - */ - CloudEventWorkflowExecution.prototype.inputData = null; - /** * CloudEventWorkflowExecution artifactIds. * @member {Array.} artifactIds @@ -18062,21 +18044,17 @@ writer = $Writer.create(); if (message.rawEvent != null && message.hasOwnProperty("rawEvent")) $root.flyteidl.event.WorkflowExecutionEvent.encode(message.rawEvent, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.outputData != null && message.hasOwnProperty("outputData")) - $root.flyteidl.core.LiteralMap.encode(message.outputData, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); if (message.outputInterface != null && message.hasOwnProperty("outputInterface")) - $root.flyteidl.core.TypedInterface.encode(message.outputInterface, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.inputData != null && message.hasOwnProperty("inputData")) - $root.flyteidl.core.LiteralMap.encode(message.inputData, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + $root.flyteidl.core.TypedInterface.encode(message.outputInterface, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); if (message.artifactIds != null && message.artifactIds.length) for (var i = 0; i < message.artifactIds.length; ++i) - $root.flyteidl.core.ArtifactID.encode(message.artifactIds[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + $root.flyteidl.core.ArtifactID.encode(message.artifactIds[i], writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); if (message.referenceExecution != null && message.hasOwnProperty("referenceExecution")) - $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.referenceExecution, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + $root.flyteidl.core.WorkflowExecutionIdentifier.encode(message.referenceExecution, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); if (message.principal != null && message.hasOwnProperty("principal")) - writer.uint32(/* id 7, wireType 2 =*/58).string(message.principal); + writer.uint32(/* id 5, wireType 2 =*/42).string(message.principal); if (message.launchPlanId != null && message.hasOwnProperty("launchPlanId")) - $root.flyteidl.core.Identifier.encode(message.launchPlanId, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + $root.flyteidl.core.Identifier.encode(message.launchPlanId, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); return writer; }; @@ -18102,26 +18080,20 @@ message.rawEvent = $root.flyteidl.event.WorkflowExecutionEvent.decode(reader, reader.uint32()); break; case 2: - message.outputData = $root.flyteidl.core.LiteralMap.decode(reader, reader.uint32()); - break; - case 3: message.outputInterface = $root.flyteidl.core.TypedInterface.decode(reader, reader.uint32()); break; - case 4: - message.inputData = $root.flyteidl.core.LiteralMap.decode(reader, reader.uint32()); - break; - case 5: + case 3: if (!(message.artifactIds && message.artifactIds.length)) message.artifactIds = []; message.artifactIds.push($root.flyteidl.core.ArtifactID.decode(reader, reader.uint32())); break; - case 6: + case 4: message.referenceExecution = $root.flyteidl.core.WorkflowExecutionIdentifier.decode(reader, reader.uint32()); break; - case 7: + case 5: message.principal = reader.string(); break; - case 8: + case 6: message.launchPlanId = $root.flyteidl.core.Identifier.decode(reader, reader.uint32()); break; default: @@ -18148,21 +18120,11 @@ if (error) return "rawEvent." + error; } - if (message.outputData != null && message.hasOwnProperty("outputData")) { - var error = $root.flyteidl.core.LiteralMap.verify(message.outputData); - if (error) - return "outputData." + error; - } if (message.outputInterface != null && message.hasOwnProperty("outputInterface")) { var error = $root.flyteidl.core.TypedInterface.verify(message.outputInterface); if (error) return "outputInterface." + error; } - if (message.inputData != null && message.hasOwnProperty("inputData")) { - var error = $root.flyteidl.core.LiteralMap.verify(message.inputData); - if (error) - return "inputData." + error; - } if (message.artifactIds != null && message.hasOwnProperty("artifactIds")) { if (!Array.isArray(message.artifactIds)) return "artifactIds: array expected"; @@ -18199,9 +18161,7 @@ * @interface ICloudEventNodeExecution * @property {flyteidl.event.INodeExecutionEvent|null} [rawEvent] CloudEventNodeExecution rawEvent * @property {flyteidl.core.ITaskExecutionIdentifier|null} [taskExecId] CloudEventNodeExecution taskExecId - * @property {flyteidl.core.ILiteralMap|null} [outputData] CloudEventNodeExecution outputData * @property {flyteidl.core.ITypedInterface|null} [outputInterface] CloudEventNodeExecution outputInterface - * @property {flyteidl.core.ILiteralMap|null} [inputData] CloudEventNodeExecution inputData * @property {Array.|null} [artifactIds] CloudEventNodeExecution artifactIds * @property {string|null} [principal] CloudEventNodeExecution principal * @property {flyteidl.core.IIdentifier|null} [launchPlanId] CloudEventNodeExecution launchPlanId @@ -18239,14 +18199,6 @@ */ CloudEventNodeExecution.prototype.taskExecId = null; - /** - * CloudEventNodeExecution outputData. - * @member {flyteidl.core.ILiteralMap|null|undefined} outputData - * @memberof flyteidl.event.CloudEventNodeExecution - * @instance - */ - CloudEventNodeExecution.prototype.outputData = null; - /** * CloudEventNodeExecution outputInterface. * @member {flyteidl.core.ITypedInterface|null|undefined} outputInterface @@ -18255,14 +18207,6 @@ */ CloudEventNodeExecution.prototype.outputInterface = null; - /** - * CloudEventNodeExecution inputData. - * @member {flyteidl.core.ILiteralMap|null|undefined} inputData - * @memberof flyteidl.event.CloudEventNodeExecution - * @instance - */ - CloudEventNodeExecution.prototype.inputData = null; - /** * CloudEventNodeExecution artifactIds. * @member {Array.} artifactIds @@ -18315,19 +18259,15 @@ $root.flyteidl.event.NodeExecutionEvent.encode(message.rawEvent, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); if (message.taskExecId != null && message.hasOwnProperty("taskExecId")) $root.flyteidl.core.TaskExecutionIdentifier.encode(message.taskExecId, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.outputData != null && message.hasOwnProperty("outputData")) - $root.flyteidl.core.LiteralMap.encode(message.outputData, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); if (message.outputInterface != null && message.hasOwnProperty("outputInterface")) - $root.flyteidl.core.TypedInterface.encode(message.outputInterface, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.inputData != null && message.hasOwnProperty("inputData")) - $root.flyteidl.core.LiteralMap.encode(message.inputData, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + $root.flyteidl.core.TypedInterface.encode(message.outputInterface, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); if (message.artifactIds != null && message.artifactIds.length) for (var i = 0; i < message.artifactIds.length; ++i) - $root.flyteidl.core.ArtifactID.encode(message.artifactIds[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + $root.flyteidl.core.ArtifactID.encode(message.artifactIds[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); if (message.principal != null && message.hasOwnProperty("principal")) - writer.uint32(/* id 7, wireType 2 =*/58).string(message.principal); + writer.uint32(/* id 5, wireType 2 =*/42).string(message.principal); if (message.launchPlanId != null && message.hasOwnProperty("launchPlanId")) - $root.flyteidl.core.Identifier.encode(message.launchPlanId, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + $root.flyteidl.core.Identifier.encode(message.launchPlanId, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); return writer; }; @@ -18356,23 +18296,17 @@ message.taskExecId = $root.flyteidl.core.TaskExecutionIdentifier.decode(reader, reader.uint32()); break; case 3: - message.outputData = $root.flyteidl.core.LiteralMap.decode(reader, reader.uint32()); - break; - case 4: message.outputInterface = $root.flyteidl.core.TypedInterface.decode(reader, reader.uint32()); break; - case 5: - message.inputData = $root.flyteidl.core.LiteralMap.decode(reader, reader.uint32()); - break; - case 6: + case 4: if (!(message.artifactIds && message.artifactIds.length)) message.artifactIds = []; message.artifactIds.push($root.flyteidl.core.ArtifactID.decode(reader, reader.uint32())); break; - case 7: + case 5: message.principal = reader.string(); break; - case 8: + case 6: message.launchPlanId = $root.flyteidl.core.Identifier.decode(reader, reader.uint32()); break; default: @@ -18404,21 +18338,11 @@ if (error) return "taskExecId." + error; } - if (message.outputData != null && message.hasOwnProperty("outputData")) { - var error = $root.flyteidl.core.LiteralMap.verify(message.outputData); - if (error) - return "outputData." + error; - } if (message.outputInterface != null && message.hasOwnProperty("outputInterface")) { var error = $root.flyteidl.core.TypedInterface.verify(message.outputInterface); if (error) return "outputInterface." + error; } - if (message.inputData != null && message.hasOwnProperty("inputData")) { - var error = $root.flyteidl.core.LiteralMap.verify(message.inputData); - if (error) - return "inputData." + error; - } if (message.artifactIds != null && message.hasOwnProperty("artifactIds")) { if (!Array.isArray(message.artifactIds)) return "artifactIds: array expected"; diff --git a/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.py b/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.py index b7035b32b5..12adeb0f0c 100644 --- a/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.py @@ -19,7 +19,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n flyteidl/event/cloudevents.proto\x12\x0e\x66lyteidl.event\x1a\x1a\x66lyteidl/event/event.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1f\x66lyteidl/core/artifact_id.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x9c\x04\n\x1b\x43loudEventWorkflowExecution\x12\x43\n\traw_event\x18\x01 \x01(\x0b\x32&.flyteidl.event.WorkflowExecutionEventR\x08rawEvent\x12:\n\x0boutput_data\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\noutputData\x12H\n\x10output_interface\x18\x03 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\x0foutputInterface\x12\x38\n\ninput_data\x18\x04 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\tinputData\x12<\n\x0c\x61rtifact_ids\x18\x05 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12[\n\x13reference_execution\x18\x06 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x12referenceExecution\x12\x1c\n\tprincipal\x18\x07 \x01(\tR\tprincipal\x12?\n\x0elaunch_plan_id\x18\x08 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\"\x81\x04\n\x17\x43loudEventNodeExecution\x12?\n\traw_event\x18\x01 \x01(\x0b\x32\".flyteidl.event.NodeExecutionEventR\x08rawEvent\x12H\n\x0ctask_exec_id\x18\x02 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\ntaskExecId\x12:\n\x0boutput_data\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\noutputData\x12H\n\x10output_interface\x18\x04 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\x0foutputInterface\x12\x38\n\ninput_data\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\tinputData\x12<\n\x0c\x61rtifact_ids\x18\x06 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12\x1c\n\tprincipal\x18\x07 \x01(\tR\tprincipal\x12?\n\x0elaunch_plan_id\x18\x08 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\"Z\n\x17\x43loudEventTaskExecution\x12?\n\traw_event\x18\x01 \x01(\x0b\x32\".flyteidl.event.TaskExecutionEventR\x08rawEvent\"\xe7\x02\n\x18\x43loudEventExecutionStart\x12M\n\x0c\x65xecution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x0b\x65xecutionId\x12?\n\x0elaunch_plan_id\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\x12:\n\x0bworkflow_id\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nworkflowId\x12<\n\x0c\x61rtifact_ids\x18\x04 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12#\n\rartifact_keys\x18\x05 \x03(\tR\x0c\x61rtifactKeys\x12\x1c\n\tprincipal\x18\x06 \x01(\tR\tprincipalB\xbc\x01\n\x12\x63om.flyteidl.eventB\x10\x43loudeventsProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/event\xa2\x02\x03\x46\x45X\xaa\x02\x0e\x46lyteidl.Event\xca\x02\x0e\x46lyteidl\\Event\xe2\x02\x1a\x46lyteidl\\Event\\GPBMetadata\xea\x02\x0f\x46lyteidl::Eventb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n flyteidl/event/cloudevents.proto\x12\x0e\x66lyteidl.event\x1a\x1a\x66lyteidl/event/event.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1f\x66lyteidl/core/artifact_id.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa6\x03\n\x1b\x43loudEventWorkflowExecution\x12\x43\n\traw_event\x18\x01 \x01(\x0b\x32&.flyteidl.event.WorkflowExecutionEventR\x08rawEvent\x12H\n\x10output_interface\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\x0foutputInterface\x12<\n\x0c\x61rtifact_ids\x18\x03 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12[\n\x13reference_execution\x18\x04 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x12referenceExecution\x12\x1c\n\tprincipal\x18\x05 \x01(\tR\tprincipal\x12?\n\x0elaunch_plan_id\x18\x06 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\"\x8b\x03\n\x17\x43loudEventNodeExecution\x12?\n\traw_event\x18\x01 \x01(\x0b\x32\".flyteidl.event.NodeExecutionEventR\x08rawEvent\x12H\n\x0ctask_exec_id\x18\x02 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\ntaskExecId\x12H\n\x10output_interface\x18\x03 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\x0foutputInterface\x12<\n\x0c\x61rtifact_ids\x18\x04 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12\x1c\n\tprincipal\x18\x05 \x01(\tR\tprincipal\x12?\n\x0elaunch_plan_id\x18\x06 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\"Z\n\x17\x43loudEventTaskExecution\x12?\n\traw_event\x18\x01 \x01(\x0b\x32\".flyteidl.event.TaskExecutionEventR\x08rawEvent\"\xe7\x02\n\x18\x43loudEventExecutionStart\x12M\n\x0c\x65xecution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x0b\x65xecutionId\x12?\n\x0elaunch_plan_id\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\x12:\n\x0bworkflow_id\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nworkflowId\x12<\n\x0c\x61rtifact_ids\x18\x04 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12#\n\rartifact_keys\x18\x05 \x03(\tR\x0c\x61rtifactKeys\x12\x1c\n\tprincipal\x18\x06 \x01(\tR\tprincipalB\xbc\x01\n\x12\x63om.flyteidl.eventB\x10\x43loudeventsProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/event\xa2\x02\x03\x46\x45X\xaa\x02\x0e\x46lyteidl.Event\xca\x02\x0e\x46lyteidl\\Event\xe2\x02\x1a\x46lyteidl\\Event\\GPBMetadata\xea\x02\x0f\x46lyteidl::Eventb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -29,11 +29,11 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\022com.flyteidl.eventB\020CloudeventsProtoP\001Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/event\242\002\003FEX\252\002\016Flyteidl.Event\312\002\016Flyteidl\\Event\342\002\032Flyteidl\\Event\\GPBMetadata\352\002\017Flyteidl::Event' _globals['_CLOUDEVENTWORKFLOWEXECUTION']._serialized_start=240 - _globals['_CLOUDEVENTWORKFLOWEXECUTION']._serialized_end=780 - _globals['_CLOUDEVENTNODEEXECUTION']._serialized_start=783 - _globals['_CLOUDEVENTNODEEXECUTION']._serialized_end=1296 - _globals['_CLOUDEVENTTASKEXECUTION']._serialized_start=1298 - _globals['_CLOUDEVENTTASKEXECUTION']._serialized_end=1388 - _globals['_CLOUDEVENTEXECUTIONSTART']._serialized_start=1391 - _globals['_CLOUDEVENTEXECUTIONSTART']._serialized_end=1750 + _globals['_CLOUDEVENTWORKFLOWEXECUTION']._serialized_end=662 + _globals['_CLOUDEVENTNODEEXECUTION']._serialized_start=665 + _globals['_CLOUDEVENTNODEEXECUTION']._serialized_end=1060 + _globals['_CLOUDEVENTTASKEXECUTION']._serialized_start=1062 + _globals['_CLOUDEVENTTASKEXECUTION']._serialized_end=1152 + _globals['_CLOUDEVENTEXECUTIONSTART']._serialized_start=1155 + _globals['_CLOUDEVENTEXECUTIONSTART']._serialized_end=1514 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.pyi index 8444627c32..fc6d11b56b 100644 --- a/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.pyi @@ -12,44 +12,36 @@ from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Map DESCRIPTOR: _descriptor.FileDescriptor class CloudEventWorkflowExecution(_message.Message): - __slots__ = ["raw_event", "output_data", "output_interface", "input_data", "artifact_ids", "reference_execution", "principal", "launch_plan_id"] + __slots__ = ["raw_event", "output_interface", "artifact_ids", "reference_execution", "principal", "launch_plan_id"] RAW_EVENT_FIELD_NUMBER: _ClassVar[int] - OUTPUT_DATA_FIELD_NUMBER: _ClassVar[int] OUTPUT_INTERFACE_FIELD_NUMBER: _ClassVar[int] - INPUT_DATA_FIELD_NUMBER: _ClassVar[int] ARTIFACT_IDS_FIELD_NUMBER: _ClassVar[int] REFERENCE_EXECUTION_FIELD_NUMBER: _ClassVar[int] PRINCIPAL_FIELD_NUMBER: _ClassVar[int] LAUNCH_PLAN_ID_FIELD_NUMBER: _ClassVar[int] raw_event: _event_pb2.WorkflowExecutionEvent - output_data: _literals_pb2.LiteralMap output_interface: _interface_pb2.TypedInterface - input_data: _literals_pb2.LiteralMap artifact_ids: _containers.RepeatedCompositeFieldContainer[_artifact_id_pb2.ArtifactID] reference_execution: _identifier_pb2.WorkflowExecutionIdentifier principal: str launch_plan_id: _identifier_pb2.Identifier - def __init__(self, raw_event: _Optional[_Union[_event_pb2.WorkflowExecutionEvent, _Mapping]] = ..., output_data: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., output_interface: _Optional[_Union[_interface_pb2.TypedInterface, _Mapping]] = ..., input_data: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., artifact_ids: _Optional[_Iterable[_Union[_artifact_id_pb2.ArtifactID, _Mapping]]] = ..., reference_execution: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., principal: _Optional[str] = ..., launch_plan_id: _Optional[_Union[_identifier_pb2.Identifier, _Mapping]] = ...) -> None: ... + def __init__(self, raw_event: _Optional[_Union[_event_pb2.WorkflowExecutionEvent, _Mapping]] = ..., output_interface: _Optional[_Union[_interface_pb2.TypedInterface, _Mapping]] = ..., artifact_ids: _Optional[_Iterable[_Union[_artifact_id_pb2.ArtifactID, _Mapping]]] = ..., reference_execution: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., principal: _Optional[str] = ..., launch_plan_id: _Optional[_Union[_identifier_pb2.Identifier, _Mapping]] = ...) -> None: ... class CloudEventNodeExecution(_message.Message): - __slots__ = ["raw_event", "task_exec_id", "output_data", "output_interface", "input_data", "artifact_ids", "principal", "launch_plan_id"] + __slots__ = ["raw_event", "task_exec_id", "output_interface", "artifact_ids", "principal", "launch_plan_id"] RAW_EVENT_FIELD_NUMBER: _ClassVar[int] TASK_EXEC_ID_FIELD_NUMBER: _ClassVar[int] - OUTPUT_DATA_FIELD_NUMBER: _ClassVar[int] OUTPUT_INTERFACE_FIELD_NUMBER: _ClassVar[int] - INPUT_DATA_FIELD_NUMBER: _ClassVar[int] ARTIFACT_IDS_FIELD_NUMBER: _ClassVar[int] PRINCIPAL_FIELD_NUMBER: _ClassVar[int] LAUNCH_PLAN_ID_FIELD_NUMBER: _ClassVar[int] raw_event: _event_pb2.NodeExecutionEvent task_exec_id: _identifier_pb2.TaskExecutionIdentifier - output_data: _literals_pb2.LiteralMap output_interface: _interface_pb2.TypedInterface - input_data: _literals_pb2.LiteralMap artifact_ids: _containers.RepeatedCompositeFieldContainer[_artifact_id_pb2.ArtifactID] principal: str launch_plan_id: _identifier_pb2.Identifier - def __init__(self, raw_event: _Optional[_Union[_event_pb2.NodeExecutionEvent, _Mapping]] = ..., task_exec_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., output_data: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., output_interface: _Optional[_Union[_interface_pb2.TypedInterface, _Mapping]] = ..., input_data: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., artifact_ids: _Optional[_Iterable[_Union[_artifact_id_pb2.ArtifactID, _Mapping]]] = ..., principal: _Optional[str] = ..., launch_plan_id: _Optional[_Union[_identifier_pb2.Identifier, _Mapping]] = ...) -> None: ... + def __init__(self, raw_event: _Optional[_Union[_event_pb2.NodeExecutionEvent, _Mapping]] = ..., task_exec_id: _Optional[_Union[_identifier_pb2.TaskExecutionIdentifier, _Mapping]] = ..., output_interface: _Optional[_Union[_interface_pb2.TypedInterface, _Mapping]] = ..., artifact_ids: _Optional[_Iterable[_Union[_artifact_id_pb2.ArtifactID, _Mapping]]] = ..., principal: _Optional[str] = ..., launch_plan_id: _Optional[_Union[_identifier_pb2.Identifier, _Mapping]] = ...) -> None: ... class CloudEventTaskExecution(_message.Message): __slots__ = ["raw_event"] diff --git a/flyteidl/gen/pb_rust/flyteidl.event.rs b/flyteidl/gen/pb_rust/flyteidl.event.rs index b7dd7ac9f3..c3a3b2a4d9 100644 --- a/flyteidl/gen/pb_rust/flyteidl.event.rs +++ b/flyteidl/gen/pb_rust/flyteidl.event.rs @@ -393,23 +393,19 @@ pub struct CloudEventWorkflowExecution { #[prost(message, optional, tag="1")] pub raw_event: ::core::option::Option, #[prost(message, optional, tag="2")] - pub output_data: ::core::option::Option, - #[prost(message, optional, tag="3")] pub output_interface: ::core::option::Option, - #[prost(message, optional, tag="4")] - pub input_data: ::core::option::Option, /// The following are ExecutionMetadata fields /// We can't have the ExecutionMetadata object directly because of import cycle - #[prost(message, repeated, tag="5")] + #[prost(message, repeated, tag="3")] pub artifact_ids: ::prost::alloc::vec::Vec, - #[prost(message, optional, tag="6")] + #[prost(message, optional, tag="4")] pub reference_execution: ::core::option::Option, - #[prost(string, tag="7")] + #[prost(string, tag="5")] pub principal: ::prost::alloc::string::String, /// The ID of the LP that generated the execution that generated the Artifact. /// Here for provenance information. /// Launch plan IDs are easier to get than workflow IDs so we'll use these for now. - #[prost(message, optional, tag="8")] + #[prost(message, optional, tag="6")] pub launch_plan_id: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] @@ -420,24 +416,19 @@ pub struct CloudEventNodeExecution { /// The relevant task execution if applicable #[prost(message, optional, tag="2")] pub task_exec_id: ::core::option::Option, - /// Hydrated output - #[prost(message, optional, tag="3")] - pub output_data: ::core::option::Option, /// The typed interface for the task that produced the event. - #[prost(message, optional, tag="4")] + #[prost(message, optional, tag="3")] pub output_interface: ::core::option::Option, - #[prost(message, optional, tag="5")] - pub input_data: ::core::option::Option, /// The following are ExecutionMetadata fields /// We can't have the ExecutionMetadata object directly because of import cycle - #[prost(message, repeated, tag="6")] + #[prost(message, repeated, tag="4")] pub artifact_ids: ::prost::alloc::vec::Vec, - #[prost(string, tag="7")] + #[prost(string, tag="5")] pub principal: ::prost::alloc::string::String, /// The ID of the LP that generated the execution that generated the Artifact. /// Here for provenance information. /// Launch plan IDs are easier to get than workflow IDs so we'll use these for now. - #[prost(message, optional, tag="8")] + #[prost(message, optional, tag="6")] pub launch_plan_id: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/flytestdlib/cache/mocks/AutoRefresh.go b/flytestdlib/cache/mocks/AutoRefresh.go index df660b44f8..bae8993322 100644 --- a/flytestdlib/cache/mocks/AutoRefresh.go +++ b/flytestdlib/cache/mocks/AutoRefresh.go @@ -24,13 +24,13 @@ func (_m AutoRefresh_DeleteDelayed) Return(_a0 error) *AutoRefresh_DeleteDelayed } func (_m *AutoRefresh) OnDeleteDelayed(id string) *AutoRefresh_DeleteDelayed { - c := _m.On("DeleteDelayed", id) - return &AutoRefresh_DeleteDelayed{Call: c} + c_call := _m.On("DeleteDelayed", id) + return &AutoRefresh_DeleteDelayed{Call: c_call} } func (_m *AutoRefresh) OnDeleteDelayedMatch(matchers ...interface{}) *AutoRefresh_DeleteDelayed { - c := _m.On("DeleteDelayed", matchers...) - return &AutoRefresh_DeleteDelayed{Call: c} + c_call := _m.On("DeleteDelayed", matchers...) + return &AutoRefresh_DeleteDelayed{Call: c_call} } // DeleteDelayed provides a mock function with given fields: id @@ -56,13 +56,13 @@ func (_m AutoRefresh_Get) Return(_a0 cache.Item, _a1 error) *AutoRefresh_Get { } func (_m *AutoRefresh) OnGet(id string) *AutoRefresh_Get { - c := _m.On("Get", id) - return &AutoRefresh_Get{Call: c} + c_call := _m.On("Get", id) + return &AutoRefresh_Get{Call: c_call} } func (_m *AutoRefresh) OnGetMatch(matchers ...interface{}) *AutoRefresh_Get { - c := _m.On("Get", matchers...) - return &AutoRefresh_Get{Call: c} + c_call := _m.On("Get", matchers...) + return &AutoRefresh_Get{Call: c_call} } // Get provides a mock function with given fields: id @@ -97,13 +97,13 @@ func (_m AutoRefresh_GetOrCreate) Return(_a0 cache.Item, _a1 error) *AutoRefresh } func (_m *AutoRefresh) OnGetOrCreate(id string, item cache.Item) *AutoRefresh_GetOrCreate { - c := _m.On("GetOrCreate", id, item) - return &AutoRefresh_GetOrCreate{Call: c} + c_call := _m.On("GetOrCreate", id, item) + return &AutoRefresh_GetOrCreate{Call: c_call} } func (_m *AutoRefresh) OnGetOrCreateMatch(matchers ...interface{}) *AutoRefresh_GetOrCreate { - c := _m.On("GetOrCreate", matchers...) - return &AutoRefresh_GetOrCreate{Call: c} + c_call := _m.On("GetOrCreate", matchers...) + return &AutoRefresh_GetOrCreate{Call: c_call} } // GetOrCreate provides a mock function with given fields: id, item @@ -138,13 +138,13 @@ func (_m AutoRefresh_Start) Return(_a0 error) *AutoRefresh_Start { } func (_m *AutoRefresh) OnStart(ctx context.Context) *AutoRefresh_Start { - c := _m.On("Start", ctx) - return &AutoRefresh_Start{Call: c} + c_call := _m.On("Start", ctx) + return &AutoRefresh_Start{Call: c_call} } func (_m *AutoRefresh) OnStartMatch(matchers ...interface{}) *AutoRefresh_Start { - c := _m.On("Start", matchers...) - return &AutoRefresh_Start{Call: c} + c_call := _m.On("Start", matchers...) + return &AutoRefresh_Start{Call: c_call} } // Start provides a mock function with given fields: ctx diff --git a/flytestdlib/cache/mocks/Item.go b/flytestdlib/cache/mocks/Item.go index 23dd8c5bb7..24dada6b4d 100644 --- a/flytestdlib/cache/mocks/Item.go +++ b/flytestdlib/cache/mocks/Item.go @@ -8,3 +8,35 @@ import mock "github.com/stretchr/testify/mock" type Item struct { mock.Mock } + +type Item_IsTerminal struct { + *mock.Call +} + +func (_m Item_IsTerminal) Return(_a0 bool) *Item_IsTerminal { + return &Item_IsTerminal{Call: _m.Call.Return(_a0)} +} + +func (_m *Item) OnIsTerminal() *Item_IsTerminal { + c_call := _m.On("IsTerminal") + return &Item_IsTerminal{Call: c_call} +} + +func (_m *Item) OnIsTerminalMatch(matchers ...interface{}) *Item_IsTerminal { + c_call := _m.On("IsTerminal", matchers...) + return &Item_IsTerminal{Call: c_call} +} + +// IsTerminal provides a mock function with given fields: +func (_m *Item) IsTerminal() bool { + ret := _m.Called() + + var r0 bool + if rf, ok := ret.Get(0).(func() bool); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(bool) + } + + return r0 +} diff --git a/flytestdlib/cache/mocks/ItemWrapper.go b/flytestdlib/cache/mocks/ItemWrapper.go index 16c916f1d3..03e4576b53 100644 --- a/flytestdlib/cache/mocks/ItemWrapper.go +++ b/flytestdlib/cache/mocks/ItemWrapper.go @@ -21,13 +21,13 @@ func (_m ItemWrapper_GetID) Return(_a0 string) *ItemWrapper_GetID { } func (_m *ItemWrapper) OnGetID() *ItemWrapper_GetID { - c := _m.On("GetID") - return &ItemWrapper_GetID{Call: c} + c_call := _m.On("GetID") + return &ItemWrapper_GetID{Call: c_call} } func (_m *ItemWrapper) OnGetIDMatch(matchers ...interface{}) *ItemWrapper_GetID { - c := _m.On("GetID", matchers...) - return &ItemWrapper_GetID{Call: c} + c_call := _m.On("GetID", matchers...) + return &ItemWrapper_GetID{Call: c_call} } // GetID provides a mock function with given fields: @@ -53,13 +53,13 @@ func (_m ItemWrapper_GetItem) Return(_a0 cache.Item) *ItemWrapper_GetItem { } func (_m *ItemWrapper) OnGetItem() *ItemWrapper_GetItem { - c := _m.On("GetItem") - return &ItemWrapper_GetItem{Call: c} + c_call := _m.On("GetItem") + return &ItemWrapper_GetItem{Call: c_call} } func (_m *ItemWrapper) OnGetItemMatch(matchers ...interface{}) *ItemWrapper_GetItem { - c := _m.On("GetItem", matchers...) - return &ItemWrapper_GetItem{Call: c} + c_call := _m.On("GetItem", matchers...) + return &ItemWrapper_GetItem{Call: c_call} } // GetItem provides a mock function with given fields: diff --git a/flytestdlib/fastcheck/mocks/filter.go b/flytestdlib/fastcheck/mocks/filter.go index 04b31555a8..e661fdbab7 100644 --- a/flytestdlib/fastcheck/mocks/filter.go +++ b/flytestdlib/fastcheck/mocks/filter.go @@ -22,13 +22,13 @@ func (_m Filter_Add) Return(evicted bool) *Filter_Add { } func (_m *Filter) OnAdd(ctx context.Context, id []byte) *Filter_Add { - c := _m.On("Add", ctx, id) - return &Filter_Add{Call: c} + c_call := _m.On("Add", ctx, id) + return &Filter_Add{Call: c_call} } func (_m *Filter) OnAddMatch(matchers ...interface{}) *Filter_Add { - c := _m.On("Add", matchers...) - return &Filter_Add{Call: c} + c_call := _m.On("Add", matchers...) + return &Filter_Add{Call: c_call} } // Add provides a mock function with given fields: ctx, id @@ -54,13 +54,13 @@ func (_m Filter_Contains) Return(_a0 bool) *Filter_Contains { } func (_m *Filter) OnContains(ctx context.Context, id []byte) *Filter_Contains { - c := _m.On("Contains", ctx, id) - return &Filter_Contains{Call: c} + c_call := _m.On("Contains", ctx, id) + return &Filter_Contains{Call: c_call} } func (_m *Filter) OnContainsMatch(matchers ...interface{}) *Filter_Contains { - c := _m.On("Contains", matchers...) - return &Filter_Contains{Call: c} + c_call := _m.On("Contains", matchers...) + return &Filter_Contains{Call: c_call} } // Contains provides a mock function with given fields: ctx, id diff --git a/flytestdlib/random/mocks/comparable.go b/flytestdlib/random/mocks/comparable.go index 10d1aaa506..bf555c98a4 100644 --- a/flytestdlib/random/mocks/comparable.go +++ b/flytestdlib/random/mocks/comparable.go @@ -21,13 +21,13 @@ func (_m Comparable_Compare) Return(_a0 bool) *Comparable_Compare { } func (_m *Comparable) OnCompare(to random.Comparable) *Comparable_Compare { - c := _m.On("Compare", to) - return &Comparable_Compare{Call: c} + c_call := _m.On("Compare", to) + return &Comparable_Compare{Call: c_call} } func (_m *Comparable) OnCompareMatch(matchers ...interface{}) *Comparable_Compare { - c := _m.On("Compare", matchers...) - return &Comparable_Compare{Call: c} + c_call := _m.On("Compare", matchers...) + return &Comparable_Compare{Call: c_call} } // Compare provides a mock function with given fields: to diff --git a/flytestdlib/random/mocks/weighted_random_list.go b/flytestdlib/random/mocks/weighted_random_list.go index f7227b6cc6..c0581a6a19 100644 --- a/flytestdlib/random/mocks/weighted_random_list.go +++ b/flytestdlib/random/mocks/weighted_random_list.go @@ -24,13 +24,13 @@ func (_m WeightedRandomList_Get) Return(_a0 random.Comparable) *WeightedRandomLi } func (_m *WeightedRandomList) OnGet() *WeightedRandomList_Get { - c := _m.On("Get") - return &WeightedRandomList_Get{Call: c} + c_call := _m.On("Get") + return &WeightedRandomList_Get{Call: c_call} } func (_m *WeightedRandomList) OnGetMatch(matchers ...interface{}) *WeightedRandomList_Get { - c := _m.On("Get", matchers...) - return &WeightedRandomList_Get{Call: c} + c_call := _m.On("Get", matchers...) + return &WeightedRandomList_Get{Call: c_call} } // Get provides a mock function with given fields: @@ -58,13 +58,13 @@ func (_m WeightedRandomList_GetWithSeed) Return(_a0 random.Comparable, _a1 error } func (_m *WeightedRandomList) OnGetWithSeed(seed rand.Source) *WeightedRandomList_GetWithSeed { - c := _m.On("GetWithSeed", seed) - return &WeightedRandomList_GetWithSeed{Call: c} + c_call := _m.On("GetWithSeed", seed) + return &WeightedRandomList_GetWithSeed{Call: c_call} } func (_m *WeightedRandomList) OnGetWithSeedMatch(matchers ...interface{}) *WeightedRandomList_GetWithSeed { - c := _m.On("GetWithSeed", matchers...) - return &WeightedRandomList_GetWithSeed{Call: c} + c_call := _m.On("GetWithSeed", matchers...) + return &WeightedRandomList_GetWithSeed{Call: c_call} } // GetWithSeed provides a mock function with given fields: seed @@ -99,13 +99,13 @@ func (_m WeightedRandomList_Len) Return(_a0 int) *WeightedRandomList_Len { } func (_m *WeightedRandomList) OnLen() *WeightedRandomList_Len { - c := _m.On("Len") - return &WeightedRandomList_Len{Call: c} + c_call := _m.On("Len") + return &WeightedRandomList_Len{Call: c_call} } func (_m *WeightedRandomList) OnLenMatch(matchers ...interface{}) *WeightedRandomList_Len { - c := _m.On("Len", matchers...) - return &WeightedRandomList_Len{Call: c} + c_call := _m.On("Len", matchers...) + return &WeightedRandomList_Len{Call: c_call} } // Len provides a mock function with given fields: @@ -131,13 +131,13 @@ func (_m WeightedRandomList_List) Return(_a0 []random.Comparable) *WeightedRando } func (_m *WeightedRandomList) OnList() *WeightedRandomList_List { - c := _m.On("List") - return &WeightedRandomList_List{Call: c} + c_call := _m.On("List") + return &WeightedRandomList_List{Call: c_call} } func (_m *WeightedRandomList) OnListMatch(matchers ...interface{}) *WeightedRandomList_List { - c := _m.On("List", matchers...) - return &WeightedRandomList_List{Call: c} + c_call := _m.On("List", matchers...) + return &WeightedRandomList_List{Call: c_call} } // List provides a mock function with given fields: diff --git a/flytestdlib/storage/mocks/composed_protobuf_store.go b/flytestdlib/storage/mocks/composed_protobuf_store.go index ed77566643..c9064c2ac5 100644 --- a/flytestdlib/storage/mocks/composed_protobuf_store.go +++ b/flytestdlib/storage/mocks/composed_protobuf_store.go @@ -27,13 +27,13 @@ func (_m ComposedProtobufStore_CopyRaw) Return(_a0 error) *ComposedProtobufStore } func (_m *ComposedProtobufStore) OnCopyRaw(ctx context.Context, source storage.DataReference, destination storage.DataReference, opts storage.Options) *ComposedProtobufStore_CopyRaw { - c := _m.On("CopyRaw", ctx, source, destination, opts) - return &ComposedProtobufStore_CopyRaw{Call: c} + c_call := _m.On("CopyRaw", ctx, source, destination, opts) + return &ComposedProtobufStore_CopyRaw{Call: c_call} } func (_m *ComposedProtobufStore) OnCopyRawMatch(matchers ...interface{}) *ComposedProtobufStore_CopyRaw { - c := _m.On("CopyRaw", matchers...) - return &ComposedProtobufStore_CopyRaw{Call: c} + c_call := _m.On("CopyRaw", matchers...) + return &ComposedProtobufStore_CopyRaw{Call: c_call} } // CopyRaw provides a mock function with given fields: ctx, source, destination, opts @@ -59,13 +59,13 @@ func (_m ComposedProtobufStore_CreateSignedURL) Return(_a0 storage.SignedURLResp } func (_m *ComposedProtobufStore) OnCreateSignedURL(ctx context.Context, reference storage.DataReference, properties storage.SignedURLProperties) *ComposedProtobufStore_CreateSignedURL { - c := _m.On("CreateSignedURL", ctx, reference, properties) - return &ComposedProtobufStore_CreateSignedURL{Call: c} + c_call := _m.On("CreateSignedURL", ctx, reference, properties) + return &ComposedProtobufStore_CreateSignedURL{Call: c_call} } func (_m *ComposedProtobufStore) OnCreateSignedURLMatch(matchers ...interface{}) *ComposedProtobufStore_CreateSignedURL { - c := _m.On("CreateSignedURL", matchers...) - return &ComposedProtobufStore_CreateSignedURL{Call: c} + c_call := _m.On("CreateSignedURL", matchers...) + return &ComposedProtobufStore_CreateSignedURL{Call: c_call} } // CreateSignedURL provides a mock function with given fields: ctx, reference, properties @@ -98,13 +98,13 @@ func (_m ComposedProtobufStore_Delete) Return(_a0 error) *ComposedProtobufStore_ } func (_m *ComposedProtobufStore) OnDelete(ctx context.Context, reference storage.DataReference) *ComposedProtobufStore_Delete { - c := _m.On("Delete", ctx, reference) - return &ComposedProtobufStore_Delete{Call: c} + c_call := _m.On("Delete", ctx, reference) + return &ComposedProtobufStore_Delete{Call: c_call} } func (_m *ComposedProtobufStore) OnDeleteMatch(matchers ...interface{}) *ComposedProtobufStore_Delete { - c := _m.On("Delete", matchers...) - return &ComposedProtobufStore_Delete{Call: c} + c_call := _m.On("Delete", matchers...) + return &ComposedProtobufStore_Delete{Call: c_call} } // Delete provides a mock function with given fields: ctx, reference @@ -130,13 +130,13 @@ func (_m ComposedProtobufStore_GetBaseContainerFQN) Return(_a0 storage.DataRefer } func (_m *ComposedProtobufStore) OnGetBaseContainerFQN(ctx context.Context) *ComposedProtobufStore_GetBaseContainerFQN { - c := _m.On("GetBaseContainerFQN", ctx) - return &ComposedProtobufStore_GetBaseContainerFQN{Call: c} + c_call := _m.On("GetBaseContainerFQN", ctx) + return &ComposedProtobufStore_GetBaseContainerFQN{Call: c_call} } func (_m *ComposedProtobufStore) OnGetBaseContainerFQNMatch(matchers ...interface{}) *ComposedProtobufStore_GetBaseContainerFQN { - c := _m.On("GetBaseContainerFQN", matchers...) - return &ComposedProtobufStore_GetBaseContainerFQN{Call: c} + c_call := _m.On("GetBaseContainerFQN", matchers...) + return &ComposedProtobufStore_GetBaseContainerFQN{Call: c_call} } // GetBaseContainerFQN provides a mock function with given fields: ctx @@ -162,13 +162,13 @@ func (_m ComposedProtobufStore_Head) Return(_a0 storage.Metadata, _a1 error) *Co } func (_m *ComposedProtobufStore) OnHead(ctx context.Context, reference storage.DataReference) *ComposedProtobufStore_Head { - c := _m.On("Head", ctx, reference) - return &ComposedProtobufStore_Head{Call: c} + c_call := _m.On("Head", ctx, reference) + return &ComposedProtobufStore_Head{Call: c_call} } func (_m *ComposedProtobufStore) OnHeadMatch(matchers ...interface{}) *ComposedProtobufStore_Head { - c := _m.On("Head", matchers...) - return &ComposedProtobufStore_Head{Call: c} + c_call := _m.On("Head", matchers...) + return &ComposedProtobufStore_Head{Call: c_call} } // Head provides a mock function with given fields: ctx, reference @@ -203,13 +203,13 @@ func (_m ComposedProtobufStore_ReadProtobuf) Return(_a0 error) *ComposedProtobuf } func (_m *ComposedProtobufStore) OnReadProtobuf(ctx context.Context, reference storage.DataReference, msg protoiface.MessageV1) *ComposedProtobufStore_ReadProtobuf { - c := _m.On("ReadProtobuf", ctx, reference, msg) - return &ComposedProtobufStore_ReadProtobuf{Call: c} + c_call := _m.On("ReadProtobuf", ctx, reference, msg) + return &ComposedProtobufStore_ReadProtobuf{Call: c_call} } func (_m *ComposedProtobufStore) OnReadProtobufMatch(matchers ...interface{}) *ComposedProtobufStore_ReadProtobuf { - c := _m.On("ReadProtobuf", matchers...) - return &ComposedProtobufStore_ReadProtobuf{Call: c} + c_call := _m.On("ReadProtobuf", matchers...) + return &ComposedProtobufStore_ReadProtobuf{Call: c_call} } // ReadProtobuf provides a mock function with given fields: ctx, reference, msg @@ -235,13 +235,13 @@ func (_m ComposedProtobufStore_ReadRaw) Return(_a0 io.ReadCloser, _a1 error) *Co } func (_m *ComposedProtobufStore) OnReadRaw(ctx context.Context, reference storage.DataReference) *ComposedProtobufStore_ReadRaw { - c := _m.On("ReadRaw", ctx, reference) - return &ComposedProtobufStore_ReadRaw{Call: c} + c_call := _m.On("ReadRaw", ctx, reference) + return &ComposedProtobufStore_ReadRaw{Call: c_call} } func (_m *ComposedProtobufStore) OnReadRawMatch(matchers ...interface{}) *ComposedProtobufStore_ReadRaw { - c := _m.On("ReadRaw", matchers...) - return &ComposedProtobufStore_ReadRaw{Call: c} + c_call := _m.On("ReadRaw", matchers...) + return &ComposedProtobufStore_ReadRaw{Call: c_call} } // ReadRaw provides a mock function with given fields: ctx, reference @@ -276,13 +276,13 @@ func (_m ComposedProtobufStore_WriteProtobuf) Return(_a0 error) *ComposedProtobu } func (_m *ComposedProtobufStore) OnWriteProtobuf(ctx context.Context, reference storage.DataReference, opts storage.Options, msg protoiface.MessageV1) *ComposedProtobufStore_WriteProtobuf { - c := _m.On("WriteProtobuf", ctx, reference, opts, msg) - return &ComposedProtobufStore_WriteProtobuf{Call: c} + c_call := _m.On("WriteProtobuf", ctx, reference, opts, msg) + return &ComposedProtobufStore_WriteProtobuf{Call: c_call} } func (_m *ComposedProtobufStore) OnWriteProtobufMatch(matchers ...interface{}) *ComposedProtobufStore_WriteProtobuf { - c := _m.On("WriteProtobuf", matchers...) - return &ComposedProtobufStore_WriteProtobuf{Call: c} + c_call := _m.On("WriteProtobuf", matchers...) + return &ComposedProtobufStore_WriteProtobuf{Call: c_call} } // WriteProtobuf provides a mock function with given fields: ctx, reference, opts, msg @@ -308,13 +308,13 @@ func (_m ComposedProtobufStore_WriteRaw) Return(_a0 error) *ComposedProtobufStor } func (_m *ComposedProtobufStore) OnWriteRaw(ctx context.Context, reference storage.DataReference, size int64, opts storage.Options, raw io.Reader) *ComposedProtobufStore_WriteRaw { - c := _m.On("WriteRaw", ctx, reference, size, opts, raw) - return &ComposedProtobufStore_WriteRaw{Call: c} + c_call := _m.On("WriteRaw", ctx, reference, size, opts, raw) + return &ComposedProtobufStore_WriteRaw{Call: c_call} } func (_m *ComposedProtobufStore) OnWriteRawMatch(matchers ...interface{}) *ComposedProtobufStore_WriteRaw { - c := _m.On("WriteRaw", matchers...) - return &ComposedProtobufStore_WriteRaw{Call: c} + c_call := _m.On("WriteRaw", matchers...) + return &ComposedProtobufStore_WriteRaw{Call: c_call} } // WriteRaw provides a mock function with given fields: ctx, reference, size, opts, raw diff --git a/flytestdlib/storage/mocks/raw_store.go b/flytestdlib/storage/mocks/raw_store.go index aa02023f60..06b731765d 100644 --- a/flytestdlib/storage/mocks/raw_store.go +++ b/flytestdlib/storage/mocks/raw_store.go @@ -25,13 +25,13 @@ func (_m RawStore_CopyRaw) Return(_a0 error) *RawStore_CopyRaw { } func (_m *RawStore) OnCopyRaw(ctx context.Context, source storage.DataReference, destination storage.DataReference, opts storage.Options) *RawStore_CopyRaw { - c := _m.On("CopyRaw", ctx, source, destination, opts) - return &RawStore_CopyRaw{Call: c} + c_call := _m.On("CopyRaw", ctx, source, destination, opts) + return &RawStore_CopyRaw{Call: c_call} } func (_m *RawStore) OnCopyRawMatch(matchers ...interface{}) *RawStore_CopyRaw { - c := _m.On("CopyRaw", matchers...) - return &RawStore_CopyRaw{Call: c} + c_call := _m.On("CopyRaw", matchers...) + return &RawStore_CopyRaw{Call: c_call} } // CopyRaw provides a mock function with given fields: ctx, source, destination, opts @@ -57,13 +57,13 @@ func (_m RawStore_CreateSignedURL) Return(_a0 storage.SignedURLResponse, _a1 err } func (_m *RawStore) OnCreateSignedURL(ctx context.Context, reference storage.DataReference, properties storage.SignedURLProperties) *RawStore_CreateSignedURL { - c := _m.On("CreateSignedURL", ctx, reference, properties) - return &RawStore_CreateSignedURL{Call: c} + c_call := _m.On("CreateSignedURL", ctx, reference, properties) + return &RawStore_CreateSignedURL{Call: c_call} } func (_m *RawStore) OnCreateSignedURLMatch(matchers ...interface{}) *RawStore_CreateSignedURL { - c := _m.On("CreateSignedURL", matchers...) - return &RawStore_CreateSignedURL{Call: c} + c_call := _m.On("CreateSignedURL", matchers...) + return &RawStore_CreateSignedURL{Call: c_call} } // CreateSignedURL provides a mock function with given fields: ctx, reference, properties @@ -96,13 +96,13 @@ func (_m RawStore_Delete) Return(_a0 error) *RawStore_Delete { } func (_m *RawStore) OnDelete(ctx context.Context, reference storage.DataReference) *RawStore_Delete { - c := _m.On("Delete", ctx, reference) - return &RawStore_Delete{Call: c} + c_call := _m.On("Delete", ctx, reference) + return &RawStore_Delete{Call: c_call} } func (_m *RawStore) OnDeleteMatch(matchers ...interface{}) *RawStore_Delete { - c := _m.On("Delete", matchers...) - return &RawStore_Delete{Call: c} + c_call := _m.On("Delete", matchers...) + return &RawStore_Delete{Call: c_call} } // Delete provides a mock function with given fields: ctx, reference @@ -128,13 +128,13 @@ func (_m RawStore_GetBaseContainerFQN) Return(_a0 storage.DataReference) *RawSto } func (_m *RawStore) OnGetBaseContainerFQN(ctx context.Context) *RawStore_GetBaseContainerFQN { - c := _m.On("GetBaseContainerFQN", ctx) - return &RawStore_GetBaseContainerFQN{Call: c} + c_call := _m.On("GetBaseContainerFQN", ctx) + return &RawStore_GetBaseContainerFQN{Call: c_call} } func (_m *RawStore) OnGetBaseContainerFQNMatch(matchers ...interface{}) *RawStore_GetBaseContainerFQN { - c := _m.On("GetBaseContainerFQN", matchers...) - return &RawStore_GetBaseContainerFQN{Call: c} + c_call := _m.On("GetBaseContainerFQN", matchers...) + return &RawStore_GetBaseContainerFQN{Call: c_call} } // GetBaseContainerFQN provides a mock function with given fields: ctx @@ -160,13 +160,13 @@ func (_m RawStore_Head) Return(_a0 storage.Metadata, _a1 error) *RawStore_Head { } func (_m *RawStore) OnHead(ctx context.Context, reference storage.DataReference) *RawStore_Head { - c := _m.On("Head", ctx, reference) - return &RawStore_Head{Call: c} + c_call := _m.On("Head", ctx, reference) + return &RawStore_Head{Call: c_call} } func (_m *RawStore) OnHeadMatch(matchers ...interface{}) *RawStore_Head { - c := _m.On("Head", matchers...) - return &RawStore_Head{Call: c} + c_call := _m.On("Head", matchers...) + return &RawStore_Head{Call: c_call} } // Head provides a mock function with given fields: ctx, reference @@ -201,13 +201,13 @@ func (_m RawStore_ReadRaw) Return(_a0 io.ReadCloser, _a1 error) *RawStore_ReadRa } func (_m *RawStore) OnReadRaw(ctx context.Context, reference storage.DataReference) *RawStore_ReadRaw { - c := _m.On("ReadRaw", ctx, reference) - return &RawStore_ReadRaw{Call: c} + c_call := _m.On("ReadRaw", ctx, reference) + return &RawStore_ReadRaw{Call: c_call} } func (_m *RawStore) OnReadRawMatch(matchers ...interface{}) *RawStore_ReadRaw { - c := _m.On("ReadRaw", matchers...) - return &RawStore_ReadRaw{Call: c} + c_call := _m.On("ReadRaw", matchers...) + return &RawStore_ReadRaw{Call: c_call} } // ReadRaw provides a mock function with given fields: ctx, reference @@ -242,13 +242,13 @@ func (_m RawStore_WriteRaw) Return(_a0 error) *RawStore_WriteRaw { } func (_m *RawStore) OnWriteRaw(ctx context.Context, reference storage.DataReference, size int64, opts storage.Options, raw io.Reader) *RawStore_WriteRaw { - c := _m.On("WriteRaw", ctx, reference, size, opts, raw) - return &RawStore_WriteRaw{Call: c} + c_call := _m.On("WriteRaw", ctx, reference, size, opts, raw) + return &RawStore_WriteRaw{Call: c_call} } func (_m *RawStore) OnWriteRawMatch(matchers ...interface{}) *RawStore_WriteRaw { - c := _m.On("WriteRaw", matchers...) - return &RawStore_WriteRaw{Call: c} + c_call := _m.On("WriteRaw", matchers...) + return &RawStore_WriteRaw{Call: c_call} } // WriteRaw provides a mock function with given fields: ctx, reference, size, opts, raw diff --git a/flytestdlib/storage/mocks/reference_constructor.go b/flytestdlib/storage/mocks/reference_constructor.go index 22fbeaf906..85619d505e 100644 --- a/flytestdlib/storage/mocks/reference_constructor.go +++ b/flytestdlib/storage/mocks/reference_constructor.go @@ -23,13 +23,13 @@ func (_m ReferenceConstructor_ConstructReference) Return(_a0 storage.DataReferen } func (_m *ReferenceConstructor) OnConstructReference(ctx context.Context, reference storage.DataReference, nestedKeys ...string) *ReferenceConstructor_ConstructReference { - c := _m.On("ConstructReference", ctx, reference, nestedKeys) - return &ReferenceConstructor_ConstructReference{Call: c} + c_call := _m.On("ConstructReference", ctx, reference, nestedKeys) + return &ReferenceConstructor_ConstructReference{Call: c_call} } func (_m *ReferenceConstructor) OnConstructReferenceMatch(matchers ...interface{}) *ReferenceConstructor_ConstructReference { - c := _m.On("ConstructReference", matchers...) - return &ReferenceConstructor_ConstructReference{Call: c} + c_call := _m.On("ConstructReference", matchers...) + return &ReferenceConstructor_ConstructReference{Call: c_call} } // ConstructReference provides a mock function with given fields: ctx, reference, nestedKeys diff --git a/flytestdlib/utils/mocks/auto_refresh_cache.go b/flytestdlib/utils/mocks/auto_refresh_cache.go index bca17869ff..a71590fb26 100644 --- a/flytestdlib/utils/mocks/auto_refresh_cache.go +++ b/flytestdlib/utils/mocks/auto_refresh_cache.go @@ -23,13 +23,13 @@ func (_m AutoRefreshCache_Get) Return(_a0 utils.CacheItem) *AutoRefreshCache_Get } func (_m *AutoRefreshCache) OnGet(id string) *AutoRefreshCache_Get { - c := _m.On("Get", id) - return &AutoRefreshCache_Get{Call: c} + c_call := _m.On("Get", id) + return &AutoRefreshCache_Get{Call: c_call} } func (_m *AutoRefreshCache) OnGetMatch(matchers ...interface{}) *AutoRefreshCache_Get { - c := _m.On("Get", matchers...) - return &AutoRefreshCache_Get{Call: c} + c_call := _m.On("Get", matchers...) + return &AutoRefreshCache_Get{Call: c_call} } // Get provides a mock function with given fields: id @@ -57,13 +57,13 @@ func (_m AutoRefreshCache_GetOrCreate) Return(_a0 utils.CacheItem, _a1 error) *A } func (_m *AutoRefreshCache) OnGetOrCreate(item utils.CacheItem) *AutoRefreshCache_GetOrCreate { - c := _m.On("GetOrCreate", item) - return &AutoRefreshCache_GetOrCreate{Call: c} + c_call := _m.On("GetOrCreate", item) + return &AutoRefreshCache_GetOrCreate{Call: c_call} } func (_m *AutoRefreshCache) OnGetOrCreateMatch(matchers ...interface{}) *AutoRefreshCache_GetOrCreate { - c := _m.On("GetOrCreate", matchers...) - return &AutoRefreshCache_GetOrCreate{Call: c} + c_call := _m.On("GetOrCreate", matchers...) + return &AutoRefreshCache_GetOrCreate{Call: c_call} } // GetOrCreate provides a mock function with given fields: item diff --git a/flytestdlib/utils/mocks/cache_item.go b/flytestdlib/utils/mocks/cache_item.go index 5f69a24d7b..03b539049f 100644 --- a/flytestdlib/utils/mocks/cache_item.go +++ b/flytestdlib/utils/mocks/cache_item.go @@ -18,13 +18,13 @@ func (_m CacheItem_ID) Return(_a0 string) *CacheItem_ID { } func (_m *CacheItem) OnID() *CacheItem_ID { - c := _m.On("ID") - return &CacheItem_ID{Call: c} + c_call := _m.On("ID") + return &CacheItem_ID{Call: c_call} } func (_m *CacheItem) OnIDMatch(matchers ...interface{}) *CacheItem_ID { - c := _m.On("ID", matchers...) - return &CacheItem_ID{Call: c} + c_call := _m.On("ID", matchers...) + return &CacheItem_ID{Call: c_call} } // ID provides a mock function with given fields: diff --git a/flytestdlib/utils/mocks/rate_limiter.go b/flytestdlib/utils/mocks/rate_limiter.go index 3ca8993c67..a851213306 100644 --- a/flytestdlib/utils/mocks/rate_limiter.go +++ b/flytestdlib/utils/mocks/rate_limiter.go @@ -22,13 +22,13 @@ func (_m RateLimiter_Wait) Return(_a0 error) *RateLimiter_Wait { } func (_m *RateLimiter) OnWait(ctx context.Context) *RateLimiter_Wait { - c := _m.On("Wait", ctx) - return &RateLimiter_Wait{Call: c} + c_call := _m.On("Wait", ctx) + return &RateLimiter_Wait{Call: c_call} } func (_m *RateLimiter) OnWaitMatch(matchers ...interface{}) *RateLimiter_Wait { - c := _m.On("Wait", matchers...) - return &RateLimiter_Wait{Call: c} + c_call := _m.On("Wait", matchers...) + return &RateLimiter_Wait{Call: c_call} } // Wait provides a mock function with given fields: ctx diff --git a/flytestdlib/utils/mocks/sequencer.go b/flytestdlib/utils/mocks/sequencer.go index ac5843698d..4c73099c3c 100644 --- a/flytestdlib/utils/mocks/sequencer.go +++ b/flytestdlib/utils/mocks/sequencer.go @@ -18,13 +18,13 @@ func (_m Sequencer_GetCur) Return(_a0 uint64) *Sequencer_GetCur { } func (_m *Sequencer) OnGetCur() *Sequencer_GetCur { - c := _m.On("GetCur") - return &Sequencer_GetCur{Call: c} + c_call := _m.On("GetCur") + return &Sequencer_GetCur{Call: c_call} } func (_m *Sequencer) OnGetCurMatch(matchers ...interface{}) *Sequencer_GetCur { - c := _m.On("GetCur", matchers...) - return &Sequencer_GetCur{Call: c} + c_call := _m.On("GetCur", matchers...) + return &Sequencer_GetCur{Call: c_call} } // GetCur provides a mock function with given fields: @@ -50,13 +50,13 @@ func (_m Sequencer_GetNext) Return(_a0 uint64) *Sequencer_GetNext { } func (_m *Sequencer) OnGetNext() *Sequencer_GetNext { - c := _m.On("GetNext") - return &Sequencer_GetNext{Call: c} + c_call := _m.On("GetNext") + return &Sequencer_GetNext{Call: c_call} } func (_m *Sequencer) OnGetNextMatch(matchers ...interface{}) *Sequencer_GetNext { - c := _m.On("GetNext", matchers...) - return &Sequencer_GetNext{Call: c} + c_call := _m.On("GetNext", matchers...) + return &Sequencer_GetNext{Call: c_call} } // GetNext provides a mock function with given fields: From be767a70e6d0cb037d1250a10051a081517ff2ae Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Thu, 28 Dec 2023 22:51:49 +0800 Subject: [PATCH 03/15] make the correction to stdlib go.mod here too Signed-off-by: Yee Hing Tong --- flytestdlib/go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod index 16d0fe3b06..947fbe4b5c 100644 --- a/flytestdlib/go.mod +++ b/flytestdlib/go.mod @@ -147,7 +147,6 @@ replace ( github.com/flyteorg/flyte/flyteplugins => ../flyteplugins github.com/flyteorg/flyte/flytepropeller => ../flytepropeller github.com/flyteorg/flyte/flytestdlib => ../flytestdlib - github.com/flyteorg/flyteidl => ../flyteidl k8s.io/api => k8s.io/api v0.28.2 k8s.io/apimachinery => k8s.io/apimachinery v0.28.2 k8s.io/client-go => k8s.io/client-go v0.28.2 From 362bda3b0ae9b06421798c67867f545f3f8f41e0 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Thu, 28 Dec 2023 23:00:01 +0800 Subject: [PATCH 04/15] buf publish Signed-off-by: Yee Hing Tong --- .github/workflows/flyteidl-buf-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flyteidl-buf-publish.yml b/.github/workflows/flyteidl-buf-publish.yml index cbb530421c..96bd0085a6 100644 --- a/.github/workflows/flyteidl-buf-publish.yml +++ b/.github/workflows/flyteidl-buf-publish.yml @@ -3,7 +3,7 @@ name: Publish flyteidl Buf Package on: push: branches: - - artifacts-shell + - artifacts-shell-2 - artifacts - master paths: From 858e27474148c26139ef9861c3890303cdcd3b13 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Fri, 29 Dec 2023 19:38:23 +0800 Subject: [PATCH 05/15] enable featureflag but still more work needed Signed-off-by: Yee Hing Tong --- charts/flyte-sandbox/values.yaml | 3 +++ docker/sandbox-bundled/manifests/complete-agent.yaml | 9 ++++++--- docker/sandbox-bundled/manifests/complete.yaml | 9 ++++++--- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/charts/flyte-sandbox/values.yaml b/charts/flyte-sandbox/values.yaml index b799b9e767..c30e0c5fb6 100644 --- a/charts/flyte-sandbox/values.yaml +++ b/charts/flyte-sandbox/values.yaml @@ -51,6 +51,9 @@ flyte-binary: enable: true cloudEventVersion: v2 type: sandbox + flyteadmin: + featureGates: + enableArtifacts: true artifactsServer: artifactBlobStoreConfig: type: stow diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 0c753699b5..9ea1a656d7 100644 --- a/docker/sandbox-bundled/manifests/complete-agent.yaml +++ b/docker/sandbox-bundled/manifests/complete-agent.yaml @@ -534,6 +534,9 @@ data: cloudEventVersion: v2 enable: true type: sandbox + flyteadmin: + featureGates: + enableArtifacts: true plugins: k8s: default-env-vars: @@ -878,7 +881,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: eTJZeFhSZWF0TEVQVWlybw== + haSharedSecret: YnVFTHBEdHY1d3YwbUFtMw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1308,7 +1311,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: 45373e78f147407fbee7ae52351e92542475be8fefff767255d1b3bdc48c3a0a + checksum/configuration: a34d42c55d42f2ad83faeb5a31a25315aec8bac20cc32bd57b34d57cf62bc84e checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1473,7 +1476,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 101b0e951be7ace5815290755725d39275a0f550892b354b9cfa129e0a750f0f + checksum/secret: aad56d8c5540c8359383701753f32ea5924abb66f5f68bf79e208df38c4f70db labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 168627b78d..25799591df 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -514,6 +514,9 @@ data: cloudEventVersion: v2 enable: true type: sandbox + flyteadmin: + featureGates: + enableArtifacts: true plugins: k8s: default-env-vars: @@ -858,7 +861,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: bkVuc0pmTEgwZEp0QUVSbQ== + haSharedSecret: UGJnMklaMkJQUDNZekZnSQ== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1256,7 +1259,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: 9502021d87030cfe424e840eee4c26900579d180008686827db9d9ef3f723a5b + checksum/configuration: 9e539e6f6c99d5c7e262b393ccaf10163e49501a72e500108d7abf1fa28efec7 checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1421,7 +1424,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 63b35e1a77beeb576299ff75680ecfdebf9034eab5c85af9b0c24646b1e3007c + checksum/secret: 7b29a08bc860be390e60c5d9743e190acd5efbba619e25a49355fbeeba42030e labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 0ae038ac5c..60fd2114aa 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -535,7 +535,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: NDV4Z0JTUVAwRnlCYUFPWQ== + haSharedSecret: clV0UmNjV2U2R0ozem9XUg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -981,7 +981,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 17dd6127a719e8f5716b5cbddc9f2c3ccb88560fca3dc5cad286376afc6271c0 + checksum/secret: 7223714463ea7b1a44702659099c6e3e3be23e3756b7d8a2aaf978780cb28e81 labels: app: docker-registry release: flyte-sandbox From 0abc124edbb66aa7ac504f80ae600855d95d6f4f Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Fri, 29 Dec 2023 19:41:33 +0800 Subject: [PATCH 06/15] remove missed inputs/outputs Signed-off-by: Yee Hing Tong --- .../implementations/cloudevent_publisher.go | 64 +------------------ 1 file changed, 1 insertion(+), 63 deletions(-) diff --git a/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go b/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go index 20bdc0203d..46bd0f0ede 100644 --- a/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go +++ b/flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go @@ -136,9 +136,7 @@ func (c *CloudEventWrappedPublisher) TransformWorkflowExecutionEvent(ctx context // For now, don't append any additional information unless succeeded if rawEvent.Phase != core.WorkflowExecution_SUCCEEDED { return &event.CloudEventWorkflowExecution{ - RawEvent: rawEvent, - OutputData: nil, - OutputInterface: nil, + RawEvent: rawEvent, }, nil } @@ -181,13 +179,6 @@ func (c *CloudEventWrappedPublisher) TransformWorkflowExecutionEvent(ctx context } } - // Get inputs to the workflow execution - var inputs *core.LiteralMap - inputs, _, err = util.GetInputs(ctx, c.urlData, &c.remoteDataConfig, - c.storageClient, executionModel.InputsURI.String()) - if err != nil { - logger.Warningf(ctx, "Error fetching input literal map %s", executionModel.InputsURI.String()) - } // The spec is used to retrieve metadata fields spec := &admin.ExecutionSpec{} err = proto.Unmarshal(executionModel.Spec, spec) @@ -195,25 +186,9 @@ func (c *CloudEventWrappedPublisher) TransformWorkflowExecutionEvent(ctx context fmt.Printf("there was an error with spec %v %v", err, executionModel.Spec) } - // Get outputs from the workflow execution - var outputs *core.LiteralMap - if rawEvent.GetOutputData() != nil { - outputs = rawEvent.GetOutputData() - } else if len(rawEvent.GetOutputUri()) > 0 { - // GetInputs actually fetches the data, even though this is an output - outputs, _, err = util.GetInputs(ctx, c.urlData, &c.remoteDataConfig, c.storageClient, rawEvent.GetOutputUri()) - if err != nil { - // gatepr: metric this - logger.Warningf(ctx, "Error fetching output literal map %v", rawEvent) - return nil, err - } - } - return &event.CloudEventWorkflowExecution{ RawEvent: rawEvent, - OutputData: outputs, OutputInterface: &workflowInterface, - InputData: inputs, ArtifactIds: spec.GetMetadata().GetArtifactIds(), ReferenceExecution: spec.GetMetadata().GetReferenceExecution(), Principal: spec.GetMetadata().Principal, @@ -303,40 +278,6 @@ func (c *CloudEventWrappedPublisher) TransformNodeExecutionEvent(ctx context.Con fmt.Printf("there was an error with spec %v %v", err, executionModel.Spec) } - // Get inputs/outputs - // This will likely need to move to the artifact service side, given message size limits. - // Replace with call to GetNodeExecutionData - var inputs *core.LiteralMap - logger.Debugf(ctx, "RawEvent id %v", rawEvent.Id) - if len(rawEvent.GetInputUri()) > 0 { - inputs, _, err = util.GetInputs(ctx, c.urlData, &c.remoteDataConfig, - c.storageClient, rawEvent.GetInputUri()) - logger.Debugf(ctx, "RawEvent input uri %v, %v", rawEvent.GetInputUri(), inputs) - - if err != nil { - fmt.Printf("Error fetching input literal map %v", rawEvent) - } - } else if rawEvent.GetInputData() != nil { - inputs = rawEvent.GetInputData() - logger.Debugf(ctx, "RawEvent input data %v, %v", rawEvent.GetInputData(), inputs) - } else { - logger.Infof(ctx, "Node execution for node exec [%+v] has no input data", rawEvent.Id) - } - - // This will likely need to move to the artifact service side, given message size limits. - var outputs *core.LiteralMap - if rawEvent.GetOutputData() != nil { - outputs = rawEvent.GetOutputData() - } else if len(rawEvent.GetOutputUri()) > 0 { - // GetInputs actually fetches the data, even though this is an output - outputs, _, err = util.GetInputs(ctx, c.urlData, &c.remoteDataConfig, - c.storageClient, rawEvent.GetOutputUri()) - if err != nil { - fmt.Printf("Error fetching output literal map %v", rawEvent) - return nil, err - } - } - // Fetch the latest task execution if any, and pull out the task interface, if applicable. // These are optional fields... if the node execution doesn't have a task execution then these will be empty. var taskExecID *core.TaskExecutionIdentifier @@ -369,13 +310,10 @@ func (c *CloudEventWrappedPublisher) TransformNodeExecutionEvent(ctx context.Con taskExecID = lte.Id } - logger.Debugf(ctx, "RawEvent inputs %v", inputs) return &event.CloudEventNodeExecution{ RawEvent: rawEvent, TaskExecId: taskExecID, - OutputData: outputs, OutputInterface: typedInterface, - InputData: inputs, ArtifactIds: spec.GetMetadata().GetArtifactIds(), Principal: spec.GetMetadata().Principal, LaunchPlanId: spec.LaunchPlan, From af3970861cadbfcf229c2e3b38a0ca694334aca5 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Wed, 3 Jan 2024 14:34:15 +0800 Subject: [PATCH 07/15] revert unintentional changes to flytestdlib from make generate" ; Signed-off-by: Yee Hing Tong --- flytestdlib/cache/mocks/AutoRefresh.go | 32 ++++----- flytestdlib/cache/mocks/Item.go | 32 --------- flytestdlib/cache/mocks/ItemWrapper.go | 16 ++--- flytestdlib/fastcheck/mocks/filter.go | 16 ++--- flytestdlib/go.mod | 1 + flytestdlib/random/mocks/comparable.go | 8 +-- .../random/mocks/weighted_random_list.go | 32 ++++----- .../storage/mocks/composed_protobuf_store.go | 72 +++++++++---------- flytestdlib/storage/mocks/raw_store.go | 56 +++++++-------- .../storage/mocks/reference_constructor.go | 8 +-- flytestdlib/utils/mocks/auto_refresh_cache.go | 16 ++--- flytestdlib/utils/mocks/cache_item.go | 8 +-- flytestdlib/utils/mocks/rate_limiter.go | 8 +-- flytestdlib/utils/mocks/sequencer.go | 16 ++--- 14 files changed, 145 insertions(+), 176 deletions(-) diff --git a/flytestdlib/cache/mocks/AutoRefresh.go b/flytestdlib/cache/mocks/AutoRefresh.go index bae8993322..df660b44f8 100644 --- a/flytestdlib/cache/mocks/AutoRefresh.go +++ b/flytestdlib/cache/mocks/AutoRefresh.go @@ -24,13 +24,13 @@ func (_m AutoRefresh_DeleteDelayed) Return(_a0 error) *AutoRefresh_DeleteDelayed } func (_m *AutoRefresh) OnDeleteDelayed(id string) *AutoRefresh_DeleteDelayed { - c_call := _m.On("DeleteDelayed", id) - return &AutoRefresh_DeleteDelayed{Call: c_call} + c := _m.On("DeleteDelayed", id) + return &AutoRefresh_DeleteDelayed{Call: c} } func (_m *AutoRefresh) OnDeleteDelayedMatch(matchers ...interface{}) *AutoRefresh_DeleteDelayed { - c_call := _m.On("DeleteDelayed", matchers...) - return &AutoRefresh_DeleteDelayed{Call: c_call} + c := _m.On("DeleteDelayed", matchers...) + return &AutoRefresh_DeleteDelayed{Call: c} } // DeleteDelayed provides a mock function with given fields: id @@ -56,13 +56,13 @@ func (_m AutoRefresh_Get) Return(_a0 cache.Item, _a1 error) *AutoRefresh_Get { } func (_m *AutoRefresh) OnGet(id string) *AutoRefresh_Get { - c_call := _m.On("Get", id) - return &AutoRefresh_Get{Call: c_call} + c := _m.On("Get", id) + return &AutoRefresh_Get{Call: c} } func (_m *AutoRefresh) OnGetMatch(matchers ...interface{}) *AutoRefresh_Get { - c_call := _m.On("Get", matchers...) - return &AutoRefresh_Get{Call: c_call} + c := _m.On("Get", matchers...) + return &AutoRefresh_Get{Call: c} } // Get provides a mock function with given fields: id @@ -97,13 +97,13 @@ func (_m AutoRefresh_GetOrCreate) Return(_a0 cache.Item, _a1 error) *AutoRefresh } func (_m *AutoRefresh) OnGetOrCreate(id string, item cache.Item) *AutoRefresh_GetOrCreate { - c_call := _m.On("GetOrCreate", id, item) - return &AutoRefresh_GetOrCreate{Call: c_call} + c := _m.On("GetOrCreate", id, item) + return &AutoRefresh_GetOrCreate{Call: c} } func (_m *AutoRefresh) OnGetOrCreateMatch(matchers ...interface{}) *AutoRefresh_GetOrCreate { - c_call := _m.On("GetOrCreate", matchers...) - return &AutoRefresh_GetOrCreate{Call: c_call} + c := _m.On("GetOrCreate", matchers...) + return &AutoRefresh_GetOrCreate{Call: c} } // GetOrCreate provides a mock function with given fields: id, item @@ -138,13 +138,13 @@ func (_m AutoRefresh_Start) Return(_a0 error) *AutoRefresh_Start { } func (_m *AutoRefresh) OnStart(ctx context.Context) *AutoRefresh_Start { - c_call := _m.On("Start", ctx) - return &AutoRefresh_Start{Call: c_call} + c := _m.On("Start", ctx) + return &AutoRefresh_Start{Call: c} } func (_m *AutoRefresh) OnStartMatch(matchers ...interface{}) *AutoRefresh_Start { - c_call := _m.On("Start", matchers...) - return &AutoRefresh_Start{Call: c_call} + c := _m.On("Start", matchers...) + return &AutoRefresh_Start{Call: c} } // Start provides a mock function with given fields: ctx diff --git a/flytestdlib/cache/mocks/Item.go b/flytestdlib/cache/mocks/Item.go index 24dada6b4d..23dd8c5bb7 100644 --- a/flytestdlib/cache/mocks/Item.go +++ b/flytestdlib/cache/mocks/Item.go @@ -8,35 +8,3 @@ import mock "github.com/stretchr/testify/mock" type Item struct { mock.Mock } - -type Item_IsTerminal struct { - *mock.Call -} - -func (_m Item_IsTerminal) Return(_a0 bool) *Item_IsTerminal { - return &Item_IsTerminal{Call: _m.Call.Return(_a0)} -} - -func (_m *Item) OnIsTerminal() *Item_IsTerminal { - c_call := _m.On("IsTerminal") - return &Item_IsTerminal{Call: c_call} -} - -func (_m *Item) OnIsTerminalMatch(matchers ...interface{}) *Item_IsTerminal { - c_call := _m.On("IsTerminal", matchers...) - return &Item_IsTerminal{Call: c_call} -} - -// IsTerminal provides a mock function with given fields: -func (_m *Item) IsTerminal() bool { - ret := _m.Called() - - var r0 bool - if rf, ok := ret.Get(0).(func() bool); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(bool) - } - - return r0 -} diff --git a/flytestdlib/cache/mocks/ItemWrapper.go b/flytestdlib/cache/mocks/ItemWrapper.go index 03e4576b53..16c916f1d3 100644 --- a/flytestdlib/cache/mocks/ItemWrapper.go +++ b/flytestdlib/cache/mocks/ItemWrapper.go @@ -21,13 +21,13 @@ func (_m ItemWrapper_GetID) Return(_a0 string) *ItemWrapper_GetID { } func (_m *ItemWrapper) OnGetID() *ItemWrapper_GetID { - c_call := _m.On("GetID") - return &ItemWrapper_GetID{Call: c_call} + c := _m.On("GetID") + return &ItemWrapper_GetID{Call: c} } func (_m *ItemWrapper) OnGetIDMatch(matchers ...interface{}) *ItemWrapper_GetID { - c_call := _m.On("GetID", matchers...) - return &ItemWrapper_GetID{Call: c_call} + c := _m.On("GetID", matchers...) + return &ItemWrapper_GetID{Call: c} } // GetID provides a mock function with given fields: @@ -53,13 +53,13 @@ func (_m ItemWrapper_GetItem) Return(_a0 cache.Item) *ItemWrapper_GetItem { } func (_m *ItemWrapper) OnGetItem() *ItemWrapper_GetItem { - c_call := _m.On("GetItem") - return &ItemWrapper_GetItem{Call: c_call} + c := _m.On("GetItem") + return &ItemWrapper_GetItem{Call: c} } func (_m *ItemWrapper) OnGetItemMatch(matchers ...interface{}) *ItemWrapper_GetItem { - c_call := _m.On("GetItem", matchers...) - return &ItemWrapper_GetItem{Call: c_call} + c := _m.On("GetItem", matchers...) + return &ItemWrapper_GetItem{Call: c} } // GetItem provides a mock function with given fields: diff --git a/flytestdlib/fastcheck/mocks/filter.go b/flytestdlib/fastcheck/mocks/filter.go index e661fdbab7..04b31555a8 100644 --- a/flytestdlib/fastcheck/mocks/filter.go +++ b/flytestdlib/fastcheck/mocks/filter.go @@ -22,13 +22,13 @@ func (_m Filter_Add) Return(evicted bool) *Filter_Add { } func (_m *Filter) OnAdd(ctx context.Context, id []byte) *Filter_Add { - c_call := _m.On("Add", ctx, id) - return &Filter_Add{Call: c_call} + c := _m.On("Add", ctx, id) + return &Filter_Add{Call: c} } func (_m *Filter) OnAddMatch(matchers ...interface{}) *Filter_Add { - c_call := _m.On("Add", matchers...) - return &Filter_Add{Call: c_call} + c := _m.On("Add", matchers...) + return &Filter_Add{Call: c} } // Add provides a mock function with given fields: ctx, id @@ -54,13 +54,13 @@ func (_m Filter_Contains) Return(_a0 bool) *Filter_Contains { } func (_m *Filter) OnContains(ctx context.Context, id []byte) *Filter_Contains { - c_call := _m.On("Contains", ctx, id) - return &Filter_Contains{Call: c_call} + c := _m.On("Contains", ctx, id) + return &Filter_Contains{Call: c} } func (_m *Filter) OnContainsMatch(matchers ...interface{}) *Filter_Contains { - c_call := _m.On("Contains", matchers...) - return &Filter_Contains{Call: c_call} + c := _m.On("Contains", matchers...) + return &Filter_Contains{Call: c} } // Contains provides a mock function with given fields: ctx, id diff --git a/flytestdlib/go.mod b/flytestdlib/go.mod index 947fbe4b5c..16d0fe3b06 100644 --- a/flytestdlib/go.mod +++ b/flytestdlib/go.mod @@ -147,6 +147,7 @@ replace ( github.com/flyteorg/flyte/flyteplugins => ../flyteplugins github.com/flyteorg/flyte/flytepropeller => ../flytepropeller github.com/flyteorg/flyte/flytestdlib => ../flytestdlib + github.com/flyteorg/flyteidl => ../flyteidl k8s.io/api => k8s.io/api v0.28.2 k8s.io/apimachinery => k8s.io/apimachinery v0.28.2 k8s.io/client-go => k8s.io/client-go v0.28.2 diff --git a/flytestdlib/random/mocks/comparable.go b/flytestdlib/random/mocks/comparable.go index bf555c98a4..10d1aaa506 100644 --- a/flytestdlib/random/mocks/comparable.go +++ b/flytestdlib/random/mocks/comparable.go @@ -21,13 +21,13 @@ func (_m Comparable_Compare) Return(_a0 bool) *Comparable_Compare { } func (_m *Comparable) OnCompare(to random.Comparable) *Comparable_Compare { - c_call := _m.On("Compare", to) - return &Comparable_Compare{Call: c_call} + c := _m.On("Compare", to) + return &Comparable_Compare{Call: c} } func (_m *Comparable) OnCompareMatch(matchers ...interface{}) *Comparable_Compare { - c_call := _m.On("Compare", matchers...) - return &Comparable_Compare{Call: c_call} + c := _m.On("Compare", matchers...) + return &Comparable_Compare{Call: c} } // Compare provides a mock function with given fields: to diff --git a/flytestdlib/random/mocks/weighted_random_list.go b/flytestdlib/random/mocks/weighted_random_list.go index c0581a6a19..f7227b6cc6 100644 --- a/flytestdlib/random/mocks/weighted_random_list.go +++ b/flytestdlib/random/mocks/weighted_random_list.go @@ -24,13 +24,13 @@ func (_m WeightedRandomList_Get) Return(_a0 random.Comparable) *WeightedRandomLi } func (_m *WeightedRandomList) OnGet() *WeightedRandomList_Get { - c_call := _m.On("Get") - return &WeightedRandomList_Get{Call: c_call} + c := _m.On("Get") + return &WeightedRandomList_Get{Call: c} } func (_m *WeightedRandomList) OnGetMatch(matchers ...interface{}) *WeightedRandomList_Get { - c_call := _m.On("Get", matchers...) - return &WeightedRandomList_Get{Call: c_call} + c := _m.On("Get", matchers...) + return &WeightedRandomList_Get{Call: c} } // Get provides a mock function with given fields: @@ -58,13 +58,13 @@ func (_m WeightedRandomList_GetWithSeed) Return(_a0 random.Comparable, _a1 error } func (_m *WeightedRandomList) OnGetWithSeed(seed rand.Source) *WeightedRandomList_GetWithSeed { - c_call := _m.On("GetWithSeed", seed) - return &WeightedRandomList_GetWithSeed{Call: c_call} + c := _m.On("GetWithSeed", seed) + return &WeightedRandomList_GetWithSeed{Call: c} } func (_m *WeightedRandomList) OnGetWithSeedMatch(matchers ...interface{}) *WeightedRandomList_GetWithSeed { - c_call := _m.On("GetWithSeed", matchers...) - return &WeightedRandomList_GetWithSeed{Call: c_call} + c := _m.On("GetWithSeed", matchers...) + return &WeightedRandomList_GetWithSeed{Call: c} } // GetWithSeed provides a mock function with given fields: seed @@ -99,13 +99,13 @@ func (_m WeightedRandomList_Len) Return(_a0 int) *WeightedRandomList_Len { } func (_m *WeightedRandomList) OnLen() *WeightedRandomList_Len { - c_call := _m.On("Len") - return &WeightedRandomList_Len{Call: c_call} + c := _m.On("Len") + return &WeightedRandomList_Len{Call: c} } func (_m *WeightedRandomList) OnLenMatch(matchers ...interface{}) *WeightedRandomList_Len { - c_call := _m.On("Len", matchers...) - return &WeightedRandomList_Len{Call: c_call} + c := _m.On("Len", matchers...) + return &WeightedRandomList_Len{Call: c} } // Len provides a mock function with given fields: @@ -131,13 +131,13 @@ func (_m WeightedRandomList_List) Return(_a0 []random.Comparable) *WeightedRando } func (_m *WeightedRandomList) OnList() *WeightedRandomList_List { - c_call := _m.On("List") - return &WeightedRandomList_List{Call: c_call} + c := _m.On("List") + return &WeightedRandomList_List{Call: c} } func (_m *WeightedRandomList) OnListMatch(matchers ...interface{}) *WeightedRandomList_List { - c_call := _m.On("List", matchers...) - return &WeightedRandomList_List{Call: c_call} + c := _m.On("List", matchers...) + return &WeightedRandomList_List{Call: c} } // List provides a mock function with given fields: diff --git a/flytestdlib/storage/mocks/composed_protobuf_store.go b/flytestdlib/storage/mocks/composed_protobuf_store.go index c9064c2ac5..ed77566643 100644 --- a/flytestdlib/storage/mocks/composed_protobuf_store.go +++ b/flytestdlib/storage/mocks/composed_protobuf_store.go @@ -27,13 +27,13 @@ func (_m ComposedProtobufStore_CopyRaw) Return(_a0 error) *ComposedProtobufStore } func (_m *ComposedProtobufStore) OnCopyRaw(ctx context.Context, source storage.DataReference, destination storage.DataReference, opts storage.Options) *ComposedProtobufStore_CopyRaw { - c_call := _m.On("CopyRaw", ctx, source, destination, opts) - return &ComposedProtobufStore_CopyRaw{Call: c_call} + c := _m.On("CopyRaw", ctx, source, destination, opts) + return &ComposedProtobufStore_CopyRaw{Call: c} } func (_m *ComposedProtobufStore) OnCopyRawMatch(matchers ...interface{}) *ComposedProtobufStore_CopyRaw { - c_call := _m.On("CopyRaw", matchers...) - return &ComposedProtobufStore_CopyRaw{Call: c_call} + c := _m.On("CopyRaw", matchers...) + return &ComposedProtobufStore_CopyRaw{Call: c} } // CopyRaw provides a mock function with given fields: ctx, source, destination, opts @@ -59,13 +59,13 @@ func (_m ComposedProtobufStore_CreateSignedURL) Return(_a0 storage.SignedURLResp } func (_m *ComposedProtobufStore) OnCreateSignedURL(ctx context.Context, reference storage.DataReference, properties storage.SignedURLProperties) *ComposedProtobufStore_CreateSignedURL { - c_call := _m.On("CreateSignedURL", ctx, reference, properties) - return &ComposedProtobufStore_CreateSignedURL{Call: c_call} + c := _m.On("CreateSignedURL", ctx, reference, properties) + return &ComposedProtobufStore_CreateSignedURL{Call: c} } func (_m *ComposedProtobufStore) OnCreateSignedURLMatch(matchers ...interface{}) *ComposedProtobufStore_CreateSignedURL { - c_call := _m.On("CreateSignedURL", matchers...) - return &ComposedProtobufStore_CreateSignedURL{Call: c_call} + c := _m.On("CreateSignedURL", matchers...) + return &ComposedProtobufStore_CreateSignedURL{Call: c} } // CreateSignedURL provides a mock function with given fields: ctx, reference, properties @@ -98,13 +98,13 @@ func (_m ComposedProtobufStore_Delete) Return(_a0 error) *ComposedProtobufStore_ } func (_m *ComposedProtobufStore) OnDelete(ctx context.Context, reference storage.DataReference) *ComposedProtobufStore_Delete { - c_call := _m.On("Delete", ctx, reference) - return &ComposedProtobufStore_Delete{Call: c_call} + c := _m.On("Delete", ctx, reference) + return &ComposedProtobufStore_Delete{Call: c} } func (_m *ComposedProtobufStore) OnDeleteMatch(matchers ...interface{}) *ComposedProtobufStore_Delete { - c_call := _m.On("Delete", matchers...) - return &ComposedProtobufStore_Delete{Call: c_call} + c := _m.On("Delete", matchers...) + return &ComposedProtobufStore_Delete{Call: c} } // Delete provides a mock function with given fields: ctx, reference @@ -130,13 +130,13 @@ func (_m ComposedProtobufStore_GetBaseContainerFQN) Return(_a0 storage.DataRefer } func (_m *ComposedProtobufStore) OnGetBaseContainerFQN(ctx context.Context) *ComposedProtobufStore_GetBaseContainerFQN { - c_call := _m.On("GetBaseContainerFQN", ctx) - return &ComposedProtobufStore_GetBaseContainerFQN{Call: c_call} + c := _m.On("GetBaseContainerFQN", ctx) + return &ComposedProtobufStore_GetBaseContainerFQN{Call: c} } func (_m *ComposedProtobufStore) OnGetBaseContainerFQNMatch(matchers ...interface{}) *ComposedProtobufStore_GetBaseContainerFQN { - c_call := _m.On("GetBaseContainerFQN", matchers...) - return &ComposedProtobufStore_GetBaseContainerFQN{Call: c_call} + c := _m.On("GetBaseContainerFQN", matchers...) + return &ComposedProtobufStore_GetBaseContainerFQN{Call: c} } // GetBaseContainerFQN provides a mock function with given fields: ctx @@ -162,13 +162,13 @@ func (_m ComposedProtobufStore_Head) Return(_a0 storage.Metadata, _a1 error) *Co } func (_m *ComposedProtobufStore) OnHead(ctx context.Context, reference storage.DataReference) *ComposedProtobufStore_Head { - c_call := _m.On("Head", ctx, reference) - return &ComposedProtobufStore_Head{Call: c_call} + c := _m.On("Head", ctx, reference) + return &ComposedProtobufStore_Head{Call: c} } func (_m *ComposedProtobufStore) OnHeadMatch(matchers ...interface{}) *ComposedProtobufStore_Head { - c_call := _m.On("Head", matchers...) - return &ComposedProtobufStore_Head{Call: c_call} + c := _m.On("Head", matchers...) + return &ComposedProtobufStore_Head{Call: c} } // Head provides a mock function with given fields: ctx, reference @@ -203,13 +203,13 @@ func (_m ComposedProtobufStore_ReadProtobuf) Return(_a0 error) *ComposedProtobuf } func (_m *ComposedProtobufStore) OnReadProtobuf(ctx context.Context, reference storage.DataReference, msg protoiface.MessageV1) *ComposedProtobufStore_ReadProtobuf { - c_call := _m.On("ReadProtobuf", ctx, reference, msg) - return &ComposedProtobufStore_ReadProtobuf{Call: c_call} + c := _m.On("ReadProtobuf", ctx, reference, msg) + return &ComposedProtobufStore_ReadProtobuf{Call: c} } func (_m *ComposedProtobufStore) OnReadProtobufMatch(matchers ...interface{}) *ComposedProtobufStore_ReadProtobuf { - c_call := _m.On("ReadProtobuf", matchers...) - return &ComposedProtobufStore_ReadProtobuf{Call: c_call} + c := _m.On("ReadProtobuf", matchers...) + return &ComposedProtobufStore_ReadProtobuf{Call: c} } // ReadProtobuf provides a mock function with given fields: ctx, reference, msg @@ -235,13 +235,13 @@ func (_m ComposedProtobufStore_ReadRaw) Return(_a0 io.ReadCloser, _a1 error) *Co } func (_m *ComposedProtobufStore) OnReadRaw(ctx context.Context, reference storage.DataReference) *ComposedProtobufStore_ReadRaw { - c_call := _m.On("ReadRaw", ctx, reference) - return &ComposedProtobufStore_ReadRaw{Call: c_call} + c := _m.On("ReadRaw", ctx, reference) + return &ComposedProtobufStore_ReadRaw{Call: c} } func (_m *ComposedProtobufStore) OnReadRawMatch(matchers ...interface{}) *ComposedProtobufStore_ReadRaw { - c_call := _m.On("ReadRaw", matchers...) - return &ComposedProtobufStore_ReadRaw{Call: c_call} + c := _m.On("ReadRaw", matchers...) + return &ComposedProtobufStore_ReadRaw{Call: c} } // ReadRaw provides a mock function with given fields: ctx, reference @@ -276,13 +276,13 @@ func (_m ComposedProtobufStore_WriteProtobuf) Return(_a0 error) *ComposedProtobu } func (_m *ComposedProtobufStore) OnWriteProtobuf(ctx context.Context, reference storage.DataReference, opts storage.Options, msg protoiface.MessageV1) *ComposedProtobufStore_WriteProtobuf { - c_call := _m.On("WriteProtobuf", ctx, reference, opts, msg) - return &ComposedProtobufStore_WriteProtobuf{Call: c_call} + c := _m.On("WriteProtobuf", ctx, reference, opts, msg) + return &ComposedProtobufStore_WriteProtobuf{Call: c} } func (_m *ComposedProtobufStore) OnWriteProtobufMatch(matchers ...interface{}) *ComposedProtobufStore_WriteProtobuf { - c_call := _m.On("WriteProtobuf", matchers...) - return &ComposedProtobufStore_WriteProtobuf{Call: c_call} + c := _m.On("WriteProtobuf", matchers...) + return &ComposedProtobufStore_WriteProtobuf{Call: c} } // WriteProtobuf provides a mock function with given fields: ctx, reference, opts, msg @@ -308,13 +308,13 @@ func (_m ComposedProtobufStore_WriteRaw) Return(_a0 error) *ComposedProtobufStor } func (_m *ComposedProtobufStore) OnWriteRaw(ctx context.Context, reference storage.DataReference, size int64, opts storage.Options, raw io.Reader) *ComposedProtobufStore_WriteRaw { - c_call := _m.On("WriteRaw", ctx, reference, size, opts, raw) - return &ComposedProtobufStore_WriteRaw{Call: c_call} + c := _m.On("WriteRaw", ctx, reference, size, opts, raw) + return &ComposedProtobufStore_WriteRaw{Call: c} } func (_m *ComposedProtobufStore) OnWriteRawMatch(matchers ...interface{}) *ComposedProtobufStore_WriteRaw { - c_call := _m.On("WriteRaw", matchers...) - return &ComposedProtobufStore_WriteRaw{Call: c_call} + c := _m.On("WriteRaw", matchers...) + return &ComposedProtobufStore_WriteRaw{Call: c} } // WriteRaw provides a mock function with given fields: ctx, reference, size, opts, raw diff --git a/flytestdlib/storage/mocks/raw_store.go b/flytestdlib/storage/mocks/raw_store.go index 06b731765d..aa02023f60 100644 --- a/flytestdlib/storage/mocks/raw_store.go +++ b/flytestdlib/storage/mocks/raw_store.go @@ -25,13 +25,13 @@ func (_m RawStore_CopyRaw) Return(_a0 error) *RawStore_CopyRaw { } func (_m *RawStore) OnCopyRaw(ctx context.Context, source storage.DataReference, destination storage.DataReference, opts storage.Options) *RawStore_CopyRaw { - c_call := _m.On("CopyRaw", ctx, source, destination, opts) - return &RawStore_CopyRaw{Call: c_call} + c := _m.On("CopyRaw", ctx, source, destination, opts) + return &RawStore_CopyRaw{Call: c} } func (_m *RawStore) OnCopyRawMatch(matchers ...interface{}) *RawStore_CopyRaw { - c_call := _m.On("CopyRaw", matchers...) - return &RawStore_CopyRaw{Call: c_call} + c := _m.On("CopyRaw", matchers...) + return &RawStore_CopyRaw{Call: c} } // CopyRaw provides a mock function with given fields: ctx, source, destination, opts @@ -57,13 +57,13 @@ func (_m RawStore_CreateSignedURL) Return(_a0 storage.SignedURLResponse, _a1 err } func (_m *RawStore) OnCreateSignedURL(ctx context.Context, reference storage.DataReference, properties storage.SignedURLProperties) *RawStore_CreateSignedURL { - c_call := _m.On("CreateSignedURL", ctx, reference, properties) - return &RawStore_CreateSignedURL{Call: c_call} + c := _m.On("CreateSignedURL", ctx, reference, properties) + return &RawStore_CreateSignedURL{Call: c} } func (_m *RawStore) OnCreateSignedURLMatch(matchers ...interface{}) *RawStore_CreateSignedURL { - c_call := _m.On("CreateSignedURL", matchers...) - return &RawStore_CreateSignedURL{Call: c_call} + c := _m.On("CreateSignedURL", matchers...) + return &RawStore_CreateSignedURL{Call: c} } // CreateSignedURL provides a mock function with given fields: ctx, reference, properties @@ -96,13 +96,13 @@ func (_m RawStore_Delete) Return(_a0 error) *RawStore_Delete { } func (_m *RawStore) OnDelete(ctx context.Context, reference storage.DataReference) *RawStore_Delete { - c_call := _m.On("Delete", ctx, reference) - return &RawStore_Delete{Call: c_call} + c := _m.On("Delete", ctx, reference) + return &RawStore_Delete{Call: c} } func (_m *RawStore) OnDeleteMatch(matchers ...interface{}) *RawStore_Delete { - c_call := _m.On("Delete", matchers...) - return &RawStore_Delete{Call: c_call} + c := _m.On("Delete", matchers...) + return &RawStore_Delete{Call: c} } // Delete provides a mock function with given fields: ctx, reference @@ -128,13 +128,13 @@ func (_m RawStore_GetBaseContainerFQN) Return(_a0 storage.DataReference) *RawSto } func (_m *RawStore) OnGetBaseContainerFQN(ctx context.Context) *RawStore_GetBaseContainerFQN { - c_call := _m.On("GetBaseContainerFQN", ctx) - return &RawStore_GetBaseContainerFQN{Call: c_call} + c := _m.On("GetBaseContainerFQN", ctx) + return &RawStore_GetBaseContainerFQN{Call: c} } func (_m *RawStore) OnGetBaseContainerFQNMatch(matchers ...interface{}) *RawStore_GetBaseContainerFQN { - c_call := _m.On("GetBaseContainerFQN", matchers...) - return &RawStore_GetBaseContainerFQN{Call: c_call} + c := _m.On("GetBaseContainerFQN", matchers...) + return &RawStore_GetBaseContainerFQN{Call: c} } // GetBaseContainerFQN provides a mock function with given fields: ctx @@ -160,13 +160,13 @@ func (_m RawStore_Head) Return(_a0 storage.Metadata, _a1 error) *RawStore_Head { } func (_m *RawStore) OnHead(ctx context.Context, reference storage.DataReference) *RawStore_Head { - c_call := _m.On("Head", ctx, reference) - return &RawStore_Head{Call: c_call} + c := _m.On("Head", ctx, reference) + return &RawStore_Head{Call: c} } func (_m *RawStore) OnHeadMatch(matchers ...interface{}) *RawStore_Head { - c_call := _m.On("Head", matchers...) - return &RawStore_Head{Call: c_call} + c := _m.On("Head", matchers...) + return &RawStore_Head{Call: c} } // Head provides a mock function with given fields: ctx, reference @@ -201,13 +201,13 @@ func (_m RawStore_ReadRaw) Return(_a0 io.ReadCloser, _a1 error) *RawStore_ReadRa } func (_m *RawStore) OnReadRaw(ctx context.Context, reference storage.DataReference) *RawStore_ReadRaw { - c_call := _m.On("ReadRaw", ctx, reference) - return &RawStore_ReadRaw{Call: c_call} + c := _m.On("ReadRaw", ctx, reference) + return &RawStore_ReadRaw{Call: c} } func (_m *RawStore) OnReadRawMatch(matchers ...interface{}) *RawStore_ReadRaw { - c_call := _m.On("ReadRaw", matchers...) - return &RawStore_ReadRaw{Call: c_call} + c := _m.On("ReadRaw", matchers...) + return &RawStore_ReadRaw{Call: c} } // ReadRaw provides a mock function with given fields: ctx, reference @@ -242,13 +242,13 @@ func (_m RawStore_WriteRaw) Return(_a0 error) *RawStore_WriteRaw { } func (_m *RawStore) OnWriteRaw(ctx context.Context, reference storage.DataReference, size int64, opts storage.Options, raw io.Reader) *RawStore_WriteRaw { - c_call := _m.On("WriteRaw", ctx, reference, size, opts, raw) - return &RawStore_WriteRaw{Call: c_call} + c := _m.On("WriteRaw", ctx, reference, size, opts, raw) + return &RawStore_WriteRaw{Call: c} } func (_m *RawStore) OnWriteRawMatch(matchers ...interface{}) *RawStore_WriteRaw { - c_call := _m.On("WriteRaw", matchers...) - return &RawStore_WriteRaw{Call: c_call} + c := _m.On("WriteRaw", matchers...) + return &RawStore_WriteRaw{Call: c} } // WriteRaw provides a mock function with given fields: ctx, reference, size, opts, raw diff --git a/flytestdlib/storage/mocks/reference_constructor.go b/flytestdlib/storage/mocks/reference_constructor.go index 85619d505e..22fbeaf906 100644 --- a/flytestdlib/storage/mocks/reference_constructor.go +++ b/flytestdlib/storage/mocks/reference_constructor.go @@ -23,13 +23,13 @@ func (_m ReferenceConstructor_ConstructReference) Return(_a0 storage.DataReferen } func (_m *ReferenceConstructor) OnConstructReference(ctx context.Context, reference storage.DataReference, nestedKeys ...string) *ReferenceConstructor_ConstructReference { - c_call := _m.On("ConstructReference", ctx, reference, nestedKeys) - return &ReferenceConstructor_ConstructReference{Call: c_call} + c := _m.On("ConstructReference", ctx, reference, nestedKeys) + return &ReferenceConstructor_ConstructReference{Call: c} } func (_m *ReferenceConstructor) OnConstructReferenceMatch(matchers ...interface{}) *ReferenceConstructor_ConstructReference { - c_call := _m.On("ConstructReference", matchers...) - return &ReferenceConstructor_ConstructReference{Call: c_call} + c := _m.On("ConstructReference", matchers...) + return &ReferenceConstructor_ConstructReference{Call: c} } // ConstructReference provides a mock function with given fields: ctx, reference, nestedKeys diff --git a/flytestdlib/utils/mocks/auto_refresh_cache.go b/flytestdlib/utils/mocks/auto_refresh_cache.go index a71590fb26..bca17869ff 100644 --- a/flytestdlib/utils/mocks/auto_refresh_cache.go +++ b/flytestdlib/utils/mocks/auto_refresh_cache.go @@ -23,13 +23,13 @@ func (_m AutoRefreshCache_Get) Return(_a0 utils.CacheItem) *AutoRefreshCache_Get } func (_m *AutoRefreshCache) OnGet(id string) *AutoRefreshCache_Get { - c_call := _m.On("Get", id) - return &AutoRefreshCache_Get{Call: c_call} + c := _m.On("Get", id) + return &AutoRefreshCache_Get{Call: c} } func (_m *AutoRefreshCache) OnGetMatch(matchers ...interface{}) *AutoRefreshCache_Get { - c_call := _m.On("Get", matchers...) - return &AutoRefreshCache_Get{Call: c_call} + c := _m.On("Get", matchers...) + return &AutoRefreshCache_Get{Call: c} } // Get provides a mock function with given fields: id @@ -57,13 +57,13 @@ func (_m AutoRefreshCache_GetOrCreate) Return(_a0 utils.CacheItem, _a1 error) *A } func (_m *AutoRefreshCache) OnGetOrCreate(item utils.CacheItem) *AutoRefreshCache_GetOrCreate { - c_call := _m.On("GetOrCreate", item) - return &AutoRefreshCache_GetOrCreate{Call: c_call} + c := _m.On("GetOrCreate", item) + return &AutoRefreshCache_GetOrCreate{Call: c} } func (_m *AutoRefreshCache) OnGetOrCreateMatch(matchers ...interface{}) *AutoRefreshCache_GetOrCreate { - c_call := _m.On("GetOrCreate", matchers...) - return &AutoRefreshCache_GetOrCreate{Call: c_call} + c := _m.On("GetOrCreate", matchers...) + return &AutoRefreshCache_GetOrCreate{Call: c} } // GetOrCreate provides a mock function with given fields: item diff --git a/flytestdlib/utils/mocks/cache_item.go b/flytestdlib/utils/mocks/cache_item.go index 03b539049f..5f69a24d7b 100644 --- a/flytestdlib/utils/mocks/cache_item.go +++ b/flytestdlib/utils/mocks/cache_item.go @@ -18,13 +18,13 @@ func (_m CacheItem_ID) Return(_a0 string) *CacheItem_ID { } func (_m *CacheItem) OnID() *CacheItem_ID { - c_call := _m.On("ID") - return &CacheItem_ID{Call: c_call} + c := _m.On("ID") + return &CacheItem_ID{Call: c} } func (_m *CacheItem) OnIDMatch(matchers ...interface{}) *CacheItem_ID { - c_call := _m.On("ID", matchers...) - return &CacheItem_ID{Call: c_call} + c := _m.On("ID", matchers...) + return &CacheItem_ID{Call: c} } // ID provides a mock function with given fields: diff --git a/flytestdlib/utils/mocks/rate_limiter.go b/flytestdlib/utils/mocks/rate_limiter.go index a851213306..3ca8993c67 100644 --- a/flytestdlib/utils/mocks/rate_limiter.go +++ b/flytestdlib/utils/mocks/rate_limiter.go @@ -22,13 +22,13 @@ func (_m RateLimiter_Wait) Return(_a0 error) *RateLimiter_Wait { } func (_m *RateLimiter) OnWait(ctx context.Context) *RateLimiter_Wait { - c_call := _m.On("Wait", ctx) - return &RateLimiter_Wait{Call: c_call} + c := _m.On("Wait", ctx) + return &RateLimiter_Wait{Call: c} } func (_m *RateLimiter) OnWaitMatch(matchers ...interface{}) *RateLimiter_Wait { - c_call := _m.On("Wait", matchers...) - return &RateLimiter_Wait{Call: c_call} + c := _m.On("Wait", matchers...) + return &RateLimiter_Wait{Call: c} } // Wait provides a mock function with given fields: ctx diff --git a/flytestdlib/utils/mocks/sequencer.go b/flytestdlib/utils/mocks/sequencer.go index 4c73099c3c..ac5843698d 100644 --- a/flytestdlib/utils/mocks/sequencer.go +++ b/flytestdlib/utils/mocks/sequencer.go @@ -18,13 +18,13 @@ func (_m Sequencer_GetCur) Return(_a0 uint64) *Sequencer_GetCur { } func (_m *Sequencer) OnGetCur() *Sequencer_GetCur { - c_call := _m.On("GetCur") - return &Sequencer_GetCur{Call: c_call} + c := _m.On("GetCur") + return &Sequencer_GetCur{Call: c} } func (_m *Sequencer) OnGetCurMatch(matchers ...interface{}) *Sequencer_GetCur { - c_call := _m.On("GetCur", matchers...) - return &Sequencer_GetCur{Call: c_call} + c := _m.On("GetCur", matchers...) + return &Sequencer_GetCur{Call: c} } // GetCur provides a mock function with given fields: @@ -50,13 +50,13 @@ func (_m Sequencer_GetNext) Return(_a0 uint64) *Sequencer_GetNext { } func (_m *Sequencer) OnGetNext() *Sequencer_GetNext { - c_call := _m.On("GetNext") - return &Sequencer_GetNext{Call: c_call} + c := _m.On("GetNext") + return &Sequencer_GetNext{Call: c} } func (_m *Sequencer) OnGetNextMatch(matchers ...interface{}) *Sequencer_GetNext { - c_call := _m.On("GetNext", matchers...) - return &Sequencer_GetNext{Call: c_call} + c := _m.On("GetNext", matchers...) + return &Sequencer_GetNext{Call: c} } // GetNext provides a mock function with given fields: From a0eec0dee8a895c5664fcf29b900640ad3d32ebd Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Wed, 3 Jan 2024 16:11:37 +0800 Subject: [PATCH 08/15] update comment on the execution start message Signed-off-by: Yee Hing Tong --- flyteidl/protos/flyteidl/event/cloudevents.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flyteidl/protos/flyteidl/event/cloudevents.proto b/flyteidl/protos/flyteidl/event/cloudevents.proto index 8736e70cb3..d02c5ff516 100644 --- a/flyteidl/protos/flyteidl/event/cloudevents.proto +++ b/flyteidl/protos/flyteidl/event/cloudevents.proto @@ -63,11 +63,11 @@ message CloudEventExecutionStart { core.Identifier workflow_id = 3; - // Artifact IDs found + // Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run. repeated core.ArtifactID artifact_ids = 4; - // Artifact keys found. - repeated string artifact_keys = 5; + // Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service. + repeated string artifact_trackers = 5; string principal = 6; } From 0d0275a2ff3aeec5801b32d580095c2abd587db2 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Wed, 3 Jan 2024 16:17:23 +0800 Subject: [PATCH 09/15] make generate idl comment change Signed-off-by: Yee Hing Tong --- .../pb-cpp/flyteidl/event/cloudevents.pb.cc | 68 ++--- .../pb-cpp/flyteidl/event/cloudevents.pb.h | 124 ++++----- .../pb-go/flyteidl/event/cloudevents.pb.go | 80 +++--- .../pb-java/flyteidl/event/Cloudevents.java | 258 +++++++++--------- flyteidl/gen/pb-js/flyteidl.d.ts | 8 +- flyteidl/gen/pb-js/flyteidl.js | 34 +-- .../flyteidl/event/cloudevents_pb2.py | 4 +- .../flyteidl/event/cloudevents_pb2.pyi | 8 +- flyteidl/gen/pb_rust/flyteidl.event.rs | 6 +- 9 files changed, 295 insertions(+), 295 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.cc index 2a8a020c9d..ec498323e1 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.cc @@ -163,7 +163,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fevent_2fcloudevents_2epr PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventExecutionStart, launch_plan_id_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventExecutionStart, workflow_id_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventExecutionStart, artifact_ids_), - PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventExecutionStart, artifact_keys_), + PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventExecutionStart, artifact_trackers_), PROTOBUF_FIELD_OFFSET(::flyteidl::event::CloudEventExecutionStart, principal_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { @@ -211,21 +211,21 @@ const char descriptor_table_protodef_flyteidl_2fevent_2fcloudevents_2eproto[] = "l\030\005 \001(\t\0221\n\016launch_plan_id\030\006 \001(\0132\031.flytei" "dl.core.Identifier\"P\n\027CloudEventTaskExec" "ution\0225\n\traw_event\030\001 \001(\0132\".flyteidl.even" - "t.TaskExecutionEvent\"\232\002\n\030CloudEventExecu" + "t.TaskExecutionEvent\"\236\002\n\030CloudEventExecu" "tionStart\022@\n\014execution_id\030\001 \001(\0132*.flytei" "dl.core.WorkflowExecutionIdentifier\0221\n\016l" "aunch_plan_id\030\002 \001(\0132\031.flyteidl.core.Iden" "tifier\022.\n\013workflow_id\030\003 \001(\0132\031.flyteidl.c" "ore.Identifier\022/\n\014artifact_ids\030\004 \003(\0132\031.f" - "lyteidl.core.ArtifactID\022\025\n\rartifact_keys" - "\030\005 \003(\t\022\021\n\tprincipal\030\006 \001(\tB=Z;github.com/" - "flyteorg/flyte/flyteidl/gen/pb-go/flytei" - "dl/eventb\006proto3" + "lyteidl.core.ArtifactID\022\031\n\021artifact_trac" + "kers\030\005 \003(\t\022\021\n\tprincipal\030\006 \001(\tB=Z;github." + "com/flyteorg/flyte/flyteidl/gen/pb-go/fl" + "yteidl/eventb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fevent_2fcloudevents_2eproto = { false, InitDefaults_flyteidl_2fevent_2fcloudevents_2eproto, descriptor_table_protodef_flyteidl_2fevent_2fcloudevents_2eproto, - "flyteidl/event/cloudevents.proto", &assign_descriptors_table_flyteidl_2fevent_2fcloudevents_2eproto, 1336, + "flyteidl/event/cloudevents.proto", &assign_descriptors_table_flyteidl_2fevent_2fcloudevents_2eproto, 1340, }; void AddDescriptors_flyteidl_2fevent_2fcloudevents_2eproto() { @@ -1896,7 +1896,7 @@ const int CloudEventExecutionStart::kExecutionIdFieldNumber; const int CloudEventExecutionStart::kLaunchPlanIdFieldNumber; const int CloudEventExecutionStart::kWorkflowIdFieldNumber; const int CloudEventExecutionStart::kArtifactIdsFieldNumber; -const int CloudEventExecutionStart::kArtifactKeysFieldNumber; +const int CloudEventExecutionStart::kArtifactTrackersFieldNumber; const int CloudEventExecutionStart::kPrincipalFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 @@ -1909,7 +1909,7 @@ CloudEventExecutionStart::CloudEventExecutionStart(const CloudEventExecutionStar : ::google::protobuf::Message(), _internal_metadata_(nullptr), artifact_ids_(from.artifact_ids_), - artifact_keys_(from.artifact_keys_) { + artifact_trackers_(from.artifact_trackers_) { _internal_metadata_.MergeFrom(from._internal_metadata_); principal_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.principal().size() > 0) { @@ -1970,7 +1970,7 @@ void CloudEventExecutionStart::Clear() { (void) cached_has_bits; artifact_ids_.Clear(); - artifact_keys_.Clear(); + artifact_trackers_.Clear(); principal_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (GetArenaNoVirtual() == nullptr && execution_id_ != nullptr) { delete execution_id_; @@ -2055,14 +2055,14 @@ const char* CloudEventExecutionStart::_InternalParse(const char* begin, const ch } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1)); break; } - // repeated string artifact_keys = 5; + // repeated string artifact_trackers = 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); - ctx->extra_parse_data().SetFieldName("flyteidl.event.CloudEventExecutionStart.artifact_keys"); - object = msg->add_artifact_keys(); + ctx->extra_parse_data().SetFieldName("flyteidl.event.CloudEventExecutionStart.artifact_trackers"); + object = msg->add_artifact_trackers(); if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; goto string_till_end; @@ -2168,16 +2168,16 @@ bool CloudEventExecutionStart::MergePartialFromCodedStream( break; } - // repeated string artifact_keys = 5; + // repeated string artifact_trackers = 5; case 5: { if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->add_artifact_keys())); + input, this->add_artifact_trackers())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->artifact_keys(this->artifact_keys_size() - 1).data(), - static_cast(this->artifact_keys(this->artifact_keys_size() - 1).length()), + this->artifact_trackers(this->artifact_trackers_size() - 1).data(), + static_cast(this->artifact_trackers(this->artifact_trackers_size() - 1).length()), ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.event.CloudEventExecutionStart.artifact_keys")); + "flyteidl.event.CloudEventExecutionStart.artifact_trackers")); } else { goto handle_unusual; } @@ -2253,14 +2253,14 @@ void CloudEventExecutionStart::SerializeWithCachedSizes( output); } - // repeated string artifact_keys = 5; - for (int i = 0, n = this->artifact_keys_size(); i < n; i++) { + // repeated string artifact_trackers = 5; + for (int i = 0, n = this->artifact_trackers_size(); i < n; i++) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->artifact_keys(i).data(), static_cast(this->artifact_keys(i).length()), + this->artifact_trackers(i).data(), static_cast(this->artifact_trackers(i).length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.event.CloudEventExecutionStart.artifact_keys"); + "flyteidl.event.CloudEventExecutionStart.artifact_trackers"); ::google::protobuf::internal::WireFormatLite::WriteString( - 5, this->artifact_keys(i), output); + 5, this->artifact_trackers(i), output); } // string principal = 6; @@ -2315,14 +2315,14 @@ ::google::protobuf::uint8* CloudEventExecutionStart::InternalSerializeWithCached 4, this->artifact_ids(static_cast(i)), target); } - // repeated string artifact_keys = 5; - for (int i = 0, n = this->artifact_keys_size(); i < n; i++) { + // repeated string artifact_trackers = 5; + for (int i = 0, n = this->artifact_trackers_size(); i < n; i++) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->artifact_keys(i).data(), static_cast(this->artifact_keys(i).length()), + this->artifact_trackers(i).data(), static_cast(this->artifact_trackers(i).length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.event.CloudEventExecutionStart.artifact_keys"); + "flyteidl.event.CloudEventExecutionStart.artifact_trackers"); target = ::google::protobuf::internal::WireFormatLite:: - WriteStringToArray(5, this->artifact_keys(i), target); + WriteStringToArray(5, this->artifact_trackers(i), target); } // string principal = 6; @@ -2368,12 +2368,12 @@ size_t CloudEventExecutionStart::ByteSizeLong() const { } } - // repeated string artifact_keys = 5; + // repeated string artifact_trackers = 5; total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->artifact_keys_size()); - for (int i = 0, n = this->artifact_keys_size(); i < n; i++) { + ::google::protobuf::internal::FromIntSize(this->artifact_trackers_size()); + for (int i = 0, n = this->artifact_trackers_size(); i < n; i++) { total_size += ::google::protobuf::internal::WireFormatLite::StringSize( - this->artifact_keys(i)); + this->artifact_trackers(i)); } // string principal = 6; @@ -2432,7 +2432,7 @@ void CloudEventExecutionStart::MergeFrom(const CloudEventExecutionStart& from) { (void) cached_has_bits; artifact_ids_.MergeFrom(from.artifact_ids_); - artifact_keys_.MergeFrom(from.artifact_keys_); + artifact_trackers_.MergeFrom(from.artifact_trackers_); if (from.principal().size() > 0) { principal_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.principal_); @@ -2474,7 +2474,7 @@ void CloudEventExecutionStart::InternalSwap(CloudEventExecutionStart* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); CastToBase(&artifact_ids_)->InternalSwap(CastToBase(&other->artifact_ids_)); - artifact_keys_.InternalSwap(CastToBase(&other->artifact_keys_)); + artifact_trackers_.InternalSwap(CastToBase(&other->artifact_trackers_)); principal_.Swap(&other->principal_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(execution_id_, other->execution_id_); diff --git a/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.h b/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.h index 96e908e105..ac0a1cc959 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/event/cloudevents.pb.h @@ -651,27 +651,27 @@ class CloudEventExecutionStart final : const ::google::protobuf::RepeatedPtrField< ::flyteidl::core::ArtifactID >& artifact_ids() const; - // repeated string artifact_keys = 5; - int artifact_keys_size() const; - void clear_artifact_keys(); - static const int kArtifactKeysFieldNumber = 5; - const ::std::string& artifact_keys(int index) const; - ::std::string* mutable_artifact_keys(int index); - void set_artifact_keys(int index, const ::std::string& value); + // repeated string artifact_trackers = 5; + int artifact_trackers_size() const; + void clear_artifact_trackers(); + static const int kArtifactTrackersFieldNumber = 5; + const ::std::string& artifact_trackers(int index) const; + ::std::string* mutable_artifact_trackers(int index); + void set_artifact_trackers(int index, const ::std::string& value); #if LANG_CXX11 - void set_artifact_keys(int index, ::std::string&& value); + void set_artifact_trackers(int index, ::std::string&& value); #endif - void set_artifact_keys(int index, const char* value); - void set_artifact_keys(int index, const char* value, size_t size); - ::std::string* add_artifact_keys(); - void add_artifact_keys(const ::std::string& value); + void set_artifact_trackers(int index, const char* value); + void set_artifact_trackers(int index, const char* value, size_t size); + ::std::string* add_artifact_trackers(); + void add_artifact_trackers(const ::std::string& value); #if LANG_CXX11 - void add_artifact_keys(::std::string&& value); + void add_artifact_trackers(::std::string&& value); #endif - void add_artifact_keys(const char* value); - void add_artifact_keys(const char* value, size_t size); - const ::google::protobuf::RepeatedPtrField<::std::string>& artifact_keys() const; - ::google::protobuf::RepeatedPtrField<::std::string>* mutable_artifact_keys(); + void add_artifact_trackers(const char* value); + void add_artifact_trackers(const char* value, size_t size); + const ::google::protobuf::RepeatedPtrField<::std::string>& artifact_trackers() const; + ::google::protobuf::RepeatedPtrField<::std::string>* mutable_artifact_trackers(); // string principal = 6; void clear_principal(); @@ -720,7 +720,7 @@ class CloudEventExecutionStart final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::RepeatedPtrField< ::flyteidl::core::ArtifactID > artifact_ids_; - ::google::protobuf::RepeatedPtrField<::std::string> artifact_keys_; + ::google::protobuf::RepeatedPtrField<::std::string> artifact_trackers_; ::google::protobuf::internal::ArenaStringPtr principal_; ::flyteidl::core::WorkflowExecutionIdentifier* execution_id_; ::flyteidl::core::Identifier* launch_plan_id_; @@ -1478,73 +1478,73 @@ CloudEventExecutionStart::artifact_ids() const { return artifact_ids_; } -// repeated string artifact_keys = 5; -inline int CloudEventExecutionStart::artifact_keys_size() const { - return artifact_keys_.size(); +// repeated string artifact_trackers = 5; +inline int CloudEventExecutionStart::artifact_trackers_size() const { + return artifact_trackers_.size(); } -inline void CloudEventExecutionStart::clear_artifact_keys() { - artifact_keys_.Clear(); +inline void CloudEventExecutionStart::clear_artifact_trackers() { + artifact_trackers_.Clear(); } -inline const ::std::string& CloudEventExecutionStart::artifact_keys(int index) const { - // @@protoc_insertion_point(field_get:flyteidl.event.CloudEventExecutionStart.artifact_keys) - return artifact_keys_.Get(index); +inline const ::std::string& CloudEventExecutionStart::artifact_trackers(int index) const { + // @@protoc_insertion_point(field_get:flyteidl.event.CloudEventExecutionStart.artifact_trackers) + return artifact_trackers_.Get(index); } -inline ::std::string* CloudEventExecutionStart::mutable_artifact_keys(int index) { - // @@protoc_insertion_point(field_mutable:flyteidl.event.CloudEventExecutionStart.artifact_keys) - return artifact_keys_.Mutable(index); +inline ::std::string* CloudEventExecutionStart::mutable_artifact_trackers(int index) { + // @@protoc_insertion_point(field_mutable:flyteidl.event.CloudEventExecutionStart.artifact_trackers) + return artifact_trackers_.Mutable(index); } -inline void CloudEventExecutionStart::set_artifact_keys(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:flyteidl.event.CloudEventExecutionStart.artifact_keys) - artifact_keys_.Mutable(index)->assign(value); +inline void CloudEventExecutionStart::set_artifact_trackers(int index, const ::std::string& value) { + // @@protoc_insertion_point(field_set:flyteidl.event.CloudEventExecutionStart.artifact_trackers) + artifact_trackers_.Mutable(index)->assign(value); } #if LANG_CXX11 -inline void CloudEventExecutionStart::set_artifact_keys(int index, ::std::string&& value) { - // @@protoc_insertion_point(field_set:flyteidl.event.CloudEventExecutionStart.artifact_keys) - artifact_keys_.Mutable(index)->assign(std::move(value)); +inline void CloudEventExecutionStart::set_artifact_trackers(int index, ::std::string&& value) { + // @@protoc_insertion_point(field_set:flyteidl.event.CloudEventExecutionStart.artifact_trackers) + artifact_trackers_.Mutable(index)->assign(std::move(value)); } #endif -inline void CloudEventExecutionStart::set_artifact_keys(int index, const char* value) { +inline void CloudEventExecutionStart::set_artifact_trackers(int index, const char* value) { GOOGLE_DCHECK(value != nullptr); - artifact_keys_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:flyteidl.event.CloudEventExecutionStart.artifact_keys) + artifact_trackers_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:flyteidl.event.CloudEventExecutionStart.artifact_trackers) } -inline void CloudEventExecutionStart::set_artifact_keys(int index, const char* value, size_t size) { - artifact_keys_.Mutable(index)->assign( +inline void CloudEventExecutionStart::set_artifact_trackers(int index, const char* value, size_t size) { + artifact_trackers_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:flyteidl.event.CloudEventExecutionStart.artifact_keys) + // @@protoc_insertion_point(field_set_pointer:flyteidl.event.CloudEventExecutionStart.artifact_trackers) } -inline ::std::string* CloudEventExecutionStart::add_artifact_keys() { - // @@protoc_insertion_point(field_add_mutable:flyteidl.event.CloudEventExecutionStart.artifact_keys) - return artifact_keys_.Add(); +inline ::std::string* CloudEventExecutionStart::add_artifact_trackers() { + // @@protoc_insertion_point(field_add_mutable:flyteidl.event.CloudEventExecutionStart.artifact_trackers) + return artifact_trackers_.Add(); } -inline void CloudEventExecutionStart::add_artifact_keys(const ::std::string& value) { - artifact_keys_.Add()->assign(value); - // @@protoc_insertion_point(field_add:flyteidl.event.CloudEventExecutionStart.artifact_keys) +inline void CloudEventExecutionStart::add_artifact_trackers(const ::std::string& value) { + artifact_trackers_.Add()->assign(value); + // @@protoc_insertion_point(field_add:flyteidl.event.CloudEventExecutionStart.artifact_trackers) } #if LANG_CXX11 -inline void CloudEventExecutionStart::add_artifact_keys(::std::string&& value) { - artifact_keys_.Add(std::move(value)); - // @@protoc_insertion_point(field_add:flyteidl.event.CloudEventExecutionStart.artifact_keys) +inline void CloudEventExecutionStart::add_artifact_trackers(::std::string&& value) { + artifact_trackers_.Add(std::move(value)); + // @@protoc_insertion_point(field_add:flyteidl.event.CloudEventExecutionStart.artifact_trackers) } #endif -inline void CloudEventExecutionStart::add_artifact_keys(const char* value) { +inline void CloudEventExecutionStart::add_artifact_trackers(const char* value) { GOOGLE_DCHECK(value != nullptr); - artifact_keys_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:flyteidl.event.CloudEventExecutionStart.artifact_keys) + artifact_trackers_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:flyteidl.event.CloudEventExecutionStart.artifact_trackers) } -inline void CloudEventExecutionStart::add_artifact_keys(const char* value, size_t size) { - artifact_keys_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:flyteidl.event.CloudEventExecutionStart.artifact_keys) +inline void CloudEventExecutionStart::add_artifact_trackers(const char* value, size_t size) { + artifact_trackers_.Add()->assign(reinterpret_cast(value), size); + // @@protoc_insertion_point(field_add_pointer:flyteidl.event.CloudEventExecutionStart.artifact_trackers) } inline const ::google::protobuf::RepeatedPtrField<::std::string>& -CloudEventExecutionStart::artifact_keys() const { - // @@protoc_insertion_point(field_list:flyteidl.event.CloudEventExecutionStart.artifact_keys) - return artifact_keys_; +CloudEventExecutionStart::artifact_trackers() const { + // @@protoc_insertion_point(field_list:flyteidl.event.CloudEventExecutionStart.artifact_trackers) + return artifact_trackers_; } inline ::google::protobuf::RepeatedPtrField<::std::string>* -CloudEventExecutionStart::mutable_artifact_keys() { - // @@protoc_insertion_point(field_mutable_list:flyteidl.event.CloudEventExecutionStart.artifact_keys) - return &artifact_keys_; +CloudEventExecutionStart::mutable_artifact_trackers() { + // @@protoc_insertion_point(field_mutable_list:flyteidl.event.CloudEventExecutionStart.artifact_trackers) + return &artifact_trackers_; } // string principal = 6; diff --git a/flyteidl/gen/pb-go/flyteidl/event/cloudevents.pb.go b/flyteidl/gen/pb-go/flyteidl/event/cloudevents.pb.go index f89296ebf9..dd2cf39d08 100644 --- a/flyteidl/gen/pb-go/flyteidl/event/cloudevents.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/event/cloudevents.pb.go @@ -240,10 +240,10 @@ type CloudEventExecutionStart struct { // The launch plan used. LaunchPlanId *core.Identifier `protobuf:"bytes,2,opt,name=launch_plan_id,json=launchPlanId,proto3" json:"launch_plan_id,omitempty"` WorkflowId *core.Identifier `protobuf:"bytes,3,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"` - // Artifact IDs found + // Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run. ArtifactIds []*core.ArtifactID `protobuf:"bytes,4,rep,name=artifact_ids,json=artifactIds,proto3" json:"artifact_ids,omitempty"` - // Artifact keys found. - ArtifactKeys []string `protobuf:"bytes,5,rep,name=artifact_keys,json=artifactKeys,proto3" json:"artifact_keys,omitempty"` + // Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service. + ArtifactTrackers []string `protobuf:"bytes,5,rep,name=artifact_trackers,json=artifactTrackers,proto3" json:"artifact_trackers,omitempty"` Principal string `protobuf:"bytes,6,opt,name=principal,proto3" json:"principal,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -303,9 +303,9 @@ func (m *CloudEventExecutionStart) GetArtifactIds() []*core.ArtifactID { return nil } -func (m *CloudEventExecutionStart) GetArtifactKeys() []string { +func (m *CloudEventExecutionStart) GetArtifactTrackers() []string { if m != nil { - return m.ArtifactKeys + return m.ArtifactTrackers } return nil } @@ -327,40 +327,40 @@ func init() { func init() { proto.RegisterFile("flyteidl/event/cloudevents.proto", fileDescriptor_f8af3ecc827e5d5e) } var fileDescriptor_f8af3ecc827e5d5e = []byte{ - // 547 bytes of a gzipped FileDescriptorProto + // 552 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xdd, 0x8a, 0xd3, 0x40, - 0x14, 0xa6, 0xcd, 0x6e, 0xb1, 0xd3, 0xba, 0x4a, 0xbc, 0x30, 0xd6, 0x5d, 0x0d, 0x15, 0xa4, 0x08, - 0x26, 0xb0, 0xde, 0xf9, 0xc3, 0xa2, 0xeb, 0x82, 0x41, 0x14, 0x89, 0x82, 0xb0, 0x5e, 0x84, 0x69, - 0xe6, 0x24, 0x3b, 0x74, 0x9a, 0x09, 0x93, 0x89, 0xb5, 0xcf, 0xe0, 0x7b, 0xf8, 0x6a, 0xbe, 0x86, - 0x64, 0xf2, 0xd7, 0x4c, 0x0b, 0x5a, 0xd4, 0x9b, 0x30, 0x99, 0xf3, 0x7d, 0xdf, 0xf9, 0xf9, 0x0e, - 0x83, 0xec, 0x88, 0xad, 0x25, 0x50, 0xc2, 0x5c, 0xf8, 0x0a, 0x89, 0x74, 0x43, 0xc6, 0x73, 0xa2, - 0x8e, 0x99, 0x93, 0x0a, 0x2e, 0xb9, 0x79, 0x54, 0x23, 0x1c, 0x75, 0x3d, 0x99, 0x68, 0x0c, 0xf5, - 0x2d, 0xb1, 0x93, 0xe3, 0x26, 0x16, 0x72, 0x01, 0x2e, 0xa3, 0x12, 0x04, 0x66, 0x95, 0xd2, 0xe4, - 0xa4, 0x1b, 0xa5, 0x89, 0x04, 0x11, 0xe1, 0x10, 0xaa, 0xf0, 0xfd, 0x6e, 0x18, 0x0b, 0x49, 0x23, - 0x1c, 0xca, 0x80, 0x92, 0x0a, 0x70, 0x4f, 0xe3, 0x13, 0x48, 0x24, 0x8d, 0x28, 0x88, 0x5a, 0x20, - 0xe6, 0x3c, 0x66, 0xe0, 0xaa, 0xbf, 0x79, 0x1e, 0xb9, 0x92, 0x2e, 0x21, 0x93, 0x78, 0x99, 0x96, - 0x80, 0xe9, 0x0f, 0x03, 0xdd, 0x3d, 0x2f, 0x1a, 0xbc, 0x28, 0x6a, 0xfe, 0xcc, 0xc5, 0x22, 0x62, - 0x7c, 0x75, 0xf1, 0x0d, 0xc2, 0x5c, 0x52, 0x9e, 0x98, 0xe7, 0x68, 0x28, 0xf0, 0x2a, 0x50, 0x1d, - 0x59, 0x3d, 0xbb, 0x37, 0x1b, 0x9d, 0x3e, 0x74, 0xba, 0xed, 0x3b, 0x5b, 0x2c, 0xa5, 0xe5, 0x5f, - 0x13, 0x78, 0xa5, 0x4e, 0xe6, 0x1b, 0x74, 0x93, 0xe7, 0x32, 0xcd, 0x65, 0xd0, 0x34, 0x68, 0xf5, - 0x95, 0xd6, 0x49, 0xab, 0x55, 0x34, 0xe0, 0x7c, 0x5a, 0xa7, 0x40, 0xbc, 0x1a, 0xe4, 0xdf, 0x28, - 0x69, 0xcd, 0x85, 0xf9, 0x1c, 0x8d, 0x37, 0x86, 0x90, 0x59, 0x86, 0x6d, 0xcc, 0x46, 0xa7, 0x77, - 0x34, 0x95, 0x97, 0x15, 0xc4, 0x7b, 0xed, 0x8f, 0x6a, 0xb8, 0x47, 0x32, 0xf3, 0x0b, 0xba, 0x25, - 0x20, 0x02, 0x01, 0x49, 0x08, 0x01, 0xd4, 0xd5, 0x5a, 0x07, 0xaa, 0x94, 0x47, 0x9a, 0xc8, 0x56, - 0x57, 0x5e, 0x33, 0x5c, 0xdf, 0x6c, 0x64, 0xda, 0x49, 0x1d, 0xa3, 0x61, 0x2a, 0x68, 0x12, 0xd2, - 0x14, 0x33, 0xeb, 0xd0, 0xee, 0xcd, 0x86, 0x7e, 0x7b, 0x61, 0x9e, 0xa1, 0x23, 0x86, 0xf3, 0x24, - 0xbc, 0x0a, 0x52, 0x86, 0x93, 0x80, 0x12, 0x6b, 0xa0, 0xb2, 0xea, 0xa5, 0x6f, 0x24, 0x19, 0x97, - 0x84, 0x0f, 0x0c, 0x27, 0x1e, 0x99, 0x7e, 0x37, 0xd0, 0xed, 0xd6, 0xa8, 0xf7, 0x9c, 0x6c, 0xa4, - 0x3e, 0xdb, 0x36, 0x69, 0xaa, 0x9b, 0xd4, 0x61, 0x6c, 0x1b, 0x34, 0x96, 0x38, 0x5b, 0xa8, 0x99, - 0x14, 0xb5, 0xf5, 0x75, 0xa3, 0x4b, 0x73, 0x70, 0xb6, 0xd8, 0x35, 0x0d, 0x24, 0xab, 0x80, 0x47, - 0x76, 0x5a, 0x6d, 0xfc, 0x13, 0xab, 0x0f, 0xf6, 0xb2, 0xfa, 0x3f, 0xbb, 0x71, 0xb9, 0x69, 0x46, - 0x67, 0x2e, 0x7f, 0x64, 0x46, 0x87, 0xa1, 0x99, 0x31, 0xfd, 0xd9, 0x47, 0x56, 0x2b, 0xde, 0xc0, - 0x3e, 0x4a, 0x2c, 0xa4, 0xf9, 0x0e, 0x8d, 0x9b, 0xc5, 0x2d, 0xea, 0xee, 0xed, 0xbd, 0xbb, 0x23, - 0x68, 0x2f, 0x77, 0x0c, 0xa2, 0xbf, 0xd7, 0x20, 0xcc, 0xa7, 0x68, 0xb4, 0xaa, 0x92, 0x15, 0x6c, - 0xe3, 0x77, 0x6c, 0x54, 0xa3, 0x3d, 0xf2, 0x97, 0x0e, 0x3f, 0x40, 0xd7, 0x1b, 0xf6, 0x02, 0xd6, - 0x99, 0x75, 0x68, 0x1b, 0xb3, 0xa1, 0xdf, 0x48, 0xbe, 0x85, 0xb5, 0xb6, 0x06, 0x03, 0x6d, 0x0d, - 0x5e, 0xbd, 0xb8, 0x7c, 0x16, 0x53, 0x79, 0x95, 0xcf, 0x9d, 0x90, 0x2f, 0x5d, 0x95, 0x96, 0x8b, - 0xb8, 0x3c, 0xb8, 0xcd, 0xcb, 0x1a, 0x43, 0xe2, 0xa6, 0xf3, 0xc7, 0x31, 0x77, 0xbb, 0xcf, 0xfc, - 0x7c, 0xa0, 0x9e, 0xd0, 0x27, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x64, 0xaa, 0xf5, 0xf2, 0x31, - 0x06, 0x00, 0x00, + 0x14, 0xa6, 0xcd, 0x6e, 0xb1, 0xd3, 0xb2, 0xae, 0xf1, 0xc2, 0x58, 0x77, 0x35, 0xf4, 0x42, 0x8a, + 0x62, 0x02, 0xeb, 0x9d, 0x3f, 0x2c, 0xba, 0x2e, 0x98, 0x0b, 0x45, 0xe2, 0x82, 0xb0, 0x5e, 0x84, + 0x69, 0xe6, 0x24, 0x3b, 0x74, 0x3a, 0x13, 0x26, 0x13, 0xeb, 0x3e, 0x83, 0xef, 0xe1, 0xeb, 0xf9, + 0x0a, 0x92, 0xc9, 0x5f, 0x93, 0x16, 0xb4, 0xe8, 0xde, 0x84, 0xc9, 0x39, 0xdf, 0xf7, 0x9d, 0x9f, + 0x6f, 0x18, 0x64, 0x47, 0xec, 0x5a, 0x01, 0x25, 0xcc, 0x85, 0x6f, 0xc0, 0x95, 0x1b, 0x32, 0x91, + 0x11, 0x7d, 0x4c, 0x9d, 0x44, 0x0a, 0x25, 0xcc, 0x83, 0x0a, 0xe1, 0xe8, 0xf0, 0x64, 0xd2, 0x61, + 0xe8, 0x6f, 0x81, 0x9d, 0x1c, 0xd5, 0xb9, 0x50, 0x48, 0x70, 0x19, 0x55, 0x20, 0x31, 0x2b, 0x95, + 0x26, 0xc7, 0xed, 0x2c, 0xe5, 0x0a, 0x64, 0x84, 0x43, 0x28, 0xd3, 0x8f, 0xda, 0x69, 0x2c, 0x15, + 0x8d, 0x70, 0xa8, 0x02, 0x4a, 0x4a, 0xc0, 0xc3, 0x0e, 0x9f, 0x00, 0x57, 0x34, 0xa2, 0x20, 0x2b, + 0x81, 0x58, 0x88, 0x98, 0x81, 0xab, 0xff, 0xe6, 0x59, 0xe4, 0x2a, 0xba, 0x84, 0x54, 0xe1, 0x65, + 0x52, 0x00, 0xa6, 0x3f, 0x0d, 0xf4, 0xe0, 0x2c, 0x1f, 0xf0, 0x3c, 0xef, 0xf9, 0x8b, 0x90, 0x8b, + 0x88, 0x89, 0xd5, 0xf9, 0x77, 0x08, 0x33, 0x45, 0x05, 0x37, 0xcf, 0xd0, 0x50, 0xe2, 0x55, 0xa0, + 0x27, 0xb2, 0x7a, 0x76, 0x6f, 0x36, 0x3a, 0x79, 0xec, 0xb4, 0xc7, 0x77, 0x36, 0x58, 0x5a, 0xcb, + 0xbf, 0x25, 0xf1, 0x4a, 0x9f, 0xcc, 0xf7, 0xe8, 0x50, 0x64, 0x2a, 0xc9, 0x54, 0x50, 0x0f, 0x68, + 0xf5, 0xb5, 0xd6, 0x71, 0xa3, 0x95, 0x0f, 0xe0, 0x5c, 0x5c, 0x27, 0x40, 0xbc, 0x0a, 0xe4, 0xdf, + 0x2e, 0x68, 0x75, 0xc0, 0x7c, 0x85, 0xc6, 0x6b, 0x4b, 0x48, 0x2d, 0xc3, 0x36, 0x66, 0xa3, 0x93, + 0xfb, 0x1d, 0x95, 0x37, 0x25, 0xc4, 0x7b, 0xe7, 0x8f, 0x2a, 0xb8, 0x47, 0x52, 0xf3, 0x2b, 0xba, + 0x2b, 0x21, 0x02, 0x09, 0x3c, 0x84, 0x00, 0xaa, 0x6e, 0xad, 0x3d, 0xdd, 0xca, 0x93, 0x8e, 0xc8, + 0xc6, 0x54, 0x5e, 0xbd, 0x5c, 0xdf, 0xac, 0x65, 0x9a, 0x4d, 0x1d, 0xa1, 0x61, 0x22, 0x29, 0x0f, + 0x69, 0x82, 0x99, 0xb5, 0x6f, 0xf7, 0x66, 0x43, 0xbf, 0x09, 0x98, 0xa7, 0xe8, 0x80, 0xe1, 0x8c, + 0x87, 0x57, 0x41, 0xc2, 0x30, 0x0f, 0x28, 0xb1, 0x06, 0xba, 0x6a, 0xb7, 0xf5, 0xb5, 0x22, 0xe3, + 0x82, 0xf0, 0x89, 0x61, 0xee, 0x91, 0xe9, 0x0f, 0x03, 0xdd, 0x6b, 0x8c, 0xfa, 0x28, 0xc8, 0x5a, + 0xe9, 0xd3, 0x4d, 0x93, 0xa6, 0x5d, 0x93, 0x5a, 0x8c, 0x4d, 0x83, 0xc6, 0x0a, 0xa7, 0x0b, 0xbd, + 0x93, 0xbc, 0xb7, 0x7e, 0xd7, 0xe8, 0xc2, 0x1c, 0x9c, 0x2e, 0xb6, 0x6d, 0x03, 0xa9, 0x32, 0xe1, + 0x91, 0xad, 0x56, 0x1b, 0xff, 0xc5, 0xea, 0xbd, 0x9d, 0xac, 0xbe, 0x61, 0x37, 0x2e, 0xd7, 0xcd, + 0x68, 0xed, 0xe5, 0xaf, 0xcc, 0x68, 0x31, 0x3a, 0x66, 0x4c, 0x7f, 0xf5, 0x91, 0xd5, 0x88, 0xd7, + 0xb0, 0xcf, 0x0a, 0x4b, 0x65, 0x7e, 0x40, 0xe3, 0xfa, 0xe2, 0xe6, 0x7d, 0xf7, 0x76, 0xbe, 0xbb, + 0x23, 0x68, 0x82, 0x5b, 0x16, 0xd1, 0xdf, 0x69, 0x11, 0xe6, 0x0b, 0x34, 0x5a, 0x95, 0xc5, 0x72, + 0xb6, 0xf1, 0x27, 0x36, 0xaa, 0xd0, 0x1e, 0xf9, 0x47, 0x87, 0x9f, 0xa2, 0x3b, 0x35, 0x5b, 0x49, + 0x1c, 0x2e, 0x40, 0xa6, 0xd6, 0xbe, 0x6d, 0xcc, 0x86, 0xfe, 0x61, 0x95, 0xb8, 0x28, 0xe3, 0xed, + 0xeb, 0x30, 0xe8, 0x5c, 0x87, 0xb7, 0xaf, 0x2f, 0x5f, 0xc6, 0x54, 0x5d, 0x65, 0x73, 0x27, 0x14, + 0x4b, 0x57, 0x97, 0x17, 0x32, 0x2e, 0x0e, 0x6e, 0xfd, 0xc2, 0xc6, 0xc0, 0xdd, 0x64, 0xfe, 0x2c, + 0x16, 0x6e, 0xfb, 0xb9, 0x9f, 0x0f, 0xf4, 0x53, 0xfa, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xef, 0x43, 0x56, 0x39, 0x06, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-java/flyteidl/event/Cloudevents.java b/flyteidl/gen/pb-java/flyteidl/event/Cloudevents.java index 6ca66d432e..0a1bc8e73a 100644 --- a/flyteidl/gen/pb-java/flyteidl/event/Cloudevents.java +++ b/flyteidl/gen/pb-java/flyteidl/event/Cloudevents.java @@ -4673,7 +4673,7 @@ public interface CloudEventExecutionStartOrBuilder extends /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -4682,7 +4682,7 @@ public interface CloudEventExecutionStartOrBuilder extends getArtifactIdsList(); /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -4690,7 +4690,7 @@ public interface CloudEventExecutionStartOrBuilder extends flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index); /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -4698,7 +4698,7 @@ public interface CloudEventExecutionStartOrBuilder extends int getArtifactIdsCount(); /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -4707,7 +4707,7 @@ public interface CloudEventExecutionStartOrBuilder extends getArtifactIdsOrBuilderList(); /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -4717,38 +4717,38 @@ flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( /** * 
-     * Artifact keys found.
+     * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
      *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ java.util.List - getArtifactKeysList(); + getArtifactTrackersList(); /** * 
-     * Artifact keys found.
+     * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
      *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - int getArtifactKeysCount(); + int getArtifactTrackersCount(); /** * 
-     * Artifact keys found.
+     * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
      *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - java.lang.String getArtifactKeys(int index); + java.lang.String getArtifactTrackers(int index); /** * 
-     * Artifact keys found.
+     * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
      *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ com.google.protobuf.ByteString - getArtifactKeysBytes(int index); + getArtifactTrackersBytes(int index); /** * string principal = 6; @@ -4778,7 +4778,7 @@ private CloudEventExecutionStart(com.google.protobuf.GeneratedMessageV3.Builder< } private CloudEventExecutionStart() { artifactIds_ = java.util.Collections.emptyList(); - artifactKeys_ = com.google.protobuf.LazyStringArrayList.EMPTY; + artifactTrackers_ = com.google.protobuf.LazyStringArrayList.EMPTY; principal_ = ""; } @@ -4857,10 +4857,10 @@ private CloudEventExecutionStart( case 42: { java.lang.String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000010) != 0)) { - artifactKeys_ = new com.google.protobuf.LazyStringArrayList(); + artifactTrackers_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000010; } - artifactKeys_.add(s); + artifactTrackers_.add(s); break; } case 50: { @@ -4888,7 +4888,7 @@ private CloudEventExecutionStart( artifactIds_ = java.util.Collections.unmodifiableList(artifactIds_); } if (((mutable_bitField0_ & 0x00000010) != 0)) { - artifactKeys_ = artifactKeys_.getUnmodifiableView(); + artifactTrackers_ = artifactTrackers_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -4999,7 +4999,7 @@ public flyteidl.core.IdentifierOuterClass.IdentifierOrBuilder getWorkflowIdOrBui private java.util.List artifactIds_; /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -5009,7 +5009,7 @@ public java.util.List getArtifactIdsList() } /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -5020,7 +5020,7 @@ public java.util.List getArtifactIdsList() } /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -5030,7 +5030,7 @@ public int getArtifactIdsCount() { } /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -5040,7 +5040,7 @@ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { } /** * 
-     * Artifact IDs found
+     * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
      *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -5050,49 +5050,49 @@ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( return artifactIds_.get(index); } - public static final int ARTIFACT_KEYS_FIELD_NUMBER = 5; - private com.google.protobuf.LazyStringList artifactKeys_; + public static final int ARTIFACT_TRACKERS_FIELD_NUMBER = 5; + private com.google.protobuf.LazyStringList artifactTrackers_; /** * 
-     * Artifact keys found.
+     * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
      *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ public com.google.protobuf.ProtocolStringList - getArtifactKeysList() { - return artifactKeys_; + getArtifactTrackersList() { + return artifactTrackers_; } /** * 
-     * Artifact keys found.
+     * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
      *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public int getArtifactKeysCount() { - return artifactKeys_.size(); + public int getArtifactTrackersCount() { + return artifactTrackers_.size(); } /** * 
-     * Artifact keys found.
+     * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
      *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public java.lang.String getArtifactKeys(int index) { - return artifactKeys_.get(index); + public java.lang.String getArtifactTrackers(int index) { + return artifactTrackers_.get(index); } /** * 
-     * Artifact keys found.
+     * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
      *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ public com.google.protobuf.ByteString - getArtifactKeysBytes(int index) { - return artifactKeys_.getByteString(index); + getArtifactTrackersBytes(int index) { + return artifactTrackers_.getByteString(index); } public static final int PRINCIPAL_FIELD_NUMBER = 6; @@ -5155,8 +5155,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < artifactIds_.size(); i++) { output.writeMessage(4, artifactIds_.get(i)); } - for (int i = 0; i < artifactKeys_.size(); i++) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 5, artifactKeys_.getRaw(i)); + for (int i = 0; i < artifactTrackers_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, artifactTrackers_.getRaw(i)); } if (!getPrincipalBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 6, principal_); @@ -5188,11 +5188,11 @@ public int getSerializedSize() { } { int dataSize = 0; - for (int i = 0; i < artifactKeys_.size(); i++) { - dataSize += computeStringSizeNoTag(artifactKeys_.getRaw(i)); + for (int i = 0; i < artifactTrackers_.size(); i++) { + dataSize += computeStringSizeNoTag(artifactTrackers_.getRaw(i)); } size += dataSize; - size += 1 * getArtifactKeysList().size(); + size += 1 * getArtifactTrackersList().size(); } if (!getPrincipalBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, principal_); @@ -5229,8 +5229,8 @@ public boolean equals(final java.lang.Object obj) { } if (!getArtifactIdsList() .equals(other.getArtifactIdsList())) return false; - if (!getArtifactKeysList() - .equals(other.getArtifactKeysList())) return false; + if (!getArtifactTrackersList() + .equals(other.getArtifactTrackersList())) return false; if (!getPrincipal() .equals(other.getPrincipal())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -5260,9 +5260,9 @@ public int hashCode() { hash = (37 * hash) + ARTIFACT_IDS_FIELD_NUMBER; hash = (53 * hash) + getArtifactIdsList().hashCode(); } - if (getArtifactKeysCount() > 0) { - hash = (37 * hash) + ARTIFACT_KEYS_FIELD_NUMBER; - hash = (53 * hash) + getArtifactKeysList().hashCode(); + if (getArtifactTrackersCount() > 0) { + hash = (37 * hash) + ARTIFACT_TRACKERS_FIELD_NUMBER; + hash = (53 * hash) + getArtifactTrackersList().hashCode(); } hash = (37 * hash) + PRINCIPAL_FIELD_NUMBER; hash = (53 * hash) + getPrincipal().hashCode(); @@ -5428,7 +5428,7 @@ public Builder clear() { } else { artifactIdsBuilder_.clear(); } - artifactKeys_ = com.google.protobuf.LazyStringArrayList.EMPTY; + artifactTrackers_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000010); principal_ = ""; @@ -5485,10 +5485,10 @@ public flyteidl.event.Cloudevents.CloudEventExecutionStart buildPartial() { result.artifactIds_ = artifactIdsBuilder_.build(); } if (((bitField0_ & 0x00000010) != 0)) { - artifactKeys_ = artifactKeys_.getUnmodifiableView(); + artifactTrackers_ = artifactTrackers_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000010); } - result.artifactKeys_ = artifactKeys_; + result.artifactTrackers_ = artifactTrackers_; result.principal_ = principal_; result.bitField0_ = to_bitField0_; onBuilt(); @@ -5574,13 +5574,13 @@ public Builder mergeFrom(flyteidl.event.Cloudevents.CloudEventExecutionStart oth } } } - if (!other.artifactKeys_.isEmpty()) { - if (artifactKeys_.isEmpty()) { - artifactKeys_ = other.artifactKeys_; + if (!other.artifactTrackers_.isEmpty()) { + if (artifactTrackers_.isEmpty()) { + artifactTrackers_ = other.artifactTrackers_; bitField0_ = (bitField0_ & ~0x00000010); } else { - ensureArtifactKeysIsMutable(); - artifactKeys_.addAll(other.artifactKeys_); + ensureArtifactTrackersIsMutable(); + artifactTrackers_.addAll(other.artifactTrackers_); } onChanged(); } @@ -6055,7 +6055,7 @@ private void ensureArtifactIdsIsMutable() { /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6069,7 +6069,7 @@ public java.util.List getArtifactIdsList() } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6083,7 +6083,7 @@ public int getArtifactIdsCount() { } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6097,7 +6097,7 @@ public flyteidl.core.ArtifactId.ArtifactID getArtifactIds(int index) { } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6118,7 +6118,7 @@ public Builder setArtifactIds( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6136,7 +6136,7 @@ public Builder setArtifactIds( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6156,7 +6156,7 @@ public Builder addArtifactIds(flyteidl.core.ArtifactId.ArtifactID value) { } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6177,7 +6177,7 @@ public Builder addArtifactIds( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6195,7 +6195,7 @@ public Builder addArtifactIds( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6213,7 +6213,7 @@ public Builder addArtifactIds( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6232,7 +6232,7 @@ public Builder addAllArtifactIds( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6249,7 +6249,7 @@ public Builder clearArtifactIds() { } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6266,7 +6266,7 @@ public Builder removeArtifactIds(int index) { } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6277,7 +6277,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder getArtifactIdsBuilder( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6291,7 +6291,7 @@ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6306,7 +6306,7 @@ public flyteidl.core.ArtifactId.ArtifactIDOrBuilder getArtifactIdsOrBuilder( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6317,7 +6317,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder() { } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6329,7 +6329,7 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( } /** * 
-       * Artifact IDs found
+       * Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run.
        *
* * repeated .flyteidl.core.ArtifactID artifact_ids = 4; @@ -6353,132 +6353,132 @@ public flyteidl.core.ArtifactId.ArtifactID.Builder addArtifactIdsBuilder( return artifactIdsBuilder_; } - private com.google.protobuf.LazyStringList artifactKeys_ = com.google.protobuf.LazyStringArrayList.EMPTY; - private void ensureArtifactKeysIsMutable() { + private com.google.protobuf.LazyStringList artifactTrackers_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private void ensureArtifactTrackersIsMutable() { if (!((bitField0_ & 0x00000010) != 0)) { - artifactKeys_ = new com.google.protobuf.LazyStringArrayList(artifactKeys_); + artifactTrackers_ = new com.google.protobuf.LazyStringArrayList(artifactTrackers_); bitField0_ |= 0x00000010; } } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ public com.google.protobuf.ProtocolStringList - getArtifactKeysList() { - return artifactKeys_.getUnmodifiableView(); + getArtifactTrackersList() { + return artifactTrackers_.getUnmodifiableView(); } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public int getArtifactKeysCount() { - return artifactKeys_.size(); + public int getArtifactTrackersCount() { + return artifactTrackers_.size(); } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public java.lang.String getArtifactKeys(int index) { - return artifactKeys_.get(index); + public java.lang.String getArtifactTrackers(int index) { + return artifactTrackers_.get(index); } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ public com.google.protobuf.ByteString - getArtifactKeysBytes(int index) { - return artifactKeys_.getByteString(index); + getArtifactTrackersBytes(int index) { + return artifactTrackers_.getByteString(index); } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public Builder setArtifactKeys( + public Builder setArtifactTrackers( int index, java.lang.String value) { if (value == null) { throw new NullPointerException(); } - ensureArtifactKeysIsMutable(); - artifactKeys_.set(index, value); + ensureArtifactTrackersIsMutable(); + artifactTrackers_.set(index, value); onChanged(); return this; } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public Builder addArtifactKeys( + public Builder addArtifactTrackers( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - ensureArtifactKeysIsMutable(); - artifactKeys_.add(value); + ensureArtifactTrackersIsMutable(); + artifactTrackers_.add(value); onChanged(); return this; } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public Builder addAllArtifactKeys( + public Builder addAllArtifactTrackers( java.lang.Iterable values) { - ensureArtifactKeysIsMutable(); + ensureArtifactTrackersIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, artifactKeys_); + values, artifactTrackers_); onChanged(); return this; } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public Builder clearArtifactKeys() { - artifactKeys_ = com.google.protobuf.LazyStringArrayList.EMPTY; + public Builder clearArtifactTrackers() { + artifactTrackers_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } /** * 
-       * Artifact keys found.
+       * Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service.
        *
* - * repeated string artifact_keys = 5; + * repeated string artifact_trackers = 5; */ - public Builder addArtifactKeysBytes( + public Builder addArtifactTrackersBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - ensureArtifactKeysIsMutable(); - artifactKeys_.add(value); + ensureArtifactTrackersIsMutable(); + artifactTrackers_.add(value); onChanged(); return this; } @@ -6657,16 +6657,16 @@ public flyteidl.event.Cloudevents.CloudEventExecutionStart getDefaultInstanceFor "l\030\005 \001(\t\0221\n\016launch_plan_id\030\006 \001(\0132\031.flytei" + "dl.core.Identifier\"P\n\027CloudEventTaskExec" + "ution\0225\n\traw_event\030\001 \001(\0132\".flyteidl.even" + - "t.TaskExecutionEvent\"\232\002\n\030CloudEventExecu" + + "t.TaskExecutionEvent\"\236\002\n\030CloudEventExecu" + "tionStart\022@\n\014execution_id\030\001 \001(\0132*.flytei" + "dl.core.WorkflowExecutionIdentifier\0221\n\016l" + "aunch_plan_id\030\002 \001(\0132\031.flyteidl.core.Iden" + "tifier\022.\n\013workflow_id\030\003 \001(\0132\031.flyteidl.c" + "ore.Identifier\022/\n\014artifact_ids\030\004 \003(\0132\031.f" + - "lyteidl.core.ArtifactID\022\025\n\rartifact_keys" + - "\030\005 \003(\t\022\021\n\tprincipal\030\006 \001(\tB=Z;github.com/" + - "flyteorg/flyte/flyteidl/gen/pb-go/flytei" + - "dl/eventb\006proto3" + "lyteidl.core.ArtifactID\022\031\n\021artifact_trac" + + "kers\030\005 \003(\t\022\021\n\tprincipal\030\006 \001(\tB=Z;github." + + "com/flyteorg/flyte/flyteidl/gen/pb-go/fl" + + "yteidl/eventb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -6709,7 +6709,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_event_CloudEventExecutionStart_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_event_CloudEventExecutionStart_descriptor, - new java.lang.String[] { "ExecutionId", "LaunchPlanId", "WorkflowId", "ArtifactIds", "ArtifactKeys", "Principal", }); + new java.lang.String[] { "ExecutionId", "LaunchPlanId", "WorkflowId", "ArtifactIds", "ArtifactTrackers", "Principal", }); flyteidl.event.Event.getDescriptor(); flyteidl.core.Literals.getDescriptor(); flyteidl.core.Interface.getDescriptor(); diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts index 94c1dd4bb5..44c8f52a04 100644 --- a/flyteidl/gen/pb-js/flyteidl.d.ts +++ b/flyteidl/gen/pb-js/flyteidl.d.ts @@ -7645,8 +7645,8 @@ export namespace flyteidl { /** CloudEventExecutionStart artifactIds */ artifactIds?: (flyteidl.core.IArtifactID[]|null); - /** CloudEventExecutionStart artifactKeys */ - artifactKeys?: (string[]|null); + /** CloudEventExecutionStart artifactTrackers */ + artifactTrackers?: (string[]|null); /** CloudEventExecutionStart principal */ principal?: (string|null); @@ -7673,8 +7673,8 @@ export namespace flyteidl { /** CloudEventExecutionStart artifactIds. */ public artifactIds: flyteidl.core.IArtifactID[]; - /** CloudEventExecutionStart artifactKeys. */ - public artifactKeys: string[]; + /** CloudEventExecutionStart artifactTrackers. */ + public artifactTrackers: string[]; /** CloudEventExecutionStart principal. */ public principal: string; diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index d3c90762e7..3bd5e9bd3d 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -18488,7 +18488,7 @@ * @property {flyteidl.core.IIdentifier|null} [launchPlanId] CloudEventExecutionStart launchPlanId * @property {flyteidl.core.IIdentifier|null} [workflowId] CloudEventExecutionStart workflowId * @property {Array.|null} [artifactIds] CloudEventExecutionStart artifactIds - * @property {Array.|null} [artifactKeys] CloudEventExecutionStart artifactKeys + * @property {Array.|null} [artifactTrackers] CloudEventExecutionStart artifactTrackers * @property {string|null} [principal] CloudEventExecutionStart principal */ @@ -18502,7 +18502,7 @@ */ function CloudEventExecutionStart(properties) { this.artifactIds = []; - this.artifactKeys = []; + this.artifactTrackers = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -18542,12 +18542,12 @@ CloudEventExecutionStart.prototype.artifactIds = $util.emptyArray; /** - * CloudEventExecutionStart artifactKeys. - * @member {Array.} artifactKeys + * CloudEventExecutionStart artifactTrackers. + * @member {Array.} artifactTrackers * @memberof flyteidl.event.CloudEventExecutionStart * @instance */ - CloudEventExecutionStart.prototype.artifactKeys = $util.emptyArray; + CloudEventExecutionStart.prototype.artifactTrackers = $util.emptyArray; /** * CloudEventExecutionStart principal. @@ -18590,9 +18590,9 @@ if (message.artifactIds != null && message.artifactIds.length) for (var i = 0; i < message.artifactIds.length; ++i) $root.flyteidl.core.ArtifactID.encode(message.artifactIds[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.artifactKeys != null && message.artifactKeys.length) - for (var i = 0; i < message.artifactKeys.length; ++i) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.artifactKeys[i]); + if (message.artifactTrackers != null && message.artifactTrackers.length) + for (var i = 0; i < message.artifactTrackers.length; ++i) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.artifactTrackers[i]); if (message.principal != null && message.hasOwnProperty("principal")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.principal); return writer; @@ -18631,9 +18631,9 @@ message.artifactIds.push($root.flyteidl.core.ArtifactID.decode(reader, reader.uint32())); break; case 5: - if (!(message.artifactKeys && message.artifactKeys.length)) - message.artifactKeys = []; - message.artifactKeys.push(reader.string()); + if (!(message.artifactTrackers && message.artifactTrackers.length)) + message.artifactTrackers = []; + message.artifactTrackers.push(reader.string()); break; case 6: message.principal = reader.string(); @@ -18681,12 +18681,12 @@ return "artifactIds." + error; } } - if (message.artifactKeys != null && message.hasOwnProperty("artifactKeys")) { - if (!Array.isArray(message.artifactKeys)) - return "artifactKeys: array expected"; - for (var i = 0; i < message.artifactKeys.length; ++i) - if (!$util.isString(message.artifactKeys[i])) - return "artifactKeys: string[] expected"; + if (message.artifactTrackers != null && message.hasOwnProperty("artifactTrackers")) { + if (!Array.isArray(message.artifactTrackers)) + return "artifactTrackers: array expected"; + for (var i = 0; i < message.artifactTrackers.length; ++i) + if (!$util.isString(message.artifactTrackers[i])) + return "artifactTrackers: string[] expected"; } if (message.principal != null && message.hasOwnProperty("principal")) if (!$util.isString(message.principal)) diff --git a/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.py b/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.py index 12adeb0f0c..7addfe281f 100644 --- a/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.py @@ -19,7 +19,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n flyteidl/event/cloudevents.proto\x12\x0e\x66lyteidl.event\x1a\x1a\x66lyteidl/event/event.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1f\x66lyteidl/core/artifact_id.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa6\x03\n\x1b\x43loudEventWorkflowExecution\x12\x43\n\traw_event\x18\x01 \x01(\x0b\x32&.flyteidl.event.WorkflowExecutionEventR\x08rawEvent\x12H\n\x10output_interface\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\x0foutputInterface\x12<\n\x0c\x61rtifact_ids\x18\x03 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12[\n\x13reference_execution\x18\x04 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x12referenceExecution\x12\x1c\n\tprincipal\x18\x05 \x01(\tR\tprincipal\x12?\n\x0elaunch_plan_id\x18\x06 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\"\x8b\x03\n\x17\x43loudEventNodeExecution\x12?\n\traw_event\x18\x01 \x01(\x0b\x32\".flyteidl.event.NodeExecutionEventR\x08rawEvent\x12H\n\x0ctask_exec_id\x18\x02 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\ntaskExecId\x12H\n\x10output_interface\x18\x03 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\x0foutputInterface\x12<\n\x0c\x61rtifact_ids\x18\x04 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12\x1c\n\tprincipal\x18\x05 \x01(\tR\tprincipal\x12?\n\x0elaunch_plan_id\x18\x06 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\"Z\n\x17\x43loudEventTaskExecution\x12?\n\traw_event\x18\x01 \x01(\x0b\x32\".flyteidl.event.TaskExecutionEventR\x08rawEvent\"\xe7\x02\n\x18\x43loudEventExecutionStart\x12M\n\x0c\x65xecution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x0b\x65xecutionId\x12?\n\x0elaunch_plan_id\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\x12:\n\x0bworkflow_id\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nworkflowId\x12<\n\x0c\x61rtifact_ids\x18\x04 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12#\n\rartifact_keys\x18\x05 \x03(\tR\x0c\x61rtifactKeys\x12\x1c\n\tprincipal\x18\x06 \x01(\tR\tprincipalB\xbc\x01\n\x12\x63om.flyteidl.eventB\x10\x43loudeventsProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/event\xa2\x02\x03\x46\x45X\xaa\x02\x0e\x46lyteidl.Event\xca\x02\x0e\x46lyteidl\\Event\xe2\x02\x1a\x46lyteidl\\Event\\GPBMetadata\xea\x02\x0f\x46lyteidl::Eventb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n flyteidl/event/cloudevents.proto\x12\x0e\x66lyteidl.event\x1a\x1a\x66lyteidl/event/event.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1f\x66lyteidl/core/artifact_id.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa6\x03\n\x1b\x43loudEventWorkflowExecution\x12\x43\n\traw_event\x18\x01 \x01(\x0b\x32&.flyteidl.event.WorkflowExecutionEventR\x08rawEvent\x12H\n\x10output_interface\x18\x02 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\x0foutputInterface\x12<\n\x0c\x61rtifact_ids\x18\x03 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12[\n\x13reference_execution\x18\x04 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x12referenceExecution\x12\x1c\n\tprincipal\x18\x05 \x01(\tR\tprincipal\x12?\n\x0elaunch_plan_id\x18\x06 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\"\x8b\x03\n\x17\x43loudEventNodeExecution\x12?\n\traw_event\x18\x01 \x01(\x0b\x32\".flyteidl.event.NodeExecutionEventR\x08rawEvent\x12H\n\x0ctask_exec_id\x18\x02 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\ntaskExecId\x12H\n\x10output_interface\x18\x03 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\x0foutputInterface\x12<\n\x0c\x61rtifact_ids\x18\x04 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12\x1c\n\tprincipal\x18\x05 \x01(\tR\tprincipal\x12?\n\x0elaunch_plan_id\x18\x06 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\"Z\n\x17\x43loudEventTaskExecution\x12?\n\traw_event\x18\x01 \x01(\x0b\x32\".flyteidl.event.TaskExecutionEventR\x08rawEvent\"\xef\x02\n\x18\x43loudEventExecutionStart\x12M\n\x0c\x65xecution_id\x18\x01 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierR\x0b\x65xecutionId\x12?\n\x0elaunch_plan_id\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x0claunchPlanId\x12:\n\x0bworkflow_id\x18\x03 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\nworkflowId\x12<\n\x0c\x61rtifact_ids\x18\x04 \x03(\x0b\x32\x19.flyteidl.core.ArtifactIDR\x0b\x61rtifactIds\x12+\n\x11\x61rtifact_trackers\x18\x05 \x03(\tR\x10\x61rtifactTrackers\x12\x1c\n\tprincipal\x18\x06 \x01(\tR\tprincipalB\xbc\x01\n\x12\x63om.flyteidl.eventB\x10\x43loudeventsProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/event\xa2\x02\x03\x46\x45X\xaa\x02\x0e\x46lyteidl.Event\xca\x02\x0e\x46lyteidl\\Event\xe2\x02\x1a\x46lyteidl\\Event\\GPBMetadata\xea\x02\x0f\x46lyteidl::Eventb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -35,5 +35,5 @@ _globals['_CLOUDEVENTTASKEXECUTION']._serialized_start=1062 _globals['_CLOUDEVENTTASKEXECUTION']._serialized_end=1152 _globals['_CLOUDEVENTEXECUTIONSTART']._serialized_start=1155 - _globals['_CLOUDEVENTEXECUTIONSTART']._serialized_end=1514 + _globals['_CLOUDEVENTEXECUTIONSTART']._serialized_end=1522 # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.pyi index fc6d11b56b..b79750c9ca 100644 --- a/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.pyi +++ b/flyteidl/gen/pb_python/flyteidl/event/cloudevents_pb2.pyi @@ -50,17 +50,17 @@ class CloudEventTaskExecution(_message.Message): def __init__(self, raw_event: _Optional[_Union[_event_pb2.TaskExecutionEvent, _Mapping]] = ...) -> None: ... class CloudEventExecutionStart(_message.Message): - __slots__ = ["execution_id", "launch_plan_id", "workflow_id", "artifact_ids", "artifact_keys", "principal"] + __slots__ = ["execution_id", "launch_plan_id", "workflow_id", "artifact_ids", "artifact_trackers", "principal"] EXECUTION_ID_FIELD_NUMBER: _ClassVar[int] LAUNCH_PLAN_ID_FIELD_NUMBER: _ClassVar[int] WORKFLOW_ID_FIELD_NUMBER: _ClassVar[int] ARTIFACT_IDS_FIELD_NUMBER: _ClassVar[int] - ARTIFACT_KEYS_FIELD_NUMBER: _ClassVar[int] + ARTIFACT_TRACKERS_FIELD_NUMBER: _ClassVar[int] PRINCIPAL_FIELD_NUMBER: _ClassVar[int] execution_id: _identifier_pb2.WorkflowExecutionIdentifier launch_plan_id: _identifier_pb2.Identifier workflow_id: _identifier_pb2.Identifier artifact_ids: _containers.RepeatedCompositeFieldContainer[_artifact_id_pb2.ArtifactID] - artifact_keys: _containers.RepeatedScalarFieldContainer[str] + artifact_trackers: _containers.RepeatedScalarFieldContainer[str] principal: str - def __init__(self, execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., launch_plan_id: _Optional[_Union[_identifier_pb2.Identifier, _Mapping]] = ..., workflow_id: _Optional[_Union[_identifier_pb2.Identifier, _Mapping]] = ..., artifact_ids: _Optional[_Iterable[_Union[_artifact_id_pb2.ArtifactID, _Mapping]]] = ..., artifact_keys: _Optional[_Iterable[str]] = ..., principal: _Optional[str] = ...) -> None: ... + def __init__(self, execution_id: _Optional[_Union[_identifier_pb2.WorkflowExecutionIdentifier, _Mapping]] = ..., launch_plan_id: _Optional[_Union[_identifier_pb2.Identifier, _Mapping]] = ..., workflow_id: _Optional[_Union[_identifier_pb2.Identifier, _Mapping]] = ..., artifact_ids: _Optional[_Iterable[_Union[_artifact_id_pb2.ArtifactID, _Mapping]]] = ..., artifact_trackers: _Optional[_Iterable[str]] = ..., principal: _Optional[str] = ...) -> None: ... diff --git a/flyteidl/gen/pb_rust/flyteidl.event.rs b/flyteidl/gen/pb_rust/flyteidl.event.rs index c3a3b2a4d9..703e5c9e9c 100644 --- a/flyteidl/gen/pb_rust/flyteidl.event.rs +++ b/flyteidl/gen/pb_rust/flyteidl.event.rs @@ -449,12 +449,12 @@ pub struct CloudEventExecutionStart { pub launch_plan_id: ::core::option::Option, #[prost(message, optional, tag="3")] pub workflow_id: ::core::option::Option, - /// Artifact IDs found + /// Artifact inputs to the workflow execution for which we have the full Artifact ID. These are likely the result of artifact queries that are run. #[prost(message, repeated, tag="4")] pub artifact_ids: ::prost::alloc::vec::Vec, - /// Artifact keys found. + /// Artifact inputs to the workflow execution for which we only have the tracking bit that's installed into the Literal's metadata by the Artifact service. #[prost(string, repeated, tag="5")] - pub artifact_keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + pub artifact_trackers: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, #[prost(string, tag="6")] pub principal: ::prost::alloc::string::String, } From c639c98cc26616bc91da4e7374176cf8738596df Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Wed, 3 Jan 2024 16:19:12 +0800 Subject: [PATCH 10/15] update admin code, tests missing Signed-off-by: Yee Hing Tong --- .../pkg/manager/impl/execution_manager.go | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/flyteadmin/pkg/manager/impl/execution_manager.go b/flyteadmin/pkg/manager/impl/execution_manager.go index db02fabf07..dc36a308c4 100644 --- a/flyteadmin/pkg/manager/impl/execution_manager.go +++ b/flyteadmin/pkg/manager/impl/execution_manager.go @@ -47,6 +47,7 @@ import ( ) const childContainerQueueKey = "child_queue" +const artifactTrackerKey = "_ua" // Map of [project] -> map of [domain] -> stop watch type projectDomainScopedStopWatchMap = map[string]map[string]*promutils.StopWatch @@ -700,31 +701,26 @@ func resolveSecurityCtx(ctx context.Context, executionConfigSecurityCtx *core.Se } } -// ExtractArtifactKeys pulls out artifact keys from Literals for lineage -// todo: rename this function to be less confusing -func (m *ExecutionManager) ExtractArtifactKeys(input *core.Literal) []string { - var artifactKeys []string +// ExtractArtifactTrackers pulls out artifact tracker strings from Literals for lineage +func (m *ExecutionManager) ExtractArtifactTrackers(artifactTrackers map[string]string, input *core.Literal) { if input == nil { - return artifactKeys + return } if input.GetMetadata() != nil { - if artifactKey, ok := input.GetMetadata()["_ua"]; ok { - artifactKeys = append(artifactKeys, artifactKey) + if tracker, ok := input.GetMetadata()[artifactTrackerKey]; ok { + artifactTrackers[tracker] = "" } } if input.GetCollection() != nil { for _, v := range input.GetCollection().Literals { - mapKeys := m.ExtractArtifactKeys(v) - artifactKeys = append(artifactKeys, mapKeys...) + m.ExtractArtifactTrackers(artifactTrackers, v) } } else if input.GetMap() != nil { for _, v := range input.GetMap().Literals { - mapKeys := m.ExtractArtifactKeys(v) - artifactKeys = append(artifactKeys, mapKeys...) + m.ExtractArtifactTrackers(artifactTrackers, v) } } - return artifactKeys } // getStringFromInput should be called when a tag or partition value is a binding to an input. the input is looked up @@ -976,7 +972,7 @@ func (m *ExecutionManager) launchExecutionAndPrepareModel( // TODO: Artifact feature gate, remove when ready var lpExpectedInputs *core.ParameterMap - var artifactTrackers []string + var artifactTrackers = make(map[string]string) var usedArtifactIDs []*core.ArtifactID if m.artifactRegistry.GetClient() != nil { // Literals may have an artifact key in the metadata field. This is something the artifact service should have @@ -988,9 +984,8 @@ func (m *ExecutionManager) launchExecutionAndPrepareModel( fixedInputMap := &core.Literal{ Value: &core.Literal_Map{Map: launchPlan.Spec.FixedInputs}, } - artifactTrackers = m.ExtractArtifactKeys(requestInputMap) - fixedInputArtifactKeys := m.ExtractArtifactKeys(fixedInputMap) - artifactTrackers = append(artifactTrackers, fixedInputArtifactKeys...) + m.ExtractArtifactTrackers(artifactTrackers, requestInputMap) + m.ExtractArtifactTrackers(artifactTrackers, fixedInputMap) // Put together the inputs that we've already resolved so that the artifact querying bit can fill them in. // This is to support artifact queries that depend on other inputs using the {{ .inputs.var }} construct. @@ -1018,7 +1013,7 @@ func (m *ExecutionManager) launchExecutionAndPrepareModel( } logger.Debugf(ctx, "Resolved launch plan closure expected inputs from [%+v] to [%+v]", launchPlan.Closure.ExpectedInputs, lpExpectedInputs) - logger.Debugf(ctx, "Found artifact keys: %v", artifactTrackers) + logger.Debugf(ctx, "Found artifact trackers: %v", artifactTrackers) logger.Debugf(ctx, "Found artifact IDs: %v", usedArtifactIDs) } else { @@ -1173,6 +1168,7 @@ func (m *ExecutionManager) launchExecutionAndPrepareModel( // Publish of event is also gated on the artifact client being available, even though it's not directly required. // TODO: Artifact feature gate, remove when ready if m.artifactRegistry.GetClient() != nil { + // TODO: Add principal m.publishExecutionStart(ctx, workflowExecutionID, request.Spec.LaunchPlan, workflow.Id, artifactTrackers, usedArtifactIDs) } @@ -1227,17 +1223,23 @@ func (m *ExecutionManager) launchExecutionAndPrepareModel( // publishExecutionStart is an event that Admin publishes for artifact lineage. func (m *ExecutionManager) publishExecutionStart(ctx context.Context, executionID core.WorkflowExecutionIdentifier, - launchPlanID *core.Identifier, workflowID *core.Identifier, inputArtifactKeys []string, usedArtifactIDs []*core.ArtifactID) { + launchPlanID *core.Identifier, workflowID *core.Identifier, artifactTrackers map[string]string, usedArtifactIDs []*core.ArtifactID) { + + var artifactTrackerList []string + // Use a list instead of the fake set + for k := range artifactTrackers { + artifactTrackerList = append(artifactTrackerList, k) + } - if len(inputArtifactKeys) > 0 || len(usedArtifactIDs) > 0 { - logger.Debugf(ctx, "Sending execution start event for execution [%+v] with input artifact keys [%+v] and used artifact ids [%+v]", executionID, inputArtifactKeys, usedArtifactIDs) + if len(artifactTrackerList) > 0 || len(usedArtifactIDs) > 0 { + logger.Debugf(ctx, "Sending execution start event for execution [%+v] with trackers [%+v] and artifact ids [%+v]", executionID, artifactTrackerList, usedArtifactIDs) request := event.CloudEventExecutionStart{ - ExecutionId: &executionID, - LaunchPlanId: launchPlanID, - WorkflowId: workflowID, - ArtifactIds: usedArtifactIDs, - ArtifactKeys: inputArtifactKeys, + ExecutionId: &executionID, + LaunchPlanId: launchPlanID, + WorkflowId: workflowID, + ArtifactIds: usedArtifactIDs, + ArtifactTrackers: artifactTrackerList, } go func() { ceCtx := context.TODO() From c446f2ebf11c51ca5dad4db802547a4a891d8d99 Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Fri, 5 Jan 2024 13:49:07 +0800 Subject: [PATCH 11/15] update ParseFlyteURL to not return or parse for the :tag anymore since we're no longer supporting that feature (yet), change the parsing logic to handle versions with slashes, update tests to match, update events handler to read the tracking tag and construct artifact IDs out of it, install tracking string into literal metadata that's just project/domain/name@version Signed-off-by: Yee Hing Tong --- flyteartifacts/pkg/db/storage.go | 6 +-- flyteartifacts/pkg/lib/constants.go | 5 +- flyteartifacts/pkg/lib/url_parse.go | 50 +++++++++---------- flyteartifacts/pkg/lib/url_parse_test.go | 36 +++++-------- .../pkg/server/processor/events_handler.go | 20 ++++++-- flyteartifacts/pkg/server/server.go | 3 ++ flyteartifacts/pkg/server/service.go | 21 ++++++-- 7 files changed, 80 insertions(+), 61 deletions(-) diff --git a/flyteartifacts/pkg/db/storage.go b/flyteartifacts/pkg/db/storage.go index a7387312fe..ca352be656 100644 --- a/flyteartifacts/pkg/db/storage.go +++ b/flyteartifacts/pkg/db/storage.go @@ -99,14 +99,12 @@ func (r *RDSStorage) CreateArtifact(ctx context.Context, serviceModel models.Art } func (r *RDSStorage) handleUriGet(ctx context.Context, uri string) (models.Artifact, error) { - artifactID, tag, err := lib.ParseFlyteURL(uri) + artifactID, err := lib.ParseFlyteURL(uri) if err != nil { logger.Errorf(ctx, "Failed to parse uri [%s]: %+v", uri, err) return models.Artifact{}, err } - if tag != "" { - return models.Artifact{}, fmt.Errorf("tag not implemented yet") - } + logger.Debugf(ctx, "Extracted artifact id [%v] from uri [%s], using id handler", artifactID, uri) return r.handleArtifactIdGet(ctx, artifactID) } diff --git a/flyteartifacts/pkg/lib/constants.go b/flyteartifacts/pkg/lib/constants.go index 845b570525..767d5146db 100644 --- a/flyteartifacts/pkg/lib/constants.go +++ b/flyteartifacts/pkg/lib/constants.go @@ -1,4 +1,7 @@ package lib -// ArtifactKey - This is used to tag Literals as a tracking bit. +// ArtifactKey - This string is used to identify Artifacts when all you have +// is the underlying Literal. Look for this key under the literal's metadata field. This situation can arise +// when a user fetches an artifact, using something like flyte remote or flyte console, and then kicks +// off an execution using that literal. const ArtifactKey = "_ua" diff --git a/flyteartifacts/pkg/lib/url_parse.go b/flyteartifacts/pkg/lib/url_parse.go index 489e416d64..cf4f1023ca 100644 --- a/flyteartifacts/pkg/lib/url_parse.go +++ b/flyteartifacts/pkg/lib/url_parse.go @@ -2,50 +2,48 @@ package lib import ( "errors" - "net/url" - "regexp" - "strings" - + "fmt" "github.com/flyteorg/flyte/flyteartifacts/pkg/models" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" + "net/url" + "regexp" ) -var flyteURLNameRe = regexp.MustCompile(`(?P[\w/-]+)(?:(:(?P\w+))?)(?:(@(?P\w+))?)`) +var flyteURLNameRe = regexp.MustCompile(`(?P[\w-]+)/(?P[\w-]+)/(?P[\w/-]+)(@(?P[\w/-]+))?`) -func ParseFlyteURL(urlStr string) (core.ArtifactID, string, error) { +func ParseFlyteURL(urlStr string) (core.ArtifactID, error) { if len(urlStr) == 0 { - return core.ArtifactID{}, "", errors.New("URL cannot be empty") + return core.ArtifactID{}, errors.New("URL cannot be empty") } parsed, err := url.Parse(urlStr) if err != nil { - return core.ArtifactID{}, "", err + return core.ArtifactID{}, err } queryValues, err := url.ParseQuery(parsed.RawQuery) if err != nil { - return core.ArtifactID{}, "", err - } - projectDomainName := strings.Split(strings.Trim(parsed.Path, "/"), "/") - if len(projectDomainName) < 3 { - return core.ArtifactID{}, "", errors.New("invalid URL format") + return core.ArtifactID{}, err } - project, domain, name := projectDomainName[0], projectDomainName[1], strings.Join(projectDomainName[2:], "/") - version := "" - tag := "" + //projectDomainName := strings.Split(strings.Trim(parsed.Path, "/"), "/") + //if len(projectDomainName) < 3 { + // return core.ArtifactID{}, errors.New("invalid URL format") + //} + //project, domain, name := projectDomainName[0], projectDomainName[1], strings.Join(projectDomainName[2:], "/") + var project, domain, name, version string queryDict := make(map[string]string) - if match := flyteURLNameRe.FindStringSubmatch(name); match != nil { - name = match[1] - if match[3] != "" { - tag = match[3] + if match := flyteURLNameRe.FindStringSubmatch(parsed.Path); match != nil { + if len(match) < 4 { + return core.ArtifactID{}, fmt.Errorf("insufficient components specified %s", parsed.Path) } - if match[5] != "" { + project = match[1] + domain = match[2] + name = match[3] + if len(match) > 5 { version = match[5] } - - if tag != "" && (version != "" || len(queryValues) > 0) { - return core.ArtifactID{}, "", errors.New("cannot specify tag with version or querydict") - } + } else { + return core.ArtifactID{}, fmt.Errorf("unable to parse %s", parsed.Path) } for key, values := range queryValues { @@ -68,5 +66,5 @@ func ParseFlyteURL(urlStr string) (core.ArtifactID, string, error) { Partitions: p, } - return a, tag, nil + return a, nil } diff --git a/flyteartifacts/pkg/lib/url_parse_test.go b/flyteartifacts/pkg/lib/url_parse_test.go index 2340d07252..d106c1cb8b 100644 --- a/flyteartifacts/pkg/lib/url_parse_test.go +++ b/flyteartifacts/pkg/lib/url_parse_test.go @@ -9,52 +9,42 @@ import ( "github.com/flyteorg/flyte/flyteartifacts/pkg/models" ) -func TestURLParseWithTag(t *testing.T) { - artifactID, tag, err := ParseFlyteURL("flyte://av0.1/project/domain/name:tag") +func TestURLParseWithVersionAndPartitions(t *testing.T) { + artifactID, err := ParseFlyteURL("flyte://av0.1/project/domain/name@version?foo=bar&ham=spam") + expPartitions := map[string]string{"foo": "bar", "ham": "spam"} assert.NoError(t, err) assert.Equal(t, "project", artifactID.ArtifactKey.Project) assert.Equal(t, "domain", artifactID.ArtifactKey.Domain) assert.Equal(t, "name", artifactID.ArtifactKey.Name) - assert.Equal(t, "", artifactID.Version) - assert.Equal(t, "tag", tag) - assert.Nil(t, artifactID.GetPartitions()) + assert.Equal(t, "version", artifactID.Version) + p := artifactID.GetPartitions() + mapP := models.PartitionsFromIdl(context.TODO(), p) + assert.Equal(t, expPartitions, mapP) } -func TestURLParseWithVersionAndPartitions(t *testing.T) { - artifactID, tag, err := ParseFlyteURL("flyte://av0.1/project/domain/name@version?foo=bar&ham=spam") +func TestURLParseWithSlashVersionAndPartitions(t *testing.T) { + artifactID, err := ParseFlyteURL("flyte://av0.1/project/domain/name/more@version/abc/0/o0?foo=bar&ham=spam") expPartitions := map[string]string{"foo": "bar", "ham": "spam"} assert.NoError(t, err) assert.Equal(t, "project", artifactID.ArtifactKey.Project) assert.Equal(t, "domain", artifactID.ArtifactKey.Domain) - assert.Equal(t, "name", artifactID.ArtifactKey.Name) - assert.Equal(t, "version", artifactID.Version) - assert.Equal(t, "", tag) + assert.Equal(t, "name/more", artifactID.ArtifactKey.Name) + assert.Equal(t, "version/abc/0/o0", artifactID.Version) p := artifactID.GetPartitions() mapP := models.PartitionsFromIdl(context.TODO(), p) assert.Equal(t, expPartitions, mapP) } -func TestURLParseFailsWithBothTagAndPartitions(t *testing.T) { - _, _, err := ParseFlyteURL("flyte://av0.1/project/domain/name:tag?foo=bar&ham=spam") - assert.Error(t, err) -} - -func TestURLParseWithBothTagAndVersion(t *testing.T) { - _, _, err := ParseFlyteURL("flyte://av0.1/project/domain/name:tag@version") - assert.Error(t, err) -} - func TestURLParseNameWithSlashes(t *testing.T) { - artifactID, tag, err := ParseFlyteURL("flyte://av0.1/project/domain/name/with/slashes") + artifactID, err := ParseFlyteURL("flyte://av0.1/project/domain/name/with/slashes") assert.NoError(t, err) assert.Equal(t, "project", artifactID.ArtifactKey.Project) assert.Equal(t, "domain", artifactID.ArtifactKey.Domain) assert.Equal(t, "name/with/slashes", artifactID.ArtifactKey.Name) - assert.Equal(t, "", tag) - artifactID, _, err = ParseFlyteURL("flyte://av0.1/project/domain/name/with/slashes?ds=2020-01-01") + artifactID, err = ParseFlyteURL("flyte://av0.1/project/domain/name/with/slashes?ds=2020-01-01") assert.NoError(t, err) assert.Equal(t, "name/with/slashes", artifactID.ArtifactKey.Name) assert.Equal(t, "project", artifactID.ArtifactKey.Project) diff --git a/flyteartifacts/pkg/server/processor/events_handler.go b/flyteartifacts/pkg/server/processor/events_handler.go index 71f7813268..929844194b 100644 --- a/flyteartifacts/pkg/server/processor/events_handler.go +++ b/flyteartifacts/pkg/server/processor/events_handler.go @@ -46,11 +46,25 @@ func (s *ServiceCallHandler) HandleEvent(ctx context.Context, cloudEvent *event2 func (s *ServiceCallHandler) HandleEventExecStart(ctx context.Context, evt *event.CloudEventExecutionStart) error { - if len(evt.ArtifactIds) > 0 { + var inputsUsed []*core.ArtifactID + + inputsUsed = append(inputsUsed, evt.ArtifactIds...) + for _, x := range evt.ArtifactTrackers { + + dummyURI := fmt.Sprintf("flyte://av0.1/%s", x) + idWithVersion, err := lib.ParseFlyteURL(dummyURI) + if err != nil { + logger.Errorf(ctx, "Error parsing input %s for execution start: %v", x, err) + return err + } + inputsUsed = append(inputsUsed, &idWithVersion) + } + + if len(inputsUsed) > 0 { // metric req := &artifact.ExecutionInputsRequest{ ExecutionId: evt.ExecutionId, - Inputs: evt.ArtifactIds, + Inputs: inputsUsed, } _, err := s.service.SetExecutionInputs(ctx, req) if err != nil { @@ -172,8 +186,6 @@ func getPartitionsAndTag(ctx context.Context, partialID core.ArtifactID, variabl } var partitions map[string]string - // todo: consider updating idl to make CreateArtifactRequest just take a full Partitions - // object rather than a mapstrstr @eapolinario @enghabu if partialID.GetPartitions().GetValue() != nil && len(partialID.GetPartitions().GetValue()) > 0 { partitions = make(map[string]string, len(partialID.GetPartitions().GetValue())) for k, lv := range partialID.GetPartitions().GetValue() { diff --git a/flyteartifacts/pkg/server/server.go b/flyteartifacts/pkg/server/server.go index 89e9448205..253b0fb4e2 100644 --- a/flyteartifacts/pkg/server/server.go +++ b/flyteartifacts/pkg/server/server.go @@ -31,6 +31,9 @@ type ArtifactService struct { } func (a *ArtifactService) CreateArtifact(ctx context.Context, req *artifact.CreateArtifactRequest) (*artifact.CreateArtifactResponse, error) { + + // todo: add a request validating section, check for nils, etc. + resp, err := a.Service.CreateArtifact(ctx, req) if err != nil { return resp, err diff --git a/flyteartifacts/pkg/server/service.go b/flyteartifacts/pkg/server/service.go index abc1b81b6a..570902fda7 100644 --- a/flyteartifacts/pkg/server/service.go +++ b/flyteartifacts/pkg/server/service.go @@ -3,6 +3,7 @@ package server import ( "context" "fmt" + "github.com/flyteorg/flyte/flyteartifacts/pkg/lib" "github.com/flyteorg/flyte/flyteartifacts/pkg/models" "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/artifact" @@ -14,16 +15,30 @@ import ( type CoreService struct { Storage StorageInterface BlobStore BlobStoreInterface - // SearchHandler SearchHandlerInterface +} + +// This string is a tracker basically that will be installed in the metadata of the literal. See the ArtifactKey constant for more information. +func (c *CoreService) getTrackingString(request artifact.CreateArtifactRequest) string { + ak := request.ArtifactKey + t := fmt.Sprintf("%s/%s/%s@%s", ak.Project, ak.Domain, ak.Name, request.Version) + + return t } func (c *CoreService) CreateArtifact(ctx context.Context, request *artifact.CreateArtifactRequest) (*artifact.CreateArtifactResponse, error) { - // todo: gatepr _ua tracking bit to be installed - if request == nil { + // todo: move one layer higher to server.go + if request == nil || request.GetArtifactKey() == nil { + logger.Errorf(ctx, "Ignoring nil or partially nil request") return nil, nil } + if request.GetSpec().GetValue().Metadata == nil { + request.GetSpec().GetValue().Metadata = make(map[string]string, 1) + } + trackingStr := c.getTrackingString(*request) + request.GetSpec().GetValue().Metadata[lib.ArtifactKey] = trackingStr + artifactObj, err := models.CreateArtifactModelFromRequest(ctx, request.ArtifactKey, request.Spec, request.Version, request.Partitions, request.Tag, request.Source) if err != nil { logger.Errorf(ctx, "Failed to validate Create request: %v", err) From 558f819ceafa1f5e3f7c436b7379769adf0168fd Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Fri, 5 Jan 2024 14:16:14 +0800 Subject: [PATCH 12/15] remove artifacts/config.go Signed-off-by: Yee Hing Tong --- flyteadmin/pkg/artifacts/config.go | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 flyteadmin/pkg/artifacts/config.go diff --git a/flyteadmin/pkg/artifacts/config.go b/flyteadmin/pkg/artifacts/config.go deleted file mode 100644 index c639666ffe..0000000000 --- a/flyteadmin/pkg/artifacts/config.go +++ /dev/null @@ -1,8 +0,0 @@ -package artifacts - -// gatepr: add proper config bits for this -type Config struct { - Host string `json:"host"` - Port int `json:"port"` - Insecure bool `json:"insecure"` -} From 125158308dcd7dae05e17374d86f67c1124b87fc Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Fri, 5 Jan 2024 15:18:50 +0800 Subject: [PATCH 13/15] fix admin unit test for artifact tracker Signed-off-by: Yee Hing Tong --- .../pkg/manager/impl/exec_manager_other_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/flyteadmin/pkg/manager/impl/exec_manager_other_test.go b/flyteadmin/pkg/manager/impl/exec_manager_other_test.go index 35b8e14d5b..2534d4055f 100644 --- a/flyteadmin/pkg/manager/impl/exec_manager_other_test.go +++ b/flyteadmin/pkg/manager/impl/exec_manager_other_test.go @@ -54,12 +54,16 @@ func TestTrackingBitExtract(t *testing.T) { }, } - trackers := execManager.ExtractArtifactKeys(&lit) + var trackers = make(map[string]string) + execManager.ExtractArtifactTrackers(trackers, &lit) assert.Equal(t, 1, len(trackers)) - trackers = execManager.ExtractArtifactKeys(&core.Literal{Value: &core.Literal_Map{Map: &inputMap}}) + trackers = make(map[string]string) + execManager.ExtractArtifactTrackers(trackers, &core.Literal{Value: &core.Literal_Map{Map: &inputMap}}) assert.Equal(t, 1, len(trackers)) - trackers = execManager.ExtractArtifactKeys(&core.Literal{Value: &core.Literal_Collection{Collection: &inputColl}}) + + trackers = make(map[string]string) + execManager.ExtractArtifactTrackers(trackers, &core.Literal{Value: &core.Literal_Collection{Collection: &inputColl}}) assert.Equal(t, 1, len(trackers)) - assert.Equal(t, "proj/domain/name@version", trackers[0]) + assert.Equal(t, "", trackers["proj/domain/name@version"]) } From 153484becbc74cf0e573253a4c1bd8f7cbc0371b Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Fri, 5 Jan 2024 18:33:51 +0800 Subject: [PATCH 14/15] remove comments, make getTrackingString take a pointer receiver Signed-off-by: Yee Hing Tong --- flyteartifacts/pkg/lib/url_parse.go | 6 +----- flyteartifacts/pkg/server/service.go | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/flyteartifacts/pkg/lib/url_parse.go b/flyteartifacts/pkg/lib/url_parse.go index cf4f1023ca..3d15d80ac6 100644 --- a/flyteartifacts/pkg/lib/url_parse.go +++ b/flyteartifacts/pkg/lib/url_parse.go @@ -24,11 +24,7 @@ func ParseFlyteURL(urlStr string) (core.ArtifactID, error) { if err != nil { return core.ArtifactID{}, err } - //projectDomainName := strings.Split(strings.Trim(parsed.Path, "/"), "/") - //if len(projectDomainName) < 3 { - // return core.ArtifactID{}, errors.New("invalid URL format") - //} - //project, domain, name := projectDomainName[0], projectDomainName[1], strings.Join(projectDomainName[2:], "/") + var project, domain, name, version string queryDict := make(map[string]string) diff --git a/flyteartifacts/pkg/server/service.go b/flyteartifacts/pkg/server/service.go index 570902fda7..8fc4e06da5 100644 --- a/flyteartifacts/pkg/server/service.go +++ b/flyteartifacts/pkg/server/service.go @@ -18,7 +18,7 @@ type CoreService struct { } // This string is a tracker basically that will be installed in the metadata of the literal. See the ArtifactKey constant for more information. -func (c *CoreService) getTrackingString(request artifact.CreateArtifactRequest) string { +func (c *CoreService) getTrackingString(request *artifact.CreateArtifactRequest) string { ak := request.ArtifactKey t := fmt.Sprintf("%s/%s/%s@%s", ak.Project, ak.Domain, ak.Name, request.Version) @@ -36,7 +36,7 @@ func (c *CoreService) CreateArtifact(ctx context.Context, request *artifact.Crea if request.GetSpec().GetValue().Metadata == nil { request.GetSpec().GetValue().Metadata = make(map[string]string, 1) } - trackingStr := c.getTrackingString(*request) + trackingStr := c.getTrackingString(request) request.GetSpec().GetValue().Metadata[lib.ArtifactKey] = trackingStr artifactObj, err := models.CreateArtifactModelFromRequest(ctx, request.ArtifactKey, request.Spec, request.Version, request.Partitions, request.Tag, request.Source) From 49d3f7db0d6a29b6ee15ccae43598a6b78c0ed5b Mon Sep 17 00:00:00 2001 From: Yee Hing Tong Date: Fri, 5 Jan 2024 18:36:40 +0800 Subject: [PATCH 15/15] make helm Signed-off-by: Yee Hing Tong --- charts/flyte-sandbox/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/flyte-sandbox/README.md b/charts/flyte-sandbox/README.md index e74f0724e5..25fae84538 100644 --- a/charts/flyte-sandbox/README.md +++ b/charts/flyte-sandbox/README.md @@ -45,6 +45,7 @@ A Helm chart for the Flyte local sandbox | flyte-binary.configuration.inline.cloudEvents.cloudEventVersion | string | `"v2"` | | | flyte-binary.configuration.inline.cloudEvents.enable | bool | `true` | | | flyte-binary.configuration.inline.cloudEvents.type | string | `"sandbox"` | | +| flyte-binary.configuration.inline.flyteadmin.featureGates.enableArtifacts | bool | `true` | | | flyte-binary.configuration.inline.plugins.k8s.default-env-vars[0].FLYTE_AWS_ENDPOINT | string | `"http://{{ printf \"%s-minio\" .Release.Name | trunc 63 | trimSuffix \"-\" }}.{{ .Release.Namespace }}:9000"` | | | flyte-binary.configuration.inline.plugins.k8s.default-env-vars[1].FLYTE_AWS_ACCESS_KEY_ID | string | `"minio"` | | | flyte-binary.configuration.inline.plugins.k8s.default-env-vars[2].FLYTE_AWS_SECRET_ACCESS_KEY | string | `"miniostorage"` | |