fluent-plugin-gcloud-pubsub-custom 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83357d537f680aba22a540d6376fd49a9b573a40
-  data.tar.gz: 3d9184737d99e8ef792ec6d610a4da1ecd6a7c0f
+  metadata.gz: 68f6350d90177c7ec295da11f19e9a65ef5742e8
+  data.tar.gz: d4114cf5858f6391db2369c70a51ebbdaf3aa0a5
 SHA512:
-  metadata.gz: 0660bd55e9c55f7569f45d895c1668c85f2ecc21751a5dda273dba76bc0d7be6518fd33ad1b5114e4d03a186af31345a043f179c079657742de7315493dc2072
-  data.tar.gz: 1a25fc5c381a8112e1bd9ed53cd7243a8838a15bcfbd2dfe6a75045e5096611b5bb222f7c009dcba896619a440cff98c6d4a77e65838e88c44a989c55a87a5be
+  metadata.gz: 22d5d1460341bf37c49c05c25eed92c5bf859944f5d7ebbfb4e3621f94cb0deb597eebc1400a601dfd48e63a5327b1a8d1f42114d484e240e6fcd9195fa04b36
+  data.tar.gz: f2bba857a997391318244eaee64713aa3dd9718779c19a43277db9723377b90f45b98d6350f525ea1e363880ae9be5509f782f41046f3f65c36941de8a4630d6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## ChangeLog
 
+### Release 1.0.2 - 2017/09/11
+
+- Bump up google-cloud-pubsub to v0.27.x
+
 ### Release 1.0.1 - 2017/09/05
 
 - Bump up google-cloud-pubsub to v0.26.x

data/fluent-plugin-gcloud-pubsub-custom.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
   gem.homepage    = "https://github.com/mia-0032/fluent-plugin-gcloud-pubsub-custom"
   gem.summary     = gem.description
-  gem.version     = "1.0.1"
+  gem.version     = "1.0.2"
   gem.authors     = ["Yoshihiro MIYAI"]
   gem.email       = "msparrow17@gmail.com"
   gem.has_rdoc    = false
@@ -17,8 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency "fluentd", [">= 0.14.15", "< 2"]
-  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.26.0"
-  gem.add_runtime_dependency "retryable", "~> 2.0"
+  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.27.0"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"

data/lib/fluent/plugin/gcloud_pubsub/client.rb

@@ -1,5 +1,4 @@
 require 'google/cloud/pubsub'
-require 'retryable'
 
 module Fluent
   module GcloudPubSub
@@ -9,15 +8,16 @@ module Fluent
     end
 
     class Publisher
-      RETRY_COUNT = 5
-      RETRYABLE_ERRORS = [Google::Cloud::UnavailableError, Google::Cloud::DeadlineExceededError, Google::Cloud::InternalError]
-
       def initialize(project, key, topic_name, autocreate_topic)
-        Retryable.retryable(tries: RETRY_COUNT, on: RETRYABLE_ERRORS) do
-          pubsub = Google::Cloud::Pubsub.new project: project, keyfile: key
-          @client = pubsub.topic topic_name, autocreate: autocreate_topic
+        pubsub = Google::Cloud::Pubsub.new project: project, keyfile: key
+        @client = pubsub.topic topic_name
+        if @client.nil?
+          if autocreate_topic
+            @client = pubsub.create_topic topic_name
+          else
+            raise Error.new "topic:#{topic_name} does not exist."
+          end
         end
-        raise Error.new "topic:#{topic_name} does not exist." if @client.nil?
       end
 
       def publish(messages)
@@ -32,15 +32,10 @@ module Fluent
     end
 
     class Subscriber
-      RETRY_COUNT = 5
-      RETRYABLE_ERRORS = [Google::Cloud::UnavailableError, Google::Cloud::DeadlineExceededError, Google::Cloud::InternalError]
-
       def initialize(project, key, topic_name, subscription_name)
-        Retryable.retryable(tries: RETRY_COUNT, on: RETRYABLE_ERRORS) do
-          pubsub = Google::Cloud::Pubsub.new project: project, keyfile: key
-          topic = pubsub.topic topic_name
-          @client = topic.subscription subscription_name
-        end
+        pubsub = Google::Cloud::Pubsub.new project: project, keyfile: key
+        topic = pubsub.topic topic_name
+        @client = topic.subscription subscription_name
         raise Error.new "subscription:#{subscription_name} does not exist." if @client.nil?
       end
 

data/test/plugin/test_in_gcloud_pubsub.rb

@@ -108,7 +108,7 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
     end
 
     test '50x error occurred on connecting to Pub/Sub' do
-      @topic_mock.subscription('subscription-test').times(5) do
+      @topic_mock.subscription('subscription-test').once do
         raise Google::Cloud::UnavailableError.new('TEST')
       end
 
@@ -177,13 +177,13 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
     test 'simple' do
       messages = Array.new(1, DummyMessage.new)
       @subscriber.pull(immediate: true, max: 100).at_least(1) { messages }
-      @subscriber.acknowledge(messages).once
+      @subscriber.acknowledge(messages).at_least(1)
 
       d = create_driver
       d.run(expect_emits: 1, timeout: 3)
       emits = d.events
 
-      assert_equal(1, emits.length)
+      assert(1 <= emits.length)
       emits.each do |tag, time, record|
         assert_equal("test", tag)
         assert_equal({"foo" => "bar"}, record)
@@ -213,13 +213,13 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
         DummyMessage.new
       ]
       @subscriber.pull(immediate: true, max: 100).at_least(1) { messages }
-      @subscriber.acknowledge(messages).once
+      @subscriber.acknowledge(messages).at_least(1)
 
       d = create_driver("#{CONFIG}\ntag_key test_tag_key")
       d.run(expect_emits: 1, timeout: 3)
       emits = d.events
 
-      assert_equal(3, emits.length)
+      assert(3 <= emits.length)
       # test tag
       assert_equal("tag1", emits[0][0])
       assert_equal("tag2", emits[1][0])
@@ -277,7 +277,7 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
     test 'retry if raised RetryableError on acknowledge' do
       messages = Array.new(1, DummyMessage.new)
       @subscriber.pull(immediate: true, max: 100).at_least(2) { messages }
-      @subscriber.acknowledge(messages).twice { raise Google::Cloud::UnavailableError.new('TEST') }
+      @subscriber.acknowledge(messages).at_least(2) { raise Google::Cloud::UnavailableError.new('TEST') }
 
       d = create_driver("#{CONFIG}\npull_interval 0.5")
       d.run(expect_emits: 2, timeout: 3)

data/test/plugin/test_out_gcloud_pubsub.rb

@@ -75,14 +75,15 @@ class GcloudPubSubOutputTest < Test::Unit::TestCase
         autocreate_topic true
       ])
 
-      @pubsub_mock.topic("topic-test", autocreate: true).once { @publisher }
+      @pubsub_mock.topic("topic-test").once { nil }
+      @pubsub_mock.create_topic("topic-test").once { @publisher }
       d.run
     end
 
     test '40x error occurred on connecting to Pub/Sub' do
       d = create_driver
 
-      @pubsub_mock.topic('topic-test', autocreate: false).once do
+      @pubsub_mock.topic('topic-test').once do
         raise Google::Cloud::NotFoundError.new('TEST')
       end
 
@@ -94,7 +95,7 @@ class GcloudPubSubOutputTest < Test::Unit::TestCase
     test '50x error occurred on connecting to Pub/Sub' do
       d = create_driver
 
-      @pubsub_mock.topic('topic-test', autocreate: false).times(5) do
+      @pubsub_mock.topic('topic-test').once do
         raise Google::Cloud::UnavailableError.new('TEST')
       end
 
@@ -106,7 +107,7 @@ class GcloudPubSubOutputTest < Test::Unit::TestCase
     test 'topic is nil' do
       d = create_driver
 
-      @pubsub_mock.topic('topic-test', autocreate: false).once { nil }
+      @pubsub_mock.topic('topic-test').once { nil }
 
       assert_raise Fluent::GcloudPubSub::Error do
         d.run {}
@@ -117,7 +118,7 @@ class GcloudPubSubOutputTest < Test::Unit::TestCase
   sub_test_case 'publish' do
     setup do
       @publisher = mock!
-      @pubsub_mock = mock!.topic(anything, anything) { @publisher }
+      @pubsub_mock = mock!.topic(anything) { @publisher }
       stub(Google::Cloud::Pubsub).new { @pubsub_mock }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gcloud-pubsub-custom
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yoshihiro MIYAI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -36,28 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
-- !ruby/object:Gem::Dependency
-  name: retryable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement