aws-sdk-sqs 1.9.0 → 1.70.0

data/lib/aws-sdk-sqs/plugins/md5s.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'openssl'
 
 module Aws
@@ -50,7 +52,9 @@ module Aws
 
           def validate_single_message(body, attributes, response)
             validate_body(body, response)
-            validate_attributes(attributes, response) unless attributes.nil?
+            unless attributes.nil? || attributes.empty?
+              validate_attributes(attributes, response)
+            end
           end
 
           def validate_body(body, response)
@@ -117,14 +121,12 @@ module Aws
           end
 
           def mismatch_error_message(section, local_md5, returned_md5, response)
-            m = "MD5 returned by SQS does not match " <<
-            "the calculation on the original request. ("
-
+            m = 'MD5 returned by SQS does not match '\
+                'the calculation on the original request. ('
             if response.respond_to?(:id) && !response.id.nil?
-              m << "Message ID: #{response.id}, "
+              m = "#{m}Message ID: #{response.id}, "
             end
-
-            m << "MD5 calculated by the #{section}: " <<
+            "#{m}MD5 calculated by the #{section}: "\
             "'#{local_md5}', MD5 checksum returned: '#{returned_md5}')"
           end
         end

data/lib/aws-sdk-sqs/plugins/queue_urls.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 module Aws
   module SQS
     module Plugins
       # @api private
       class QueueUrls < Seahorse::Client::Plugin
-
+        # Extract region from a provided queue_url
         class Handler < Seahorse::Client::Handler
-
           def call(context)
-            if queue_url = context.params[:queue_url]
+            if (queue_url = context.params[:queue_url])
               update_endpoint(context, queue_url)
               update_region(context, queue_url)
             end
@@ -19,18 +20,31 @@ module Aws
           end
 
           # If the region in the queue url is not the configured
-          # region, then we will modify the request to have
-          # a sigv4 signer for the proper region.
+          # region, then we will modify signing to use it
           def update_region(context, queue_url)
-            if queue_region = queue_url.to_s.split('.')[1]
-              if queue_region != context.config.region
-                config = context.config.dup
-                config.region = queue_region
-                config.sigv4_region = queue_region
-                config.sigv4_signer = Aws::Plugins::SignatureV4.build_signer(config)
-                context.config = config
+            if (queue_region = parse_region(queue_url)) &&
+               queue_region != context.config.region
+              context[:auth_scheme]['signingRegion'] = queue_region
+            end
+          end
+
+          private
+
+          # take the first component after the SQS service component
+          # Will return us-east-1 for:
+          #   https://sqs.us-east-1.amazonaws.com/1234567890/demo
+          #   https://vpce-x-y.sqs.us-east-1.vpce.amazonaws.com/1234567890/demo
+          # Will not return for:
+          #   https://localstack-sqs.example.dev/queue/example
+          def parse_region(url)
+            parts = URI.parse(url).host.split('.')
+            parts.each_with_index do |part, index|
+              if part == 'sqs'
+                # assume region is the part right after the 'sqs' part
+                return parts[index + 1]
               end
             end
+            nil # no region found
           end
 
         end