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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68f6350d90177c7ec295da11f19e9a65ef5742e8
-  data.tar.gz: d4114cf5858f6391db2369c70a51ebbdaf3aa0a5
+SHA256:
+  metadata.gz: cff8f14b950f9ad31d4ff53e99eca09abb58f9e408da1e39d47c09b339b97fff
+  data.tar.gz: 8a95a2fe872bf460727d20d6061616919de0aec557d5383347cdc43a1f261e6e
 SHA512:
-  metadata.gz: 22d5d1460341bf37c49c05c25eed92c5bf859944f5d7ebbfb4e3621f94cb0deb597eebc1400a601dfd48e63a5327b1a8d1f42114d484e240e6fcd9195fa04b36
-  data.tar.gz: f2bba857a997391318244eaee64713aa3dd9718779c19a43277db9723377b90f45b98d6350f525ea1e363880ae9be5509f782f41046f3f65c36941de8a4630d6
+  metadata.gz: 3aa9e0201dc0d387bfb3d051ea9e3a5ac797d9452658ede73e063e0ea75db14ec9614abc28e0b2088f49dd2cd2aabbdc45a6c50fa4e8c2dea7059a76ae6855e9
+  data.tar.gz: b044538a4c7e5c20d5b4ab521088d3e44c5f6f1ea318e7b000ebc511e8ca2ae76e9b095fb07db8cc8a86e1c244c7aed736e8ad0405ede26e309cd037555eaa9f

data/.travis.yml

@@ -2,9 +2,10 @@ language: ruby
 
 rvm:
   - 2.1
-  - 2.2.5
-  - 2.3.3
-  - 2.4.0
+  - 2.2
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
 
 gemfile:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## ChangeLog
 
+### Release 1.0.3 - 2018/03/29
+
+- Bump up google-cloud-pubsub to v0.30.x
+- Make config file Fluentd v1 compatible
+
 ### Release 1.0.2 - 2017/09/11
 
 - Bump up google-cloud-pubsub to v0.27.x

data/README.md

@@ -19,6 +19,10 @@ This plugin is forked from https://github.com/mdoi/fluent-plugin-gcloud-pubsub
 - Add a pull style subscription to the topic
 - Download your credential (json) or [set scope on GCE instance](https://cloud.google.com/compute/docs/api/how-tos/authorization)
 
+When using output plugin, you need to grant Pub/Sub Publisher and Pub/Sub Viewer role to IAM.
+
+Also, when using input plugin, you need to grant Pub/Sub Subscriber and Pub/Sub Viewer role to IAM.
+
 ## Requirements
 
 | fluent-plugin-gcloud-pubsub-custom | fluentd | ruby |
@@ -56,11 +60,13 @@ Use `gcloud_pubsub` output plugin.
   max_messages 1000
   max_total_size 9800000
   max_message_size 4000000
-  buffer_type file
-  buffer_path /path/to/your/buffer
-  flush_interval 1s
-  try_flush_interval 0.1
-  format json
+  <buffer>
+    @type memory
+    flush_interval 1s
+  </buffer>
+  <format>
+    @type json
+  </format>
 </match>
 ```
 
@@ -84,10 +90,6 @@ Use `gcloud_pubsub` output plugin.
     - See https://cloud.google.com/pubsub/quotas#other_limits
 - `max_message_size` (optional, default: `4000000` = `4MB`)
   - Messages exceeding `max_message_size` are not published because Pub/Sub clients cannot receive it.
-- `buffer_type`, `buffer_path`, `flush_interval`, `try_flush_interval`
-  - These are fluentd buffer configuration. See http://docs.fluentd.org/articles/buffer-plugin-overview
-- `format` (optional, default: `json`)
-  - Set output format. See http://docs.fluentd.org/articles/out_file#format
 
 ### Pull messages
 
@@ -105,11 +107,13 @@ Use `gcloud_pubsub` input plugin.
   return_immediately true
   pull_interval 0.5
   pull_threads 2
-  format json
   parse_error_action exception
   enable_rpc true
   rpc_bind 0.0.0.0
   rpc_port 24680
+  <parse>
+    @type json
+  </parse>
 </source>
 ```
 
@@ -139,8 +143,6 @@ Use `gcloud_pubsub` input plugin.
   - Pulling messages by intervals of specified seconds.
 - `pull_threads` (optional, default: `1`)
   - Set number of threads to pull messages.
-- `format` (optional, default: `json`)
-  - Set input format. See format section in http://docs.fluentd.org/articles/in_tail
 - `parse_error_action` (optional, default: `exception`)
   - Set error type when parsing messages fails.
     - `exception`: Raise exception. Messages are not acknowledged.

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.2"
+  gem.version     = "1.0.3"
   gem.authors     = ["Yoshihiro MIYAI"]
   gem.email       = "msparrow17@gmail.com"
   gem.has_rdoc    = false
@@ -17,7 +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.27.0"
+  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.30.0"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"

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

@@ -9,7 +9,7 @@ module Fluent
 
     class Publisher
       def initialize(project, key, topic_name, autocreate_topic)
-        pubsub = Google::Cloud::Pubsub.new project: project, keyfile: key
+        pubsub = Google::Cloud::Pubsub.new project_id: project, credentials: key
         @client = pubsub.topic topic_name
         if @client.nil?
           if autocreate_topic
@@ -33,7 +33,7 @@ module Fluent
 
     class Subscriber
       def initialize(project, key, topic_name, subscription_name)
-        pubsub = Google::Cloud::Pubsub.new project: project, keyfile: key
+        pubsub = Google::Cloud::Pubsub.new project_id: project, credentials: key
         topic = pubsub.topic topic_name
         @client = topic.subscription subscription_name
         raise Error.new "subscription:#{subscription_name} does not exist." if @client.nil?

data/lib/fluent/plugin/in_gcloud_pubsub.rb

@@ -37,8 +37,6 @@ module Fluent::Plugin
     config_param :return_immediately, :bool,    default: true
     desc 'Set number of threads to pull messages.'
     config_param :pull_threads,       :integer, default: 1
-    desc 'Set input format.'
-    config_param :format,             :string,  default: DEFAULT_PARSER_TYPE
     desc 'Set error type when parsing messages fails.'
     config_param :parse_error_action, :enum,    default: :exception, list: [:exception, :warning]
     # for HTTP RPC

data/lib/fluent/plugin/out_gcloud_pubsub.rb

@@ -25,8 +25,6 @@ module Fluent::Plugin
     config_param :max_total_size,     :integer, :default => 9800000  # 9.8MB
     desc 'Limit bytesize per message.'
     config_param :max_message_size,   :integer, :default => 4000000  # 4MB
-    desc 'Set output format.'
-    config_param :format,             :string,  :default => 'json'
 
     config_section :buffer do
       config_set_default :@type, DEFAULT_BUFFER_TYPE

data/test/plugin/test_in_gcloud_pubsub.rb

@@ -11,8 +11,6 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
       topic topic-test
       subscription subscription-test
       key key-test
-      format json
-      json_parser yajl
   ]
 
   DEFAULT_HOST = '127.0.0.1'
@@ -55,7 +53,6 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
         return_immediately true
         pull_interval 2
         pull_threads 3
-        format ltsv
         enable_rpc true
         rpc_bind 127.0.0.1
         rpc_port 24681
@@ -70,7 +67,6 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
       assert_equal(1000, d.instance.max_messages)
       assert_equal(true, d.instance.return_immediately)
       assert_equal(3, d.instance.pull_threads)
-      assert_equal('ltsv', d.instance.format)
       assert_equal(true, d.instance.enable_rpc)
       assert_equal('127.0.0.1', d.instance.rpc_bind)
       assert_equal(24681, d.instance.rpc_port)
@@ -82,7 +78,6 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
       assert_equal(100, d.instance.max_messages)
       assert_equal(true, d.instance.return_immediately)
       assert_equal(1, d.instance.pull_threads)
-      assert_equal('json', d.instance.format)
       assert_equal(false, d.instance.enable_rpc)
       assert_equal('0.0.0.0', d.instance.rpc_bind)
       assert_equal(24680, d.instance.rpc_port)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gcloud-pubsub-custom
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Yoshihiro MIYAI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Google Cloud Pub/Sub input/output plugin for Fluentd event collector