fluent-plugin-s3 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb79ec06cc2a084f5043825a68b9e15b3d3eed9008f0906ff6fedede8659a22
-  data.tar.gz: '09eb263937f9f5dd397296579426a744f701eee6ba45d4a2b05b0f5c7990fe5b'
+  metadata.gz: db01fa7706627c40baf9e272644c4449c47e4adac7c67ae336099c1c65021e04
+  data.tar.gz: d74f9c06bcce4606b62d06ba416f934824213e42b508cf49dc093392c34692fe
 SHA512:
-  metadata.gz: 5a0685a1d250f12608bf432c4157d6a1b9cd7a627161cf2278c703ae07cce9fe858d5468bbe5056d060f40914570ea9ec39bbec04828c1dbf193737edf72193a
-  data.tar.gz: 0caf64221c557536e5e3d1d6f21f28cfdce5fc865a4a4d5b55ec490fd716701675b49999faf81b9e030348abbd68e265df690154f2aac155613efbfcf4ba144d
+  metadata.gz: 920c6ddc28b300bf9b00c2a21005d4adfeefc2e6c59ddb9afffedb2fcd45145baf70e2f7ec01997c12380d7b31def2289ece915a3099d0045b086314c914a555
+  data.tar.gz: eb84c4fc47ad9840fb375d65f532f7f5df701ce733b8959c6e037ffd45010548555ae5695b9e0839d4af60967ec791b5cb4cd049e103653b7b441a4f2bf54209

data/.github/workflows/linux.yml

@@ -1,14 +1,16 @@
 name: linux
 on:
-  - push
-  - pull_request
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
+        ruby: [ '3.1', '3.0', '2.7' ]
         os:
           - ubuntu-latest
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}

data/.github/workflows/stale-actions.yml

@@ -18,5 +18,5 @@ jobs:
         close-pr-message: "This PR was automatically closed because of stale in 30 days"
         stale-pr-label: "stale"
         stale-issue-label: "stale"
-        exempt-issue-labels: "bug,help wanted"
-        exempt-pr-labels: "bug,help wanted"
+        exempt-issue-labels: "bug,help wanted,enhancement"
+        exempt-pr-labels: "bug,help wanted,enhancement"

data/ChangeLog

@@ -1,3 +1,10 @@
+Release 1.7.0 - 2022/06/14
+
+  * in_s3: Allow multi workers
+  * in_s3: Support alternative AWS key ID and secret for SQS
+  * out_s3: Add warning for multi workers
+  * out_s3: Support object tagging
+
 Release 1.6.1 - 2021/08/19
 
   * in_s3/out_s3: Don't raise error when s3_endpoint is used for VPC endpoint (GitHub: #384)

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.7.0

data/docs/input.md

@@ -77,6 +77,14 @@ SQS queue name. Need to create SQS queue on the region same as S3 bucket.
 
 SQS Owner Account ID
 
+### aws_key_id
+
+Alternative aws key id for SQS
+
+### aws_sec_key
+
+Alternative aws key secret for SQS
+
 ### skip_delete
 
 When true, messages are not deleted after polling block. Default is false.

data/docs/output.md

@@ -438,6 +438,10 @@ It would be useful when you use S3 compatible storage that accepts only signatur
 
 Given a threshold to treat events as delay, output warning logs if delayed events were put into s3.
 
+## tagging
+
+The S3 tag-set for the object. The tag-set must be encoded as URL Query parameters. (For example, "Key1=Value1").
+
 ## \<bucket_lifecycle_rule\> section
 
 Specify one or more lifecycle rules for the bucket

data/fluent-plugin-s3.gemspec

@@ -23,4 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "test-unit", ">= 3.0.8"
   gem.add_development_dependency "test-unit-rr", ">= 1.0.3"
   gem.add_development_dependency "timecop"
+  # aws-sdk-core requires one of ox, oga, libxml, nokogiri or rexml,
+  # and rexml is no longer default gem as of Ruby 3.0.
+  gem.add_development_dependency "rexml"
 end

data/lib/fluent/plugin/in_s3.rb

@@ -98,6 +98,10 @@ module Fluent::Plugin
       config_param :queue_owner_aws_account_id, :string, default: nil
       desc "Use 's3_region' instead"
       config_param :endpoint, :string, default: nil
+      desc "AWS access key id for SQS user"
+      config_param :aws_key_id, :string, default: nil, secret: true
+      desc "AWS secret key for SQS user."
+      config_param :aws_sec_key, :string, default: nil, secret: true
       desc "Skip message deletion"
       config_param :skip_delete, :bool, default: false
       desc "The long polling interval."
@@ -136,6 +140,14 @@ module Fluent::Plugin
         raise Fluent::ConfigError, "sqs/queue_name is required"
       end
 
+      if !!@aws_key_id ^ !!@aws_sec_key
+        raise Fluent::ConfigError, "aws_key_id or aws_sec_key is missing"
+      end
+
+      if !!@sqs.aws_key_id ^ !!@sqs.aws_sec_key
+        raise Fluent::ConfigError, "sqs/aws_key_id or sqs/aws_sec_key is missing"
+      end
+
       Aws.use_bundled_cert! if @use_bundled_cert
 
       @extractor = EXTRACTOR_REGISTRY.lookup(@store_as).new(log: log)
@@ -144,6 +156,10 @@ module Fluent::Plugin
       @parser = parser_create(conf: parser_config, default_type: DEFAULT_PARSE_TYPE)
     end
 
+    def multi_workers_ready?
+      true
+    end
+
     def start
       super
 
@@ -275,6 +291,10 @@ module Fluent::Plugin
       options[:region] = @s3_region if @s3_region
       options[:endpoint] = @sqs.endpoint if @sqs.endpoint
       options[:http_proxy] = @proxy_uri if @proxy_uri
+      if @sqs.aws_key_id && @sqs.aws_sec_key
+        options[:access_key_id] = @sqs.aws_key_id
+        options[:secret_access_key] = @sqs.aws_sec_key
+      end
       log.on_trace do
         options[:http_wire_trace] = true
         options[:logger] = log

data/lib/fluent/plugin/out_s3.rb

@@ -147,6 +147,8 @@ module Fluent::Plugin
     config_param :signature_version, :string, default: nil # use nil to follow SDK default configuration
     desc "Given a threshold to treat events as delay, output warning logs if delayed events were put into s3"
     config_param :warn_for_delay, :time, default: nil
+    desc "Arbitrary S3 tag-set for the object"
+    config_param :tagging, :string, default: nil
     desc "Arbitrary S3 metadata headers to set for the object"
     config_param :s3_metadata, :hash, default: nil
     config_section :bucket_lifecycle_rule, param_name: :bucket_lifecycle_rules, multi: true do
@@ -360,6 +362,7 @@ module Fluent::Plugin
         put_options[:grant_read] = @grant_read if @grant_read
         put_options[:grant_read_acp] = @grant_read_acp if @grant_read_acp
         put_options[:grant_write_acp] = @grant_write_acp if @grant_write_acp
+        put_options[:tagging] = @tagging if @tagging
 
         if @s3_metadata
           put_options[:metadata] = {}
@@ -461,8 +464,9 @@ module Fluent::Plugin
         log.warn "The default value of s3_object_key_format will use ${chunk_id} instead of %{index} to avoid object conflict in v2"
       end
 
