diff --git a/diode-proto/diode/v1/reconciler.proto b/diode-proto/diode/v1/reconciler.proto index 300c88c8..e9e43887 100644 --- a/diode-proto/diode/v1/reconciler.proto +++ b/diode-proto/diode/v1/reconciler.proto @@ -113,17 +113,15 @@ message RetrieveIngestionLogsResponse { // The request to take action on an ingestion log message ActionIngestionLogRequest { - message DiffAction {} - message ApplyAction {} - message RejectAction {} - - oneof action { - DiffAction diff = 1; - ApplyAction apply = 2; - RejectAction reject = 3; + enum Action { + DIFF = 0; + APPLY = 1; + REJECT = 2; } - string ingestion_log_id = 4; - optional string branch_id = 5; + + Action action = 1; + string ingestion_log_id = 2; + optional string branch_id = 3; } // The response from the ActionIngestionLog request diff --git a/diode-server/gen/diode/v1/reconcilerpb/reconciler.pb.go b/diode-server/gen/diode/v1/reconcilerpb/reconciler.pb.go index c64eb1fc..ce62fe94 100644 --- a/diode-server/gen/diode/v1/reconcilerpb/reconciler.pb.go +++ b/diode-server/gen/diode/v1/reconcilerpb/reconciler.pb.go @@ -77,6 +77,55 @@ func (State) EnumDescriptor() ([]byte, []int) { return file_diode_v1_reconciler_proto_rawDescGZIP(), []int{0} } +type ActionIngestionLogRequest_Action int32 + +const ( + ActionIngestionLogRequest_DIFF ActionIngestionLogRequest_Action = 0 + ActionIngestionLogRequest_APPLY ActionIngestionLogRequest_Action = 1 + ActionIngestionLogRequest_REJECT ActionIngestionLogRequest_Action = 2 +) + +// Enum value maps for ActionIngestionLogRequest_Action. +var ( + ActionIngestionLogRequest_Action_name = map[int32]string{ + 0: "DIFF", + 1: "APPLY", + 2: "REJECT", + } + ActionIngestionLogRequest_Action_value = map[string]int32{ + "DIFF": 0, + "APPLY": 1, + "REJECT": 2, + } +) + +func (x ActionIngestionLogRequest_Action) Enum() *ActionIngestionLogRequest_Action { + p := new(ActionIngestionLogRequest_Action) + *p = x + return p +} + +func (x ActionIngestionLogRequest_Action) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ActionIngestionLogRequest_Action) Descriptor() protoreflect.EnumDescriptor { + return file_diode_v1_reconciler_proto_enumTypes[1].Descriptor() +} + +func (ActionIngestionLogRequest_Action) Type() protoreflect.EnumType { + return &file_diode_v1_reconciler_proto_enumTypes[1] +} + +func (x ActionIngestionLogRequest_Action) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ActionIngestionLogRequest_Action.Descriptor instead. +func (ActionIngestionLogRequest_Action) EnumDescriptor() ([]byte, []int) { + return file_diode_v1_reconciler_proto_rawDescGZIP(), []int{9, 0} +} + // An ingestion data source type IngestionDataSource struct { state protoimpl.MessageState @@ -737,14 +786,9 @@ type ActionIngestionLogRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Types that are assignable to Action: - // - // *ActionIngestionLogRequest_Diff - // *ActionIngestionLogRequest_Apply - // *ActionIngestionLogRequest_Reject - Action isActionIngestionLogRequest_Action `protobuf_oneof:"action"` - IngestionLogId string `protobuf:"bytes,4,opt,name=ingestion_log_id,json=ingestionLogId,proto3" json:"ingestion_log_id,omitempty"` - BranchId *string `protobuf:"bytes,5,opt,name=branch_id,json=branchId,proto3,oneof" json:"branch_id,omitempty"` + Action ActionIngestionLogRequest_Action `protobuf:"varint,1,opt,name=action,proto3,enum=diode.v1.ActionIngestionLogRequest_Action" json:"action,omitempty"` + IngestionLogId string `protobuf:"bytes,2,opt,name=ingestion_log_id,json=ingestionLogId,proto3" json:"ingestion_log_id,omitempty"` + BranchId *string `protobuf:"bytes,3,opt,name=branch_id,json=branchId,proto3,oneof" json:"branch_id,omitempty"` } func (x *ActionIngestionLogRequest) Reset() { @@ -777,32 +821,11 @@ func (*ActionIngestionLogRequest) Descriptor() ([]byte, []int) { return file_diode_v1_reconciler_proto_rawDescGZIP(), []int{9} } -func (m *ActionIngestionLogRequest) GetAction() isActionIngestionLogRequest_Action { - if m != nil { - return m.Action - } - return nil -} - -func (x *ActionIngestionLogRequest) GetDiff() *ActionIngestionLogRequest_DiffAction { - if x, ok := x.GetAction().(*ActionIngestionLogRequest_Diff); ok { - return x.Diff - } - return nil -} - -func (x *ActionIngestionLogRequest) GetApply() *ActionIngestionLogRequest_ApplyAction { - if x, ok := x.GetAction().(*ActionIngestionLogRequest_Apply); ok { - return x.Apply +func (x *ActionIngestionLogRequest) GetAction() ActionIngestionLogRequest_Action { + if x != nil { + return x.Action } - return nil -} - -func (x *ActionIngestionLogRequest) GetReject() *ActionIngestionLogRequest_RejectAction { - if x, ok := x.GetAction().(*ActionIngestionLogRequest_Reject); ok { - return x.Reject - } - return nil + return ActionIngestionLogRequest_DIFF } func (x *ActionIngestionLogRequest) GetIngestionLogId() string { @@ -819,28 +842,6 @@ func (x *ActionIngestionLogRequest) GetBranchId() string { return "" } -type isActionIngestionLogRequest_Action interface { - isActionIngestionLogRequest_Action() -} - -type ActionIngestionLogRequest_Diff struct { - Diff *ActionIngestionLogRequest_DiffAction `protobuf:"bytes,1,opt,name=diff,proto3,oneof"` -} - -type ActionIngestionLogRequest_Apply struct { - Apply *ActionIngestionLogRequest_ApplyAction `protobuf:"bytes,2,opt,name=apply,proto3,oneof"` -} - -type ActionIngestionLogRequest_Reject struct { - Reject *ActionIngestionLogRequest_RejectAction `protobuf:"bytes,3,opt,name=reject,proto3,oneof"` -} - -func (*ActionIngestionLogRequest_Diff) isActionIngestionLogRequest_Action() {} - -func (*ActionIngestionLogRequest_Apply) isActionIngestionLogRequest_Action() {} - -func (*ActionIngestionLogRequest_Reject) isActionIngestionLogRequest_Action() {} - // The response from the ActionIngestionLog request type ActionIngestionLogResponse struct { state protoimpl.MessageState @@ -1009,114 +1010,6 @@ func (x *IngestionError_Details_Error) GetChangeId() string { return "" } -type ActionIngestionLogRequest_DiffAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ActionIngestionLogRequest_DiffAction) Reset() { - *x = ActionIngestionLogRequest_DiffAction{} - mi := &file_diode_v1_reconciler_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ActionIngestionLogRequest_DiffAction) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ActionIngestionLogRequest_DiffAction) ProtoMessage() {} - -func (x *ActionIngestionLogRequest_DiffAction) ProtoReflect() protoreflect.Message { - mi := &file_diode_v1_reconciler_proto_msgTypes[13] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ActionIngestionLogRequest_DiffAction.ProtoReflect.Descriptor instead. -func (*ActionIngestionLogRequest_DiffAction) Descriptor() ([]byte, []int) { - return file_diode_v1_reconciler_proto_rawDescGZIP(), []int{9, 0} -} - -type ActionIngestionLogRequest_ApplyAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ActionIngestionLogRequest_ApplyAction) Reset() { - *x = ActionIngestionLogRequest_ApplyAction{} - mi := &file_diode_v1_reconciler_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ActionIngestionLogRequest_ApplyAction) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ActionIngestionLogRequest_ApplyAction) ProtoMessage() {} - -func (x *ActionIngestionLogRequest_ApplyAction) ProtoReflect() protoreflect.Message { - mi := &file_diode_v1_reconciler_proto_msgTypes[14] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ActionIngestionLogRequest_ApplyAction.ProtoReflect.Descriptor instead. -func (*ActionIngestionLogRequest_ApplyAction) Descriptor() ([]byte, []int) { - return file_diode_v1_reconciler_proto_rawDescGZIP(), []int{9, 1} -} - -type ActionIngestionLogRequest_RejectAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ActionIngestionLogRequest_RejectAction) Reset() { - *x = ActionIngestionLogRequest_RejectAction{} - mi := &file_diode_v1_reconciler_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ActionIngestionLogRequest_RejectAction) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ActionIngestionLogRequest_RejectAction) ProtoMessage() {} - -func (x *ActionIngestionLogRequest_RejectAction) ProtoReflect() protoreflect.Message { - mi := &file_diode_v1_reconciler_proto_msgTypes[15] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ActionIngestionLogRequest_RejectAction.ProtoReflect.Descriptor instead. -func (*ActionIngestionLogRequest_RejectAction) Descriptor() ([]byte, []int) { - return file_diode_v1_reconciler_proto_rawDescGZIP(), []int{9, 2} -} - type ActionIngestionLogResponse_Error struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1128,7 +1021,7 @@ type ActionIngestionLogResponse_Error struct { func (x *ActionIngestionLogResponse_Error) Reset() { *x = ActionIngestionLogResponse_Error{} - mi := &file_diode_v1_reconciler_proto_msgTypes[16] + mi := &file_diode_v1_reconciler_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1140,7 +1033,7 @@ func (x *ActionIngestionLogResponse_Error) String() string { func (*ActionIngestionLogResponse_Error) ProtoMessage() {} func (x *ActionIngestionLogResponse_Error) ProtoReflect() protoreflect.Message { - mi := &file_diode_v1_reconciler_proto_msgTypes[16] + mi := &file_diode_v1_reconciler_proto_msgTypes[13] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1297,82 +1190,71 @@ var file_diode_v1_reconciler_proto_rawDesc = []byte{ 0x52, 0x07, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x50, 0x61, 0x67, 0x65, 0x54, 0x6f, 0x6b, 0x65, - 0x6e, 0x22, 0x87, 0x03, 0x0a, 0x19, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, + 0x6e, 0x22, 0xe4, 0x01, 0x0a, 0x19, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x44, 0x0a, 0x04, 0x64, 0x69, 0x66, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, - 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, - 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x2e, 0x44, 0x69, 0x66, 0x66, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, - 0x04, 0x64, 0x69, 0x66, 0x66, 0x12, 0x47, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, - 0x6f, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x05, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x4a, - 0x0a, 0x06, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, - 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x28, 0x0a, 0x10, 0x69, 0x6e, - 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, - 0x6f, 0x67, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x09, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f, 0x69, - 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x08, 0x62, 0x72, 0x61, 0x6e, 0x63, - 0x68, 0x49, 0x64, 0x88, 0x01, 0x01, 0x1a, 0x0c, 0x0a, 0x0a, 0x44, 0x69, 0x66, 0x66, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x0d, 0x0a, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x1a, 0x0e, 0x0a, 0x0c, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x42, 0x08, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0x0a, - 0x0a, 0x5f, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f, 0x69, 0x64, 0x22, 0xc1, 0x01, 0x0a, 0x1a, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, - 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x03, 0x6c, 0x6f, - 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, - 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x42, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x18, 0x02, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, - 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, - 0x52, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x1a, 0x35, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, - 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, - 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x2a, - 0x50, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, - 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55, 0x45, - 0x55, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x43, 0x49, - 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, - 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x4f, 0x5f, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x53, 0x10, - 0x04, 0x32, 0xdf, 0x02, 0x0a, 0x11, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x63, 0x69, 0x6c, 0x65, 0x72, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7f, 0x0a, 0x1c, 0x52, 0x65, 0x74, 0x72, 0x69, - 0x65, 0x76, 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, - 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x2d, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, - 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, + 0x42, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x2a, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x69, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, + 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x49, 0x64, 0x12, 0x20, 0x0a, + 0x09, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x48, 0x00, 0x52, 0x08, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x49, 0x64, 0x88, 0x01, 0x01, 0x22, + 0x29, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x49, 0x46, + 0x46, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x01, 0x12, 0x0a, + 0x0a, 0x06, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x10, 0x02, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x62, + 0x72, 0x61, 0x6e, 0x63, 0x68, 0x5f, 0x69, 0x64, 0x22, 0xc1, 0x01, 0x0a, 0x1a, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, 0x03, 0x6c, 0x6f, + 0x67, 0x12, 0x42, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x2a, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x06, 0x65, + 0x72, 0x72, 0x6f, 0x72, 0x73, 0x1a, 0x35, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x18, + 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x2a, 0x50, 0x0a, 0x05, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, + 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55, 0x45, 0x55, 0x45, 0x44, + 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x45, 0x43, 0x4f, 0x4e, 0x43, 0x49, 0x4c, 0x45, 0x44, + 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0e, + 0x0a, 0x0a, 0x4e, 0x4f, 0x5f, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x53, 0x10, 0x04, 0x32, 0xdf, + 0x02, 0x0a, 0x11, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x63, 0x69, 0x6c, 0x65, 0x72, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x7f, 0x0a, 0x1c, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, + 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x73, 0x12, 0x2d, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, + 0x6e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, + 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, + 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x68, 0x0a, 0x15, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, + 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x26, + 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, + 0x76, 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, - 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x68, 0x0a, 0x15, 0x52, 0x65, 0x74, 0x72, - 0x69, 0x65, 0x76, 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, - 0x73, 0x12, 0x26, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x74, - 0x72, 0x69, 0x65, 0x76, 0x65, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, - 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x64, 0x69, 0x6f, 0x64, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x49, 0x6e, 0x67, - 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x5f, 0x0a, 0x12, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, - 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x12, 0x23, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, - 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, - 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, - 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x42, 0xa4, 0x01, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x69, 0x6f, 0x64, - 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0f, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x63, 0x69, 0x6c, 0x65, 0x72, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x65, 0x74, 0x62, 0x6f, 0x78, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x64, - 0x69, 0x6f, 0x64, 0x65, 0x2f, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x72, - 0x65, 0x63, 0x6f, 0x6e, 0x63, 0x69, 0x6c, 0x65, 0x72, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x44, 0x58, - 0x58, 0xaa, 0x02, 0x08, 0x44, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x08, 0x44, - 0x69, 0x6f, 0x64, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x14, 0x44, 0x69, 0x6f, 0x64, 0x65, 0x5c, - 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, - 0x09, 0x44, 0x69, 0x6f, 0x64, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x5f, 0x0a, 0x12, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, + 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x12, 0x23, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x69, 0x6f, 0x6e, + 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x64, 0x69, 0x6f, + 0x64, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x67, 0x65, + 0x73, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x42, 0xa4, 0x01, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x76, + 0x31, 0x42, 0x0f, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x63, 0x69, 0x6c, 0x65, 0x72, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x6e, 0x65, 0x74, 0x62, 0x6f, 0x78, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x64, 0x69, 0x6f, 0x64, + 0x65, 0x2f, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x67, + 0x65, 0x6e, 0x2f, 0x64, 0x69, 0x6f, 0x64, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x63, 0x6f, + 0x6e, 0x63, 0x69, 0x6c, 0x65, 0x72, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x44, 0x58, 0x58, 0xaa, 0x02, + 0x08, 0x44, 0x69, 0x6f, 0x64, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x08, 0x44, 0x69, 0x6f, 0x64, + 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x14, 0x44, 0x69, 0x6f, 0x64, 0x65, 0x5c, 0x56, 0x31, 0x5c, + 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x09, 0x44, 0x69, + 0x6f, 0x64, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1387,56 +1269,52 @@ func file_diode_v1_reconciler_proto_rawDescGZIP() []byte { return file_diode_v1_reconciler_proto_rawDescData } -var file_diode_v1_reconciler_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_diode_v1_reconciler_proto_msgTypes = make([]protoimpl.MessageInfo, 17) +var file_diode_v1_reconciler_proto_enumTypes = make([]protoimpl.EnumInfo, 2) +var file_diode_v1_reconciler_proto_msgTypes = make([]protoimpl.MessageInfo, 14) var file_diode_v1_reconciler_proto_goTypes = []any{ - (State)(0), // 0: diode.v1.State - (*IngestionDataSource)(nil), // 1: diode.v1.IngestionDataSource - (*RetrieveIngestionDataSourcesRequest)(nil), // 2: diode.v1.RetrieveIngestionDataSourcesRequest - (*RetrieveIngestionDataSourcesResponse)(nil), // 3: diode.v1.RetrieveIngestionDataSourcesResponse - (*IngestionError)(nil), // 4: diode.v1.IngestionError - (*IngestionMetrics)(nil), // 5: diode.v1.IngestionMetrics - (*ChangeSet)(nil), // 6: diode.v1.ChangeSet - (*IngestionLog)(nil), // 7: diode.v1.IngestionLog - (*RetrieveIngestionLogsRequest)(nil), // 8: diode.v1.RetrieveIngestionLogsRequest - (*RetrieveIngestionLogsResponse)(nil), // 9: diode.v1.RetrieveIngestionLogsResponse - (*ActionIngestionLogRequest)(nil), // 10: diode.v1.ActionIngestionLogRequest - (*ActionIngestionLogResponse)(nil), // 11: diode.v1.ActionIngestionLogResponse - (*IngestionError_Details)(nil), // 12: diode.v1.IngestionError.Details - (*IngestionError_Details_Error)(nil), // 13: diode.v1.IngestionError.Details.Error - (*ActionIngestionLogRequest_DiffAction)(nil), // 14: diode.v1.ActionIngestionLogRequest.DiffAction - (*ActionIngestionLogRequest_ApplyAction)(nil), // 15: diode.v1.ActionIngestionLogRequest.ApplyAction - (*ActionIngestionLogRequest_RejectAction)(nil), // 16: diode.v1.ActionIngestionLogRequest.RejectAction - (*ActionIngestionLogResponse_Error)(nil), // 17: diode.v1.ActionIngestionLogResponse.Error - (*diodepb.Entity)(nil), // 18: diode.v1.Entity + (State)(0), // 0: diode.v1.State + (ActionIngestionLogRequest_Action)(0), // 1: diode.v1.ActionIngestionLogRequest.Action + (*IngestionDataSource)(nil), // 2: diode.v1.IngestionDataSource + (*RetrieveIngestionDataSourcesRequest)(nil), // 3: diode.v1.RetrieveIngestionDataSourcesRequest + (*RetrieveIngestionDataSourcesResponse)(nil), // 4: diode.v1.RetrieveIngestionDataSourcesResponse + (*IngestionError)(nil), // 5: diode.v1.IngestionError + (*IngestionMetrics)(nil), // 6: diode.v1.IngestionMetrics + (*ChangeSet)(nil), // 7: diode.v1.ChangeSet + (*IngestionLog)(nil), // 8: diode.v1.IngestionLog + (*RetrieveIngestionLogsRequest)(nil), // 9: diode.v1.RetrieveIngestionLogsRequest + (*RetrieveIngestionLogsResponse)(nil), // 10: diode.v1.RetrieveIngestionLogsResponse + (*ActionIngestionLogRequest)(nil), // 11: diode.v1.ActionIngestionLogRequest + (*ActionIngestionLogResponse)(nil), // 12: diode.v1.ActionIngestionLogResponse + (*IngestionError_Details)(nil), // 13: diode.v1.IngestionError.Details + (*IngestionError_Details_Error)(nil), // 14: diode.v1.IngestionError.Details.Error + (*ActionIngestionLogResponse_Error)(nil), // 15: diode.v1.ActionIngestionLogResponse.Error + (*diodepb.Entity)(nil), // 16: diode.v1.Entity } var file_diode_v1_reconciler_proto_depIdxs = []int32{ - 1, // 0: diode.v1.RetrieveIngestionDataSourcesResponse.ingestion_data_sources:type_name -> diode.v1.IngestionDataSource - 12, // 1: diode.v1.IngestionError.details:type_name -> diode.v1.IngestionError.Details + 2, // 0: diode.v1.RetrieveIngestionDataSourcesResponse.ingestion_data_sources:type_name -> diode.v1.IngestionDataSource + 13, // 1: diode.v1.IngestionError.details:type_name -> diode.v1.IngestionError.Details 0, // 2: diode.v1.IngestionLog.state:type_name -> diode.v1.State - 18, // 3: diode.v1.IngestionLog.entity:type_name -> diode.v1.Entity - 4, // 4: diode.v1.IngestionLog.error:type_name -> diode.v1.IngestionError - 6, // 5: diode.v1.IngestionLog.change_set:type_name -> diode.v1.ChangeSet + 16, // 3: diode.v1.IngestionLog.entity:type_name -> diode.v1.Entity + 5, // 4: diode.v1.IngestionLog.error:type_name -> diode.v1.IngestionError + 7, // 5: diode.v1.IngestionLog.change_set:type_name -> diode.v1.ChangeSet 0, // 6: diode.v1.RetrieveIngestionLogsRequest.state:type_name -> diode.v1.State - 7, // 7: diode.v1.RetrieveIngestionLogsResponse.logs:type_name -> diode.v1.IngestionLog - 5, // 8: diode.v1.RetrieveIngestionLogsResponse.metrics:type_name -> diode.v1.IngestionMetrics - 14, // 9: diode.v1.ActionIngestionLogRequest.diff:type_name -> diode.v1.ActionIngestionLogRequest.DiffAction - 15, // 10: diode.v1.ActionIngestionLogRequest.apply:type_name -> diode.v1.ActionIngestionLogRequest.ApplyAction - 16, // 11: diode.v1.ActionIngestionLogRequest.reject:type_name -> diode.v1.ActionIngestionLogRequest.RejectAction - 7, // 12: diode.v1.ActionIngestionLogResponse.log:type_name -> diode.v1.IngestionLog - 17, // 13: diode.v1.ActionIngestionLogResponse.errors:type_name -> diode.v1.ActionIngestionLogResponse.Error - 13, // 14: diode.v1.IngestionError.Details.errors:type_name -> diode.v1.IngestionError.Details.Error - 2, // 15: diode.v1.ReconcilerService.RetrieveIngestionDataSources:input_type -> diode.v1.RetrieveIngestionDataSourcesRequest - 8, // 16: diode.v1.ReconcilerService.RetrieveIngestionLogs:input_type -> diode.v1.RetrieveIngestionLogsRequest - 10, // 17: diode.v1.ReconcilerService.ActionIngestionLog:input_type -> diode.v1.ActionIngestionLogRequest - 3, // 18: diode.v1.ReconcilerService.RetrieveIngestionDataSources:output_type -> diode.v1.RetrieveIngestionDataSourcesResponse - 9, // 19: diode.v1.ReconcilerService.RetrieveIngestionLogs:output_type -> diode.v1.RetrieveIngestionLogsResponse - 11, // 20: diode.v1.ReconcilerService.ActionIngestionLog:output_type -> diode.v1.ActionIngestionLogResponse - 18, // [18:21] is the sub-list for method output_type - 15, // [15:18] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 8, // 7: diode.v1.RetrieveIngestionLogsResponse.logs:type_name -> diode.v1.IngestionLog + 6, // 8: diode.v1.RetrieveIngestionLogsResponse.metrics:type_name -> diode.v1.IngestionMetrics + 1, // 9: diode.v1.ActionIngestionLogRequest.action:type_name -> diode.v1.ActionIngestionLogRequest.Action + 8, // 10: diode.v1.ActionIngestionLogResponse.log:type_name -> diode.v1.IngestionLog + 15, // 11: diode.v1.ActionIngestionLogResponse.errors:type_name -> diode.v1.ActionIngestionLogResponse.Error + 14, // 12: diode.v1.IngestionError.Details.errors:type_name -> diode.v1.IngestionError.Details.Error + 3, // 13: diode.v1.ReconcilerService.RetrieveIngestionDataSources:input_type -> diode.v1.RetrieveIngestionDataSourcesRequest + 9, // 14: diode.v1.ReconcilerService.RetrieveIngestionLogs:input_type -> diode.v1.RetrieveIngestionLogsRequest + 11, // 15: diode.v1.ReconcilerService.ActionIngestionLog:input_type -> diode.v1.ActionIngestionLogRequest + 4, // 16: diode.v1.ReconcilerService.RetrieveIngestionDataSources:output_type -> diode.v1.RetrieveIngestionDataSourcesResponse + 10, // 17: diode.v1.ReconcilerService.RetrieveIngestionLogs:output_type -> diode.v1.RetrieveIngestionLogsResponse + 12, // 18: diode.v1.ReconcilerService.ActionIngestionLog:output_type -> diode.v1.ActionIngestionLogResponse + 16, // [16:19] is the sub-list for method output_type + 13, // [13:16] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_diode_v1_reconciler_proto_init() } @@ -1445,18 +1323,14 @@ func file_diode_v1_reconciler_proto_init() { return } file_diode_v1_reconciler_proto_msgTypes[7].OneofWrappers = []any{} - file_diode_v1_reconciler_proto_msgTypes[9].OneofWrappers = []any{ - (*ActionIngestionLogRequest_Diff)(nil), - (*ActionIngestionLogRequest_Apply)(nil), - (*ActionIngestionLogRequest_Reject)(nil), - } + file_diode_v1_reconciler_proto_msgTypes[9].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_diode_v1_reconciler_proto_rawDesc, - NumEnums: 1, - NumMessages: 17, + NumEnums: 2, + NumMessages: 14, NumExtensions: 0, NumServices: 1, }, diff --git a/diode-server/gen/diode/v1/reconcilerpb/reconciler.pb.validate.go b/diode-server/gen/diode/v1/reconcilerpb/reconciler.pb.validate.go index 87341581..79187394 100644 --- a/diode-server/gen/diode/v1/reconcilerpb/reconciler.pb.validate.go +++ b/diode-server/gen/diode/v1/reconcilerpb/reconciler.pb.validate.go @@ -1302,135 +1302,9 @@ func (m *ActionIngestionLogRequest) validate(all bool) error { var errors []error - // no validation rules for IngestionLogId - - switch v := m.Action.(type) { - case *ActionIngestionLogRequest_Diff: - if v == nil { - err := ActionIngestionLogRequestValidationError{ - field: "Action", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetDiff()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, ActionIngestionLogRequestValidationError{ - field: "Diff", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, ActionIngestionLogRequestValidationError{ - field: "Diff", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetDiff()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return ActionIngestionLogRequestValidationError{ - field: "Diff", - reason: "embedded message failed validation", - cause: err, - } - } - } - - case *ActionIngestionLogRequest_Apply: - if v == nil { - err := ActionIngestionLogRequestValidationError{ - field: "Action", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } + // no validation rules for Action - if all { - switch v := interface{}(m.GetApply()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, ActionIngestionLogRequestValidationError{ - field: "Apply", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, ActionIngestionLogRequestValidationError{ - field: "Apply", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetApply()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return ActionIngestionLogRequestValidationError{ - field: "Apply", - reason: "embedded message failed validation", - cause: err, - } - } - } - - case *ActionIngestionLogRequest_Reject: - if v == nil { - err := ActionIngestionLogRequestValidationError{ - field: "Action", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetReject()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, ActionIngestionLogRequestValidationError{ - field: "Reject", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, ActionIngestionLogRequestValidationError{ - field: "Reject", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetReject()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return ActionIngestionLogRequestValidationError{ - field: "Reject", - reason: "embedded message failed validation", - cause: err, - } - } - } - - default: - _ = v // ensures v is used - } + // no validation rules for IngestionLogId if m.BranchId != nil { // no validation rules for BranchId @@ -1928,322 +1802,6 @@ var _ interface { ErrorName() string } = IngestionError_Details_ErrorValidationError{} -// Validate checks the field values on ActionIngestionLogRequest_DiffAction -// with the rules defined in the proto definition for this message. If any -// rules are violated, the first error encountered is returned, or nil if -// there are no violations. -func (m *ActionIngestionLogRequest_DiffAction) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on ActionIngestionLogRequest_DiffAction -// with the rules defined in the proto definition for this message. If any -// rules are violated, the result is a list of violation errors wrapped in -// ActionIngestionLogRequest_DiffActionMultiError, or nil if none found. -func (m *ActionIngestionLogRequest_DiffAction) ValidateAll() error { - return m.validate(true) -} - -func (m *ActionIngestionLogRequest_DiffAction) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return ActionIngestionLogRequest_DiffActionMultiError(errors) - } - - return nil -} - -// ActionIngestionLogRequest_DiffActionMultiError is an error wrapping multiple -// validation errors returned by -// ActionIngestionLogRequest_DiffAction.ValidateAll() if the designated -// constraints aren't met. -type ActionIngestionLogRequest_DiffActionMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m ActionIngestionLogRequest_DiffActionMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m ActionIngestionLogRequest_DiffActionMultiError) AllErrors() []error { return m } - -// ActionIngestionLogRequest_DiffActionValidationError is the validation error -// returned by ActionIngestionLogRequest_DiffAction.Validate if the designated -// constraints aren't met. -type ActionIngestionLogRequest_DiffActionValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e ActionIngestionLogRequest_DiffActionValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e ActionIngestionLogRequest_DiffActionValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e ActionIngestionLogRequest_DiffActionValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e ActionIngestionLogRequest_DiffActionValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e ActionIngestionLogRequest_DiffActionValidationError) ErrorName() string { - return "ActionIngestionLogRequest_DiffActionValidationError" -} - -// Error satisfies the builtin error interface -func (e ActionIngestionLogRequest_DiffActionValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sActionIngestionLogRequest_DiffAction.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = ActionIngestionLogRequest_DiffActionValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = ActionIngestionLogRequest_DiffActionValidationError{} - -// Validate checks the field values on ActionIngestionLogRequest_ApplyAction -// with the rules defined in the proto definition for this message. If any -// rules are violated, the first error encountered is returned, or nil if -// there are no violations. -func (m *ActionIngestionLogRequest_ApplyAction) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on ActionIngestionLogRequest_ApplyAction -// with the rules defined in the proto definition for this message. If any -// rules are violated, the result is a list of violation errors wrapped in -// ActionIngestionLogRequest_ApplyActionMultiError, or nil if none found. -func (m *ActionIngestionLogRequest_ApplyAction) ValidateAll() error { - return m.validate(true) -} - -func (m *ActionIngestionLogRequest_ApplyAction) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return ActionIngestionLogRequest_ApplyActionMultiError(errors) - } - - return nil -} - -// ActionIngestionLogRequest_ApplyActionMultiError is an error wrapping -// multiple validation errors returned by -// ActionIngestionLogRequest_ApplyAction.ValidateAll() if the designated -// constraints aren't met. -type ActionIngestionLogRequest_ApplyActionMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m ActionIngestionLogRequest_ApplyActionMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m ActionIngestionLogRequest_ApplyActionMultiError) AllErrors() []error { return m } - -// ActionIngestionLogRequest_ApplyActionValidationError is the validation error -// returned by ActionIngestionLogRequest_ApplyAction.Validate if the -// designated constraints aren't met. -type ActionIngestionLogRequest_ApplyActionValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e ActionIngestionLogRequest_ApplyActionValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e ActionIngestionLogRequest_ApplyActionValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e ActionIngestionLogRequest_ApplyActionValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e ActionIngestionLogRequest_ApplyActionValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e ActionIngestionLogRequest_ApplyActionValidationError) ErrorName() string { - return "ActionIngestionLogRequest_ApplyActionValidationError" -} - -// Error satisfies the builtin error interface -func (e ActionIngestionLogRequest_ApplyActionValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sActionIngestionLogRequest_ApplyAction.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = ActionIngestionLogRequest_ApplyActionValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = ActionIngestionLogRequest_ApplyActionValidationError{} - -// Validate checks the field values on ActionIngestionLogRequest_RejectAction -// with the rules defined in the proto definition for this message. If any -// rules are violated, the first error encountered is returned, or nil if -// there are no violations. -func (m *ActionIngestionLogRequest_RejectAction) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on -// ActionIngestionLogRequest_RejectAction with the rules defined in the proto -// definition for this message. If any rules are violated, the result is a -// list of violation errors wrapped in -// ActionIngestionLogRequest_RejectActionMultiError, or nil if none found. -func (m *ActionIngestionLogRequest_RejectAction) ValidateAll() error { - return m.validate(true) -} - -func (m *ActionIngestionLogRequest_RejectAction) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return ActionIngestionLogRequest_RejectActionMultiError(errors) - } - - return nil -} - -// ActionIngestionLogRequest_RejectActionMultiError is an error wrapping -// multiple validation errors returned by -// ActionIngestionLogRequest_RejectAction.ValidateAll() if the designated -// constraints aren't met. -type ActionIngestionLogRequest_RejectActionMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m ActionIngestionLogRequest_RejectActionMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m ActionIngestionLogRequest_RejectActionMultiError) AllErrors() []error { return m } - -// ActionIngestionLogRequest_RejectActionValidationError is the validation -// error returned by ActionIngestionLogRequest_RejectAction.Validate if the -// designated constraints aren't met. -type ActionIngestionLogRequest_RejectActionValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e ActionIngestionLogRequest_RejectActionValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e ActionIngestionLogRequest_RejectActionValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e ActionIngestionLogRequest_RejectActionValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e ActionIngestionLogRequest_RejectActionValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e ActionIngestionLogRequest_RejectActionValidationError) ErrorName() string { - return "ActionIngestionLogRequest_RejectActionValidationError" -} - -// Error satisfies the builtin error interface -func (e ActionIngestionLogRequest_RejectActionValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sActionIngestionLogRequest_RejectAction.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = ActionIngestionLogRequest_RejectActionValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = ActionIngestionLogRequest_RejectActionValidationError{} - // Validate checks the field values on ActionIngestionLogResponse_Error with // the rules defined in the proto definition for this message. If any rules // are violated, the first error encountered is returned, or nil if there are