jetstream_bridge 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3609786f5181b8d4af9197952b7ff8d2878123c1c248bd6345454b99b43e0803
-  data.tar.gz: e0f521d0962785ca1c8e3cb271c7961d8aa9c55ac58b441ae04c39d150de4aae
+  metadata.gz: 0defcef0e3c705c2a62268116e62d93076b4f5ba405de6fcfc1b3ea2b0122101
+  data.tar.gz: 3eaede87e4904d755a8370042f4405011a5dd3996704a21f8f4329676a81dffd
 SHA512:
-  metadata.gz: cd6d5b0380a0ff25c60f093c7d64b80bd5733666d7621f07462817112b5fdeb4b6f63396e1be09ce7f5ad4cb9368d185ecd4a8c5674fae3e677def970fd2f1ed
-  data.tar.gz: 7d595ae9091f19e2c35168ed3422a2b5cf424d183f5d4c3942c97b423b8a9f9c70cd560e08c26979ec818929975dc590143e7fa30f5706068d594e4c59ec2598
+  metadata.gz: 58b9210d52525cc66332c68ba3c22f03b320941178635a99e489aaf62ad74a90e2bccaaab0e9851aa23397247bb0bdf4c66e2da86924249823039af66a428efd
+  data.tar.gz: d96886372c8067e1147b879f794a772df9052d12966ce20e585ee19d950876c952f76af88400b46da186a35583314e09e0b3f84e9598843696e38a8a3e96a3d5

data/lib/jetstream_bridge/topology/stream.rb

@@ -37,8 +37,7 @@ module JetstreamBridge
     def log_all_blocked(name, blocked)
       if blocked.any?
         Logging.warn(
-          "Stream #{name}: all missing subjects belong to other streams; unchanged. " \
-          "blocked=#{blocked.inspect}",
+          "Stream #{name}: all missing subjects belong to other streams; unchanged. blocked=#{blocked.inspect}",
           tag: 'JetstreamBridge::Stream'
         )
       else
@@ -54,8 +53,7 @@ module JetstreamBridge
 
     def log_not_created(name, blocked)
       Logging.warn(
-        "Not creating stream #{name}: all desired subjects belong to other streams. " \
-        "blocked=#{blocked.inspect}",
+        "Not creating stream #{name}: all desired subjects belong to other streams. blocked=#{blocked.inspect}",
         tag: 'JetstreamBridge::Stream'
       )
     end
@@ -70,10 +68,24 @@ module JetstreamBridge
       msg += " (skipped overlapped=#{blocked.inspect})" if blocked.any?
       Logging.info(msg, tag: 'JetstreamBridge::Stream')
     end
+
+    def log_config_updated(name, storage:)
+      Logging.info(
+        "Updated stream #{name} config; storage=#{storage.inspect}",
+        tag: 'JetstreamBridge::Stream'
+      )
+    end
+
+    def log_retention_mismatch(name, have:, want:)
+      Logging.warn(
+        "Stream #{name} retention mismatch (have=#{have.inspect}, want=#{want.inspect}). " \
+        "Retention is immutable; skipping retention change.",
+        tag: 'JetstreamBridge::Stream'
+      )
+    end
   end
 
-  # Ensures a stream exists and updates only uncovered subjects, using work-queue semantics:
-  # Persist with zero consumers; delete after the first ack (retention: 'workqueue').
+  # Ensures a stream exists and updates only uncovered subjects, using work-queue semantics.
   class Stream
     RETENTION = 'workqueue'
     STORAGE   = 'file'
@@ -89,17 +101,12 @@ module JetstreamBridge
           info ? ensure_update(jts, name, info, desired) : ensure_create(jts, name, desired)
         rescue NATS::JetStream::Error => e
           if StreamSupport.overlap_error?(e) && (attempts += 1) <= 1
-            Logging.warn(
-              "Overlap race while ensuring #{name}; retrying once...",
-              tag: 'JetstreamBridge::Stream'
-            )
+            Logging.warn("Overlap race while ensuring #{name}; retrying once...", tag: 'JetstreamBridge::Stream')
             sleep(0.05)
             retry
           elsif StreamSupport.overlap_error?(e)
-            Logging.warn(
-              "Overlap persists ensuring #{name}; leaving unchanged. err=#{e.message.inspect}",
-              tag: 'JetstreamBridge::Stream'
-            )
+            Logging.warn("Overlap persists ensuring #{name}; leaving unchanged. err=#{e.message.inspect}",
+                         tag: 'JetstreamBridge::Stream')
             nil
           else
             raise
@@ -109,18 +116,27 @@ module JetstreamBridge
 
       private
 
-      # ---- keep ensure_update small (<=20 lines, lower ABC) ----
       def ensure_update(jts, name, info, desired_subjects)
         existing = StreamSupport.normalize_subjects(info.config.subjects || [])
         to_add   = StreamSupport.missing_subjects(existing, desired_subjects)
+        add_subjects(jts, name, existing, to_add) if to_add.any?
 
-        return add_subjects(jts, name, existing, to_add) if to_add.any?
+        # Retention is immutable; warn if different and do not include on update.
+        have_ret = info.config.retention.to_s.downcase
+        if have_ret != RETENTION
+          StreamSupport.log_retention_mismatch(name, have: have_ret, want: RETENTION)
+        end
 
-        if config_needs_update?(info)
-          apply_update(jts, name, existing)
-          return log_config_updated(name)
+        # Storage can be updated; do it without passing retention.
+        have_storage = info.config.storage.to_s.downcase
+        if have_storage != STORAGE
+          apply_update(jts, name, existing, storage: STORAGE)
+          StreamSupport.log_config_updated(name, storage: STORAGE)
+          return
         end
 
+        return if to_add.any?
+
         StreamSupport.log_already_covered(name)
       end
 
@@ -129,36 +145,18 @@ module JetstreamBridge
         allowed, blocked = OverlapGuard.partition_allowed(jts, name, to_add)
         return StreamSupport.log_all_blocked(name, blocked) if allowed.empty?
 
-        target = merge_subjects(existing, allowed)
+        target = (existing + allowed).uniq
         OverlapGuard.check!(jts, name, target)
+        # Do not pass retention on update to avoid 10052.
         apply_update(jts, name, target)
         StreamSupport.log_updated(name, allowed, blocked)
       end
 
-      def merge_subjects(existing, allowed)
-        (existing + allowed).uniq
-      end
-
-      def config_needs_update?(info)
-        info.config.retention.to_s.downcase != RETENTION ||
-          info.config.storage.to_s.downcase != STORAGE
-      end
-
-      def apply_update(jts, name, subjects)
-        jts.update_stream(
-          name: name,
-          subjects: subjects,
-          retention: RETENTION,
-          storage: STORAGE
-        )
-      end
-
-      def log_config_updated(name)
-        Logging.info(
-          "Updated stream #{name} config; retention=#{RETENTION.inspect} " \
-          "storage=#{STORAGE.inspect}",
-          tag: 'JetstreamBridge::Stream'
-        )
+      # Only include mutable fields on update (subjects, storage). Never retention.
+      def apply_update(jts, name, subjects, storage: nil)
+        params = { name: name, subjects: subjects }
+        params[:storage] = storage if storage
+        jts.update_stream(**params)
       end
 
       def ensure_create(jts, name, desired_subjects)

data/lib/jetstream_bridge/version.rb

@@ -4,5 +4,5 @@
 #
 # Version constant for the gem.
 module JetstreamBridge
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetstream_bridge
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Mike Attara