hanami-events-cloud_pubsub 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b786cbc6b85949059720828605ac3263973bda40906a06d0c879984e1f293e9c
-  data.tar.gz: 3850d7de58d0da55bd0c975b1cae04ee0fd218a47e9a1da08791e823361da33e
+  metadata.gz: 639fa55622e6b2d507f561c134d807559f514262fa046e853bac4c0ba6b9af1d
+  data.tar.gz: 61fe66adcaf2b93d19ba8b45f5aae9c0fed36820f75336e43ecb9d9d903796cd
 SHA512:
-  metadata.gz: baa476518202b7e5e71c589c16b1c31f49a5b2f8a04c90cc697ce59740fc6b5de04bf7dfa0d7c6b73169ea5d6a8bc840246c20060b9cd6f2e18ae7e21047c00a
-  data.tar.gz: 37fe813d6d91d89bf79d3b6e16fa40973a8bdd9f2ce2f7d0aea7bc3fe07ba91367c08e75b1d71af8fef09adeff0d2ef114bc31a88df7accf0815bc88c16964e5
+  metadata.gz: 667da0f37844d1101ad21e9ff32dccee22785a22deecb149bb068428d3a9af971dd017346df762ca4b3fb5ed4bd44acf00023e77f15b5720d43c9b7bc013bd72
+  data.tar.gz: 94c662671929bc356a0b7d4f9dec885b0916fa49d0205bb4bc092b40111b9e67d69a593987014316ff807c30a18baa254e9adc1fa652cc0489baf0c374bd0092

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (2.0.0)
+    hanami-events-cloud_pubsub (2.1.0)
       dry-configurable (~> 0.8.0)
       google-cloud-pubsub (~> 0.34.0)
       hanami-cli (>= 0.2.0)
@@ -49,7 +49,7 @@ GEM
       googleauth (>= 0.6.2, < 0.10.0)
       grpc (>= 1.7.2, < 2.0)
       rly (~> 0.2.3)
-    google-protobuf (3.7.0)
+    google-protobuf (3.7.0-x86_64-linux)
     googleapis-common-protos (1.3.8)
       google-protobuf (~> 3.0)
       googleapis-common-protos-types (~> 1.0)
@@ -63,7 +63,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    grpc (1.19.0)
+    grpc (1.19.0-x86_64-linux)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
     grpc-google-iam-v1 (0.6.9)

data/README.md

@@ -30,6 +30,9 @@ Hanami.configure do
       config.pubsub = { project_id: 'emulator' } # optional
       config.logger = Hanami.logger # optional
       config.namespace = :staging # optional
+      config.auto_create_topics = false # optional
+      config.auto_create_subscriptions = false # optional
+      config.error_handlers << ->(err, message) { MyErrorReporter.report(err) }
       # ...
     end
   end

data/lib/hanami/events/adapter/cloud_pubsub.rb

@@ -93,11 +93,12 @@ module Hanami
           @serializer ||= Hanami::Events::Serializer[@serializer_type].new
         end
 
-        def topic_for(event_name)
-          @topic_registry[event_name.to_s] ||=
-            begin
-              @pubsub.find_topic(event_name) || @pubsub.create_topic(event_name)
-            end
+        def topic_for(name)
+          @topic_registry[name.to_s] ||= begin
+            @pubsub.find_topic(name) ||
+              (CloudPubsub.auto_create_topics && @pubsub.create_topic(name)) ||
+              raise(CloudPubsub::Errors::TopicNotFoundError, "no topic named: #{name}")
+          end
         end
 
         def namespaced(val, sep: '.')

data/lib/hanami/events/cloud_pubsub.rb

@@ -7,6 +7,7 @@ require 'hanami/events/cloud_pubsub/middleware/stack'
 require 'hanami/events/cloud_pubsub/middleware/logging'
 require 'hanami/events/cloud_pubsub/middleware/auto_retry'
 require 'hanami/events/cloud_pubsub/runner'
+require 'hanami/events/cloud_pubsub/errors'
 require 'google/cloud/pubsub'
 require 'dry-configurable'
 
@@ -31,6 +32,8 @@ module Hanami
       end
 
       setting :project_id, reader: true
+      setting :auto_create_subscriptions, false, reader: true
+      setting :auto_create_topics, false, reader: true
       setting :logger, Logger.new(STDOUT), reader: true
       setting :subscriptions_loader, proc {
         abort <<~MSG

data/lib/hanami/events/cloud_pubsub/errors.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Hanami
+  module Events
+    module CloudPubsub
+      # Errors
+      module Errors
+        class Error < StandardError; end
+        class TopicNotFoundError < Error; end
+        class SubscriptionNotFoundError < Error; end
+      end
+    end
+  end
+end

data/lib/hanami/events/cloud_pubsub/listener.rb

@@ -17,8 +17,6 @@ module Hanami
                     :event_name,
                     :subscriber_opts,
                     :middleware
-
-        # rubocop:disable Metrics/ParameterLists
         def initialize(topic:,
                        logger:,
                        handler:,
@@ -34,7 +32,6 @@ module Hanami
           @subscriber_opts = CloudPubsub.config.subscriber.to_h.merge(subscriber_opts)
           @middleware = middleware
         end
-        # rubocop:enable Metrics/ParameterLists
 
         def register
           subscription = subscription_for(subscriber_id)
@@ -90,9 +87,9 @@ module Hanami
         end
 
         def subscription_for(name)
-          topic.create_subscription(name)
-        rescue Google::Cloud::AlreadyExistsError
-          topic.find_subscription(name)
+          topic.find_subscription(name) ||
+            (CloudPubsub.auto_create_subscriptions && topic.create_subscription(name)) ||
+            raise(Errors::SubscriptionNotFoundError, "no subscription named: #{name}")
         end
 
         def ensure_subscriber!

data/lib/hanami/events/cloud_pubsub/middleware/auto_retry.rb

@@ -11,7 +11,7 @@ module Hanami
             @logger = logger
           end
 
-          def call(message, *_args)
+          def call(message, args = {})
             succeeded = false
             failed = false
             yield
@@ -20,19 +20,19 @@ module Hanami
             failed = true
             raise err
           ensure
-            ack_or_reject(message, succeeded, failed)
+            ack_or_reject(message, succeeded, failed, args)
           end
 
           private
 
-          def ack_or_reject(message, succeeded, failed)
+          def ack_or_reject(message, succeeded, failed, args)
             id = message.message_id
 
             if succeeded
               message.acknowledge!
               logger.debug "Message(#{id}) was acknowledged"
             elsif failed
-              seconds = calculate_backoff_seconds(message)
+              seconds = calculate_backoff_seconds(message, args)
               success = message.modify_ack_deadline!(seconds)
               msg = "added #{success ? seconds : 0} seconds of delay to ack deadline"
               logger.debug "Message(#{id}) failed, #{msg}" if success
@@ -46,9 +46,16 @@ module Hanami
             @logger || CloudPubsub.logger
           end
 
-          def calculate_backoff_seconds(_message)
-            # Figure out a way to keep track of retries
-            60
+          def calculate_backoff_seconds(_message, args)
+            amt = if args.key?(:attempts)
+                    count = args[:attempts]
+                    # min + exponential + random smear
+                    15 + count**4 + (rand(30) * (count + 1))
+                  else
+                    60
+                  end
+
+            amt > 600 ? 600 : amt
           end
         end
       end

data/lib/hanami/events/cloud_pubsub/middleware/stack.rb

@@ -40,14 +40,14 @@ module Hanami
             @entries.shift
           end
 
-          def invoke(*args)
+          def invoke(*base_args)
             stack = entries.dup
 
-            traverse_stack = lambda do
+            traverse_stack = lambda do |*args|
               if stack.empty?
-                yield(*args)
+                yield(*base_args, *args)
               else
-                stack.shift.call(*args, &traverse_stack)
+                stack.shift.call(*base_args, *args, &traverse_stack)
               end
             end
 

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '2.0.0'
+      VERSION = '2.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -138,6 +138,7 @@ files:
 - lib/hanami/events/adapter/cloud_pubsub.rb
 - lib/hanami/events/cloud_pubsub.rb
 - lib/hanami/events/cloud_pubsub/cli.rb
+- lib/hanami/events/cloud_pubsub/errors.rb
 - lib/hanami/events/cloud_pubsub/handler.rb
 - lib/hanami/events/cloud_pubsub/health_check_server.rb
 - lib/hanami/events/cloud_pubsub/integration.rb