add support for recovery section in event streams (#2421)

pkg/apis/acid.zalan.do/v1/postgresql_type.go

@@ -247,16 +247,18 @@ type ConnectionPooler struct {
 
 // Stream defines properties for creating FabricEventStream resources
 type Stream struct {
-	ApplicationId string                 `json:"applicationId"`
-	Database      string                 `json:"database"`
-	Tables        map[string]StreamTable `json:"tables"`
-	Filter        map[string]*string     `json:"filter,omitempty"`
-	BatchSize     *uint32                `json:"batchSize,omitempty"`
+	ApplicationId  string                 `json:"applicationId"`
+	Database       string                 `json:"database"`
+	Tables         map[string]StreamTable `json:"tables"`
+	Filter         map[string]*string     `json:"filter,omitempty"`
+	BatchSize      *uint32                `json:"batchSize,omitempty"`
+	EnableRecovery *bool                  `json:"enableRecovery,omitempty"`
 }
 
 // StreamTable defines properties of outbox tables for FabricEventStreams
 type StreamTable struct {
-	EventType     string  `json:"eventType"`
-	IdColumn      *string `json:"idColumn,omitempty"`
-	PayloadColumn *string `json:"payloadColumn,omitempty"`
+	EventType         string  `json:"eventType"`
+	RecoveryEventType string  `json:"recoveryEventType"`
+	IdColumn          *string `json:"idColumn,omitempty"`
+	PayloadColumn     *string `json:"payloadColumn,omitempty"`
 }

pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go

@@ -1281,6 +1281,11 @@ func (in *Stream) DeepCopyInto(out *Stream) {
 		*out = new(uint32)
 		**out = **in
 	}
+	if in.EnableRecovery != nil {
+		in, out := &in.EnableRecovery, &out.EnableRecovery
+		*out = new(bool)
+		**out = **in
+	}
 	return
 }
 

pkg/apis/zalando.org/v1/fabriceventstream.go

@@ -33,9 +33,10 @@ type FabricEventStreamList struct {
 
 // EventStream defines the source, flow and sink of the event stream
 type EventStream struct {
-	EventStreamFlow   EventStreamFlow   `json:"flow"`
-	EventStreamSink   EventStreamSink   `json:"sink"`
-	EventStreamSource EventStreamSource `json:"source"`
+	EventStreamFlow     EventStreamFlow     `json:"flow"`
+	EventStreamSink     EventStreamSink     `json:"sink"`
+	EventStreamSource   EventStreamSource   `json:"source"`
+	EventStreamRecovery EventStreamRecovery `json:"recovery"`
 }
 
 // EventStreamFlow defines the flow characteristics of the event stream
@@ -51,6 +52,12 @@ type EventStreamSink struct {
 	MaxBatchSize *uint32 `json:"maxBatchSize,omitempty"`
 }
 
+// EventStreamRecovery defines the target of dead letter queue
+type EventStreamRecovery struct {
+	Type string           `json:"type"`
+	Sink *EventStreamSink `json:"sink"`
+}
+
 // EventStreamSource defines the source of the event stream and connection for FES operator
 type EventStreamSource struct {
 	Type             string           `json:"type"`

pkg/apis/zalando.org/v1/zz_generated.deepcopy.go

@@ -33,6 +33,12 @@ import (
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Connection) DeepCopyInto(out *Connection) {
 	*out = *in
+	if in.PublicationName != nil {
+		in, out := &in.PublicationName, &out.PublicationName
+		*out = new(string)
+		**out = **in
+	}
+	in.DBAuth.DeepCopyInto(&out.DBAuth)
 	return
 }
 
@@ -65,6 +71,10 @@ func (in *DBAuth) DeepCopy() *DBAuth {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EventStream) DeepCopyInto(out *EventStream) {
 	*out = *in
+	in.EventStreamFlow.DeepCopyInto(&out.EventStreamFlow)
+	in.EventStreamRecovery.DeepCopyInto(&out.EventStreamRecovery)
+	in.EventStreamSink.DeepCopyInto(&out.EventStreamSink)
+	in.EventStreamSource.DeepCopyInto(&out.EventStreamSource)
 	return
 }
 
@@ -81,6 +91,11 @@ func (in *EventStream) DeepCopy() *EventStream {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EventStreamFlow) DeepCopyInto(out *EventStreamFlow) {
 	*out = *in
+	if in.PayloadColumn != nil {
+		in, out := &in.PayloadColumn, &out.PayloadColumn
+		*out = new(string)
+		**out = **in
+	}
 	return
 }
 
@@ -94,9 +109,35 @@ func (in *EventStreamFlow) DeepCopy() *EventStreamFlow {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EventStreamRecovery) DeepCopyInto(out *EventStreamRecovery) {
+	*out = *in
+	if in.Sink != nil {
+		in, out := &in.Sink, &out.Sink
+		*out = new(EventStreamSink)
+		(*in).DeepCopyInto(*out)
+	}
+	return
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EventStreamRecovery) DeepCopy() *EventStreamRecovery {
+	if in == nil {
+		return nil
+	}
+	out := new(EventStreamRecovery)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EventStreamSink) DeepCopyInto(out *EventStreamSink) {
 	*out = *in
+	if in.MaxBatchSize != nil {
+		in, out := &in.MaxBatchSize, &out.MaxBatchSize
+		*out = new(uint32)
+		**out = **in
+	}
 	return
 }
 
@@ -113,6 +154,13 @@ func (in *EventStreamSink) DeepCopy() *EventStreamSink {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EventStreamSource) DeepCopyInto(out *EventStreamSource) {
 	*out = *in
+	in.Connection.DeepCopyInto(&out.Connection)
+	if in.Filter != nil {
+		in, out := &in.Filter, &out.Filter
+		*out = new(string)
+		**out = **in
+	}
+	in.EventStreamTable.DeepCopyInto(&out.EventStreamTable)
 	return
 }
 
@@ -129,6 +177,11 @@ func (in *EventStreamSource) DeepCopy() *EventStreamSource {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EventStreamTable) DeepCopyInto(out *EventStreamTable) {
 	*out = *in
+	if in.IDColumn != nil {
+		in, out := &in.IDColumn, &out.IDColumn
+		*out = new(string)
+		**out = **in
+	}
 	return
 }