aws-sdk-core 2.1.0 → 2.1.4

data/lib/aws-sdk-core/signers/s3.rb

@@ -1,7 +1,7 @@
 require 'set'
 require 'time'
 require 'openssl'
-require 'uri'
+require 'webrick/httputils'
 
 module Aws
   module Signers
@@ -53,7 +53,7 @@ module Aws
       def signature(request)
         string_to_sign = string_to_sign(request)
         signature = digest(credentials.secret_access_key, string_to_sign)
-        URI.escape(signature)
+        uri_escape(signature)
       end
 
       def digest(secret, string_to_sign)
@@ -150,7 +150,35 @@ module Aws
       def signed_querystring_params(endpoint)
         endpoint.query.to_s.split('&').select do |p|
           SIGNED_QUERYSTRING_PARAMS.include?(p.split('=')[0])
-        end.map { |p| URI.decode(p) }
+        end.map { |p| CGI.unescape(p) }
+      end
+
+      def uri_escape(s)
+
+        #URI.escape(s)
+
+        # URI.escape is deprecated, replacing it with escape from webrick
+        # to squelch the massive number of warnings generated from Ruby.
+        # The following script was used to determine the differences
+        # between the various escape methods available. The webrick
+        # escape only had two differences and it is available in the
+        # standard lib.
+        #
+        #     (0..255).each {|c|
+        #       s = [c].pack("C")
+        #       e = [
+        #         CGI.escape(s),
+        #         ERB::Util.url_encode(s),
+        #         URI.encode_www_form_component(s),
+        #         WEBrick::HTTPUtils.escape_form(s),
+        #         WEBrick::HTTPUtils.escape(s),
+        #         URI.escape(s),
+        #       ]
+        #       next if e.uniq.length == 1
+        #       puts("%5s %5s %5s %5s %5s %5s %5s" % ([s.inspect] + e))
+        #     }
+        #
+        WEBrick::HTTPUtils.escape(s).gsub('%5B', '[').gsub('%5D', ']')
       end
 
     end

data/lib/aws-sdk-core/stubbing/protocols/ec2.rb

@@ -31,11 +31,9 @@ module Aws
 
         def build_body(api, operation, data)
           xml = []
-          if rules = operation.output
-            Xml::Builder.new(operation.output, target:xml).to_xml(data)
-            xml.shift
-            xml.pop
-          end
+          Xml::Builder.new(operation.output, target:xml).to_xml(data)
+          xml.shift
+          xml.pop
           xmlns = "http://ec2.amazonaws.com/doc/#{api.version}/".inspect
           xml.unshift("  <requestId>stubbed-request-id</requestId>")
           xml.unshift("<#{operation.name}Response xmlns=#{xmlns}>\n")

data/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb

@@ -7,7 +7,6 @@ module Aws
 
         def body_for(api, operation, rules, data)
           xml = []
-          builder = Aws::Xml::DocBuilder.new(target: xml, indent: '  ')
           rules.location_name = operation.name + 'Result'
           rules['xmlNamespace'] = { 'uri' => api.metadata['xmlNamespace'] }
           Xml::Builder.new(rules, target:xml).to_xml(data)

data/lib/aws-sdk-core/type_builder.rb

@@ -0,0 +1,14 @@
+module Aws
+  # @api private
+  class TypeBuilder
+
+    def initialize(svc_module)
+      @types_module = svc_module.const_set(:Types, Module.new)
+    end
+
+    def build_type(shape, shapes)
+      @types_module.const_set(shape.name, Structure.new(*shape.member_names))
+    end
+
+  end
+end

data/lib/aws-sdk-core/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.1.0'
+  VERSION = '2.1.4'
 end

data/lib/aws-sdk-core/xml/parser/engines/oga.rb

@@ -0,0 +1,39 @@
+require 'oga'
+
+module Aws
+  module Xml
+    class Parser
+      class OgaEngine
+
+        def initialize(stack)
+          @stack = stack
+          @depth = 0
+        end
+
+        def parse(xml)
+          Oga.sax_parse_xml(self, xml, strict:true)
+        rescue LL::ParserError => error
+          raise ParsingError.new(error.message, nil, nil)
+        end
+
+        def on_element(namespace, name, attrs = {})
+          @depth += 1
+          @stack.start_element(name)
+          attrs.each do |attr|
+            @stack.attr(*attr)
+          end
+        end
+
+        def on_text(value)
+          @stack.text(value) if @depth > 0
+        end
+
+        def after_element(_, _)
+          @stack.end_element
+          @depth -= 1
+        end
+
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/xml/parser.rb

@@ -10,6 +10,7 @@ module Aws
 
       autoload :LibxmlEngine, 'aws-sdk-core/xml/parser/engines/libxml'
       autoload :NokogiriEngine, 'aws-sdk-core/xml/parser/engines/nokogiri'
