fluent-plugin-s3 1.0.0 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6484393067ca566165643a70c9bb844f3499cd00
4
- data.tar.gz: 59a603dd4ebf2d53746d1c8b434e692c59d165d9
3
+ metadata.gz: 3d2e2bf9bcf8921a06dac049e573cff83e1b424b
4
+ data.tar.gz: 4c67b88fd89f1aad339efff5bc07f341b9e02780
5
5
  SHA512:
6
- metadata.gz: 0425f28aa5c45b2f514002e4c9555685099420a9912973abb901e8e60c54fb5e99fddbe8ca406a24dd40975214f68e66caa27c737b5928eb5281c5f9378e66c9
7
- data.tar.gz: 8dd9b50f05b3cf0eea06a8e54e860b8c61b114c88a8e9879b5ae6d12213fc5368a690c4ccb279872d25d7e8c60d58cb9039a74d5980d95fcb2c70142b3142773
6
+ metadata.gz: '0182ff57df3b6548dd59e4d3a01db05b4e89fc2d2799a8ceaa8870a2ff985cc12cec429de8d164eb00a7d23d45eb9ad5824c29b77c069fd054a49b9d0dc78bf7'
7
+ data.tar.gz: 05f7a10944f6e20a0b395cf25a56010a82e33042f3dd723fcce0229a3bb0df59e3a6350b71c07927a17f364ee87ba277eaf03928695cd887248a1e9cec431b50
data/ChangeLog CHANGED
@@ -1,3 +1,7 @@
1
+ Release 1.1.0 - 2017/11/29
2
+
3
+ * Use aws-sdk-s3 / aws-sdk-sqs gems instead of aws-sdk gem
4
+
1
5
  Release 1.0.0 - 2017/11/15
2
6
 
3
7
  * Use v0.14 API
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.0
1
+ 1.1.0
@@ -18,7 +18,8 @@ Gem::Specification.new do |gem|
18
18
  gem.require_paths = ['lib']
19
19
 
20
20
  gem.add_dependency "fluentd", [">= 0.14.2", "< 2"]
21
- gem.add_dependency "aws-sdk", [">= 2.3.22", "< 3"]
21
+ gem.add_dependency "aws-sdk-s3", "~> 1.0"
22
+ gem.add_dependency "aws-sdk-sqs", "~> 1.0"
22
23
  gem.add_development_dependency "rake", ">= 0.9.2"
23
24
  gem.add_development_dependency "test-unit", ">= 3.0.8"
24
25
  gem.add_development_dependency "test-unit-rr", ">= 1.0.3"
@@ -1,7 +1,9 @@
1
1
  require 'fluent/plugin/input'
2
2
  require 'fluent/log-ext'
3
3
 
4
- require 'aws-sdk-resources'
4
+ require 'aws-sdk-s3'
5
+ require 'aws-sdk-sqs'
6
+ require 'aws-sdk-sqs/queue_poller'
5
7
  require 'cgi/util'
6
8
  require 'zlib'
7
9
  require 'time'
@@ -1,7 +1,7 @@
1
1
  require 'fluent/plugin/output'
2
2
  require 'fluent/log-ext'
3
3
  require 'fluent/timezone'
4
- require 'aws-sdk-resources'
4
+ require 'aws-sdk-s3'
5
5
  require 'zlib'
6
6
  require 'time'
7
7
  require 'tempfile'
@@ -1,4 +1,6 @@
1
- require 'aws-sdk-resources'
1
+ require 'aws-sdk-s3'
2
+ require 'aws-sdk-sqs'
3
+ require 'aws-sdk-sqs/queue_poller'
2
4
 
3
5
  require 'fluent/test'
4
6
  require 'fluent/test/helpers'
@@ -119,6 +121,7 @@ class S3InputTest < Test::Unit::TestCase
119
121
  mock(Aws::S3::Resource).new(client: @s3_client) { @s3_resource }
120
122
  @s3_bucket = mock(Aws::S3::Bucket.new(name: "test",
121
123
  client: @s3_client))
124
+ @s3_bucket.exists? { true }
122
125
  @s3_resource.bucket(anything) { @s3_bucket }
123
126
 
124
127
  test_queue_url = "http://example.com/test_queue"
@@ -2,7 +2,7 @@ require 'fluent/test'
2
2
  require 'fluent/test/helpers'
3
3
  require 'fluent/test/log'
4
4
  require 'fluent/test/driver/output'
5
- require 'aws-sdk-resources'
5
+ require 'aws-sdk-s3'
6
6
  require 'fluent/plugin/out_s3'
7
7
 
8
8
  require 'test/unit/rr'
@@ -417,8 +417,18 @@ EOC
417
417
  FileUtils.rm_f(s3_local_file_path)
418
418
  end
419
419
 
420
+ class MockResponse
421
+ attr_reader :data
422
+
423
+ def initialize(data)
424
+ @data = data
425
+ end
426
+ end
427
+
420
428
  def setup_mocks(exists_return = false)
421
429
  @s3_client = stub(Aws::S3::Client.new(stub_responses: true))
430
+ # aws-sdk-s3 calls Client#put_object inside Object#put
431
+ mock(@s3_client).put_object(anything).at_least(0) { MockResponse.new({}) }
422
432
  mock(Aws::S3::Client).new(anything).at_least(0) { @s3_client }
423
433
  @s3_resource = mock(Aws::S3::Resource.new(client: @s3_client))
424
434
  mock(Aws::S3::Resource).new(client: @s3_client) { @s3_resource }
@@ -454,6 +464,7 @@ EOC
454
464
 
455
465
  def setup_mocks_hardened_policy()
456
466
  @s3_client = stub(Aws::S3::Client.new(:stub_responses => true))
467
+ mock(@s3_client).put_object(anything).at_least(0) { MockResponse.new({}) }
457
468
  mock(Aws::S3::Client).new(anything).at_least(0) { @s3_client }
458
469
  @s3_resource = mock(Aws::S3::Resource.new(:client => @s3_client))
459
470
  mock(Aws::S3::Resource).new(:client => @s3_client) { @s3_resource }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-s3
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-11-16 00:00:00.000000000 Z
12
+ date: 2017-11-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: fluentd
@@ -32,25 +32,33 @@ dependencies:
32
32
  - !ruby/object:Gem::Version
33
33
  version: '2'
34
34
  - !ruby/object:Gem::Dependency
35
- name: aws-sdk
35
+ name: aws-sdk-s3
36
36
  requirement: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
39
- - !ruby/object:Gem::Version
40
- version: 2.3.22
41
- - - "<"
38
+ - - "~>"
42
39
  - !ruby/object:Gem::Version
43
- version: '3'
40
+ version: '1.0'
44
41
  type: :runtime
45
42
  prerelease: false
46
43
  version_requirements: !ruby/object:Gem::Requirement
47
44
  requirements:
48
- - - ">="
45
+ - - "~>"
49
46
  - !ruby/object:Gem::Version
50
- version: 2.3.22
51
- - - "<"
47
+ version: '1.0'
48
+ - !ruby/object:Gem::Dependency
49
+ name: aws-sdk-sqs
50
+ requirement: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: '1.0'
55
+ type: :runtime
56
+ prerelease: false
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
52
60
  - !ruby/object:Gem::Version
53
- version: '3'
61
+ version: '1.0'
54
62
  - !ruby/object:Gem::Dependency
55
63
  name: rake
56
64
  requirement: !ruby/object:Gem::Requirement