right_aws_api 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70504cc6fa36ede740358a16562cd1df06e2726f
-  data.tar.gz: af7971a58c4ef781e66c44ea14aeb22818dbf10d
+  metadata.gz: 6492aa023c1c1ebd6bd48364935b1e3c7f06252a
+  data.tar.gz: b0ad4720da8e079270f04307a2096ea0a5ad69d1
 SHA512:
-  metadata.gz: ba205723733d46d6befcc751a67c02ad08fa95dcae7ab78e53f0921718efb300f8f68601ad99e99fb145ffa2909ea0aea7fa17c25d393d0c6fd082889fc0022e
-  data.tar.gz: 84001e30b3103ec1baea2b566bf387e3dbe46626f9d379d3dabd996df304a741b5cb3704c3cb66ae390016a2ac7397096b662b6a7a3cf1e8bf1aab3a7c085fa5
+  metadata.gz: 55ef622a2fa9f2baa1315af3e6c4d380038f9f1c8f47f50ade5c79bdabfdc7fef6d434eedfe7b42ffd5ecd9950c2d2d59177c941087f93e4f8ae0fe194ff7c0c
+  data.tar.gz: b1ba2b1e5d6c0474152c048510263fbacbe0da034cebeb23f91257e61315889ddf006756bf5959e95c0026dfab7fc468a6a87ccf4abc804d806b4f5496625895

data/HISTORY

@@ -1,4 +1,7 @@
 == current (not released as a gem yet)
+== 2016-10-18, v0.3.5
+  - Fixed a bug in MWS error parsing
+  - Bumped right_cloud_api_base version to not use net-http-persistent 3.0+
 == 2015-11-11, v0.3.4
   - Add LimitRateExceeded to the retryable error types
 == 2015-09-24, v0.3.3
@@ -45,4 +48,4 @@
 == 2014-10-30, v0.2.1
   - Added support for AWS v4 signature and make it the default
 
-== 2013-06-28, pre-release
+== 2013-06-28, pre-release

data/lib/cloud/aws/s3/manager.rb

@@ -327,7 +327,7 @@ module RightScale
         #
         # @example
         #   # Do not use DNS-like bucket hosts but put buckets into path
-        #   link = RightScale::CloudApi::AWS::S3::Link::Manager::new(key, secret, endpoint, :no_dns_buckets => true)
+        #   link = RightScale::CloudApi::AWS::S3::Link::Manager::new(key, secret, endpoint, :cloud => { :no_dns_buckets => true })
         #   link.GetObject('Bucket' => 'foo', 'Object' => 'bar') #=>
         #     'https://s3.amazonaws.com/foo/bar?AWSAccessKeyId=AK...TA&Expires=1436557118&
         #      Signature=hg...%3D&response-content-type=image%2Fpeg'
@@ -407,4 +407,4 @@ module RightScale
       end
     end
   end
-end
+end

data/lib/cloud/aws/s3/wrappers/default.rb

@@ -283,7 +283,7 @@ module RightScale
                 :params => { 'uploads' => '' }
 
 
-              base.query_api_pattern 'UploadPart', :post, '{:Bucket}/{:Object}',
+              base.query_api_pattern 'UploadPart', :put, '{:Bucket}/{:Object}',
                 :params  => { 'partNumber' => :PartNumber,
                               'uploadId'   => :UploadId },
                 :headers => { 'content-type' => 'binary/octet-stream' }
@@ -298,7 +298,7 @@ module RightScale
               base.query_api_pattern 'CompleteMultipartUpload', :post, '{:Bucket}/{:Object}',
                 :params  => { 'uploadId' => :UploadId },
                 :body    => { 'CompleteMultipartUpload' => :CompleteMultipartUpload },
-                :headers => { 'x-amz-acl' => :Acl, 'content-type' => 'application/xml'}
+                :headers => { 'content-type' => 'application/xml'}
 
 
               base.query_api_pattern 'AbortMultipartUpload', :delete, '{:Bucket}/{:Object}',

