aws-sdk-core 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13117254bdddddf4223c6846d2088631c80e1af4
-  data.tar.gz: b48fa027be73b0bf52b339c4a2a1905f36468dd1
+  metadata.gz: e48a29b6d07bf2881c5ff4ed4192b67205f41c7b
+  data.tar.gz: e2cec76e3ec2e6409e4767a97b986b58096368bc
 SHA512:
-  metadata.gz: 22e4d9b1d2e5d569043868acd8158e64dc9f6c9ad47cbfa23778d6537ee7d64457f1045e5991962fe74472d9fad31b4d815f169c6ec80e7e6ad668b79ef067ae
-  data.tar.gz: 6c5cc908a083a5935156212d58f737d3acd5204ad75211ddcf7f6422a1d954eeb6531fcab95c516ff9f5df7ef2adea18288841b083099004b9bb179812e8e171
+  metadata.gz: 352e29c1deb5889f65b286e20a97106a0dc36d59390f7ec8c8666883868bf0399daf06de1a3fb53a42a6c2d0f773897b119df79e689527ca2e387668beae3d9c
+  data.tar.gz: b106dcab820a1d5f8c834784a732396941375167a24ba717b6f5704d7860ee24980e2fb2ec91e33f725d2c78b9fb48695d3aa79397e6fd42769cc7e5cbe883b0

data/apis/ecs/2014-11-13/api-2.json

@@ -854,7 +854,8 @@
       "type":"structure",
       "members":{
         "name":{"shape":"String"},
-        "command":{"shape":"StringList"}
+        "command":{"shape":"StringList"},
+        "environment":{"shape":"EnvironmentVariables"}
       }
     },
     "ContainerOverrides":{
@@ -1164,6 +1165,8 @@
       "type":"structure",
       "members":{
         "familyPrefix":{"shape":"String"},
+        "status":{"shape":"TaskDefinitionStatus"},
+        "sort":{"shape":"SortOrder"},
         "nextToken":{"shape":"String"},
         "maxResults":{"shape":"BoxedInteger"}
       }
@@ -1377,6 +1380,13 @@
       "type":"list",
       "member":{"shape":"Service"}
     },
+    "SortOrder":{
+      "type":"string",
+      "enum":[
+        "ASC",
+        "DESC"
+      ]
+    },
     "StartTaskRequest":{
       "type":"structure",
       "required":[
@@ -1471,9 +1481,17 @@
         "containerDefinitions":{"shape":"ContainerDefinitions"},
         "family":{"shape":"String"},
         "revision":{"shape":"Integer"},
-        "volumes":{"shape":"VolumeList"}
+        "volumes":{"shape":"VolumeList"},
+        "status":{"shape":"TaskDefinitionStatus"}
       }
     },
+    "TaskDefinitionStatus":{
+      "type":"string",
+      "enum":[
+        "ACTIVE",
+        "INACTIVE"
+      ]
+    },
     "TaskOverride":{
       "type":"structure",
       "members":{

data/apis/iam/2010-05-08/paginators-1.json

@@ -21,6 +21,38 @@
       "limit_key": "MaxItems",
       "result_key": "AccountAliases"
     },
+    "ListAttachedGroupPolicies": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "more_results": "IsTruncated",
+      "limit_key": "MaxItems",
+      "result_key": "AttachedPolicies"
+    },
+    "ListAttachedRolePolicies": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "more_results": "IsTruncated",
+      "limit_key": "MaxItems",
+      "result_key": "AttachedPolicies"
+    },
+    "ListAttachedUserPolicies": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "more_results": "IsTruncated",
+      "limit_key": "MaxItems",
+      "result_key": "AttachedPolicies"
+    },
+    "ListEntitiesForPolicy": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "more_results": "IsTruncated",
+      "limit_key": "MaxItems",
+      "result_key": [
+        "PolicyGroups",
+        "PolicyUsers",
+        "PolicyRoles"
+      ]
+    },
     "ListGroupPolicies": {
       "input_token": "Marker",
       "output_token": "Marker",

data/apis/iam/2010-05-08/resources-1.json

@@ -1497,6 +1497,14 @@
           }
         }
       },
+      "waiters": {
+        "Exists": {
+          "waiterName": "UserExists",
+          "params": [
+            { "target": "UserName", "source": "identifier", "name": "Name" }
+          ]
+        }
+      },
       "has": {
         "AccessKey": {
           "resource": {

data/apis/iam/2010-05-08/waiters-2.json

@@ -0,0 +1,22 @@
+{
+  "version": 2,
+  "waiters": {
+    "UserExists": {
+      "delay": 1,
+      "operation": "GetUser",
+      "maxAttempts": 20,
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "status",
+          "expected": 200
+        },
+        {
+          "state": "retry",
+          "matcher": "error",
+          "expected": "NoSuchEntity"
+        }
+      ]
+    }
+  }
+}

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.rb

@@ -191,7 +191,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 +284,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.

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
 

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/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