aws-sdk-core 2.11.632 → 3.0.0.rc1

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

@@ -1,14 +1,13 @@
 require 'json'
+require_relative 'json/builder'
+require_relative 'json/error_handler'
+require_relative 'json/handler'
+require_relative 'json/parser'
 
 module Aws
   # @api private
   module Json
 
-    autoload :Builder, 'aws-sdk-core/json/builder'
-    autoload :ErrorHandler, 'aws-sdk-core/json/error_handler'
-    autoload :Handler, 'aws-sdk-core/json/handler'
-    autoload :Parser, 'aws-sdk-core/json/parser'
-
     class ParseError < StandardError
 
       def initialize(error)

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

@@ -38,10 +38,11 @@ module Aws
       def parse_body(context)
         if simple_json?(context)
           Json.load(context.http_response.body_contents)
-        else
-          rules = context.operation.output
+        elsif rules = context.operation.output
           json = context.http_response.body_contents
           Parser.new(rules).parse(json == '' ? '{}' : json)
+        else
+          EmptyStructure.new
         end
       end
 

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

@@ -21,7 +21,7 @@ module Aws
 
       def structure(ref, values, target = nil)
         shape = ref.shape
-        target = ref[:struct_class].new if target.nil?
+        target = ref.shape.struct_class.new if target.nil?
         values.each do |key, value|
           member_name, member_ref = shape.member_by_location_name(key)
           if member_ref

data/lib/aws-sdk-core/log/param_filter.rb

@@ -9,9 +9,10 @@ module Aws
       # logs. This is updated automatically as part of each release. See the
       # `tasks/sensitive.rake` for more information.
       #
-      # ** DO NOT EDIT THE FOLLOWING LINE OF CODE **
-      #
-      SENSITIVE = [:access_token, :admin_contact, :artifact_credentials, :auth_code, :base_32_string_seed, :client_id, :client_secret, :copy_source_sse_customer_key, :id_token, :local_console_password, :new_password, :old_password, :password, :plaintext, :previous_password, :private_key, :proposed_password, :public_key, :qr_code_png, :refresh_token, :registrant_contact, :secret_access_key, :secret_hash, :shared_secret, :sse_customer_key, :ssekms_key_id, :tech_contact, :trust_password, :upload_credentials, :username, :value]
+      # @api private
+      # begin
+      SENSITIVE = [:access_token, :admin_contact, :artifact_credentials, :auth_code, :base_32_string_seed, :client_id, :client_secret, :copy_source_sse_customer_key, :credentials, :id_token, :local_console_password, :new_password, :old_password, :password, :plaintext, :previous_password, :private_key, :proposed_password, :public_key, :qr_code_png, :refresh_token, :registrant_contact, :secret_access_key, :secret_hash, :shared_secret, :sse_customer_key, :ssekms_key_id, :tech_contact, :temporary_password, :trust_password, :upload_credentials, :username, :value]
+      # end
 
       def initialize(options = {})
         @filters = Set.new(SENSITIVE + Array(options[:filter]))

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

@@ -120,6 +120,7 @@ module Aws
     # 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.
+    # @api private
     module UnsafeEnumerableMethods
 
       def count

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

@@ -1,14 +1,16 @@
+require 'jmespath'
+
 module Aws
   # @api private
   class Pager
 
-    def initialize(rules)
-      @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
-      map_tokens(rules)
+    # @option options [required, Hash<JMESPath,JMESPath>] :tokens
+    # @option options [String<JMESPath>] :limit_key
+    # @option options [String<JMESPath>] :more_results
+    def initialize(options)
+      @tokens = options.fetch(:tokens)
+      @limit_key = options.fetch(:limit_key, nil)
+      @more_results = options.fetch(:more_results, nil)
     end
 
     # @return [Symbol, nil]
@@ -37,32 +39,35 @@ module Aws
       if @more_results
         JMESPath.search(@more_results, response.data)
       else
-        next_tokens = self.next_tokens(response)
-        prev_tokens = self.prev_tokens(response)
-        !(next_tokens.empty? || next_tokens == prev_tokens)
+        next_t = next_tokens(response)
+        prev_t = prev_tokens(response)
+        !(next_t.empty? || next_t == prev_t)
       end
     end
 
     private
 
-    def map_tokens(rules)
-      input = Array(rules['input_token'])
-      output = Array(rules['output_token'])
-      @tokens = {}
-      input.each.with_index do |key, n|
-        @tokens[underscore(output[n])] = underscore(key)
-      end
-    end
-
-    def underscore(str)
-      str.
-        gsub(' or ', '||').
-        gsub(/\w+/) { |part| Seahorse::Util.underscore(part) }
-    end
-
     def empty_value?(value)
       value.nil? || value == '' || value == [] || value == {}
     end
 
