aws-sdk-core 2.0.48 → 2.1.0

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

@@ -6,7 +6,7 @@ module Aws
 
       # @param [Credentials] credentials
       def initialize(credentials)
-        @credentials = credentials
+        @credentials = credentials.credentials
       end
 
       private

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

@@ -27,9 +27,9 @@ module Aws
         ).sign(context.http_request)
       end
 
-      # @param [Credentials] credentials
+      # @param [CredentialProvider] credentials
       def initialize(credentials, params, force_path_style)
-        @credentials = credentials
+        @credentials = credentials.credentials
         @params = Query::ParamList.new
         params.each_pair do |param_name, param_value|
           @params.set(param_name, param_value)
@@ -51,7 +51,6 @@ module Aws
       end
 
       def signature(request)
-        secret = credentials.secret_access_key
         string_to_sign = string_to_sign(request)
         signature = digest(credentials.secret_access_key, string_to_sign)
         URI.escape(signature)

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

@@ -25,14 +25,13 @@ module Aws
       def string_to_sign(http_request, params)
         [
           http_request.http_method,
-          host(http_request),
-          http_request.endpoint.path,
+          host(http_request.endpoint),
+          path(http_request.endpoint),
           params.to_s,
         ].join("\n")
       end
 
-      def host(http_request)
-        endpoint = http_request.endpoint
+      def host(endpoint)
         host = endpoint.host.downcase
         if
           (endpoint.scheme == 'http' && endpoint.port != 80) ||
@@ -43,6 +42,10 @@ module Aws
         host
       end
 
+      def path(endpoint)
+        endpoint.path == '' ? '/' : endpoint.path
+      end
+
     end
   end
 end

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

@@ -21,7 +21,7 @@ module Aws
       #   will be made to.
       def initialize(credentials, service_name, region)
         @service_name = service_name
-        @credentials = credentials
+        @credentials = credentials.credentials
         @region = region
       end
 
@@ -32,8 +32,8 @@ module Aws
         body_digest = req.headers['X-Amz-Content-Sha256'] || hexdigest(req.body)
         req.headers['X-Amz-Date'] = datetime
         req.headers['Host'] = req.endpoint.host
-        req.headers['X-Amz-Security-Token'] = credentials.session_token if
-          credentials.session_token
+        req.headers['X-Amz-Security-Token'] = @credentials.session_token if
+          @credentials.session_token
         req.headers['X-Amz-Content-Sha256'] ||= body_digest
         req.headers['Authorization'] = authorization(req, datetime, body_digest)
         req
@@ -67,8 +67,8 @@ module Aws
         params.set("X-Amz-Date", now)
         params.set("X-Amz-Expires", options[:expires_in].to_s)
         params.set("X-Amz-SignedHeaders", signed_headers(request))
-        params.set('X-Amz-Security-Token', credentials.session_token) if
-          credentials.session_token
+        params.set('X-Amz-Security-Token', @credentials.session_token) if
+          @credentials.session_token
 
         endpoint = request.endpoint
         if endpoint.query
@@ -88,14 +88,14 @@ module Aws
       end
 
       def credential(datetime)
-        "#{credentials.access_key_id}/#{credential_scope(datetime)}"
+        "#{@credentials.access_key_id}/#{credential_scope(datetime)}"
       end
 
       def signature(request, datetime, body_digest)
-        k_secret = credentials.secret_access_key
+        k_secret = @credentials.secret_access_key
         k_date = hmac("AWS4" + k_secret, datetime[0,8])
-        k_region = hmac(k_date, region)
-        k_service = hmac(k_region, service_name)
+        k_region = hmac(k_date, @region)
+        k_service = hmac(k_region, @service_name)
         k_credentials = hmac(k_service, 'aws4_request')
         hexhmac(k_credentials, string_to_sign(request, datetime, body_digest))
       end
@@ -112,8 +112,8 @@ module Aws
       def credential_scope(datetime)
         parts = []
         parts << datetime[0,8]
-        parts << region
-        parts << service_name
+        parts << @region
+        parts << @service_name
         parts << 'aws4_request'
         parts.join("/")
       end
@@ -200,17 +200,6 @@ module Aws
         OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), key, value)
       end
 
-      private
-
-      # @return [Credentials]
-      attr_reader :credentials
-
-      # @return [String]
-      attr_reader :service_name
-
-      # @return [String]
-      attr_reader :region
-
     end
   end
 end

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

@@ -1,56 +1,28 @@
-require 'thread'
-
 module Aws
-
-  # A utilty class that makes it easier to work with Struct objects.
-  #
-  # ## Construction
-  #
-  # You can construct a Structure with a simple hash.
-  #
-  #     person = Structure.new(name: 'John Doe', age: 40)
-  #     #=> #<struct  name="John Doe", age=40>
-  #
-  # ## Empty Structures
-  #
-  # The stdlib Struct class does not work with empty member lists.
-  # Structure solves this by introducing the EmptyStructure class.
-  #
-  #     struct = Structure.new({})
-  #     #=> #<struct>
-  #
-  # ## Structure Classes
-  #
-  # In addition to simpler object construction, struct classes are re-used
-  # automatically.
-  #
-  #   person1 = Structure.new(name: 'John Doe', age: 40)
-  #   person2 = Structure.new(name: 'Jane Doe', age: 40)
-  #
-  #   person1.class == person2.class
-  #
-  # ## Hash Conversion
-  #
-  # Calling {#to_h} or {#to_hash} on a Structure object performs a deep
-  # conversion of Structure objects into hashes.
-  #
-  #     person = Structure.new(
-  #       name: "John",
-  #       age: 40,
-  #       friend: Structure.new(name: "Jane", age: 40, friend: nil)
-  #     )
-  #     person.to_h
-  #     #=> {:name=>"John", :age=>40, :friend=>{:name=>"Jane", :age=>40}}
-  #
+  # @api private
   class Structure < Struct
 
-    @@classes = {}
-    @@classes_mutex = Mutex.new
-
     if Struct.instance_methods.include?(:to_h)
       alias orig_to_h to_h
     end
 
+    def initialize(values = {})
+      values.each do |k, v|
+        self[k] = v
+      end
+    end
+
+    # @return [Boolean] Returns `true` if this structure has a value
+    #   set for the given member.
+    def key?(member_name)
+      !self[member_name].nil?
+    end
+
+    # @return [Boolean] Returns `true` if all of the member values are `nil`.
+    def empty?
+      values.compact == []
+    end
+
     # Deeply converts the Structure into a hash.  Structure members that
     # are `nil` are omitted from the resultant hash.
     #
@@ -77,109 +49,18 @@ module Aws
     end
     alias to_hash to_h
 
+    undef_method :each
+
     class << self
 
-      # Defines a Struct class with the given member names.  Returns an
-      # instance of that class with nil member values.
-      #
-      #     struct = Structure.new([:name, :age])
-      #     struct.members
-      #     #=> [:name, :age]
-      #
-      #     struct[:name] #=> nil
-      #     struct[:age] #=> nil
-      #
-      # You can provide an ordered list of values to initialize structure
-      # members with:
-      #
-      #     struct = Structure.new([:name, :age], ['John Doe', 40])
-      #     struct.members
-      #     #=> [:name, :age]
-      #
-      #     struct[:name] #=> 'John Doe'
-      #     struct[:age] #=> 40
-      #
-      # Calling {new} multiple times with the same list of members will
-      # reuse Struct classes.
-      #
-      #     struct1 = Structure.new([:name, :age])
-      #     struct2 = Structure.new([:name, :age])
-      #
-      #     struct1.class.equal?(struct2.class)
-      #     #=> true
-      #
-      # Calling {new} without members, or with an empty list of members
-      # will return an {EmptyStructure}:
-      #
-      #     struct = Structure.new
-      #     struct.members
-      #     #=> []
-      #
-      # You can also create an empty Structure via {EmptyStructure}.
-      #
-      # @overload new(member_names)
-      #   @param [Array<Symbol>] member_names An array of member names.
-      #   @return [Struct]
-      #
-      # @overload new(*member_names)
-      #   @param [Symbol] member_names A list of member names.
-      #   @return [Struct]
-      #
-      # @overload new(members)
-      #   @param [Hash<Symbol,Object>] members A hash of member names
-      #     and values.
-      #   @return [Struct]
-      #
-      # @overload new()
-      #   @return [EmptyStructure]
-      #
+      # @api private
       def new(*args)
-        members, values = parse_args(args)
-        if members.empty? && self == Structure
-          EmptyStructure.new
+        if args == ['AwsEmptyStructure']
+          super
+        elsif args.empty? || args.first == []
+          EmptyStructure
         else
-          struct_class = @@classes[members]
-          if struct_class.nil?
-            @@classes_mutex.synchronize do
-              struct_class = members.empty? ? super(:_) : super(*members)
-              @@classes[members] = struct_class
-            end
-          end
-          struct_class.new(*values)
-        end
-      end
-
-      # Deeply converts hashes to Structure objects.  Hashes with string
-      # keys are not converted, but their values are.
-      # @api private
-      def from_hash(value)
-        case value
-        when Hash
-          data = value.each.with_object({}) do |(key, value), hash|
-            hash[key] = from_hash(value)
-          end
-          Symbol === data.keys.first ? new(data) : data
-        when Array
-          value.map { |v| from_hash(v) }
-        else value
-        end
-      end
-
-      private
-
-      def parse_args(args)
-        case args.count
-        when 0 then [[], []]
-        when 1 then parse_single_arg(args.first)
-        else [args, []]
-        end
-      end
-
-      def parse_single_arg(arg)
-        case arg
-        when Array then [arg, []]
-        when Hash then [arg.keys, arg.values]
-        else [[arg], []]
+          super(*args)
         end
       end
 

data/lib/aws-sdk-core/stubbing/data_applicator.rb

@@ -0,0 +1,46 @@
+module Aws
+  module Stubbing
+    class DataApplicator
+
+      include Seahorse::Model::Shapes
+
+      # @param [Seahorse::Models::Shapes::ShapeRef] rules
+      def initialize(rules)
+        @rules = rules
+      end
+
+      # @param [Hash] data
+      # @param [Structure] stub
+      def apply_data(data, stub)
+        apply_data_to_struct(@rules, data, stub)
+      end
+
+      private
+
+      def apply_data_to_struct(ref, data, struct)
+        data.each do |key, value|
+          struct[key] = member_value(ref.shape.member(key), value)
+        end
+        struct
+      end
+
+      def member_value(ref, value)
+        case ref.shape
+        when StructureShape
+          apply_data_to_struct(ref, value, ref[:struct_class].new)
+        when ListShape
+          value.inject([]) do |list, v|
+            list << member_value(ref.shape.member, v)
+          end
+        when MapShape
+          value.inject({}) do |map, (k,v)|
+            map[k.to_s] = member_value(ref.shape.value, v)
+            map
+          end
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/stubbing/empty_stub.rb

@@ -0,0 +1,53 @@
+module Aws
+  module Stubbing
+    class EmptyStub
+
+      include Seahorse::Model::Shapes
+
+      # @param [Seahorse::Models::Shapes::ShapeRef] rules
+      def initialize(rules)
+        @rules = rules
+      end
+
+      # @return [Structure]
+      def stub
+        stub_ref(@rules)
+      end
+
+      private
+
+      def stub_ref(ref, visited = [])
+        if visited.include?(ref.shape)
+          return nil
+        else
+          visited = visited + [ref.shape]
+        end
+        case ref.shape
+        when StructureShape then stub_structure(ref, visited)
+        when ListShape then []
+        when MapShape then {}
+        else stub_scalar(ref)
+        end
+      end
+
+      def stub_structure(ref, visited)
+        ref.shape.members.inject(ref[:struct_class].new) do |struct, (mname, mref)|
+          struct[mname] = stub_ref(mref, visited)
+          struct
+        end
+      end
+
+      def stub_scalar(ref)
+        case ref.shape
+        when StringShape then ref.shape.name || 'string'
+        when IntegerShape then 0
+        when FloatShape then 0.0
+        when BooleanShape then false
+        when TimestampShape then Time.now
+        else nil
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module Aws
+  module Stubbing
+    module Protocols
+      class EC2
+
+        def stub_data(api, operation, data)
+          resp = Seahorse::Client::Http::Response.new
+          resp.status_code = 200
+          resp.body = build_body(api, operation, data)
+          resp.headers['Content-Length'] = resp.body.size
+          resp.headers['Content-Type'] = 'text/xml;charset=UTF-8'
+          resp.headers['Server'] = 'AmazonEC2'
+          resp
+        end
+
+        def stub_error(error_code)
+          http_resp = Seahorse::Client::Http::Response.new
+          http_resp.status_code = 400
+          http_resp.body = <<-XML.strip
+<ErrorResponse>
+  <Error>
+    <Code>#{error_code}</Code>
+    <Message>stubbed-response-error-message</Message>
+  </Error>
+</ErrorResponse>
+          XML
+          http_resp
+        end
+
+        private
+
+        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
+          xmlns = "http://ec2.amazonaws.com/doc/#{api.version}/".inspect
+          xml.unshift("  <requestId>stubbed-request-id</requestId>")
+          xml.unshift("<#{operation.name}Response xmlns=#{xmlns}>\n")
+          xml.push("</#{operation.name}Response>\n")
+          xml.join
+        end
+
+      end
+    end
+  end
+end