aws-sdk-resources 2.0.48 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88fe0a7962e9f135b00ec8d5629489f73b4492df
-  data.tar.gz: 8228380edef1723af9a73997693f01b7de75e5e6
+  metadata.gz: 1961d384b58666ed95adab0542f240ea34e90283
+  data.tar.gz: 6234d8d83737d79295e3087eca3faa2abe78e4bb
 SHA512:
-  metadata.gz: 4e1b0b5666c695e4a895496174d72b46a6dd8cf07742c18daf8a1aeda946bd3e763f8809108d33686b3e4e23f5438451a37cb72ac966596e62859674d1df34d9
-  data.tar.gz: c341c1944f105db93e1aec0fd6cdb8c436ea91305f0f9b2edb70587846aa9e124083c7e89e8261c8b38f08a6fc7a326f66b511dae8596ba086627ee6634209eb
+  metadata.gz: 3db807796aa9afb541ec253832c20564e83065bce6491b00c455bd8b16200cd99b699197efc5392d0bf2251849b905dc82a5bdbe60b525aaa5bb94fe3410a85b
+  data.tar.gz: 0149d9727b8a9ed429c3abbdff040378732dd421a974d5028fda419027a3a20c219778b7fb12a502a117ff27704a62db8a2ec9a551c2a33089cf73ef008433e8

data/lib/aws-sdk-resources.rb

@@ -26,7 +26,7 @@ module Aws
       when Resources::Definition then definition
       when Hash then Resources::Definition.new(definition)
       when String
-        Resources::Definition.new(Aws.load_json(definition), source_path: definition)
+        Resources::Definition.new(Json.load_file(definition), source_path: definition)
       else raise ArgumentError, "invalid resource definition #{definition}"
     end
     definition.apply(svc_module)

data/lib/aws-sdk-resources/builder.rb

@@ -47,10 +47,11 @@ module Aws
 
       def build_batch(identifier_map, options, &block)
         resources = (0...resource_count(identifier_map)).collect do |n|
-          identifiers = @sources.each.with_object({}) do |source, identifiers|
+          identifiers = @sources.inject({}) do |hash, source|
             value = identifier_map[source.target]
             value = value[n] if source.plural?
-            identifiers[source.target] = value
+            hash[source.target] = value
+            hash
           end
           resource = build_one(identifiers, options)
           yield(resource) if block_given?

data/lib/aws-sdk-resources/definition.rb

@@ -58,16 +58,17 @@ module Aws
       end
 
       def define_data_attributes(namespace, resource, definition)
-        return unless shape_name = definition['shape']
-        shape = resource.client_class.api.shape_map.shape('shape' => shape_name)
-        shape.member_names.each do |member_name|
-          if
-            resource.instance_methods.include?(member_name) ||
-            data_attribute_is_an_identifier?(member_name, resource, definition)
-          then
-            next # some data attributes are duplicates to identifiers
-          else
-            resource.add_data_attribute(member_name)
+        if shape_name = definition['shape']
+          shape = resource.client_class.api.metadata['shapes'][shape_name]
+          shape.member_names.each do |member_name|
+            if
+              resource.instance_methods.include?(member_name) ||
+              data_attribute_is_an_identifier?(member_name, resource, definition)
+            then
+              next # some data attributes are duplicates to identifiers
+            else
+              resource.add_data_attribute(member_name)
+            end
           end
         end
       end
@@ -155,8 +156,12 @@ module Aws
 
       def limit_key(resource, definition)
         operation_name = definition['request']['operation']
-        paginators = resource.client_class.paginators
-        paginators.pager(operation_name).limit_key
+        operation = resource.client_class.api.operation(underscore(operation_name))
+        if operation[:pager]
+          operation[:pager].limit_key
+        else
+          nil
+        end
       end
 
       def define_request(definition)

data/lib/aws-sdk-resources/documenter.rb

@@ -13,6 +13,8 @@ module Aws
 
       class << self
 
+        include Seahorse::Model::Shapes
+
         def apply_customizations
           document_s3_object_upload_file_additional_options
         end
@@ -21,23 +23,24 @@ module Aws
 
         def document_s3_object_upload_file_additional_options
           input = Aws::S3::Client.api.operation(:create_multipart_upload).input
-          opts = input.member_names - [:bucket, :key]
+          opts = input.shape.member_names - [:bucket, :key]
           tags = opts.map do |opt|
-            shape = input.member(opt)
-            type = case shape
-            when Seahorse::Model::Shapes::Structure then 'Structure'
-            when Seahorse::Model::Shapes::List then 'Array'
-            when Seahorse::Model::Shapes::Map then 'Hash'
-            when Seahorse::Model::Shapes::String then 'String'
-            when Seahorse::Model::Shapes::Integer then 'Integer'
-            when Seahorse::Model::Shapes::Float then 'Float'
-            when Seahorse::Model::Shapes::Boolean then 'Boolean'
-            when Seahorse::Model::Shapes::Timestamp then 'Time'
-            when Seahorse::Model::Shapes::Blob then 'IO'
+            ref = input.shape.member(opt)
+            type = case ref.shape
+            when StructureShape then 'Structure'
+            when ListShape then 'Array'
+            when MapShape then 'Hash'
+            when StringShape then 'String'
+            when IntegerShape then 'Integer'
+            when FloatShape then 'Float'
+            when BooleanShape then 'Boolean'
+            when TimestampShape then 'Time'
+            when BlobShape then 'IO'
             else
-              raise "unhandled shape class `#{shape.class.name}'"
+              raise "unhandled shape class `#{ref.shape.class.name}'"
             end
-            "@option options [#{type}] :#{opt} #{shape.documentation}"
+            docs = ref.documentation || ref.shape.documentation
+            "@option options [#{type}] :#{opt} #{docs}"
           end
           tags = YARD::DocstringParser.new.parse(tags).to_docstring.tags
           m = YARD::Registry['Aws::S3::Object#upload_file']

data/lib/aws-sdk-resources/documenter/base_operation_documenter.rb

@@ -1,8 +1,13 @@
+require 'set'
+
 module Aws
   module Resources
     class Documenter
       class BaseOperationDocumenter
 
+        include Api::Docs::Utils
+        include Seahorse::Model::Shapes
+
         def initialize(yard_class, resource_class, operation_name, operation)
           @yard_class = yard_class
           @resource_class = resource_class
@@ -16,6 +21,8 @@ module Aws
             @api_request_params = @operation.request.params
             @request_operation_name = @operation.request.method_name.to_s
             @called_operation = "Client##{@api_request_name}"
+            @yard_client_operation = YARD::Registry["#{@resource_class.client_class.name}##{api_request_name}"]
+
           end
           if @operation.respond_to?(:builder)
             @builder = @operation.builder
@@ -125,30 +132,49 @@ module Aws
         # to the method code object.
         # @return [Array<YARD::Tag>]
         def example_tags
-          []
+          if api_request && api_request.input
+            [request_syntax_example_tag]
+          else
+            []
+          end
+        end
+
+        def request_syntax_example_tag
+          input = operation_input_ref(api_request, without: fixed_param_names)
+          params = Api::Docs::ParamFormatter.new(input).format
+          example = "#{variable_name}.#{operation_name}(#{params})"
+          example = "@example Request syntax example with placeholder values" +
+            "\n\n    " + example.lines.join('    ')
+          tag(example)
         end
 
         def option_tags
           if api_request && api_request.input
+            skip = fixed_param_names
             tags = []
-            required = api_request.input.required
-            members = api_request.input.members
-            members = members.sort_by { |name,_| required.include?(name) ? 0 : 1 }
-            members.each do |member_name, member_shape|
-              if api_request_params.any? { |p| p.target.match(/^#{member_name}\b/) }
-                next
+            @yard_client_operation.tags.each do |tag|
+              if YARD::Tags::OptionTag === tag
+                next if skip.include?(tag.pair.name[1..-1]) # remove `:` prefix
+                tags << tag
               end
-              docstring = member_shape.documentation
-              req = ' **`required`** &mdash; ' if required.include?(member_name)
-              tags << "@option options [#{param_type(member_shape)}] :#{member_name} #{req}#{docstring}"
             end
-            tags = tags.join("\n")
-            YARD::DocstringParser.new.parse(tags).to_docstring.tags
+            tags
           else
             []
           end
         end
 
+        # Returns a set of root input params that are provided by default
+        # by this operation. These params should not be documented in syntax
+        # examples or in option tags.
+        def fixed_param_names
+          if api_request_params
+            Set.new(api_request_params.map { |p| p.target.split(/\b/).first })
+          else
+            Set.new
+          end
+        end
+
         # If this operation makes an API request, then a `@see` tag is
         # returned that references the client API operation.
         # @return [Array<YARD::Tag>]
@@ -178,26 +204,6 @@ module Aws
           YARD::DocstringParser.new.parse(tags.sort.join("\n")).to_docstring.tags
         end
 
-        def return_tag
-          if return_type == ['void'] && return_message.strip.empty?
-            nil
-          else
-            YARD::Tags::Tag.new(:return, return_message, return_type)
-          end
-        end
-
-        # The response object type for the @return tag. This must be overridden
-        # in sub-classes.
-        def return_type
-          raise NotImplementedError
-        end
-
-        # The message portion of the @return tag for this operation. This must
-        # be overridden in sub-classes.
-        def return_message
-          raise NotImplementedError
-        end
-
         # Returns a suitable variable name for the resource class being
         # documented:
         #
@@ -211,15 +217,15 @@ module Aws
 
         def path_type
           case path_shape
-          when Seahorse::Model::Shapes::Structure then 'Structure'
-          when Seahorse::Model::Shapes::List then 'Array'
-          when Seahorse::Model::Shapes::Map then 'Hash'
-          when Seahorse::Model::Shapes::String then 'String'
-          when Seahorse::Model::Shapes::Integer then 'Integer'
-          when Seahorse::Model::Shapes::Float then 'Float'
-          when Seahorse::Model::Shapes::Boolean then 'Boolean'
-          when Seahorse::Model::Shapes::Timestamp then 'Time'
-          when Seahorse::Model::Shapes::Blob then 'IO'
+          when StructureShape then 'Structure'
+          when ListShape then 'Array'
+          when MapShape then 'Hash'
+          when StringShape then 'String'
+          when IntegerShape then 'Integer'
+          when FloatShape then 'Float'
+          when BooleanShape then 'Boolean'
+          when TimestampShape then 'Time'
+          when BlobShape then 'IO'
           else
             raise "unhandled shape class `#{path_shape.class.name}'"
           end
@@ -232,40 +238,41 @@ module Aws
         # Returns the output shape for the called operation.
         def response_shape
           api = resource_class.client_class.api
-          api.operation(@operation.request.method_name).output
+          output = api.operation(@operation.request.method_name).output
+          output ? output.shape : nil
         end
 
         def resolve_shape(shape, path)
           if path != '@'
             shape = path.scan(/\w+|\[.*?\]/).inject(shape) do |shape, part|
               if part[0] == '['
-                shape.member
+                shape.member.shape
               else
-                shape.member(part)
+                shape.member(part).shape
               end
             end
           end
         end
 
-        def param_type(shape)
-          case shape
-          when Seahorse::Model::Shapes::Blob then 'IO'
-          when Seahorse::Model::Shapes::Byte then  'String'
-          when Seahorse::Model::Shapes::Boolean then 'Boolean'
-          when Seahorse::Model::Shapes::Character then 'String'
-          when Seahorse::Model::Shapes::Double then 'Float'
-          when Seahorse::Model::Shapes::Float then 'Float'
-          when Seahorse::Model::Shapes::Integer then 'Integer'
-          when Seahorse::Model::Shapes::List then 'Array'
-          when Seahorse::Model::Shapes::Long then 'Integer'
-          when Seahorse::Model::Shapes::Map then 'Hash'
-          when Seahorse::Model::Shapes::String then 'String'
-          when Seahorse::Model::Shapes::Structure then 'Hash'
-          when Seahorse::Model::Shapes::Timestamp then 'Time'
+        def param_type(ref)
+          case ref.shape
+          when BlobShape then 'IO'
+          when BooleanShape then 'Boolean'
+          when FloatShape then 'Float'
+          when IntegerShape then 'Integer'
+          when ListShape then 'Array'
+          when MapShape then 'Hash'
+          when StringShape then 'String'
+          when StructureShape then 'Hash'
+          when TimestampShape then 'Time'
           else raise 'unhandled type'
           end
         end
 
+        def docs(ref)
+          ref.documentation || ref.shape.documentation
+        end
+
       end
     end
   end

data/lib/aws-sdk-resources/documenter/data_operation_documenter.rb

@@ -3,44 +3,22 @@ module Aws
     class Documenter
       class DataOperationDocumenter < BaseOperationDocumenter
 
-        def docstring
+        def return_type
           if plural?
-            super + " Calls {#{called_operation}}, returning an array of {#{path_type}} objects."
+            "Array<#{path_type}>"
           else
-            super + " Calls {#{called_operation}}, returning a #{return_type.first}."
+            path_type
           end
         end
 
-        def return_message
-          if plural? && structure?
-            "an array of {Structure structures} with the following members:\n" + data_members
-          elsif structure?
-            "a {Structure} with the following members:\n" + data_members
-          else
-            ''
-          end
-        end
-
-        def data_members
-          "\n" + path_shape.member_names.map{ |n| "\n* `#{n}`" }.join("\n")
-        end
-
-        def return_type
-          if plural?
-            ["Array<#{path_type}>"]
-          else
-            [path_type]
-          end
+        def return_tag
+          tag("@return [#{return_type}]")
         end
 
         def plural?
           !!@operation.path.match(/\[/)
         end
 
-        def structure?
-          Seahorse::Model::Shapes::Structure === path_shape
-        end
-
       end
     end
   end

data/lib/aws-sdk-resources/documenter/has_many_operation_documenter.rb

@@ -8,50 +8,46 @@ module Aws
 Returns a {Resources::Collection Collection} of {#{target_resource_class_name}}
 resources. No API requests are made until you call an enumerable method on the
 collection. {#{called_operation}} will be called multiple times until every
-{#{target_resource_class_name}} has been yielded. 
+{#{target_resource_class_name}} has been yielded.
           DOCSTRING
         end
 
-        def return_type
-          ["Collection<#{target_resource_class_name}>"]
-        end
-
-        def return_message
-          "a {Aws::Resources::Collection Collection} of {#{target_resource_class_name}} resource objects."
+        def return_tag
+          tag("@return [Collection<#{target_resource_class_name}>]")
         end
 
         def example_tags
-          tags = []
-          tags << enumerate_example
-          tags << enumerate_with_limit_example
-          tags << batch_examples if target_resource_batches?
-          YARD::DocstringParser.new.parse(tags.join("\n")).to_docstring.tags
+          tags = super
+          tags << enumerate_example_tag
+          tags << enumerate_with_limit_example_tag
+          tags << batch_examples_tag if target_resource_batches?
+          tags
         end
 
-        def enumerate_example
-          return <<EXAMPLE
+        def enumerate_example_tag
+          tag(<<-EXAMPLE.strip)
 @example Enumerating {#{target_resource_class_name}} resources.
   #{variable_name}.#{@operation_name}.each do |#{target_resource_class_name.downcase}|
     # yields each #{target_resource_class_name.downcase}
   end
-EXAMPLE
+          EXAMPLE
         end
 
-        def enumerate_with_limit_example
-          return <<EXAMPLE
+        def enumerate_with_limit_example_tag
+          tag(<<-EXAMPLE.strip)
 @example Enumerating {#{target_resource_class_name}} resources with a limit.
   #{variable_name}.#{@operation_name}.limit(10).each do |#{target_resource_class_name.downcase}|
     # yields at most 10 #{@operation_name}
   end
-EXAMPLE
+          EXAMPLE
         end
 
-        def batch_examples
+        def batch_examples_tag
           example = "@example Batch operations callable on the returned collection"
           target_resource_batch_operations.each do |name|
             example << "\n  #{variable_name}.#{@operation_name}.#{name}"
           end
-          example
+          tag(example)
         end
 
         def target_resource_batches?

data/lib/aws-sdk-resources/documenter/has_operation_documenter.rb

@@ -3,51 +3,14 @@ module Aws
     class Documenter
       class HasOperationDocumenter < BaseOperationDocumenter
 
-        def docstring
-          docs = []
-          docs << super
-
-          if can_return_nil?
-            docs << return_message
-          elsif argument?
-            msg = "Returns a {#{target_resource_class}} resource with "
-            msg << "the given `#{argument_name}`."
-            docs << msg
-          else
-            docs << "Returns a {#{target_resource_class}} resource."
-          end
-
-          if data_member && resource_class.load_operation
-            load_method = resource_class.load_operation.request.method_name
-            msg = "Calling this method will call {Client##{load_method}} "
-            msg << "unless the resource is already {#data_loaded? loaded}. "
-            msg << "No additional API requests are made."
-            docs << msg
-          else
-            msg = "Calling this method will **not** make an API request."
-            docs << msg
-          end
-
-          docs.join(' ')
-        end
-
-        def return_type
+        def return_tag
           if plural?
-            type = ["Array<#{target_resource_class_name}>"]
+            type = "Array<#{target_resource_class_name}>"
           else
-            type = [target_resource_class_name]
-          end
-          type << 'nil' if can_return_nil?
-          type
-        end
-
-        def return_message
-          if can_return_nil?
-            "Returns a {#{target_resource_class_name}} resource, or `nil` " +
-            "if `#data.#{data_member_source}` is `nil`."
-          else
-            "Returns a {#{target_resource_class_name}} resource."
+            type = target_resource_class_name
           end
+          type += ',nil' if can_return_nil?
+          tag("@return [#{type}]")
         end
 
         def parameters
@@ -85,10 +48,6 @@ module Aws
           builder.sources.find { |s| BuilderSources::DataMember === s }
         end
 
-        def data_member_source
-          data_member.source
-        end
-
         def argument_name
           argument = builder.sources.find do |source|
             BuilderSources::Argument === source

data/lib/aws-sdk-resources/documenter/operation_documenter.rb

@@ -4,37 +4,14 @@ module Aws
       class OperationDocumenter < BaseOperationDocumenter
 
         def docstring
-          super + " #{return_base_message}"
+          @api_request.documentation
         end
 
-        def return_type
-          if returns_data_members
-            ['Structure']
-          else
-            ['void']
-          end
-        end
-
-        def return_message
-          "#{return_base_message} #{returns_data_members}"
-        end
-
-        def return_base_message
-          if returns_data_members
-            "Calls {#{called_operation}}, returning its response."
-          end
-        end
-
-        def returns_data_members
-          if response_shape && response_shape.member_names.count > 0
-            msg = "The response data has following properties:\n"
-            response_shape.member_names.each do |name|
-              msg << "\n* `#{name}`"
-            end
-            msg
-          else
-            nil
+        def return_tag
+          @yard_client_operation.tags.each do |tag|
+            return tag if tag.tag_name == 'return'
           end
+          nil
         end
 
       end

data/lib/aws-sdk-resources/documenter/resource_operation_documenter.rb

@@ -8,47 +8,35 @@ module Aws
           @plural = @operation.builder.plural?
         end
 
-        # @return [Boolean] Returns `true` if this operation returns an 
+        # @return [Boolean] Returns `true` if this operation returns an
         #   array of resource objects. Returns `false` if this method returns
         #   a single resource object.
         attr_reader :plural
 
         alias plural? plural
 
-        def docstring
-          super + ' ' "#{return_message} Calls {#{called_operation}}."
-        end
-
-        def return_type
-          if plural?
-            ["Array<#{target_resource_class_name}>"]
-          else
-            [target_resource_class_name]
-          end
-        end
-
-        def return_message
+        def return_tag
           if plural?
-            "Returns an array of {#{target_resource_class_name}} resources."
+            tag("@return [Array<#{target_resource_class_name}>]")
           else
-            "Returns a {#{target_resource_class_name}} resource."
+            tag("@return [#{target_resource_class_name}]")
           end
         end
 
         def example_tags
           id = target_resource_class.identifiers.last.to_s
           idv = target_resource_class_name.downcase + '-' + id.gsub('_', '-')
-          tag = []
-          tag << "@example Basic usage"
-          tag << "  #{resp_variable} = #{variable_name}.#{operation_name}(options)"
+          example = []
+          example << "@example Basic usage"
+          example << "  #{resp_variable} = #{variable_name}.#{operation_name}(options)"
           if plural?
-            tag << "  #{resp_variable}.map(&:#{id})"
-            tag << "  #=> [#{idv.inspect}, ...]"
+            example << "  #{resp_variable}.map(&:#{id})"
+            example << "  #=> [#{idv.inspect}, ...]"
           else
-            tag << "  #{resp_variable}.#{id}"
-            tag << "  #=> #{idv.inspect}"
+            example << "  #{resp_variable}.#{id}"
+            example << "  #=> #{idv.inspect}"
           end
-          YARD::DocstringParser.new.parse(tag).to_docstring.tags
+          super + [tag(example.join("\n"))]
         end
 
         def resp_variable

data/lib/aws-sdk-resources/documenter/waiter_operation_documenter.rb

@@ -23,8 +23,8 @@ You can modify defaults and register callbacks by passing a block argument.
           DOCSTRING
         end
 
-        def return_type
-          [resource_class_name]
+        def return_tag
+          tag("@return [#{resource_class_name}] #{return_message}")
         end
 
         def return_message
@@ -47,10 +47,6 @@ You can modify defaults and register callbacks by passing a block argument.
           @resource_class.client_class.api.operation(api_request_name)
         end
 
-        def api_request_params
-          @operation.params
-        end
-
         def api_request_name
           waiter.poller.operation_name
         end
@@ -60,7 +56,7 @@ You can modify defaults and register callbacks by passing a block argument.
         end
 
         def example_tags
-          tag = <<-EXAMPLE.strip
+          example = <<-EXAMPLE.strip
 @example Basic usage
   #{variable_name}.#{operation_name}
 
@@ -72,7 +68,7 @@ You can modify defaults and register callbacks by passing a block argument.
      w.before_wait do { |count, prev_resp| ... }
   end
           EXAMPLE
-          YARD::DocstringParser.new.parse(tag).to_docstring.tags
+          super + [tag(example)]
         end
 
       end

data/lib/aws-sdk-resources/services/s3/encryption/client.rb

@@ -80,14 +80,14 @@ module Aws
     #         @keys = keys
     #         @encryption_materials = Aws::S3::Encryption::Materials.new(
     #           key: @keys[default_key_name],
-    #           description: MultiJson.dump(key: default_key_name),
+    #           description: JSON.dump(key: default_key_name),
     #         )
     #       end
     #
     #       attr_reader :encryption_materials
     #
     #       def key_for(matdesc)
-    #         key_name = MultiJson.load(matdesc)['key']
+    #         key_name = JSON.load(matdesc)['key']
     #         if key = @keys[key_name]
     #           key
     #         else
@@ -159,7 +159,7 @@ module Aws
         # * `:key_provider`
         # * `:encryption_key`
         #
-        # You may also pass any other options accepted by {S3::Client.new}.
+        # You may also pass any other options accepted by {S3::Client#initialize}.
         #
         # @option options [S3::Client] :client A basic S3 client that is used
         #   to make api calls. If a `:client` is not provided, a new {S3::Client}

data/lib/aws-sdk-resources/services/s3/encryption/decrypt_handler.rb

@@ -66,11 +66,11 @@ module Aws
 
         def envelope_from_instr_file(context)
           suffix = context[:encryption][:instruction_file_suffix]
-          MultiJson.load(context.client.get_object(
+          Json.load(context.client.get_object(
             bucket: context.params[:bucket],
             key: context.params[:key] + suffix
           ).body.read)
-        rescue S3::Errors::ServiceError, MultiJson::ParseError
+        rescue S3::Errors::ServiceError, Json::ParseError
           nil
         end
 

data/lib/aws-sdk-resources/services/s3/encryption/encrypt_handler.rb

@@ -30,7 +30,7 @@ module Aws
             context.client.put_object(
               bucket: context.params[:bucket],
               key: context.params[:key] + suffix,
-              body: MultiJson.dump(envelope)
+              body: Json.dump(envelope)
             )
           end
         end

data/lib/aws-sdk-resources/services/s3/encryption/materials.rb

@@ -45,9 +45,9 @@ module Aws
         end
 
         def validate_desc(description)
-          MultiJson.load(description)
+          Json.load(description)
           description
-        rescue MultiJson::ParseError
+        rescue Json::ParseError
           msg = "expected description to be a valid JSON document string"
           raise ArgumentError, msg
         end

data/lib/aws-sdk-resources/services/s3/presigned_post.rb

@@ -1,6 +1,5 @@
 require 'openssl'
 require 'base64'
-require 'multi_json'
 
 module Aws
   module S3
@@ -210,7 +209,7 @@ module Aws
       # @option options [String] :server_side_encryption_customer_algorithm See {PresignedPost#server_side_encryption_customer_algorithm}.
       # @option options [String] :server_side_encryption_customer_key See {PresignedPost#server_side_encryption_customer_key}.
       def initialize(credentials, bucket_region, bucket_name, options = {})
-        @credentials = credentials
+        @credentials = credentials.credentials
         @bucket_region = bucket_region
         @bucket_name = bucket_name
         @url = bucket_url
@@ -597,7 +596,7 @@ module Aws
         signature_fields(datetime).each do |name, value|
           policy['conditions'] << { name => value }
         end
-        base64(MultiJson.dump(policy))
+        base64(Json.dump(policy))
       end
 
       def signature_fields(datetime)

data/lib/aws-sdk-resources/services/sns/message_verifier.rb

@@ -1,7 +1,6 @@
 require 'net/http'
 require 'openssl'
 require 'base64'
-require 'multi_json'
 
 module Aws
   module SNS
@@ -59,7 +58,7 @@ module Aws
       # @raise [VerificationError] Raised when the given message has failed
       #   verification.
       def authenticate!(message_body)
-        msg = MultiJson.load(message_body)
+        msg = Json.load(message_body)
         if public_key(msg).verify(sha1, signature(msg), canonical_string(msg))
           true
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.0.48
+  version: 2.1.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.48
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.48
+        version: 2.1.0
 description: Provides resource oriented interfaces and other higher-level abstractions
   for many AWS services. This gem is part of the official AWS SDK for Ruby.
 email: