aws-sdk-core 2.1.0 → 2.1.4

data/apis/redshift/2012-12-01/waiters-2.json

@@ -2,45 +2,50 @@
   "version": 2,
   "waiters": {
     "ClusterAvailable": {
+      "delay": 60,
       "operation": "DescribeClusters",
       "maxAttempts": 30,
-      "delay": 60,
       "acceptors": [
         {
-          "state": "success",
+          "expected": "available",
           "matcher": "pathAll",
-          "argument": "Clusters[].ClusterStatus",
-          "expected": "available"
+          "state": "success",
+          "argument": "Clusters[].ClusterStatus"
         },
         {
-          "state": "failure",
+          "expected": "deleting",
           "matcher": "pathAny",
-          "argument": "Clusters[].ClusterStatus",
-          "expected": "deleting"
+          "state": "failure",
+          "argument": "Clusters[].ClusterStatus"
+        },
+        {
+          "expected": "ClusterNotFound",
+          "matcher": "error",
+          "state": "retry"
         }
       ]
     },
     "ClusterDeleted": {
+      "delay": 60,
       "operation": "DescribeClusters",
       "maxAttempts": 30,
-      "delay": 60,
       "acceptors": [
         {
-          "state": "success",
+          "expected": "ClusterNotFound",
           "matcher": "error",
-          "expected": "ClusterNotFound"
+          "state": "success"
         },
         {
-          "state": "failure",
+          "expected": "creating",
           "matcher": "pathAny",
-          "argument": "Clusters[].ClusterStatus",
-          "expected": "creating"
+          "state": "failure",
+          "argument": "Clusters[].ClusterStatus"
         },
         {
+          "expected": "pathAny",
+          "matcher": "pathList",
           "state": "failure",
-          "matcher": "pathAny",
-          "argument": "Clusters[].ClusterStatus",
-          "expected": "rebooting"
+          "argument": "Clusters[].ClusterStatus"
         }
       ]
     },
@@ -64,22 +69,27 @@
       ]
     },
     "SnapshotAvailable": {
+      "delay": 15,
       "operation": "DescribeClusterSnapshots",
       "maxAttempts": 20,
-      "delay": 15,
       "acceptors": [
         {
-          "state": "success",
+          "expected": "available",
           "matcher": "pathAll",
-          "argument": "Snapshots[].Status",
-          "expected": "available"
+          "state": "success",
+          "argument": "Snapshots[].Status"
         },
         {
+          "expected": "failed",
+          "matcher": "pathAny",
           "state": "failure",
+          "argument": "Snapshots[].Status"
+        },
+        {
+          "expected": "deleted",
           "matcher": "pathAny",
-          "argument": "Snapshots[].Status",
-          "expected": "failed",
-          "expected": "deleted"
+          "state": "failure",
+          "argument": "Snapshots[].Status"
         }
       ]
     }

data/apis/sts/2011-06-15/api-2.json

@@ -275,7 +275,7 @@
         "PrincipalArn":{"shape":"arnType"},
         "SAMLAssertion":{"shape":"SAMLAssertionType"},
         "Policy":{"shape":"sessionPolicyDocumentType"},
-        "DurationSeconds":{"shape":"durationSecondsType"}
+        "DurationSeconds":{"shape":"roleDurationSecondsType"}
       }
     },
     "AssumeRoleWithSAMLResponse":{
@@ -304,7 +304,7 @@
         "WebIdentityToken":{"shape":"clientTokenType"},
         "ProviderId":{"shape":"urlType"},
         "Policy":{"shape":"sessionPolicyDocumentType"},
-        "DurationSeconds":{"shape":"durationSecondsType"}
+        "DurationSeconds":{"shape":"roleDurationSecondsType"}
       }
     },
     "AssumeRoleWithWebIdentityResponse":{

data/bin/aws.rb

@@ -102,6 +102,12 @@ module Aws
       end
     end
   end
+  class Client
+    def resource
+      namespace = Aws.const_get(self.class.name.split('::')[1])
+      namespace::Resource.new(client: self)
+    end
+  end
 end
 
 begin

data/lib/aws-sdk-core/api/builder.rb

@@ -38,6 +38,7 @@ module Aws
         api = build_api(definition)
         shapes = build_shape_map(definition, api, docs)
         build_operations(definition, api, shapes, docs)
+        build_struct_classes(shapes, options)
         api
       end
 
@@ -86,6 +87,13 @@ module Aws
         op
       end
 
+      def build_struct_classes(shapes, options)
+        type_builder = options[:type_builder] || TypeBuilder.new(Module.new)
+        shapes.each_structure do |shape|
+          shape[:struct_class] = type_builder.build_type(shape, shapes)
+        end
+      end
+
       def underscore(str)
         Seahorse::Util.underscore(str).to_sym
       end

data/lib/aws-sdk-core/api/docs/builder.rb

@@ -38,7 +38,7 @@ module Aws
 
         def service_docstring
           path = "doc-src/services/#{@svc_name}/service.md"
-          path = 'doc-src/services/default/service.md' unless File.exists?(path)
+          path = 'doc-src/services/default/service.md' unless File.exist?(path)
           template = read(path)
           svc_name = @svc_name
           api = @api
@@ -62,7 +62,7 @@ module Aws
 
         def errors_docstring
           path = "doc-src/services/#{@svc_name}/errors.md"
-          path = 'doc-src/services/default/errors.md' unless File.exists?(path)
+          path = 'doc-src/services/default/errors.md' unless File.exist?(path)
           template = read(path)
           svc_name = @svc_name
           api = @api
@@ -90,7 +90,7 @@ module Aws
 
         def client_docstring
           path = "doc-src/services/#{@svc_name}/client.md"
-          path = 'doc-src/services/default/client.md' unless File.exists?(path)
+          path = 'doc-src/services/default/client.md' unless File.exist?(path)
           render(path)
         end
 
@@ -162,7 +162,7 @@ module Aws
   waiters and the client method they call:
   <table>
   <thead>
-  <tr><th>Waiter Name</th><th>Client Method</th><th>Delay</th><th>Max Attempts</th></tr>
+  <tr><th>Waiter Name</th><th>Client Method</th><th>Default Delay:</th><th>Default Max Attempts:</th></tr>
   </thead>
   <tbody>
   #{waiters}

data/lib/aws-sdk-core/api/docs/operation_documenter.rb

@@ -71,7 +71,7 @@ module Aws
         end
 
         def examples_from_disk(method_name, operation)
-          dir = "examples/#{@service_name.downcase}/client/#{method_name}/*.md"
+          dir = "examples/#{@service_name.downcase}/client/#{method_name}/*.rb"
           Dir.glob(dir).map do |path|
             title = File.basename(path).split(/\./).first
             title = title.sub(/^\d+_/, '').gsub(/_/, ' ')

data/lib/aws-sdk-core/api/shape_map.rb

@@ -4,12 +4,6 @@ module Aws
 
       include Seahorse::Model::Shapes
 
-      EMPTY_REF = begin
-        shape = StructureShape.new
-        shape[:struct_class] = Aws::EmptyStructure
-        ShapeRef.new(shape: shape)
-      end
-
       SHAPE_CLASSES = {
         'blob' => BlobShape,
         'byte' => StringShape,
@@ -70,7 +64,7 @@ module Aws
             documentation: documentation,
             metadata: meta)
         else
-          EMPTY_REF
+          empty_ref
         end
       end
 
@@ -102,7 +96,6 @@ module Aws
               target: "#{shape.name}$#{member_name}",
             ))
           end
-          shape[:struct_class] = Structure.new(*shape.member_names)
         when ListShape
           shape.member = shape_ref(
             traits.delete('member'),
@@ -131,6 +124,15 @@ module Aws
         end
       end
 
+      def empty_ref
+        @empty_ref ||= begin
+          shape = StructureShape.new
+          shape.name = 'EmptyStructure'
+          @shapes['EmptyStructure'] = shape
+          ShapeRef.new(shape: shape)
+        end
+      end
+
       def underscore(str)
         Seahorse::Util.underscore(str).to_sym
       end

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

@@ -36,7 +36,7 @@ module Aws
     #
     #     # stub data in the constructor
     #     client = Aws::S3::Client.new(stub_responses: {
-    #       list_buckets: { bukets: [{name: 'my-bucket' }] },
+    #       list_buckets: { buckets: [{name: 'my-bucket' }] },
     #       get_object: { body: 'data' },
     #     })
     #
@@ -46,7 +46,7 @@ module Aws
     # You can also specify the stub data using {#stub_responses}
     #
     #     client = Aws::S3::Client.new(stub_responses: true)
-    #     client.stub_resposnes(:list_buckets, {
+    #     client.stub_responses(:list_buckets, {
     #       buckets: [{ name: 'my-bucket' }]
     #     })
     #
@@ -70,14 +70,18 @@ module Aws
     # fake responses with placeholder values. You can override the data
     # returned. You can also specify errors it should raise.
     #
+    #     # simulate service errors, give the error code
     #     client.stub_responses(:get_object, 'NotFound')
     #     client.get_object(bucket:'aws-sdk', key:'foo')
     #     #=> raises Aws::S3::Errors::NotFound
     #
+    #     # to simulate other errors, give the error class, you must
+    #     # be able to construct an instance with `.new`
     #     client.stub_responses(:get_object, Timeout::Error)
     #     client.get_object(bucket:'aws-sdk', key:'foo')
     #     #=> raises new Timeout::Error
     #
+    #     # or you can give an instance of an error class
     #     client.stub_responses(:get_object, RuntimeError.new('custom message'))
     #     client.get_object(bucket:'aws-sdk', key:'foo')
     #     #=> raises the given runtime error object

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

@@ -1,6 +1,6 @@
 Aws.add_service(:CloudFront, {
-  api: "#{Aws::API_DIR}/cloudfront/2014-11-06/api-2.json",
-  docs: "#{Aws::API_DIR}/cloudfront/2014-11-06/docs-2.json",
-  paginators: "#{Aws::API_DIR}/cloudfront/2014-11-06/paginators-1.json",
-  waiters: "#{Aws::API_DIR}/cloudfront/2014-11-06/waiters-2.json",
+  api: "#{Aws::API_DIR}/cloudfront/2015-04-17/api-2.json",
+  docs: "#{Aws::API_DIR}/cloudfront/2015-04-17/docs-2.json",
+  paginators: "#{Aws::API_DIR}/cloudfront/2015-04-17/paginators-1.json",
+  waiters: "#{Aws::API_DIR}/cloudfront/2015-04-17/waiters-2.json",
 })

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

@@ -0,0 +1,5 @@
+Aws.add_service(:CodeCommit, {
+  api: "#{Aws::API_DIR}/codecommit/2015-04-13/api-2.json",
+  docs: "#{Aws::API_DIR}/codecommit/2015-04-13/docs-2.json",
+  paginators: "#{Aws::API_DIR}/codecommit/2015-04-13/paginators-1.json",
+})

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

@@ -0,0 +1,4 @@
+Aws.add_service(:CodePipeline, {
+  api: "#{Aws::API_DIR}/codepipeline/2015-07-09/api-2.json",
+  docs: "#{Aws::API_DIR}/codepipeline/2015-07-09/docs-2.json",
+})

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

@@ -4,13 +4,11 @@ module Aws
     extend Deprecations
 
     # @return [Credentials]
-    def credentials
-      @credentials
-    end
+    attr_reader :credentials
 
     # @return [Boolean]
     def set?
-      !!@credentials && @credentials.set?
+      !!credentials && credentials.set?
     end
 
     # @deprecated Deprecated in 2.1.0. This method is subject to errors
@@ -18,7 +16,7 @@ module Aws
     #   objects. Will be removed in 2.2.0.
     # @see #credentials
     def access_key_id
-      @credentials ? @credentials.access_key_id : nil
+      credentials ? credentials.access_key_id : nil
     end
     deprecated(:access_key_id, use: '#credentials')
 
@@ -27,7 +25,7 @@ module Aws
     #   objects. Will be removed in 2.2.0.
     # @see #credentials
     def secret_access_key
-      @credentials ? @credentials.secret_access_key : nil
+      credentials ? credentials.secret_access_key : nil
     end
     deprecated(:secret_access_key, use: '#credentials')
 
@@ -36,7 +34,7 @@ module Aws
     #   objects. Will be removed in 2.2.0.
     # @see #credentials
     def session_token
-      @credentials ? @credentials.session_token : nil
+      credentials ? credentials.session_token : nil
     end
     deprecated(:session_token, use: '#credentials')
 

data/lib/aws-sdk-core/dynamodb/attribute_value.rb

@@ -66,8 +66,8 @@ module Aws
           type, value = extract_type_and_value(obj)
           case type
           when :m
-            value.each.with_object({}) do |(key, value), map|
-              map[key] = format(value)
+            value.each.with_object({}) do |(k, v), map|
+              map[k] = format(v)
             end
           when :l then value.map { |v| format(v) }
           when :s then value

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

@@ -11,6 +11,7 @@ module Aws
     autoload :AttributeValue, 'aws-sdk-core/dynamodb/attribute_value'
 
     class Client
+
       def data_to_http_resp(operation_name, data)
         api = config.api
         operation = api.operation(operation_name)
@@ -20,6 +21,19 @@ module Aws
         ParamValidator.validate!(operation.output, data)
         protocol_helper.stub_data(api, operation, data)
       end
+
+      def stub_data(operation_name, data = {})
+        if config.simple_attributes
+          rules = config.api.operation(operation_name).output
+          translator = Plugins::DynamoDBSimpleAttributes::ValueTranslator
+          data = translator.apply(rules, :marshal, data)
+          data = super(operation_name, data)
+          translator.apply(rules, :unmarshal, data)
+        else
+          super
+        end
+      end
+
     end
   end
 end

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

@@ -17,12 +17,11 @@ module Aws
       @loaded << klass_or_module
       klass_or_module.constants.each do |const_name|
         path = klass_or_module.autoload?(const_name)
-        require(path) if path
-        const = klass_or_module.const_get(const_name)
-        if const.is_a?(Module)
-          unless @loaded.include?(const)
-            load(const)
-          end
+        begin
+          require(path) if path
+          const = klass_or_module.const_get(const_name)
+          self.load(const) if Module === const && !@loaded.include?(const)
+        rescue LoadError
         end
       end
       self

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

@@ -3,4 +3,5 @@ Aws.add_service(:IAM, {
   docs: "#{Aws::API_DIR}/iam/2010-05-08/docs-2.json",
   paginators: "#{Aws::API_DIR}/iam/2010-05-08/paginators-1.json",
   resources: "#{Aws::API_DIR}/iam/2010-05-08/resources-1.json",
+  waiters: "#{Aws::API_DIR}/iam/2010-05-08/waiters-2.json",
 })

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

@@ -82,7 +82,7 @@ module Aws
           profile_name = http_get(conn, path).lines.first.strip
           http_get(conn, path + profile_name)
         end
-      rescue *FAILURES => e
+      rescue *FAILURES
         if failed_attempts < @retries
           @backoff.call(failed_attempts)
           failed_attempts += 1

data/lib/aws-sdk-core/json/handler.rb

@@ -8,10 +8,10 @@ module Aws
       # @return [Seahorse::Client::Response]
       def call(context)
         build_request(context)
-        resp = @handler.call(context)
-        resp.on(200..299) { |resp| parse_response(resp) }
-        resp.on(200..599) { |resp| apply_request_id(context) }
-        resp
+        response = @handler.call(context)
+        response.on(200..299) { |resp| parse_response(resp) }
+        response.on(200..599) { |resp| apply_request_id(context) }
+        response
       end
 
       private

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

@@ -2,38 +2,39 @@ module Aws
 
   # Decorates a {Seahorse::Client::Response} with paging methods:
   #
-  #     page = PageableResponse.new(response, pager)
-  #     page.last_page?
+  #     resp = s3.list_objects(params)
+  #     resp.last_page?
   #     #=> false
   #
   #     # sends a request to receive the next response page
-  #     page = page.next_page
-  #     page.last_page?
+  #     resp = resp.next_page
+  #     resp.last_page?
   #     #=> true
   #
-  #     page.next_page
+  #     resp.next_page
   #     #=> raises PageableResponse::LastPageError
   #
   # You can enumerate all response pages with a block
   #
-  #     page = PageableResponse.new(response, pager)
-  #     page.each do |page|
+  #     ec2.describe_instances(params).each do |page|
   #       # yields once per page
+  #       page.reservations.each do |r|
+  #         # ...
+  #       end
   #     end
   #
   # Or using {#next_page} and {#last_page?}:
   #
-  #     page = PageableResponse.new(response, pager)
-  #     page = page.next_page until page.last_page?
-  #
-  # @note Normally you should not need to construct a {PageableResponse}
-  #   directly. The {Plugins::ResponsePaging} plugin automatically
-  #   decorates all responses with a {PageableResponse}.
+  #     resp.last_page?
+  #     resp = resp.next_page until resp.last_page?
   #
   module PageableResponse
 
-    def self.included(base)
-      base.send(:include, Enumerable)
+    def self.extended(base)
+      base.send(:extend, Enumerable)
+      base.send(:extend, UnsafeEnumerableMethods)
+      base.instance_variable_set("@last_page", nil)
+      base.instance_variable_set("@more_results", nil)
     end
 
     # @return [Paging::Pager]
@@ -79,24 +80,6 @@ module Aws
     end
     alias each_page each
 
-    # @api private
-    def count
-      if respond_to?(:count)
-        data.count
-      else
-        raise NotImplementedError
-      end
-    end
-
-    # @api private
-    def respond_to?(method_name, *args)
-      if method_name == :count
-        data.respond_to?(:count)
-      else
-        super
-      end
-    end
-
     private
 
     # @param [Hash] params A hash of additional request params to
@@ -114,7 +97,7 @@ module Aws
     # @return [Hash] Returns the hash of request parameters for the
     #   next page, merging any given params.
     def next_page_params(params)
-      context.params.merge(@pager.next_tokens(self).merge(params))
+      context[:original_params].merge(@pager.next_tokens(self).merge(params))
     end
 
     # Raised when calling {PageableResponse#next_page} on a pager that
@@ -133,5 +116,32 @@ module Aws
 
     end
 
+    # A handful of Enumerable methods, such as #count are not safe
+    # to call on a pageable response, as this would trigger n api calls
+    # simply to count the number of response pages, when likely what is
+    # wanted is to access count on the data. Same for #to_h.
+    module UnsafeEnumerableMethods
+
+      def count
+        if data.respond_to?(:count)
+          data.count
+        else
+          raise NoMethodError, "undefined method `count'"
+        end
+      end
+
+      def respond_to?(method_name, *args)
+        if method_name == :count
+          data.respond_to?(:count)
+        else
+          false
+        end
+      end
+
+      def to_h
+        data.to_h
+      end
+
+    end
   end
 end

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

@@ -3,9 +3,8 @@ module Aws
   class Pager
 
     def initialize(rules)
-      if rules['more_results']
-        @more_results = underscore(rules['more_results'])
-      end
+      @more_results = rules['more_results']
+      @more_results = underscore(@more_results) if @more_results
       if rules['limit_key']
         @limit_key = underscore(rules['limit_key']).to_sym
       end

data/lib/aws-sdk-core/plugins/dynamodb_simple_attributes.rb

@@ -139,6 +139,10 @@ module Aws
 
         include Seahorse::Model::Shapes
 
+        def self.apply(rules, mode, data)
+          new(rules, mode).apply(data)
+        end
+
         def initialize(rules, mode)
           @rules = rules
           @mode = mode

data/lib/aws-sdk-core/plugins/ec2_copy_encrypted_snapshot.rb

@@ -64,6 +64,7 @@ module Aws
           context.http_request.http_method = 'GET'
           context.http_request.endpoint = new_endpoint(context)
           context.http_request.body = ''
+          context.http_request.headers.delete('Content-Type')
         end
 
         def new_endpoint(context)
@@ -74,7 +75,7 @@ module Aws
         end
 
         def presigned_url(http_request, config)
-          signer = Signers::V4.new('ec2', config.credentials, config.region)
+          signer = Signers::V4.new(config.credentials, 'ec2', config.region)
           signer.presigned_url(http_request, expires_in: 3600)
         end
 

data/lib/aws-sdk-core/plugins/regional_endpoint.rb

@@ -3,8 +3,8 @@ module Aws
 
     # @seahorse.client.option [required, String] :region
     #   The AWS region to connect to.  The region is used to construct
-    #   the client endpoint.  Defaults to `ENV['AWS_DEFAULT_REGION']`.
-    #   Also checks `AWS_REGION` and `AMAZON_REGION`.
+    #   the client endpoint.  Defaults to `ENV['AWS_REGION']`.
+    #   Also checks `AMAZON_REGION` and `AWS_DEFAULT_REGION`.
     #
     # @seahorse.client.option [String] :endpoint A default endpoint is
     #   constructed from the `:region`.

data/lib/aws-sdk-core/plugins/response_paging.rb

@@ -22,6 +22,7 @@ module Aws
       class Handler < Seahorse::Client::Handler
 
         def call(context)
+          context[:original_params] = context.params
           resp = @handler.call(context)
           resp.extend(PageableResponse)
           resp.pager = context.operation[:pager]

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

@@ -53,7 +53,7 @@ module Aws
     # @note This method does not indicate if the file found at {#path}
     #   will be parsable, only if it can be read.
     def loadable?
-      !path.nil? && File.exists?(path) && File.readable?(path)
+      !path.nil? && File.exist?(path) && File.readable?(path)
     end
 
     private
@@ -92,7 +92,7 @@ module Aws
       map = {}
       file.lines.each do |line|
         line = line.split(/^|\s;/).first # remove comments
-        section = line.match(/^\s*\[([^\[\]]+)\]\s*$/) unless line.nil?
+        section = line.match(/^\s*\[([^\[\]]+)\]\s*(#.+)?$/) unless line.nil?
         if section
           current_section = section[1]
         elsif current_section