+      autoload :OgaEngine, 'aws-sdk-core/xml/parser/engines/oga'
       autoload :OxEngine, 'aws-sdk-core/xml/parser/engines/ox'
       autoload :RexmlEngine, 'aws-sdk-core/xml/parser/engines/rexml'
 
@@ -35,6 +36,7 @@ module Aws
         #   Must be one of the following values:
         #
         #   * :ox
+        #   * :oga
         #   * :libxml
         #   * :nokogiri
         #   * :rexml
@@ -47,6 +49,7 @@ module Aws
         #   One of:
         #
         #   * {OxEngine}
+        #   * {OgaEngine}
         #   * {LibxmlEngine}
         #   * {NokogiriEngine}
         #   * {RexmlEngine}
@@ -71,7 +74,7 @@ module Aws
 
       end
 
-      self.engine = [:ox, :libxml, :nokogiri, :rexml].find do |name|
+      self.engine = [:ox, :oga, :libxml, :nokogiri, :rexml].find do |name|
         try_load_engine(name)
       end
 

data/lib/aws-sdk-core.rb

@@ -26,7 +26,9 @@ module Aws
     CloudTrail
     CloudWatch
     CloudWatchLogs
+    CodeCommit
     CodeDeploy
+    CodePipeline
     CognitoIdentity
     CognitoSync
     ConfigService
@@ -99,6 +101,7 @@ module Aws
   autoload :SharedCredentials, 'aws-sdk-core/shared_credentials'
   autoload :Structure, 'aws-sdk-core/structure'
   autoload :TreeHash, 'aws-sdk-core/tree_hash'
+  autoload :TypeBuilder, 'aws-sdk-core/type_builder'
   autoload :VERSION, 'aws-sdk-core/version'
 
   # @api private
@@ -191,7 +194,6 @@ module Aws
   # @api private
   module Signers
     autoload :Base, 'aws-sdk-core/signers/base'
-    autoload :Handler, 'aws-sdk-core/signers/handler'
     autoload :S3, 'aws-sdk-core/signers/s3'
     autoload :V2, 'aws-sdk-core/signers/v2'
     autoload :V3, 'aws-sdk-core/signers/v3'
@@ -285,16 +287,25 @@ module Aws
       eager_loader = EagerLoader.new
       eager_loader.load(JMESPath)
       eager_loader.load(Seahorse)
-      (options[:services] || SERVICE_MODULE_NAMES).each do |svc_name|
-        begin
-          eager_loader.load(Aws.const_get(svc_name))
-        rescue NameError
-          raise ArgumentError, "invalid service Aws::#{svc_name}"
-        end
+      sub_modules(options).each do |module_or_class|
+        eager_loader.load(module_or_class)
       end
       eager_loader
     end
 
+    def sub_modules(options = {})
+      constants = Aws.constants.map(&:to_s)
+      if options[:services]
+        constants -= SERVICE_MODULE_NAMES
+        constants += options[:services] || SERVICE_MODULE_NAMES
+      end
+      constants.inject([]) do |modules, const_name|
+        constant = Aws.const_get(const_name)
+        modules << constant if Module === constant
+        modules
+      end
+    end
+
     # Yields to the given block for each service that has already been
     # defined via {add_service}. Also yields to the given block for
     # each new service added after the callback is registered.
@@ -339,18 +350,11 @@ module Aws
 
   # build service client classes
   service_added do |name, svc_module, options|
+    options[:type_builder] ||= TypeBuilder.new(svc_module)
     svc_module.const_set(:Client, Client.define(name, options))
     svc_module.const_set(:Errors, Module.new { extend Errors::DynamicErrors })
   end
 
-  # define a struct class for each client data type
-  service_added do |name, svc_module, options|
-    svc_module.const_set(:Types, Module.new)
-    svc_module::Client.api.metadata['shapes'].each_structure do |shape|
-      svc_module::Types.const_set(shape.name, shape[:struct_class])
-    end
-  end
-
   # enable response paging
   service_added do |name, svc_module, options|
     if paginators = options[:paginators]

data/lib/seahorse/client/http/request.rb

@@ -11,7 +11,7 @@ module Seahorse
         # @option options [Headers] :headers (Headers.new)
         # @option options [Body] :body (StringIO.new)
         def initialize(options = {})
-          self.endpoint = options[:endpoint] if options[:endpoint]
+          self.endpoint = options[:endpoint]
           self.http_method = options[:http_method] || 'GET'
           self.headers = Headers.new(options[:headers] || {})
           self.body = options[:body]

data/lib/seahorse/client/http/response.rb

@@ -23,12 +23,14 @@ module Seahorse
         # @return [Headers]
         attr_accessor :headers
 
-        # @return [IO]
-        attr_accessor :body
-
         # @return [StandardError, nil]
         attr_reader :error
 
+        # @return [IO]
+        def body
+          @body
+        end
+
         # @param [#read, #size, #rewind] io
         def body=(io)
           @body = case io

data/lib/seahorse/client/net_http/connection_pool.rb

@@ -106,9 +106,9 @@ module Seahorse
             session.continue_timeout = http_continue_timeout if
               session.respond_to?(:continue_timeout=)
             yield(session)
-          rescue Exception => error
+          rescue
             session.finish if session
-            raise error
+            raise
           else
             # No error raised? Good, check the session into the pool.
             @pool_mutex.synchronize { @pool[endpoint] << session }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.4
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -39,21 +39,22 @@ files:
 - apis/cloudformation/2010-05-15/paginators-1.json
 - apis/cloudformation/2010-05-15/resources-1.json
 - apis/cloudformation/2010-05-15/waiters-2.json
-- apis/cloudfront/2014-11-06/api-2.json
-- apis/cloudfront/2014-11-06/paginators-1.json
-- apis/cloudfront/2014-11-06/waiters-2.json
+- apis/cloudfront/2015-04-17/api-2.json
+- apis/cloudfront/2015-04-17/paginators-1.json
+- apis/cloudfront/2015-04-17/waiters-2.json
 - apis/cloudhsm/2014-05-30/api-2.json
 - apis/cloudsearch/2013-01-01/api-2.json
 - apis/cloudsearch/2013-01-01/paginators-1.json
 - apis/cloudsearchdomain/2013-01-01/api-2.json
 - apis/cloudtrail/2013-11-01/api-2.json
 - apis/cloudtrail/2013-11-01/paginators-1.json
+- apis/codecommit/2015-04-13/api-2.json
+- apis/codecommit/2015-04-13/paginators-1.json
 - apis/codedeploy/2014-10-06/api-2.json
 - apis/codedeploy/2014-10-06/paginators-1.json
+- apis/codepipeline/2015-07-09/api-2.json
 - apis/cognito-identity/2014-06-30/api-2.json
 - apis/cognito-sync/2014-06-30/api-2.json
-- apis/config/2014-10-17/api-2.json
-- apis/config/2014-10-17/paginators-1.json
 - apis/config/2014-11-12/api-2.json
 - apis/config/2014-11-12/paginators-1.json
 - apis/datapipeline/2012-10-29/api-2.json
@@ -65,14 +66,6 @@ files:
 - apis/dynamodb/2012-08-10/paginators-1.json
 - apis/dynamodb/2012-08-10/resources-1.json
 - apis/dynamodb/2012-08-10/waiters-2.json
-- apis/ec2/2014-10-01/api-2.json
-- apis/ec2/2014-10-01/paginators-1.json
-- apis/ec2/2014-10-01/resources-1.json
-- apis/ec2/2014-10-01/waiters-2.json
-- apis/ec2/2015-03-01/api-2.json
-- apis/ec2/2015-03-01/paginators-1.json
-- apis/ec2/2015-03-01/resources-1.json
-- apis/ec2/2015-03-01/waiters-2.json
 - apis/ec2/2015-04-15/api-2.json
 - apis/ec2/2015-04-15/paginators-1.json
 - apis/ec2/2015-04-15/resources-1.json
@@ -105,6 +98,7 @@ files:
 - apis/iam/2010-05-08/api-2.json
 - apis/iam/2010-05-08/paginators-1.json
 - apis/iam/2010-05-08/resources-1.json
+- apis/iam/2010-05-08/waiters-2.json
 - apis/importexport/2010-06-01/api-2.json
 - apis/importexport/2010-06-01/paginators-1.json
 - apis/kinesis/2013-12-02/api-2.json
@@ -186,7 +180,9 @@ files:
 - lib/aws-sdk-core/cloudtrail.rb
 - lib/aws-sdk-core/cloudwatch.rb
 - lib/aws-sdk-core/cloudwatchlogs.rb
+- lib/aws-sdk-core/codecommit.rb
 - lib/aws-sdk-core/codedeploy.rb
+- lib/aws-sdk-core/codepipeline.rb
 - lib/aws-sdk-core/cognitoidentity.rb
 - lib/aws-sdk-core/cognitosync.rb
 - lib/aws-sdk-core/configservice.rb
@@ -317,6 +313,7 @@ files:
 - lib/aws-sdk-core/support.rb
 - lib/aws-sdk-core/swf.rb
 - lib/aws-sdk-core/tree_hash.rb
+- lib/aws-sdk-core/type_builder.rb
 - lib/aws-sdk-core/version.rb
 - lib/aws-sdk-core/waiters/errors.rb
 - lib/aws-sdk-core/waiters/null_provider.rb
@@ -332,6 +329,7 @@ files:
 - lib/aws-sdk-core/xml/parser.rb
 - lib/aws-sdk-core/xml/parser/engines/libxml.rb
 - lib/aws-sdk-core/xml/parser/engines/nokogiri.rb
+- lib/aws-sdk-core/xml/parser/engines/oga.rb
 - lib/aws-sdk-core/xml/parser/engines/ox.rb
 - lib/aws-sdk-core/xml/parser/engines/rexml.rb
 - lib/aws-sdk-core/xml/parser/frame.rb