fluent-plugin-gcloud-pubsub-custom 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c1d001b87fc5d90ec9539e1fd22792b9d2cd45b
-  data.tar.gz: '0449660048a17af7b4a7626c28ecadee76852392'
+SHA256:
+  metadata.gz: 51c4af6bf7aee07e04161734152a796864a9a21924eab0e2434e45d177b4be0d
+  data.tar.gz: cd0bb6ec1e0b769b0e7792c5c8d5a797a5407ffca3dbe66f37bd1010959194ce
 SHA512:
-  metadata.gz: 8b2cc614e5bbdfd0923be3c300ccd4855b5f8598c1e89ed382c2f571529ac461a613f3c2f1404aca25141b6c6093c61c227aa6957e3fa99b04f5b0922ffe31a7
-  data.tar.gz: 3126f3675aadcfbdb06f04d0abbb104d30fc2f5ec593af7cc974839cf9d13e3407ee26cb80c11b6443e46febeb4bbd57fa12ae2bdbb5cdcd8d655d3b59d7ada8
+  metadata.gz: 4f6f11c50da0f9396275e757a18cec552fdeeb8718e290a1388a2190bd26cb327704e6424848bf65a656e545f8cd6364ae571c285774cf82735a5512f0a57cd4
+  data.tar.gz: 62840bd5232d0f756c5ea09449f9821b2a55cee69d2fe0c048bfe764c4673fb389cde7b2b8c1b6d671a3f6def5d0d11587b080b15011fee1868079df7c35a4e8

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 
 rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
 
 gemfile:

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## ChangeLog
 
+### Release 1.4.0 - 2020/08/11
+
+- Bump up google-cloud-pubsub to v0.39.x
+  - In preparation for updating to v1.x
+- Output plugin
+  - Add `dest_project` parameter
+
 ### Release 1.3.2 - 2019/08/16
 
 - Input plugin

data/README.md

@@ -81,6 +81,8 @@ Use `gcloud_pubsub` output plugin.
 - `topic` (required)
   - Set topic name to publish.
   - You can use placeholder in this param. See: https://docs.fluentd.org/v1.0/articles/buffer-section
+- `dest_project` (optional, default: `nil`)
+  - Set your destination GCP project if you publish messages cross project.
 - `autocreate_topic` (optional, default: `false`)
   - If set to `true`, specified topic will be created when it doesn't exist.
 - `max_messages` (optional, default: `1000`)

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

@@ -7,17 +7,16 @@ 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.3.2"
+  gem.version     = "1.4.0"
   gem.authors     = ["Yoshihiro MIYAI"]
   gem.email       = "msparrow17@gmail.com"
-  gem.has_rdoc    = false
   gem.files       = `git ls-files`.split("\n")
   gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency "fluentd", [">= 0.14.15", "< 2"]
-  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.30.0"
+  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.39.0"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"

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

@@ -24,18 +24,23 @@ module Fluent
     end
 
     class Publisher
-      def initialize(project, key, autocreate_topic)
+      def initialize(project, key, autocreate_topic, dest_project)
         @pubsub = Google::Cloud::Pubsub.new project_id: project, credentials: key
         @autocreate_topic = autocreate_topic
+        @dest_project = dest_project
         @topics = {}
       end
 
       def topic(topic_name)
         return @topics[topic_name] if @topics.has_key? topic_name
 
-        client = @pubsub.topic topic_name
-        if client.nil? && @autocreate_topic
-          client = @pubsub.create_topic topic_name
+        if @dest_project.nil?
+          client = @pubsub.topic topic_name
+          if client.nil? && @autocreate_topic
+            client = @pubsub.create_topic topic_name
+          end
+        else
+          client = @pubsub.topic topic_name, project: @dest_project
         end
         if client.nil?
           raise Error.new "topic:#{topic_name} does not exist."

data/lib/fluent/plugin/out_gcloud_pubsub.rb

@@ -19,6 +19,8 @@ module Fluent::Plugin
     config_param :key,                :string,  :default => nil
     desc 'Set topic name to publish.'
     config_param :topic,              :string
+    desc "Set your dest GCP project if publishing cross project"
+    config_param :dest_project,       :string,  :default => nil
     desc "If set to `true`, specified topic will be created when it doesn't exist."
     config_param :autocreate_topic,   :bool,    :default => false
     desc 'Publishing messages count per request to Cloud Pub/Sub.'
@@ -47,7 +49,7 @@ module Fluent::Plugin
 
     def start
       super
-      @publisher = Fluent::GcloudPubSub::Publisher.new @project, @key, @autocreate_topic
+      @publisher = Fluent::GcloudPubSub::Publisher.new @project, @key, @autocreate_topic, @dest_project
     end
 
     def format(tag, time, record)

data/test/plugin/test_out_gcloud_pubsub.rb

@@ -62,6 +62,17 @@ class GcloudPubSubOutputTest < Test::Unit::TestCase
 
       assert_equal(true, d.instance.autocreate_topic)
     end
+
+    test '"dest_project" can be specified' do
+      d = create_driver(%[
+        project project-test
+        topic topic-test
+        key key-test
+        dest_project dest-project-test
+      ])
+
+      assert_equal("dest-project-test", d.instance.dest_project)
+    end
   end
 
   sub_test_case 'topic' do
@@ -87,6 +98,21 @@ class GcloudPubSubOutputTest < Test::Unit::TestCase
       end
     end
 
+    test '"dest_project" is set' do
+      d = create_driver(%[
+        project project-test
+        topic topic-test
+        key key-test
+        dest_project dest-project-test
+      ])
+
+      @publisher.publish.once
+      @pubsub_mock.topic("topic-test", {:project=>"dest-project-test"}).once { @publisher }
+      d.run(default_tag: "test") do
+        d.feed(@time, {"a" => "b"})
+      end
+    end
+
     test '40x error occurred on connecting to Pub/Sub' do
       d = create_driver
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gcloud-pubsub-custom
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Yoshihiro MIYAI
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ homepage: https://github.com/mia-0032/fluent-plugin-gcloud-pubsub-custom
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Google Cloud Pub/Sub input/output plugin for Fluentd event collector
 test_files: