From dff12e465e10681d0567b332a726081712775ebe Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Tue, 19 Sep 2023 11:35:26 +0100 Subject: [PATCH] Ignore `subject_transform_dest` in stream sourcing Signed-off-by: Neil Twigg --- server/jetstream_test.go | 6 +++--- server/stream.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/jetstream_test.go b/server/jetstream_test.go index 08c9ea25..46bc5aa9 100644 --- a/server/jetstream_test.go +++ b/server/jetstream_test.go @@ -11575,7 +11575,7 @@ func TestJetStreamMirrorBasics(t *testing.T) { createStreamServerStreamConfig(&StreamConfig{ Name: "M5", Storage: FileStorage, - Mirror: &StreamSource{Name: "S1", FilterSubject: "foo", SubjectTransformDest: "foo2"}, + Mirror: &StreamSource{Name: "S1", SubjectTransforms: []SubjectTransformConfig{{Source: "foo", Destination: "foo2"}}}, }, 0) createStreamServerStreamConfig(&StreamConfig{ @@ -11688,7 +11688,7 @@ func TestJetStreamSourceBasics(t *testing.T) { Name: "MS", Storage: FileStorage, Sources: []*StreamSource{ - {Name: "foo", SubjectTransformDest: "foo2.>"}, + {Name: "foo", SubjectTransforms: []SubjectTransformConfig{{Source: ">", Destination: "foo2.>"}}}, {Name: "bar"}, {Name: "baz"}, }, @@ -11770,7 +11770,7 @@ func TestJetStreamSourceBasics(t *testing.T) { Name: "FMS2", Storage: FileStorage, Sources: []*StreamSource{ - {Name: "TEST", OptStartSeq: 11, FilterSubject: "dlc", SubjectTransformDest: "dlc2"}, + {Name: "TEST", OptStartSeq: 11, SubjectTransforms: []SubjectTransformConfig{{Source: "dlc", Destination: "dlc2"}}}, }, } createStream(cfg) diff --git a/server/stream.go b/server/stream.go index d66f6062..f7eba930 100644 --- a/server/stream.go +++ b/server/stream.go @@ -186,7 +186,7 @@ type StreamSourceInfo struct { Active time.Duration `json:"active"` Error *ApiError `json:"error,omitempty"` FilterSubject string `json:"filter_subject,omitempty"` - SubjectTransformDest string `json:"subject_transform_dest,omitempty"` + SubjectTransformDest string `json:"-"` SubjectTransforms []SubjectTransformConfig `json:"subject_transforms,omitempty"` } @@ -196,7 +196,7 @@ type StreamSource struct { OptStartSeq uint64 `json:"opt_start_seq,omitempty"` OptStartTime *time.Time `json:"opt_start_time,omitempty"` FilterSubject string `json:"filter_subject,omitempty"` - SubjectTransformDest string `json:"subject_transform_dest,omitempty"` + SubjectTransformDest string `json:"-"` SubjectTransforms []SubjectTransformConfig `json:"subject_transforms,omitempty"` External *ExternalStream `json:"external,omitempty"`