+    class NullPager
+
+      # @return [nil]
+      attr_reader :limit_key
+
+      def next_tokens
+        {}
+      end
+
+      def prev_tokens
+        {}
+      end
+
+      def truncated?(response)
+        false
+      end
+
+    end
   end
 end

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

@@ -40,7 +40,7 @@ module Aws
 
     def structure(ref, values)
       values = c(ref, values)
-      if Struct === values || Hash === values
+      if ::Struct === values || Hash === values
         values.each_pair do |k, v|
           unless v.nil?
             if ref.shape.member?(k)
@@ -165,10 +165,10 @@ module Aws
     end
 
     add(StructureShape, Hash) { |h| h.dup }
-    add(StructureShape, Struct)
+    add(StructureShape, ::Struct)
 
     add(MapShape, Hash) { |h| h.dup }
-    add(MapShape, Struct) do |s|
+    add(MapShape, ::Struct) do |s|
       s.members.each.with_object({}) {|k,h| h[k] = s[k] }
     end
 

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

@@ -16,7 +16,11 @@ module Aws
     # @param [Seahorse::Model::Shapes::ShapeRef] rules
     # @option options [Boolean] :validate_required (true)
     def initialize(rules, options = {})
-      @rules = rules
+      @rules = rules || begin
+        shape = StructureShape.new
+        shape.struct_class = EmptyStructure
+        ShapeRef.new(shape: shape)
+      end
       @validate_required = options[:validate_required] != false
     end
 
@@ -74,8 +78,10 @@ module Aws
     end
 
     def map(ref, values, errors, context)
-
-      return unless correct_type?(ref, values, errors, context)
+      unless Hash === values
+        errors << expected_got(context, "a hash", values)
+        return
+      end
 
       key_ref = ref.shape.key
       value_ref = ref.shape.value
@@ -123,7 +129,7 @@ module Aws
     def correct_type?(ref, value, errors, context)
       case value
       when Hash then true
-      when ref[:struct_class] then true
+      when ref.shape.struct_class then true
       else
         errors << expected_got(context, "a hash", value)
         false

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

@@ -0,0 +1,62 @@
+module Aws
+  # @api private
+  module Plugins
+    # @api private
+    class CredentialsConfiguration < Seahorse::Client::Plugin
+
+      option(:access_key_id, doc_type: String, docstring: '')
+
+      option(:secret_access_key, doc_type: String, docstring: '')
+
+      option(:session_token, doc_type: String, docstring: '')
+
+      option(:profile,
+        doc_default: 'default',
+        doc_type: String,
+        docstring: <<-DOCS)
+Used when loading credentials from the shared credentials file
+at HOME/.aws/credentials.  When not specified, 'default' is used.
+        DOCS
+
+      option(:credentials,
+        required: true,
+        doc_type: 'Aws::CredentialProvider',
+        docstring: <<-DOCS
+Your AWS credentials. This can be an instance of any one of the
+following classes:
+
+* `Aws::Credentials` - Used for configuring static, non-refreshing
+  credentials.
+
+* `Aws::InstanceProfileCredentials` - Used for loading credentials
+  from an EC2 IMDS on an EC2 instance.
+
+* `Aws::SharedCredentials` - Used for loading credentials from a
+  shared file, such as `~/.aws/config`.
+
+* `Aws::AssumeRoleCredentials` - Used when you need to assume a role.
+
+When `:credentials` are not configured directly, the following
+locations will be searched for credentials:
+
+* `Aws.config[:credentials]`
+* The `:access_key_id`, `:secret_access_key`, and `:session_token` options.
+* ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']
+* `~/.aws/credentials`
+* `~/.aws/config`
+* EC2 IMDS instance profile - When used by default, the timeouts are
+  very aggressive. Construct and pass an instance of
+  `Aws::InstanceProfileCredentails` to enable retries and extended
+  timeouts.
+        DOCS
+      ) do |config|
+        CredentialProviderChain.new(config).resolve
+      end
+
+      option(:instance_profile_credentials_retries, 0)
+
+      option(:instance_profile_credentials_timeout, 1)
+
+    end
+  end
+end

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

@@ -31,17 +31,17 @@ module Aws
     #     Aws::EC2.new
     #     #=> raises ArgumentError: invalid configuration option `:force_path_style'
     #
-    # To avoid this issue, you can nest service specific options 
+    # To avoid this issue, you can nest service specific options
     #
     #     Aws.config[:s3] = { force_path_style: true }
     #
     #     Aws::EC2.new # no error this time