google-cloud-pubsub 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19d022ba204052f7d871418daa55ed9b47f9e6786abe0c2bc996eba6e31f393e
-  data.tar.gz: 5440bfb2fa042c83d0e9ea22a3bd974c517c9d7c771b291ddbe953b7f622100f
+  metadata.gz: afdce505d87a251a0408c830e80728cf68506cf5631013cfcdae0bc18dba549b
+  data.tar.gz: c46a1e91681598c21d1b4014b6fb0aadb7f8575c9c08e2c9a13ac8b91de87ed6
 SHA512:
-  metadata.gz: 0a487ba4783cb96c663b7ff96311b6514ec851aca7d0985b391574ff1161b19f8aaed391fdc3571f68103c43ab3244adc6d79e9f2a13b3a99fab792139b4da56
-  data.tar.gz: 683a30d9cd5db86e950323205007ac1e83796b386929bb41d4ed5978c1e984debdd0f7f08a273f1ff6fed4c0fcbaef4e9b5cfcfcec11c37e0ab48078ba64e50a
+  metadata.gz: 6a31118080d4ad3a6a03b1911f6ec192dfe51021140bea354568c128856bd86cfbea79fd75d6fc6457a68e7266f018f9ef1e23868ee074576539f71916f8bc57
+  data.tar.gz: 4b9ff30c34dd3e08456dce04434e7e9da0552048dc86980d3b82f0af1114377601c7a96d71e1738973df0a506302dc5a7919ac900616b7b2fca58951891e5dfc

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 2.12.1 (2022-08-21)
+
+#### Bug Fixes
+
+* update non EOS ack to return Success always ([#19023](https://github.com/googleapis/google-cloud-ruby/issues/19023)) 
+
 ### 2.12.0 (2022-08-09)
 
 #### Features

data/lib/google/cloud/pubsub/received_message.rb

@@ -204,7 +204,12 @@ module Google
         #
         def acknowledge! &block
           ensure_subscription!
-          subscription.acknowledge ack_id, &block
+          if subscription.respond_to?(:exactly_once_delivery_enabled) && subscription.exactly_once_delivery_enabled
+            subscription.acknowledge ack_id, &block
+          else
+            subscription.acknowledge ack_id
+            yield AcknowledgeResult.new(AcknowledgeResult::SUCCESS) if block_given?
+          end
         end
         alias ack! acknowledge!
 
@@ -265,7 +270,12 @@ module Google
         #
         def modify_ack_deadline! new_deadline, &block
           ensure_subscription!
-          subscription.modify_ack_deadline new_deadline, ack_id, &block
+          if subscription.respond_to?(:exactly_once_delivery_enabled) && subscription.exactly_once_delivery_enabled
+            subscription.modify_ack_deadline new_deadline, ack_id, &block
+          else
+            subscription.modify_ack_deadline new_deadline, ack_id
+            yield AcknowledgeResult.new(AcknowledgeResult::SUCCESS) if block_given?
+          end
         end
 
         ##

data/lib/google/cloud/pubsub/subscriber/timed_unary_buffer.rb

@@ -35,11 +35,11 @@ module Google
 
           PERMANENT_FAILURE = "PERMANENT_FAILURE".freeze
           # Google::Cloud::Unavailable error is already retried at gapic level
-          RETRIABLE_ERRORS = [Google::Cloud::CanceledError,
-                              Google::Cloud::DeadlineExceededError,
-                              Google::Cloud::InternalError,
-                              Google::Cloud::ResourceExhaustedError,
-                              Google::Cloud::InvalidArgumentError].freeze
+          EXACTLY_ONCE_DELIVERY_POSSIBLE_RETRIABLE_ERRORS = [Google::Cloud::CanceledError,
+                                                             Google::Cloud::DeadlineExceededError,
+                                                             Google::Cloud::InternalError,
+                                                             Google::Cloud::ResourceExhaustedError,
+                                                             Google::Cloud::InvalidArgumentError].freeze
           MAX_RETRY_DURATION = 600 # 600s since the server allows ack/modacks for 10 mins max
           MAX_TRIES = 15
           BASE_INTERVAL = 1
@@ -128,7 +128,7 @@ module Google
                 begin
                   @subscriber.service.acknowledge ack_req.subscription, *ack_req.ack_ids
                   handle_callback AcknowledgeResult.new(AcknowledgeResult::SUCCESS), ack_req.ack_ids
-                rescue *RETRIABLE_ERRORS => e
+                rescue *EXACTLY_ONCE_DELIVERY_POSSIBLE_RETRIABLE_ERRORS => e
                   handle_failure e, ack_req.ack_ids if @subscriber.exactly_once_delivery_enabled
                 rescue StandardError => e
                   handle_callback construct_result(e), ack_req.ack_ids
@@ -146,7 +146,7 @@ module Google
                   handle_callback AcknowledgeResult.new(AcknowledgeResult::SUCCESS),
                                   mod_ack_req.ack_ids,
                                   modack: true
-                rescue *RETRIABLE_ERRORS => e
+                rescue *EXACTLY_ONCE_DELIVERY_POSSIBLE_RETRIABLE_ERRORS => e
                   if @subscriber.exactly_once_delivery_enabled
                     handle_failure e, mod_ack_req.ack_ids, mod_ack_req.ack_deadline_seconds
                   end
@@ -276,7 +276,7 @@ module Google
                                   max_interval: MAX_INTERVAL,
                                   multiplier: MULTIPLIER,
                                   max_elapsed_time: MAX_RETRY_DURATION,
-                                  on: RETRIABLE_ERRORS do
+                                  on: EXACTLY_ONCE_DELIVERY_POSSIBLE_RETRIABLE_ERRORS do
                 return if ack_ids.nil?
                 begin
                   yield ack_ids

data/lib/google/cloud/pubsub/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module PubSub
-      VERSION = "2.12.0".freeze
+      VERSION = "2.12.1".freeze
     end
 
     Pubsub = PubSub unless const_defined? :Pubsub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby