switch logical and operatiors

Signed-off-by: riquemon <[email protected]>

Author: riquemon

lib/fluent/plugin/out_s3.rb

@@ -44,7 +44,7 @@ def initialize
       desc "A http proxy url for requests to aws sts service"
       config_param :sts_http_proxy, :string, default: nil, secret: true
       desc "A url for a regional sts api endpoint, the default is global"
-      config_param :sts_endpoint_url, :string, default: nil ## STS_region
+      config_param :sts_endpoint_url, :string, default: nil
     end
     # See the following link for additional params that could be added:
     # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/STS/Client.html#assume_role_with_web_identity-instance_method
@@ -495,11 +495,11 @@ def setup_credentials
         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 and c.sts_endpoint_url
+        if c.sts_http_proxy && c.sts_endpoint_url
           credentials_options[:client] = Aws::STS::Client.new(http_proxy: c.sts_http_proxy, endpoint: c.sts_endpoint_url)
-        elsif @region and c.sts_http_proxy
+        elsif @region && c.sts_http_proxy
           credentials_options[:client] = Aws::STS::Client.new(region: @region, http_proxy: c.sts_http_proxy)
-        elsif @region and c.sts_endpoint_url
+        elsif @region && c.sts_endpoint_url
           credentials_options[:client] = Aws::STS::Client.new(region: @region, endpoint: c.sts_endpoint_url)
         elsif c.sts_http_proxy
           credentials_options[:client] = Aws::STS::Client.new(http_proxy: c.sts_http_proxy)