fluent-plugin-s3 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6484393067ca566165643a70c9bb844f3499cd00
-  data.tar.gz: 59a603dd4ebf2d53746d1c8b434e692c59d165d9
+  metadata.gz: 3d2e2bf9bcf8921a06dac049e573cff83e1b424b
+  data.tar.gz: 4c67b88fd89f1aad339efff5bc07f341b9e02780
 SHA512:
-  metadata.gz: 0425f28aa5c45b2f514002e4c9555685099420a9912973abb901e8e60c54fb5e99fddbe8ca406a24dd40975214f68e66caa27c737b5928eb5281c5f9378e66c9
-  data.tar.gz: 8dd9b50f05b3cf0eea06a8e54e860b8c61b114c88a8e9879b5ae6d12213fc5368a690c4ccb279872d25d7e8c60d58cb9039a74d5980d95fcb2c70142b3142773
+  metadata.gz: '0182ff57df3b6548dd59e4d3a01db05b4e89fc2d2799a8ceaa8870a2ff985cc12cec429de8d164eb00a7d23d45eb9ad5824c29b77c069fd054a49b9d0dc78bf7'
+  data.tar.gz: 05f7a10944f6e20a0b395cf25a56010a82e33042f3dd723fcce0229a3bb0df59e3a6350b71c07927a17f364ee87ba277eaf03928695cd887248a1e9cec431b50

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 1.1.0 - 2017/11/29
+
+  * Use aws-sdk-s3 / aws-sdk-sqs gems instead of aws-sdk gem
+
 Release 1.0.0 - 2017/11/15
 
   * Use v0.14 API

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/fluent-plugin-s3.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "fluentd", [">= 0.14.2", "< 2"]
-  gem.add_dependency "aws-sdk", [">= 2.3.22", "< 3"]
+  gem.add_dependency "aws-sdk-s3", "~> 1.0"
+  gem.add_dependency "aws-sdk-sqs", "~> 1.0"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "test-unit", ">= 3.0.8"
   gem.add_development_dependency "test-unit-rr", ">= 1.0.3"

data/lib/fluent/plugin/in_s3.rb

@@ -1,7 +1,9 @@
 require 'fluent/plugin/input'
 require 'fluent/log-ext'
 
-require 'aws-sdk-resources'
+require 'aws-sdk-s3'
+require 'aws-sdk-sqs'
+require 'aws-sdk-sqs/queue_poller'
 require 'cgi/util'
 require 'zlib'
 require 'time'

data/lib/fluent/plugin/out_s3.rb

@@ -1,7 +1,7 @@
 require 'fluent/plugin/output'
 require 'fluent/log-ext'
 require 'fluent/timezone'
-require 'aws-sdk-resources'
+require 'aws-sdk-s3'
 require 'zlib'
 require 'time'
 require 'tempfile'

data/test/test_in_s3.rb

@@ -1,4 +1,6 @@
-require 'aws-sdk-resources'
+require 'aws-sdk-s3'
+require 'aws-sdk-sqs'
+require 'aws-sdk-sqs/queue_poller'
 
 require 'fluent/test'
 require 'fluent/test/helpers'
@@ -119,6 +121,7 @@ class S3InputTest < Test::Unit::TestCase
     mock(Aws::S3::Resource).new(client: @s3_client) { @s3_resource }
     @s3_bucket = mock(Aws::S3::Bucket.new(name: "test",
                                           client: @s3_client))
+    @s3_bucket.exists? { true }
     @s3_resource.bucket(anything) { @s3_bucket }
 
     test_queue_url = "http://example.com/test_queue"

data/test/test_out_s3.rb

@@ -2,7 +2,7 @@ require 'fluent/test'
 require 'fluent/test/helpers'
 require 'fluent/test/log'
 require 'fluent/test/driver/output'
-require 'aws-sdk-resources'
+require 'aws-sdk-s3'
 require 'fluent/plugin/out_s3'
 
 require 'test/unit/rr'
@@ -417,8 +417,18 @@ EOC
     FileUtils.rm_f(s3_local_file_path)
   end
 
+  class MockResponse
+    attr_reader :data
+
+    def initialize(data)
+      @data = data
+    end
+  end
+
   def setup_mocks(exists_return = false)
     @s3_client = stub(Aws::S3::Client.new(stub_responses: true))
+    # aws-sdk-s3 calls Client#put_object inside Object#put
+    mock(@s3_client).put_object(anything).at_least(0) { MockResponse.new({}) }
     mock(Aws::S3::Client).new(anything).at_least(0) { @s3_client }
     @s3_resource = mock(Aws::S3::Resource.new(client: @s3_client))
     mock(Aws::S3::Resource).new(client: @s3_client) { @s3_resource }
@@ -454,6 +464,7 @@ EOC
 
   def setup_mocks_hardened_policy()
     @s3_client = stub(Aws::S3::Client.new(:stub_responses => true))
+    mock(@s3_client).put_object(anything).at_least(0) { MockResponse.new({}) }
     mock(Aws::S3::Client).new(anything).at_least(0) { @s3_client }
     @s3_resource = mock(Aws::S3::Resource.new(:client => @s3_client))
     mock(Aws::S3::Resource).new(:client => @s3_client) { @s3_resource }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -32,25 +32,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.22
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.22
-    - - "<"
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-sqs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement