aws-sdk-core 2.0.0.rc13 → 2.0.0.rc14

data/lib/aws/plugins/global_configuration.rb

@@ -50,9 +50,7 @@ module Aws
       def apply_service_defaults(client_class, options)
         if defaults = Aws.config[client_class::IDENTIFIER]
           defaults.each do |option_name, default|
-            next if option_name == :api_version
-            next if options.key?(option_name)
-            options[option_name] = default
+            options[option_name] = default unless options.key?(option_name)
           end
         end
       end
@@ -60,8 +58,7 @@ module Aws
       def apply_aws_defaults(client_class, options)
         Aws.config.each do |option_name, default|
           next if client_class::IDENTIFIER == option_name
-          next if Aws.service_modules.key?(option_name)
-          next if option_name == :api_version
+          next if Aws.services.key?(option_name)
           next if options.key?(option_name)
           options[option_name] = default
         end

data/lib/aws/plugins/regional_endpoint.rb

@@ -19,8 +19,7 @@ module Aws
         ENV.values_at(*keys).compact.first
       }
 
-      # intentionally not documented
-      option(:region_defaults) do |cfg|
+      option(:endpoint) do |cfg|
         EndpointProvider.default_provider.resolve(
           service: cfg.api.metadata('endpointPrefix'),
           region: cfg.region,
@@ -28,8 +27,6 @@ module Aws
         )
       end
 
-      option(:endpoint) { |cfg| cfg.region_defaults[:endpoint] }
-
       def after_initialize(client)
         if client.config.region.nil? or client.config.region == ''
           raise Errors::MissingRegionError

data/lib/aws/plugins/request_signer.rb

@@ -40,8 +40,14 @@ module Aws
       # Intentionally not documented - this should go away when all
       # services support signature version 4 in every region.
       option(:signature_version) do |cfg|
-        cfg.region_defaults[:signature_version] or
-        cfg.api.metadata('signatureVersion')
+        if
+          cfg.api.metadata('endpointPrefix') == 's3' &&
+          cfg.api.metadata('v3Regions').include?(cfg.region)
+        then
+          's3'
+        else
+          cfg.api.metadata('signatureVersion')
+        end
       end
 
       option(:sigv4_name) do |cfg|

data/lib/aws/plugins/response_paging.rb

@@ -6,7 +6,7 @@ module Aws
       class Handler < Seahorse::Client::Handler
 
         def call(context)
-          paging_provider = context.config.api.metadata('paging')
+          paging_provider = context.client.class::PAGING_PROVIDER
           pager = paging_provider.pager(context.operation.name)
           PageableResponse.new(@handler.call(context), pager)
         end

data/lib/aws/plugins/s3_sse_cpk.rb

@@ -1,30 +1,51 @@
-require 'openssl'
-require 'base64'
+require 'uri'
 
 module Aws
   module Plugins
+
+    # @seahorse.client.option [Boolean] :require_https_for_sse_cpk (true)
+    #   When `true`, the endpoint **must** be HTTPS for all operations
+    #   where server-side-encryption is used with customer-provided keys.
+    #   This should only be disabled for local testing.
     class S3SseCpk < Seahorse::Client::Plugin
 
+      option(:require_https_for_sse_cpk, true)
+
       class Handler < Seahorse::Client::Handler
 
         def call(context)
-          compute_key_md5(context.params)
+          compute_key_md5(context)
           @handler.call(context)
         end
 
         private
 
-        def compute_key_md5(params)
+        def compute_key_md5(context)
+          params = context.params
           if key = params[:sse_customer_key]
+            require_https(context)
             params[:sse_customer_key] = base64(key)
             params[:sse_customer_key_md5] = base64(md5(key))
           end
           if key = params[:copy_source_sse_customer_key]
+            require_https(context)
             params[:copy_source_sse_customer_key] = base64(key)
             params[:copy_source_sse_customer_key_md5] = base64(md5(key))
           end
         end
 
+        def require_https(context)
+          unless URI::HTTPS === context.config.endpoint
+            msg = <<-MSG.strip.gsub("\n", ' ')
+              Attempting to send customer-provided-keys for S3
+              server-side-encryption over HTTP; Please configure a HTTPS
+              endpoint. If you are attempting to use a test endpoint,
+              you can disable this check via `:require_https_for_sse_cpk`
+            MSG
+            raise ArgumentError, msg
+          end
+        end
+
         def md5(str)
           OpenSSL::Digest::MD5.digest(str)
         end

data/lib/aws/service.rb

@@ -16,29 +16,11 @@ module Aws
       unless @warned
         @warned = true
         warn(<<-MSG.strip)
-#{self.name}.new deprecated as of v2.0.0.rc11 and will be removed as of v2.0.0.0 final; use #{self.name}.client() or #{self.name}::Client.new() instead
+#{self.name}.new deprecated as of v2.0.0.rc11 and will be removed as of v2.0.0.0 final; use #{self.name}::Client.new() instead
         MSG
       end
-      client(options)
-    end
-
-    # Constructs and returns an API client for this service.
-    # All options are passed to the Client class constructor.
-    def client(options = {})
       const_get(:Client).new(options)
     end
 
-    class << self
-
-      # @api private
-      def define(identifier, versions = {})
-        svc_mod = Module.new
-        svc_mod.extend(Service)
-        svc_mod.const_set(:Errors, Module.new { extend Errors::DynamicErrors })
-        svc_mod.const_set(:Client, ClientFactory.define(identifier, versions))
-        svc_mod
-      end
-
-    end
   end
 end

data/lib/aws/service_builder.rb

@@ -0,0 +1,56 @@
+module Aws
+  class ServiceBuilder
+    class << self
+
+      # @param [Symbol] identifier
+      # @option options [required, String, Hash, Seahorse::Model::Api] 'api'
+      # @option options [String, Hash, Paging::Provider] 'paging'
+      # @return [Module<Service>]
+      def new(identifier, options = {})
+        svc_module = Module.new
+        svc_module.send(:extend, Service)
+        svc_module.const_set(:Errors, Module.new { extend Errors::DynamicErrors })
+        svc_module.const_set(:Client, client_class(identifier, options))
+        svc_module
+      end
+
+      private
+
+      def client_class(identifier, options)
+        client_class = Class.new(Seahorse::Client::Base)
+        client_class.const_set(:IDENTIFIER, identifier)
+        client_class.const_set(:PAGING_PROVIDER, paging_provider(options))
+        client_class.set_api(api(options))
+        Api::ServiceCustomizations.apply(client_class)
+        client_class
+      end
+
+      def api(options)
+        api = options['api']
+        case api
+        when Seahorse::Model::Api then api
+        when Hash then Seahorse::Model::Api.new(api)
+        when String then Seahorse::Model::Api.new(load_json(api))
+        else
+          raise ArgumentError, "expected :api to be an Api, Hash or String"
+        end
+      end
+
+      def paging_provider(options)
+        paginators = options['paginators']
+        case paginators
+        when Paging::Provider then paginators
+        when Hash then Paging::Provider.new(paginators)
+        when String then Paging::Provider.new(load_json(paginators))
+        when nil then Paging::NullProvider.new
+        end
+      end
+
+      def load_json(path)
+        path = File.join(GEM_ROOT, path) unless path.match(/^#{File::SEPARATOR}/)
+        MultiJson.load(File.read(path))
+      end
+
+    end
+  end
+end

data/lib/aws/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.0.rc13'
+  VERSION = '2.0.0.rc14'
 end

data/lib/aws/xml/builder.rb

@@ -91,14 +91,10 @@ module Aws
 
       def shape_attrs(shape)
         if xmlns = shape.metadata('xmlNamespace')
-          # temporary work-around until all models are updated to
-          # xmlNamespace with a hash and optional prefix
-          if xmlns.is_a?(Hash)
-            key = 'xmlns'
-            key += ':' + xmlns['prefix'] if xmlns['prefix']
-            { key => xmlns['uri'] }
+          if prefix = xmlns['prefix']
+            { 'xmlns:' + prefix => xmlns['uri'] }
           else
-            { 'xmlns' => xmlns }
+            { 'xmlns' => xmlns['uri'] }
           end
         else
           {}

data/{vendor/seahorse/lib → lib}/seahorse/client/http/request.rb

@@ -30,7 +30,7 @@ module Seahorse
         # @return [IO]
         attr_reader :body
 
-        # @param [String, URI::HTTP, URI::HTTPS, nil]
+        # @param [String, URI::HTTP, URI::HTTPS, nil] endpoint
         def endpoint=(endpoint)
           endpoint = URI.parse(endpoint) if endpoint.is_a?(String)
           if endpoint.nil? or URI::HTTP === endpoint or URI::HTTPS === endpoint

data/{vendor/seahorse/lib → lib}/seahorse/client/plugins/endpoint.rb

@@ -18,6 +18,16 @@ module Seahorse
 
         option(:endpoint)
 
+        def after_initialize(client)
+          endpoint = URI.parse(client.config.endpoint.to_s)
+          if URI::HTTPS === endpoint or URI::HTTP === endpoint
+            client.config.endpoint = endpoint
+          else
+            msg = 'expected :endpoint to be a HTTP or HTTPS endpoint'
+            raise ArgumentError, msg
+          end
+        end
+
         class Handler < Client::Handler
 
           def call(context)
@@ -28,31 +38,30 @@ module Seahorse
           private
 
           def build_endpoint(context)
-            uri = configured_endpoint(context)
+            uri = URI.parse(context.config.endpoint.to_s)
             apply_path_params(uri, context)
             apply_querystring_params(uri, context)
             uri
           end
 
-          def configured_endpoint(context)
-            if context.config.endpoint
-              endpoint = context.config.endpoint.to_s
-              endpoint = "https://#{endpoint}" unless endpoint =~ /^http/
-              URI.parse(endpoint)
-            else
-              raise "required configuration option :endpoint not set"
-            end
-          end
-
           def apply_path_params(uri, context)
             path = uri.path.sub(/\/$/, '')
             path += context.operation.http_request_uri.split('?')[0]
             input = context.operation.input
-            uri.path = path.gsub(/{\w+}/) do |placeholder|
-              placeholder = placeholder[1..-2]
+            uri.path = path.gsub(/{\w+\+?}/) do |placeholder|
+              if placeholder.include?('+')
+                placeholder = placeholder[1..-3]
+                greedy = true
+              else
+                placeholder = placeholder[1..-2]
+              end
               name, shape = input.member_by_location_name(placeholder)
               param = context.params[name]
-              param.split('/').map{ |value| escape(value) }.join('/')
+              if greedy
+                param.split('/').map{ |value| escape(value) }.join('/')
+              else
+                escape(param)
+              end
             end
           end
 

data/{vendor/seahorse/lib → lib}/seahorse/model/shapes.rb

@@ -361,7 +361,7 @@ module Seahorse
 
       end
 
-      class Char < String; end
+      class Character < String; end
 
       class Byte < String; end
 
@@ -422,7 +422,7 @@ module Seahorse
       register('blob', Shapes::Blob)
       register('byte', Shapes::Byte)
       register('boolean', Shapes::Boolean)
-      register('char', Shapes::Char)
+      register('character', Shapes::Character)
       register('double', Shapes::Double)
       register('float', Shapes::Float)
       register('integer', Shapes::Integer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc13
+  version: 2.0.0.rc14
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -56,14 +56,14 @@ dependencies:
   name: jamespath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides client libraries for AWS.
@@ -83,7 +83,6 @@ files:
 - lib/aws/api/manifest_builder.rb
 - lib/aws/api/minifier.rb
 - lib/aws/api/service_customizations.rb
-- lib/aws/client_factory.rb
 - lib/aws/credential_provider_chain.rb
 - lib/aws/credentials.rb
 - lib/aws/empty_structure.rb
@@ -137,6 +136,7 @@ files:
 - lib/aws/response_handler.rb
 - lib/aws/rest_body_handler.rb
 - lib/aws/service.rb
+- lib/aws/service_builder.rb
 - lib/aws/shared_credentials.rb
 - lib/aws/signers/base.rb
 - lib/aws/signers/handler.rb
@@ -153,49 +153,49 @@ files:
 - lib/aws/xml/rest_handler.rb
 - lib/aws-sdk-core.rb
 - lib/aws.rb
-- vendor/seahorse/lib/seahorse/client/base.rb
-- vendor/seahorse/lib/seahorse/client/block_io.rb
-- vendor/seahorse/lib/seahorse/client/configuration.rb
-- vendor/seahorse/lib/seahorse/client/handler.rb
-- vendor/seahorse/lib/seahorse/client/handler_builder.rb
-- vendor/seahorse/lib/seahorse/client/handler_list.rb
-- vendor/seahorse/lib/seahorse/client/handler_list_entry.rb
-- vendor/seahorse/lib/seahorse/client/http/error.rb
-- vendor/seahorse/lib/seahorse/client/http/headers.rb
-- vendor/seahorse/lib/seahorse/client/http/request.rb
-- vendor/seahorse/lib/seahorse/client/http/response.rb
-- vendor/seahorse/lib/seahorse/client/logging/formatter.rb
-- vendor/seahorse/lib/seahorse/client/logging/handler.rb
-- vendor/seahorse/lib/seahorse/client/managed_file.rb
-- vendor/seahorse/lib/seahorse/client/net_http/connection_pool.rb
-- vendor/seahorse/lib/seahorse/client/net_http/handler.rb
-- vendor/seahorse/lib/seahorse/client/net_http/patches.rb
-- vendor/seahorse/lib/seahorse/client/param_converter.rb
-- vendor/seahorse/lib/seahorse/client/param_validator.rb
-- vendor/seahorse/lib/seahorse/client/plugin.rb
-- vendor/seahorse/lib/seahorse/client/plugin_list.rb
-- vendor/seahorse/lib/seahorse/client/plugins/api.rb
-- vendor/seahorse/lib/seahorse/client/plugins/content_length.rb
-- vendor/seahorse/lib/seahorse/client/plugins/endpoint.rb
-- vendor/seahorse/lib/seahorse/client/plugins/json_simple.rb
-- vendor/seahorse/lib/seahorse/client/plugins/logging.rb
-- vendor/seahorse/lib/seahorse/client/plugins/net_http.rb
-- vendor/seahorse/lib/seahorse/client/plugins/operation_methods.rb
-- vendor/seahorse/lib/seahorse/client/plugins/param_conversion.rb
-- vendor/seahorse/lib/seahorse/client/plugins/param_validation.rb
-- vendor/seahorse/lib/seahorse/client/plugins/raise_response_errors.rb
-- vendor/seahorse/lib/seahorse/client/plugins/restful_bindings.rb
-- vendor/seahorse/lib/seahorse/client/request.rb
-- vendor/seahorse/lib/seahorse/client/request_context.rb
-- vendor/seahorse/lib/seahorse/client/response.rb
-- vendor/seahorse/lib/seahorse/client/xml/builder.rb
-- vendor/seahorse/lib/seahorse/model/api.rb
-- vendor/seahorse/lib/seahorse/model/operation.rb
-- vendor/seahorse/lib/seahorse/model/shape_map.rb
-- vendor/seahorse/lib/seahorse/model/shapes.rb
-- vendor/seahorse/lib/seahorse/util.rb
-- vendor/seahorse/lib/seahorse/version.rb
-- vendor/seahorse/lib/seahorse.rb
+- lib/seahorse/client/base.rb
+- lib/seahorse/client/block_io.rb
+- lib/seahorse/client/configuration.rb
+- lib/seahorse/client/handler.rb
+- lib/seahorse/client/handler_builder.rb
+- lib/seahorse/client/handler_list.rb
+- lib/seahorse/client/handler_list_entry.rb
+- lib/seahorse/client/http/error.rb
+- lib/seahorse/client/http/headers.rb
+- lib/seahorse/client/http/request.rb
+- lib/seahorse/client/http/response.rb
+- lib/seahorse/client/logging/formatter.rb
+- lib/seahorse/client/logging/handler.rb
+- lib/seahorse/client/managed_file.rb
+- lib/seahorse/client/net_http/connection_pool.rb
+- lib/seahorse/client/net_http/handler.rb
+- lib/seahorse/client/net_http/patches.rb
+- lib/seahorse/client/param_converter.rb
+- lib/seahorse/client/param_validator.rb
+- lib/seahorse/client/plugin.rb
+- lib/seahorse/client/plugin_list.rb
+- lib/seahorse/client/plugins/api.rb
+- lib/seahorse/client/plugins/content_length.rb
+- lib/seahorse/client/plugins/endpoint.rb
+- lib/seahorse/client/plugins/json_simple.rb
+- lib/seahorse/client/plugins/logging.rb
+- lib/seahorse/client/plugins/net_http.rb
+- lib/seahorse/client/plugins/operation_methods.rb
+- lib/seahorse/client/plugins/param_conversion.rb
+- lib/seahorse/client/plugins/param_validation.rb
+- lib/seahorse/client/plugins/raise_response_errors.rb
+- lib/seahorse/client/plugins/restful_bindings.rb
+- lib/seahorse/client/request.rb
+- lib/seahorse/client/request_context.rb
+- lib/seahorse/client/response.rb
+- lib/seahorse/client/xml/builder.rb
+- lib/seahorse/model/api.rb
+- lib/seahorse/model/operation.rb
+- lib/seahorse/model/shape_map.rb
+- lib/seahorse/model/shapes.rb
+- lib/seahorse/util.rb
+- lib/seahorse/version.rb
+- lib/seahorse.rb
 - apis/autoscaling-2011-01-01.api.json
 - apis/autoscaling-2011-01-01.paginators.json
 - apis/cloudformation-2010-05-15.api.json
@@ -303,7 +303,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- vendor/seahorse/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='