Merge pull request #388 from fluent/ci-update-ruby

Support Ruby 3.0 or later

.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 }}

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

lib/fluent/plugin/out_s3.rb

@@ -516,7 +516,7 @@ def setup_credentials
                                          end
         end
 
-        options[:credentials] = Aws::AssumeRoleCredentials.new(credentials_options)
+        options[:credentials] = Aws::AssumeRoleCredentials.new(**credentials_options)
       when @aws_key_id && @aws_sec_key
         options[:access_key_id] = @aws_key_id
         options[:secret_access_key] = @aws_sec_key
@@ -532,7 +532,7 @@ def setup_credentials
         elsif @s3_region
           credentials_options[:client] = Aws::STS::Client.new(:region => @s3_region)
         end
-        options[:credentials] = Aws::AssumeRoleWebIdentityCredentials.new(credentials_options)
+        options[:credentials] = Aws::AssumeRoleWebIdentityCredentials.new(**credentials_options)
       when @instance_profile_credentials
         c = @instance_profile_credentials
         credentials_options[:retries] = c.retries if c.retries