Merge pull request #32 from cosmo0920/migrate-v0.14

Migrate to use v0.14 API

Author: atomita

Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in fluent-plugin-aws-elasticsearch-service.gemspec
 gemspec
 
-gem 'fluent-plugin-elasticsearch', '~> 1.0', require: false
+gem 'fluent-plugin-elasticsearch', "~> 2.0.0.rc.1", require: false
 gem 'aws-sdk', '~> 2', require: false
 gem 'faraday_middleware-aws-signers-v4', '>= 0.1.0', '< 0.1.2', require: false

fluent-plugin-aws-elasticsearch-service.gemspec

@@ -23,8 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_runtime_dependency "fluentd", "~> 0"
-  spec.add_runtime_dependency "fluent-plugin-elasticsearch", "~> 1.0"
+  spec.add_runtime_dependency "fluent-plugin-elasticsearch", "~> 2.0.0.rc.1"
   spec.add_runtime_dependency "aws-sdk", "~> 2"
   spec.add_runtime_dependency "faraday_middleware-aws-signers-v4", ">= 0.1.0", "< 0.1.2"
 end

lib/fluent/plugin/out_aws-elasticsearch-service.rb

@@ -6,10 +6,10 @@
 require 'faraday_middleware/aws_signers_v4'
 
 
-module Fluent
+module Fluent::Plugin
   class AwsElasticsearchServiceOutput < ElasticsearchOutput
 
-    Plugin.register_output('aws-elasticsearch-service', self)
+    Fluent::Plugin.register_output('aws-elasticsearch-service', self)
 
     config_section :endpoint do
       config_param :region, :string
@@ -57,6 +57,10 @@ def get_connection_options
       }
     end
 
+    def write(chunk)
+      super
+    end
+
 
     private
 

spec/lib/fluent/plugin/out_aws-elasticsearch-service_spec.rb

@@ -1,28 +1,39 @@
 # -*- encoding: utf-8 -*-
+require 'spec_helper'
 
-describe Fluent::AwsElasticsearchServiceOutput do
-  let(:driver)   { Fluent::Test::OutputTestDriver.new(Fluent::AwsElasticsearchServiceOutput, 'test.metrics').configure(config) }
+describe Fluent::Plugin::AwsElasticsearchServiceOutput do
+  let(:driver)   { Fluent::Test::Driver::Output.new(Fluent::Plugin::AwsElasticsearchServiceOutput).configure(config) }
   let(:instance) { driver.instance }
 
   describe "config" do
     let(:config) do
       %[
       <endpoint>
+        region us-east-1
         url  xxxxxxxxxxxxxxxxxxxx
       </endpoint>
       ]
     end
 
     it "`endpoint` is array." do
-      expect( instance.endpoint ).to eq "xxxxxxxxxxxxxxxxxxxx"
+      instance.endpoint.map do |ep|
+        expect(ep[:url]).to eq "xxxxxxxxxxxxxxxxxxxx"
+      end
     end
 
-    it "should get room_id" do
-      expect( instance.room_id ).to eq "1234567890"
+    it "should get region" do
+      instance.endpoint.map do |ep|
+        expect(ep[:region]).to eq "us-east-1"
+      end
     end
 
-    it "should get body" do
-      expect( instance.body ).to eq "some message"
+    it "should get default values" do
+      instance.endpoint.map do |ep|
+        expect(ep[:access_key_id]).to eq ""
+        expect(ep[:secret_access_key]).to eq ""
+        expect(ep[:assume_role_arn]).to eq nil
+        expect(ep[:assume_role_session_name]).to eq "fluentd"
+      end
     end
   end
 end

spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'fluent/load'
 require 'fluent/test'
+require 'fluent/test/driver/output'
 
 require 'fluent/plugin/out_aws-elasticsearch-service'