lib/fluent/plugin/out_s3.rb in fluent-plugin-s3-1.5.0 vs lib/fluent/plugin/out_s3.rb in fluent-plugin-s3-1.5.1

@@ -483,16 +483,32 @@
         credentials_options[:duration_seconds] = c.duration_seconds if c.duration_seconds
         credentials_options[:external_id] = c.external_id if c.external_id
         credentials_options[:sts_endpoint_url] = c.sts_endpoint_url if c.sts_endpoint_url
         credentials_options[:sts_http_proxy] = c.sts_http_proxy if c.sts_http_proxy
         if c.sts_http_proxy && c.sts_endpoint_url
-          credentials_options[:client] = Aws::STS::Client.new(region: region, http_proxy: c.sts_http_proxy, endpoint: c.sts_endpoint_url, credentials: iam_user_credentials)
+          credentials_options[:client] = if iam_user_credentials
+                                           Aws::STS::Client.new(region: region, http_proxy: c.sts_http_proxy, endpoint: c.sts_endpoint_url, credentials: iam_user_credentials)
+                                         else
+                                           Aws::STS::Client.new(region: region, http_proxy: c.sts_http_proxy, endpoint: c.sts_endpoint_url)
+                                         end
         elsif c.sts_http_proxy
-          credentials_options[:client] = Aws::STS::Client.new(region: region, http_proxy: c.sts_http_proxy, credentials: iam_user_credentials)
+          credentials_options[:client] = if iam_user_credentials
+                                           Aws::STS::Client.new(region: region, http_proxy: c.sts_http_proxy, credentials: iam_user_credentials)
+                                         else
+                                           Aws::STS::Client.new(region: region, http_proxy: c.sts_http_proxy)
+                                         end
         elsif c.sts_endpoint_url
-          credentials_options[:client] = Aws::STS::Client.new(region: region, endpoint: c.sts_endpoint_url, credentials: iam_user_credentials)
+          credentials_options[:client] = if iam_user_credentials
+                                           Aws::STS::Client.new(region: region, endpoint: c.sts_endpoint_url, credentials: iam_user_credentials)
+                                         else
+                                           Aws::STS::Client.new(region: region, endpoint: c.sts_endpoint_url)
+                                         end
         else
-          credentials_options[:client] = Aws::STS::Client.new(region: region, credentials: iam_user_credentials)
+          credentials_options[:client] = if iam_user_credentials
+                                           Aws::STS::Client.new(region: region, credentials: iam_user_credentials)
+                                         else
+                                           Aws::STS::Client.new(region: region)
+                                         end
         end
 
         options[:credentials] = Aws::AssumeRoleCredentials.new(credentials_options)
       when @aws_key_id && @aws_sec_key
         options[:access_key_id] = @aws_key_id