fluent-plugin-elb-access-log 0.3.7.pre.beta1 → 0.3.7

data/spec/{in_elb_access_log_spec.rb → in_elb_access_log_clb_spec.rb}

@@ -32,13 +32,14 @@ describe Fluent::ElbAccessLogInput do
     allow_any_instance_of(Fluent::ElbAccessLogInput).to receive(:load_history) { [] }
     allow_any_instance_of(Fluent::ElbAccessLogInput).to receive(:parse_tsfile) { nil }
     allow(FileUtils).to receive(:touch)
-  end
+    expect(driver.instance.log).to_not receive(:error)
+ end
 
   after do
     Timecop.return
   end
 
-  subject { x = driver.emits; x }
+  subject { driver.emits }
 
   context 'when access log does not exist' do
     before do
@@ -47,6 +48,7 @@ describe Fluent::ElbAccessLogInput do
       expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: tomorrow_prefix) { [] }
       expect(driver.instance).to_not receive(:save_timestamp).with(today)
       expect(driver.instance).to receive(:save_history)
+      expect(driver.instance.log).to_not receive(:warn)
 
       driver.run
     end
@@ -92,6 +94,7 @@ describe Fluent::ElbAccessLogInput do
 
       expect(driver.instance).to receive(:save_timestamp).with(tomorrow)
       expect(driver.instance).to receive(:save_history)
+      expect(driver.instance.log).to_not receive(:warn)
 
       driver.run
     end
@@ -223,7 +226,7 @@ describe Fluent::ElbAccessLogInput do
          "request.uri.fragment"=>nil}]]
     end
 
-    it { is_expected.to eq expected_emits }
+    it { is_expected.to match_table expected_emits }
 
     context 'when sampling' do
       let(:fluentd_conf) do
@@ -239,7 +242,7 @@ describe Fluent::ElbAccessLogInput do
       it do
         expected_emits.delete_at(3)
         expected_emits.delete_at(1)
-        is_expected.to eq expected_emits
+        is_expected.to match_table expected_emits
       end
     end
   end
@@ -267,6 +270,7 @@ describe Fluent::ElbAccessLogInput do
       expect(driver.instance).to receive(:save_history)
 
       allow(Addressable::URI).to receive(:parse).and_raise('parse error')
+      expect(driver.instance.log).to receive(:warn).with('parse error: http://hoge-1876938939.ap-northeast-1.elb.amazonaws.com:80/')
 
       driver.run
     end
@@ -298,7 +302,7 @@ describe Fluent::ElbAccessLogInput do
          "request.http_version"=>"HTTP/1.1"}]]
     end
 
-    it { is_expected.to eq expected_emits }
+    it { is_expected.to match_table expected_emits }
   end
 
   context 'when access log exists (with tag option)' do
@@ -332,6 +336,7 @@ describe Fluent::ElbAccessLogInput do
 
       expect(driver.instance).to receive(:save_timestamp).with(today)
       expect(driver.instance).to receive(:save_history)
+      expect(driver.instance.log).to_not receive(:warn)
 
       driver.run
     end
@@ -370,7 +375,7 @@ describe Fluent::ElbAccessLogInput do
          "request.uri.fragment"=>nil}]]
     end
 
-    it { is_expected.to eq expected_emits }
+    it { is_expected.to match_table expected_emits }
   end
 
   context 'when access old log exists' do
@@ -396,6 +401,7 @@ describe Fluent::ElbAccessLogInput do
 
       expect(driver.instance).to_not receive(:save_timestamp)
       expect(driver.instance).to receive(:save_history)
+      expect(driver.instance.log).to_not receive(:warn)
 
       driver.run
     end
@@ -434,7 +440,7 @@ describe Fluent::ElbAccessLogInput do
          "request.uri.fragment"=>nil}]]
     end
 
-    it { is_expected.to eq expected_emits }
+    it { is_expected.to match_table expected_emits }
   end
 
   context 'when parse error' do
@@ -460,6 +466,7 @@ describe Fluent::ElbAccessLogInput do
       expect(driver.instance).to receive(:save_history)
 
       expect(CSV).to receive(:parse_line).and_raise('parse error')
+      expect(driver.instance.log).to_not receive(:warn)
 
       driver.run
     end
@@ -498,7 +505,7 @@ describe Fluent::ElbAccessLogInput do
          "request.uri.fragment"=>nil}]]
     end
 
-    it { is_expected.to eq expected_emits }
+    it { is_expected.to match_table expected_emits }
 
     context 'when no user_agent' do
       let(:today_access_log) do
@@ -513,7 +520,7 @@ describe Fluent::ElbAccessLogInput do
         expected_emits[0][2]['ssl_protocol'] = nil
       end
 
-      it { is_expected.to eq expected_emits }
+      it { is_expected.to match_table expected_emits }
     end
   end
 
@@ -537,6 +544,7 @@ describe Fluent::ElbAccessLogInput do
       expect(client).to_not receive(:get_object)
       expect(driver.instance).to_not receive(:save_timestamp)
       expect(driver.instance).to receive(:save_history)
+      expect(driver.instance.log).to_not receive(:warn)
 
       driver.run
     end
@@ -565,6 +573,7 @@ describe Fluent::ElbAccessLogInput do
       history << today_object_key
       expect(driver.instance).to_not receive(:save_timestamp)
       expect(driver.instance).to receive(:save_history)
+      expect(driver.instance.log).to_not receive(:warn)
 
       driver.run
     end
@@ -595,6 +604,7 @@ describe Fluent::ElbAccessLogInput do
 
       expect(driver.instance).to receive(:save_timestamp).with(today)
       expect(driver.instance).to receive(:save_history)
+      expect(driver.instance.log).to_not receive(:warn)
     end
 
     subject { history.length }
@@ -638,6 +648,7 @@ describe Fluent::ElbAccessLogInput do
 
       expect(driver.instance).to receive(:save_timestamp).with(today)
       expect(driver.instance).to receive(:save_history)
+      expect(driver.instance.log).to_not receive(:warn)
 
       driver.run
     end
@@ -676,6 +687,6 @@ describe Fluent::ElbAccessLogInput do
          "request.uri.fragment"=>nil}]]
     end
 
-    it { is_expected.to eq expected_emits }
+    it { is_expected.to match_table expected_emits }
   end
 end

data/spec/in_elb_access_log_config_spec.rb

@@ -43,6 +43,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
       expect(driver.instance.history_length).to eq 100
       expect(driver.instance.sampling_interval).to eq 1
       expect(driver.instance.debug).to be_falsey
+      expect(driver.instance.elb_type).to eq 'clb'
     end
   end
 
@@ -61,6 +62,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
     let(:buffer_sec) { 1200 }
     let(:history_length) { 200 }
     let(:sampling_interval) { 100 }
+    let(:elb_type) { 'alb' }
 
     let(:fluentd_conf) do
       {
@@ -82,6 +84,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
         history_length: history_length,
         sampling_interval: sampling_interval,
         debug: true,
+        elb_type: elb_type,
       }
     end
 
@@ -103,6 +106,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
       expect(driver.instance.history_length).to eq history_length
       expect(driver.instance.sampling_interval).to eq sampling_interval
       expect(driver.instance.debug).to be_truthy
+      expect(driver.instance.elb_type).to eq elb_type
     end
   end
 
@@ -166,4 +170,24 @@ describe 'Fluent::ElbAccessLogInput#configure' do
       expect(driver.instance.start_datetime).to eq Time.parse(tsfile_datetime)
     end
   end
+
+  context 'when an invalid ELB type' do
+    let(:start_datetime) { '2015-01-01 01:02:03 UTC' }
+
+    let(:fluentd_conf) do
+      {
+        account_id: account_id,
+        s3_bucket: s3_bucket,
+        region: region,
+        start_datetime: start_datetime,
+        elb_type: 'invalid',
+      }
+    end
+
+    it do
+      expect {
+        subject
+      }.to raise_error 'Invalid ELB type: invalid'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,20 @@
 require 'fluent/test'
 require 'fluent/plugin/in_elb_access_log'
 
-require 'aws-sdk'
+require 'aws-sdk-s3'
 require 'time'
 require 'timecop'
+require 'rspec/match_table'
+
+if ENV['TRAVIS']
+  require 'simplecov'
+  require 'coveralls'
+
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter "spec/"
+  end
+end
 
 # Disable Test::Unit
 module Test::Unit::RunCount; def run(*); end; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-access-log
 version: !ruby/object:Gem::Version
-  version: 0.3.7.pre.beta1
+  version: 0.3.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec-match_table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fluentd input plugin for AWS ELB Access Logs.
 email:
 - sugawara@cookpad.com
@@ -139,8 +167,9 @@ files:
 - fluent-plugin-elb-access-log.gemspec
 - lib/fluent/plugin/in_elb_access_log.rb
 - lib/fluent_plugin_elb_access_log/version.rb
+- spec/in_elb_access_log_alb_spec.rb
+- spec/in_elb_access_log_clb_spec.rb
 - spec/in_elb_access_log_config_spec.rb
-- spec/in_elb_access_log_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/winebarrel/fluent-plugin-elb-access-log
 licenses:
@@ -157,16 +186,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Fluentd input plugin for AWS ELB Access Logs.
 test_files:
+- spec/in_elb_access_log_alb_spec.rb
+- spec/in_elb_access_log_clb_spec.rb
 - spec/in_elb_access_log_config_spec.rb
-- spec/in_elb_access_log_spec.rb
 - spec/spec_helper.rb