-      if (@buffer_config.flush_thread_count > 1) && ['${chunk_id}', '%{uuid_flush}'].none? { |key| @s3_object_key_format.include?(key) }
-        log.warn "No ${chunk_id} or %{uuid_flush} in s3_object_key_format with multiple flush threads. Recommend to set ${chunk_id} or %{uuid_flush} to avoid data lost by object conflict"
+      is_working_on_parallel = @buffer_config.flush_thread_count > 1 || system_config.workers > 1
+      if is_working_on_parallel && ['${chunk_id}', '%{uuid_flush}'].none? { |key| @s3_object_key_format.include?(key) }
+        log.warn "No ${chunk_id} or %{uuid_flush} in s3_object_key_format with multiple flush threads or multiple workers. Recommend to set ${chunk_id} or %{uuid_flush} to avoid data lost by object conflict"
       end
     end
 

data/test/test_in_s3.rb

@@ -84,7 +84,7 @@ class S3InputTest < Test::Unit::TestCase
 
     def test_unknown_store_as
       config = CONFIG + "\nstore_as unknown"
-      assert_raise(Fluent::ConfigError) do
+      assert_raise(Fluent::NotFoundPluginError) do
         create_driver(config)
       end
     end
@@ -153,6 +153,104 @@ EOS
     }
   end
 
+  def test_sqs_with_invalid_keys_missing_secret_key
+    assert_raise(Fluent::ConfigError, "sqs/aws_key_id or sqs/aws_sec_key is missing") {
+      conf = <<"EOS"
+aws_key_id test_key_id
+aws_sec_key test_sec_key
+s3_bucket test_bucket
+buffer_type memory
+<sqs>
+  queue_name test_queue
+  endpoint eu-west-1
+  aws_key_id sqs_test_key_id
+</sqs>
+EOS
+        create_driver(conf)
+      }
+    end
+
+  def test_sqs_with_invalid_aws_keys_missing_key_id
+    assert_raise(Fluent::ConfigError, "sqs/aws_key_id or sqs/aws_sec_key is missing") {
+      conf = <<"EOS"
+aws_key_id test_key_id
+aws_sec_key test_sec_key
+s3_bucket test_bucket
+buffer_type memory
+<sqs>
+  queue_name test_queue
+  endpoint eu-west-1
+  aws_sec_key sqs_test_sec_key
+</sqs>
+EOS
+      create_driver(conf)
+    }
+  end
+
+  def test_sqs_with_valid_aws_keys_complete_pair
+    conf = <<"EOS"
+aws_key_id test_key_id
+aws_sec_key test_sec_key
+s3_bucket test_bucket
+buffer_type memory
+<sqs>
+  queue_name test_queue
+  endpoint eu-west-1
+  aws_key_id sqs_test_key_id
+  aws_sec_key sqs_test_sec_key
+</sqs>
+EOS
+    d = create_driver(conf)
+    assert_equal 'sqs_test_key_id', d.instance.sqs.aws_key_id
+    assert_equal 'sqs_test_sec_key', d.instance.sqs.aws_sec_key
+  end
+
+  def test_with_invalid_aws_keys_missing_secret_key
+    assert_raise(Fluent::ConfigError, "aws_key_id or aws_sec_key is missing") {
+      conf = <<"EOS"
+aws_key_id test_key_id
+s3_bucket test_bucket
+buffer_type memory
+<sqs>
+  queue_name test_queue
+  endpoint eu-west-1
+</sqs>
+EOS
+      create_driver(conf)
+    }
+  end
+
+  def test_with_invalid_aws_keys_missing_key_id
+    assert_raise(Fluent::ConfigError, "aws_key_id or aws_sec_key is missing") {
+      conf = <<"EOS"
+aws_sec_key test_sec_key
+s3_bucket test_bucket
+buffer_type memory
+<sqs>
+  queue_name test_queue
+  endpoint eu-west-1
+</sqs>
+EOS
+      create_driver(conf)
+    }
+  end
+
+  def test_with_valid_aws_keys_complete_pair
+    conf = <<"EOS"
+aws_key_id test_key_id
+aws_sec_key test_sec_key
+s3_bucket test_bucket
+buffer_type memory
+<sqs>
+  queue_name test_queue
+  endpoint eu-west-1
+</sqs>
+EOS
+    d = create_driver(conf)
+    assert_equal 'test_key_id', d.instance.aws_key_id
+    assert_equal 'test_sec_key', d.instance.aws_sec_key
+  end
+
   Struct.new("StubResponse", :queue_url)
   Struct.new("StubMessage", :message_id, :receipt_handle, :body)
 

data/test/test_out_s3.rb

@@ -52,102 +52,147 @@ class S3OutputTest < Test::Unit::TestCase
     end.configure(conf)
   end
 
-  def test_configure
-    d = create_driver
-    assert_equal 'test_key_id', d.instance.aws_key_id
-    assert_equal 'test_sec_key', d.instance.aws_sec_key
-    assert_equal 'test_bucket', d.instance.s3_bucket
-    assert_equal 'log', d.instance.path
-    assert_equal 'gz', d.instance.instance_variable_get(:@compressor).ext
-    assert_equal 'application/x-gzip', d.instance.instance_variable_get(:@compressor).content_type
-    assert_equal false, d.instance.force_path_style
-    assert_equal nil, d.instance.compute_checksums
-    assert_equal nil, d.instance.signature_version
-    assert_equal true, d.instance.check_bucket
-    assert_equal true, d.instance.check_object
-  end
-
-  def test_s3_endpoint_with_valid_endpoint
-    d = create_driver(CONFIG + 's3_endpoint riak-cs.example.com')
-    assert_equal 'riak-cs.example.com', d.instance.s3_endpoint
-  end
-
-  data('US West (Oregon)' => 's3-us-west-2.amazonaws.com',
-       'EU (Frankfurt)' => 's3.eu-central-1.amazonaws.com',
-       'Asia Pacific (Tokyo)' => 's3-ap-northeast-1.amazonaws.com')
-  def test_s3_endpoint_with_invalid_endpoint(endpoint)
-    assert_raise(Fluent::ConfigError, "s3_endpoint parameter is not supported, use s3_region instead. This parameter is for S3 compatible services") {
-      create_driver(CONFIG + "s3_endpoint #{endpoint}")
-    }
-  end
+  sub_test_case "configure" do
+    def test_configure
+      d = create_driver
+      assert_equal 'test_key_id', d.instance.aws_key_id
+      assert_equal 'test_sec_key', d.instance.aws_sec_key
+      assert_equal 'test_bucket', d.instance.s3_bucket
+      assert_equal 'log', d.instance.path
+      assert_equal 'gz', d.instance.instance_variable_get(:@compressor).ext
+      assert_equal 'application/x-gzip', d.instance.instance_variable_get(:@compressor).content_type
+      assert_equal false, d.instance.force_path_style
+      assert_equal nil, d.instance.compute_checksums
+      assert_equal nil, d.instance.signature_version
+      assert_equal true, d.instance.check_bucket
+      assert_equal true, d.instance.check_object
+    end
 
-  def test_configure_with_mime_type_json
-    conf = CONFIG.clone
-    conf << "\nstore_as json\n"
-    d = create_driver(conf)
-    assert_equal 'json', d.instance.instance_variable_get(:@compressor).ext
-    assert_equal 'application/json', d.instance.instance_variable_get(:@compressor).content_type
-  end
+    def test_s3_endpoint_with_valid_endpoint
+      d = create_driver(CONFIG + 's3_endpoint riak-cs.example.com')
+      assert_equal 'riak-cs.example.com', d.instance.s3_endpoint
+    end
 
-  def test_configure_with_mime_type_text
-    conf = CONFIG.clone
-    conf << "\nstore_as text\n"
-    d = create_driver(conf)
-    assert_equal 'txt', d.instance.instance_variable_get(:@compressor).ext
-    assert_equal 'text/plain', d.instance.instance_variable_get(:@compressor).content_type
-  end
+    data('US West (Oregon)' => 's3-us-west-2.amazonaws.com',
+         'EU (Frankfurt)' => 's3.eu-central-1.amazonaws.com',
+         'Asia Pacific (Tokyo)' => 's3-ap-northeast-1.amazonaws.com')
+    def test_s3_endpoint_with_invalid_endpoint(endpoint)
+      assert_raise(Fluent::ConfigError, "s3_endpoint parameter is not supported, use s3_region instead. This parameter is for S3 compatible services") {
+        create_driver(CONFIG + "s3_endpoint #{endpoint}")
+      }
+    end
 
-  def test_configure_with_mime_type_lzo
-    conf = CONFIG.clone
-    conf << "\nstore_as lzo\n"
-    d = create_driver(conf)
-    assert_equal 'lzo', d.instance.instance_variable_get(:@compressor).ext
-    assert_equal 'application/x-lzop', d.instance.instance_variable_get(:@compressor).content_type
-  rescue => e
-    # TODO: replace code with disable lzop command
-    assert(e.is_a?(Fluent::ConfigError))
-  end
+    def test_configure_with_mime_type_json
+      conf = CONFIG.clone
+      conf << "\nstore_as json\n"
+      d = create_driver(conf)
+      assert_equal 'json', d.instance.instance_variable_get(:@compressor).ext
+      assert_equal 'application/json', d.instance.instance_variable_get(:@compressor).content_type
+    end
 
-  def test_configure_with_path_style
-    conf = CONFIG.clone
-    conf << "\nforce_path_style true\n"
-    d = create_driver(conf)
-    assert d.instance.force_path_style
-  end
+    def test_configure_with_mime_type_text
+      conf = CONFIG.clone
+      conf << "\nstore_as text\n"
+      d = create_driver(conf)
+      assert_equal 'txt', d.instance.instance_variable_get(:@compressor).ext
+      assert_equal 'text/plain', d.instance.instance_variable_get(:@compressor).content_type
+    end
 
-  def test_configure_with_compute_checksums
-    conf = CONFIG.clone
-    conf << "\ncompute_checksums false\n"
-    d = create_driver(conf)
-    assert_equal false, d.instance.compute_checksums
-  end
+    def test_configure_with_mime_type_lzo
+      conf = CONFIG.clone
+      conf << "\nstore_as lzo\n"
+      d = create_driver(conf)
+      assert_equal 'lzo', d.instance.instance_variable_get(:@compressor).ext
+      assert_equal 'application/x-lzop', d.instance.instance_variable_get(:@compressor).content_type
+    rescue => e
+      # TODO: replace code with disable lzop command
+      assert(e.is_a?(Fluent::ConfigError))
+    end
 
-  def test_configure_with_hex_random_length
-    conf = CONFIG.clone
-    assert_raise Fluent::ConfigError do
-      create_driver(conf + "\nhex_random_length 17\n")
+    def test_configure_with_path_style
+      conf = CONFIG.clone
+      conf << "\nforce_path_style true\n"
+      d = create_driver(conf)
+      assert d.instance.force_path_style
     end
-    assert_nothing_raised do
-      create_driver(conf + "\nhex_random_length 16\n")
+
+    def test_configure_with_compute_checksums
+      conf = CONFIG.clone
+      conf << "\ncompute_checksums false\n"
+      d = create_driver(conf)
+      assert_equal false, d.instance.compute_checksums
     end
-  end
 
-  def test_configure_with_no_check_on_s3
-    conf = CONFIG.clone
-    conf << "\ncheck_bucket false\ncheck_object false\n"
-    d = create_driver(conf)
-    assert_equal false, d.instance.check_bucket
-    assert_equal false, d.instance.check_object
-  end
+    def test_configure_with_hex_random_length
+      conf = CONFIG.clone
+      assert_raise Fluent::ConfigError do
+        create_driver(conf + "\nhex_random_length 17\n")
+      end
+      assert_nothing_raised do
+        create_driver(conf + "\nhex_random_length 16\n")
+      end
+    end
+
+    def test_configure_with_no_check_on_s3
+      conf = CONFIG.clone
+      conf << "\ncheck_bucket false\ncheck_object false\n"
+      d = create_driver(conf)
+      assert_equal false, d.instance.check_bucket
+      assert_equal false, d.instance.check_object
+    end
+
+    def test_configure_with_grant
+      conf = CONFIG.clone
+      conf << "\grant_full_control id='0123456789'\ngrant_read id='1234567890'\ngrant_read_acp id='2345678901'\ngrant_write_acp id='3456789012'\n"
+      d = create_driver(conf)
+      assert_equal "id='0123456789'", d.instance.grant_full_control
+      assert_equal "id='1234567890'", d.instance.grant_read
+      assert_equal "id='2345678901'", d.instance.grant_read_acp
+      assert_equal "id='3456789012'", d.instance.grant_write_acp
+    end
 
-  def test_configure_with_grant
-    conf = CONFIG.clone
-    conf << "\grant_full_control id='0123456789'\ngrant_read id='1234567890'\ngrant_read_acp id='2345678901'\ngrant_write_acp id='3456789012'\n"
-    d = create_driver(conf)
-    assert_equal "id='0123456789'", d.instance.grant_full_control
-    assert_equal "id='1234567890'", d.instance.grant_read
-    assert_equal "id='2345678901'", d.instance.grant_read_acp
-    assert_equal "id='3456789012'", d.instance.grant_write_acp
+    CONFIG_WITH_OBJECTKEY_DEFAULT = %[
+      s3_object_key_format "%{path}%{time_slice}_%{index}.%{file_extension}"
+      aws_key_id test_key_id
+      aws_sec_key test_sec_key
+      s3_bucket test_bucket
+      path log
+      utc
+      buffer_type memory
+      time_slice_format %Y%m%d-%H
+    ]
+
+    CONFIG_WITH_OBJECTKEY_FIXED_FOR_MULTI_THEAD = %[
+      s3_object_key_format "%{path}%{time_slice}_${chunk_id}.%{file_extension}"
+      aws_key_id test_key_id
+      aws_sec_key test_sec_key
+      s3_bucket test_bucket
+      path log
+      utc
+      buffer_type memory
+      time_slice_format %Y%m%d-%H
+    ]
+
+    data("non_objectkey", {"expected_warning_num" => 1, "conf" => CONFIG, "workers" => 1, "with_multi_buffers" => false})
+    data("non_objectkey-multi_buffer", {"expected_warning_num" => 2, "conf" => CONFIG, "workers" => 1, "with_multi_buffers" => true})
+    data("non_objectkey-multi_worker", {"expected_warning_num" => 2, "conf" => CONFIG, "workers" => 2, "with_multi_buffers" => false})
+    data("default_objectkey", {"expected_warning_num" => 0, "conf" => CONFIG_WITH_OBJECTKEY_DEFAULT, "workers" => 1, "with_multi_buffers" => false})
+    data("default_objectkey-multi_buffer", {"expected_warning_num" => 1, "conf" => CONFIG_WITH_OBJECTKEY_DEFAULT, "workers" => 1, "with_multi_buffers" => true})
+    data("default_objectkey-multi_worker", {"expected_warning_num" => 1, "conf" => CONFIG_WITH_OBJECTKEY_DEFAULT, "workers" => 2, "with_multi_buffers" => false})
+    data("fixed_objectkey", {"expected_warning_num" => 0, "conf" => CONFIG_WITH_OBJECTKEY_FIXED_FOR_MULTI_THEAD, "workers" => 1, "with_multi_buffers" => false})
+    data("fixed_objectkey-multi_buffer", {"expected_warning_num" => 0, "conf" => CONFIG_WITH_OBJECTKEY_FIXED_FOR_MULTI_THEAD, "workers" => 1, "with_multi_buffers" => true})
+    data("fixed_objectkey-multi_worker", {"expected_warning_num" => 0, "conf" => CONFIG_WITH_OBJECTKEY_FIXED_FOR_MULTI_THEAD, "workers" => 2, "with_multi_buffers" => false})
+    def test_configure_warning_on_parallel(data)
+      conf = data["conf"].clone
+      if data["with_multi_buffers"]
+        conf << "\n<buffer>\n@type memory\nflush_thread_count 2\n</buffer>\n"
+      end
+      assert_rr do
+        d = Fluent::Test::Driver::Output.new(Fluent::Plugin::S3Output, opts: {"workers": data["workers"]})
+        mock(d.instance.log).warn(anything).times(data["expected_warning_num"])
+        d.configure(conf)
+      end
+    end
   end
 
   def test_format
@@ -517,9 +562,9 @@ EOC
 
   def test_assume_role_credentials
     expected_credentials = Aws::Credentials.new("test_key", "test_secret")
-    mock(Aws::AssumeRoleCredentials).new(role_arn: "test_arn",
-                                         role_session_name: "test_session",
-                                         client: anything){
+    mock(Aws::AssumeRoleCredentials).new({ role_arn: "test_arn",
+                                           role_session_name: "test_session",
+                                           client: anything }){
       expected_credentials
     }
     config = CONFIG_TIME_SLICE.split("\n").reject{|x| x =~ /.+aws_.+/}.join("\n")
@@ -540,9 +585,9 @@ EOC
     expected_credentials = Aws::Credentials.new("test_key", "test_secret")
     sts_client = Aws::STS::Client.new(region: 'ap-northeast-1')
     mock(Aws::STS::Client).new(region: 'ap-northeast-1'){ sts_client }
-    mock(Aws::AssumeRoleCredentials).new(role_arn: "test_arn",
-                                         role_session_name: "test_session",
-                                         client: sts_client){
+    mock(Aws::AssumeRoleCredentials).new({ role_arn: "test_arn",
+                                           role_session_name: "test_session",
+                                           client: sts_client }){
       expected_credentials
     }
     config = CONFIG_TIME_SLICE.split("\n").reject{|x| x =~ /.+aws_.+/}.join("\n")
@@ -565,9 +610,9 @@ EOC
     sts_client = Aws::STS::Client.new(region: 'ap-northeast-1', credentials: expected_credentials)
     mock(Aws::Credentials).new("test_key_id", "test_sec_key") { expected_credentials }
     mock(Aws::STS::Client).new(region: 'ap-northeast-1', credentials: expected_credentials){ sts_client }
-    mock(Aws::AssumeRoleCredentials).new(role_arn: "test_arn",
-                                         role_session_name: "test_session",
-                                         client: sts_client){
+    mock(Aws::AssumeRoleCredentials).new({ role_arn: "test_arn",
+                                           role_session_name: "test_session",
+                                           client: sts_client } ){
       expected_credentials
     }
     config = CONFIG_TIME_SLICE
@@ -592,10 +637,10 @@ EOC
     expected_sts_http_proxy = 'http://example.com'
     sts_client = Aws::STS::Client.new(region: expected_region, http_proxy: expected_sts_http_proxy)
     mock(Aws::STS::Client).new(region:expected_region, http_proxy: expected_sts_http_proxy){ sts_client }
-    mock(Aws::AssumeRoleCredentials).new(role_arn: "test_arn",
-                                         role_session_name: "test_session",
-                                         client: sts_client,
-                                         sts_http_proxy: expected_sts_http_proxy){
+    mock(Aws::AssumeRoleCredentials).new({ role_arn: "test_arn",
+                                           role_session_name: "test_session",
+                                           client: sts_client,
+                                           sts_http_proxy: expected_sts_http_proxy }){
       expected_credentials
     }
     config = CONFIG_TIME_SLICE.split("\n").reject{|x| x =~ /.+aws_.+/}.join("\n")
@@ -619,10 +664,10 @@ EOC
     expected_sts_http_proxy = 'http://example.com'
     sts_client = Aws::STS::Client.new(region: "us-east-1", http_proxy: expected_sts_http_proxy)
     mock(Aws::STS::Client).new(region: "us-east-1", http_proxy: expected_sts_http_proxy){ sts_client }
-    mock(Aws::AssumeRoleCredentials).new(role_arn: "test_arn",
-                                         role_session_name: "test_session",
-                                         client: sts_client,
-                                         sts_http_proxy: expected_sts_http_proxy){
+    mock(Aws::AssumeRoleCredentials).new({ role_arn: "test_arn",
+                                           role_session_name: "test_session",
+                                           client: sts_client,
+                                           sts_http_proxy: expected_sts_http_proxy }){
       expected_credentials
     }
     config = CONFIG_TIME_SLICE.split("\n").reject{|x| x =~ /.+aws_.+/}.join("\n")
@@ -645,10 +690,10 @@ EOC
     expected_sts_endpoint_url = 'http://example.com'
     sts_client = Aws::STS::Client.new(region: "us-east-1", endpoint: expected_sts_endpoint_url)
     mock(Aws::STS::Client).new(region: "us-east-1", endpoint: expected_sts_endpoint_url){ sts_client }
-    mock(Aws::AssumeRoleCredentials).new(role_arn: "test_arn",
-                                         role_session_name: "test_session",
-                                         client: sts_client,
-                                         sts_endpoint_url: expected_sts_endpoint_url){
+    mock(Aws::AssumeRoleCredentials).new({ role_arn: "test_arn",
+                                           role_session_name: "test_session",
+                                           client: sts_client,
+                                           sts_endpoint_url: expected_sts_endpoint_url }){
       expected_credentials
     }
     config = CONFIG_TIME_SLICE.split("\n").reject{|x| x =~ /.+aws_.+/}.join("\n")
@@ -671,9 +716,9 @@ EOC
     expected_sts_region = 'ap-south-1'
     sts_client = Aws::STS::Client.new(region: expected_sts_region)
     mock(Aws::STS::Client).new(region: expected_sts_region){ sts_client }
-    mock(Aws::AssumeRoleCredentials).new(role_arn: "test_arn",
-                                         role_session_name: "test_session",
-                                         client: sts_client){
+    mock(Aws::AssumeRoleCredentials).new({ role_arn: "test_arn",
+                                           role_session_name: "test_session",
+                                           client: sts_client }){
       expected_credentials
     }
     config = CONFIG_TIME_SLICE.split("\n").reject{|x| x =~ /.+aws_.+/}.join("\n")
@@ -694,10 +739,12 @@ EOC
   def test_web_identity_credentials
     expected_credentials = Aws::Credentials.new("test_key", "test_secret")
     mock(Aws::AssumeRoleWebIdentityCredentials).new(
-      role_arn: "test_arn",
-      role_session_name: "test_session",
-      web_identity_token_file: "test_file",
-      client: anything
+      {
+        role_arn: "test_arn",
+        role_session_name: "test_session",
+        web_identity_token_file: "test_file",
+        client: anything
+      }
     ){
       expected_credentials
     }
@@ -722,10 +769,12 @@ EOC
     sts_client = Aws::STS::Client.new(region: 'us-east-1')
     mock(Aws::STS::Client).new(region: 'us-east-1'){ sts_client }
     mock(Aws::AssumeRoleWebIdentityCredentials).new(
-      role_arn: "test_arn",
-      role_session_name: "test_session",
-      web_identity_token_file: "test_file",
-      client: sts_client
+      {
+        role_arn: "test_arn",
+        role_session_name: "test_session",
+        web_identity_token_file: "test_file",
+        client: sts_client
+      }
     ){
       expected_credentials
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -115,6 +115,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  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: Amazon S3 output plugin for Fluentd event collector
 email: frsyuki@gmail.com
 executables: []
@@ -172,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Amazon S3 output plugin for Fluentd event collector