data/lib/cloud/mws/base/manager.rb

@@ -22,6 +22,7 @@
 #++
 
 require "cloud/mws/base/routines/request_signer"
+require "cloud/mws/base/parsers/response_error"
 
 module RightScale
   module CloudApi
@@ -51,6 +52,8 @@ module RightScale
         set_routine ResponseParser
         set_routine ResultWrapper
 
+        set :response_error_parser => Parser::MWS::ResponseError
+
         def api(action, params={}, &block)
           params['Action'] ||= action.to_s._snake_case._camelize
           opts = {}

data/lib/cloud/mws/base/parsers/response_error.rb

@@ -0,0 +1,75 @@
+#--
+# Copyright (c) 2016 RightScale, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# 'Software'), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+
+module RightScale
+  module CloudApi
+    module Parser
+      # MWS namespace
+      module MWS
+
+        class ResponseError
+
+          # Parse HTTP error message from a response body
+          #
+          # @param [RightScale::CloudApi::HTTPResponse] response
+          # @param [Hash] options
+          # @option options [Class] :xml_parser
+          #
+          # @return [String]
+          #
+          # @example
+          #  <?xml version="1.0" encoding="UTF-8"?>
+          #  <ErrorResponse xmlns="http://mws.amazonaws.com/FulfillmentInboundShipment/2010-10-01/">
+          #    <Error>
+          #      <Type>Sender</Type>
+          #      <Code>InvalidRequestException</Code>
+          #      <Message>Reason: Cannot change Status of Shipment.</Message>
+          #    </Error>
+          #    <RequestId>dc32b07f-0ffb-4a4b-aab4-9f5fbb8d8797</RequestId>
+          #  </ErrorResponse>
+          #  # And the method parse all above into:
+          #  400: InvalidRequestException: Reason: Cannot change Status of Shipment. (RequestID: dc32b07f-0ffb-4a4b-aab4-9f5fbb8d8797)
+          #
+          def self.parse(response, options={})
+            result = "#{response.code}: "
+            body   = response.body.to_s
+            if response['content-type'].to_s[/xml/] || body[/\A<\?xml /]
+              hash = Utils::get_xml_parser_class(options[:xml_parser]).parse(body)
+              if hash["ErrorResponse"]
+                error  = hash["ErrorResponse"]["Error"]
+                result = "#{error['Code']}: #{error['Message']}"
+                # Add RequestId
+                result << " (RequestID: #{hash["ErrorResponse"]["RequestId"]})"
+              end
+            else
+              result << "#{body}" unless body._blank?
+            end
+            result
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/right_aws_api_version.rb

@@ -33,7 +33,7 @@ module RightScale
       # Gem version namespace
       module VERSION
         # Current version
-        STRING = '0.3.4'
+        STRING = '0.3.5'
       end
     end
   end

data/right_aws_api.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.require_path     = 'lib'
   spec.required_ruby_version = '>= 1.8.7'
 
-  spec.add_dependency 'right_cloud_api_base', '>= 0.2.2'
+  spec.add_dependency 'right_cloud_api_base', '>= 0.2.6'
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_aws_api
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - RightScale, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_cloud_api_base
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - lib/cloud/ecs/pa/parsers/response_error.rb
 - lib/cloud/ecs/pa/routines/request_signer.rb
 - lib/cloud/mws/base/manager.rb
+- lib/cloud/mws/base/parsers/response_error.rb
 - lib/cloud/mws/base/routines/request_signer.rb
 - lib/cloud/mws/cart_information/manager.rb
 - lib/cloud/mws/customer_information/manager.rb
@@ -165,12 +166,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The gem provides interface to AWS cloud services.
 test_files:
-- spec/describe_calls.rb
-- spec/cloud/aws/s3/routines/request_signer_spec.rb
 - spec/cloud/aws/base/helpers/utils_spec.rb
+- spec/cloud/aws/s3/routines/request_signer_spec.rb
+- spec/describe_calls.rb
 has_rdoc: