Remove the single subject transform destination field from StreamSour…

…ce (config and info) see nats-io/nats-server#4557
nats-io · Sep 19, 2023 · 40affd3 · 40affd3
1 parent 128efc0
commit 40affd3
Showing 1 changed file with 14 additions and 22 deletions.
diff --git a/jsm.go b/jsm.go
@@ -166,14 +166,13 @@ type Placement struct {
 
 // StreamSource dictates how streams can source from other streams.
 type StreamSource struct {
-	Name                 string                   `json:"name"`
-	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"`
-	SubjectTransforms    []SubjectTransformConfig `json:"subject_transforms,omitempty"`
-	External             *ExternalStream          `json:"external,omitempty"`
-	Domain               string                   `json:"-"`
+	Name              string                   `json:"name"`
+	OptStartSeq       uint64                   `json:"opt_start_seq,omitempty"`
+	OptStartTime      *time.Time               `json:"opt_start_time,omitempty"`
+	FilterSubject     string                   `json:"filter_subject,omitempty"`
+	SubjectTransforms []SubjectTransformConfig `json:"subject_transforms,omitempty"`
+	External          *ExternalStream          `json:"external,omitempty"`
+	Domain            string                   `json:"-"`
 }
 
 // ExternalStream allows you to qualify access to a stream source in another
@@ -810,9 +809,6 @@ func (js *js) AddStream(cfg *StreamConfig, opts ...JSOpt) (*StreamInfo, error) {
 			return nil, ErrStreamSourceNotSupported
 		}
 		for i := range cfg.Sources {
-			if cfg.Sources[i].SubjectTransformDest != _EMPTY_ && resp.Sources[i].SubjectTransformDest == _EMPTY_ {
-				return nil, ErrStreamSourceSubjectTransformNotSupported
-			}
 			if len(cfg.Sources[i].SubjectTransforms) != 0 && len(resp.Sources[i].SubjectTransforms) == 0 {
 				return nil, ErrStreamSourceMultipleSubjectTransformsNotSupported
 			}
@@ -936,14 +932,13 @@ type StreamAlternate struct {
 
 // StreamSourceInfo shows information about an upstream stream source.
 type StreamSourceInfo struct {
-	Name                 string                   `json:"name"`
-	Lag                  uint64                   `json:"lag"`
-	Active               time.Duration            `json:"active"`
-	External             *ExternalStream          `json:"external"`
-	Error                *APIError                `json:"error"`
-	FilterSubject        string                   `json:"filter_subject,omitempty"`
-	SubjectTransformDest string                   `json:"subject_transform_dest,omitempty"`
-	SubjectTransforms    []SubjectTransformConfig `json:"subject_transforms,omitempty"`
+	Name              string                   `json:"name"`
+	Lag               uint64                   `json:"lag"`
+	Active            time.Duration            `json:"active"`
+	External          *ExternalStream          `json:"external"`
+	Error             *APIError                `json:"error"`
+	FilterSubject     string                   `json:"filter_subject,omitempty"`
+	SubjectTransforms []SubjectTransformConfig `json:"subject_transforms,omitempty"`
 }
 
 // StreamState is information about the given stream.
@@ -1026,9 +1021,6 @@ func (js *js) UpdateStream(cfg *StreamConfig, opts ...JSOpt) (*StreamInfo, error
 			return nil, ErrStreamSourceNotSupported
 		}
 		for i := range cfg.Sources {
-			if cfg.Sources[i].SubjectTransformDest != _EMPTY_ && resp.Sources[i].SubjectTransformDest == _EMPTY_ {
-				return nil, ErrStreamSourceSubjectTransformNotSupported
-			}
 			if len(cfg.Sources[i].SubjectTransforms) != 0 && len(resp.Sources[i].SubjectTransforms) == 0 {
 				return nil, ErrStreamSourceMultipleSubjectTransformsNotSupported
 			}