aws-sdk-core 2.11.632 → 3.0.0.rc1

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

@@ -16,20 +16,6 @@ module Aws
         @config.stub_responses.each do |operation_name, stubs|
           apply_stubs(operation_name, Array === stubs ? stubs : [stubs])
         end
-        @config.stub_responses = true
-      end
-
-      # When a client is stubbed allow the user to access the requests made
-      @api_requests = []
-
-      requests = @api_requests
-      self.handle do |context|
-        requests << {
-          operation_name: context.operation_name,
-          params: context.params,
-          context: context
-        }
-        @handler.call(context)
       end
     end
 
@@ -63,18 +49,8 @@ module Aws
     #       buckets: [{ name: 'my-bucket' }]
     #     })
     #
-    #     client.list_buckets.buckets.map(&:name)
-    #     #=> ['my-bucket']
-    #
-    # With a Resource class {#stub_responses} on the corresponding client:
-    #
-    #     s3 = Aws::S3::Resource.new(stub_responses: true)
-    #     s3.client.stub_responses(:list_buckets, {
-    #       buckets: [{ name: 'my-bucket' }]
-    #     })
-    #
-    #     s3.buckets.map(&:name)
-    #     #=> ['my-bucket']
+    #     client.list_buckets.buckets.map(&:name) #=> ['my-bucket']
+    #     #=> ['aws-sdk']
     #
     # Lastly, default stubs can be configured via `Aws.config`:
     #
@@ -87,22 +63,6 @@ module Aws
     #     Aws::S3::Client.new.list_buckets.buckets.map(&:name)
     #     #=> ['my-bucket']
     #
-    #     Aws::S3::Resource.new.buckets.map(&:name)
-    #     #=> ['my-bucket']
-    #
-    # ## Dynamic Stubbing
-    #
-    # In addition to creating static stubs, it's also possible to generate
-    # stubs dynamically based on the parameters with which operations were
-    # called, by passing a `Proc` object:
-    #
-    #     s3 = Aws::S3::Resource.new(stub_responses: true)
-    #     s3.client.stub_responses(:put_object, -> (context) {
-    #       s3.client.stub_responses(:get_object, content_type: context.params[:content_type])
-    #     })
-    #
-    # The yielded object is an instance of {Seahorse::Client::RequestContext}.
-    #
     # ## Stubbing Errors
     #
     # When stubbing is enabled, the SDK will default to generate
@@ -180,27 +140,6 @@ module Aws
       end
     end
 
-    # Allows you to access all of the requests that the stubbed client has made
-    #
-    # @params [Boolean] exclude_presign Setting to true for filtering out not sent requests from
-    #                 generating presigned urls. Default to false.
-    # @return [Array] Returns an array of the api requests made, each request object contains the
-    #                 :operation_name, :params, and :context of the request. 
-    # @raise [NotImplementedError] Raises `NotImplementedError` when the client is not stubbed
-    def api_requests(options = {})
-      if config.stub_responses
-        if options[:exclude_presign]
-          @api_requests.reject {|req| req[:context][:presigned_url] }
-        else
-          @api_requests
-        end
-      else
-        msg = 'This method is only implemented for stubbed clients, and is '
-        msg << 'available when you enable stubbing in the constructor with `stub_responses: true`'
-        raise NotImplementedError.new(msg)
-      end
-    end
-
     # Generates and returns stubbed response data from the named operation.
     #
     #     s3 = Aws::S3::Client.new
@@ -220,7 +159,7 @@ module Aws
     # @return [Structure] Returns a stubbed response data structure. The
     #   actual class returned will depend on the given `operation_name`.
     def stub_data(operation_name, data = {})
-      Stubbing::StubData.new(operation(operation_name)).stub(data)
+      Stubbing::StubData.new(config.api.operation(operation_name)).stub(data)
     end
 
     # @api private

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

@@ -1,3 +1,5 @@
+require_relative 'deprecations'
+
 module Aws
   module CredentialProvider
 

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

@@ -62,8 +62,7 @@ module Aws
       if options[:config]
         SharedCredentials.new(profile_name: options[:config].profile)
       else
-        SharedCredentials.new(
-          profile_name: ENV['AWS_PROFILE'].nil? ? 'default' : ENV['AWS_PROFILE'])
+        SharedCredentials.new(profile_name: 'default')
       end
     rescue Errors::NoSuchProfileError
       nil

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

@@ -16,7 +16,6 @@ module Aws
     def load(klass_or_module)
       @loaded << klass_or_module
       klass_or_module.constants.each do |const_name|
-        next if const_name == :Tms
         path = klass_or_module.autoload?(const_name)
         begin
           require(path) if path

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

@@ -60,7 +60,7 @@ module Aws
       super
     end
 
-    # @return [Integer] The number of times to retry failed attempts to
+    # @return [Integer] The number of times to retry failed atttempts to
     #   fetch credentials from the instance metadata service. Defaults to 0.
     attr_reader :retries
 
@@ -78,18 +78,14 @@ module Aws
       # Retry loading credentials up to 3 times is the instance metadata
       # service is responding but is returning invalid JSON documents
       # in response to the GET profile credentials call.
-      begin
-        retry_errors([JSON::ParserError, StandardError], max_retries: 3) do
-          c = JSON.parse(get_credentials.to_s)
-          @credentials = Credentials.new(
-            c['AccessKeyId'],
-            c['SecretAccessKey'],
-            c['Token']
-          )
-          @expiration = c['Expiration'] ? Time.iso8601(c['Expiration']) : nil
-        end
-      rescue JSON::ParserError
-        raise Aws::Errors::MetadataParserError.new
+      retry_errors([JSON::ParserError, StandardError], max_retries: 3) do
+        c = JSON.parse(get_credentials.to_s)
+        @credentials = Credentials.new(
+          c['AccessKeyId'],
+          c['SecretAccessKey'],
+          c['Token']
+        )
+        @expiration = c['Expiration'] ? Time.parse(c['Expiration']) : nil
       end
     end
 
@@ -130,7 +126,7 @@ module Aws
       retries = 0
       begin
         yield
-      rescue *error_classes => _error
+      rescue *error_classes => error
         if retries < max_retries
           @backoff.call(retries)
           retries += 1

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

@@ -1,10 +1,10 @@
 require 'thread'
 
 module Aws
-
-  # Each Service module has its own Errors module, e.g. {S3::Errors}.
   module Errors
 
+    class NonSupportedRubyVersionError < RuntimeError; end
+
     # The base class for all errors returned by an Amazon Web Service.
     # All ~400 level client errors and ~500 level server errors are raised
     # as service errors.  This indicates it was an error returned from the
@@ -34,56 +34,34 @@ module Aws
       end
     end
 
-    # Raised when InstanceProfileCredentialsProvider or
-    # EcsCredentialsProvider fails to parse the metadata response after retries
-    class MetadataParserError < RuntimeError
-      def initialize(*args)
-        msg = "Failed to parse metadata service response."
-        super(msg)
-      end
-    end
-
     # Various plugins perform client-side checksums of responses.
     # This error indicates a checksum failed.
     class ChecksumError < RuntimeError; end
 
-    # Raised when a {Service} is constructed and the specified shared
+    # Raised when a client is constructed and the specified shared
     # credentials profile does not exist.
     class NoSuchProfileError < RuntimeError; end
 
-    # Raised when a {Service} is constructed, where Assume Role credentials are
+    # Raised when a client is constructed, where Assume Role credentials are
     # expected, and there is no source profile specified.
     class NoSourceProfileError < RuntimeError; end
 
-    # Raised when a {Service} is constructed and credentials are not
+    # Raised when a client is constructed and credentials are not
     # set, or the set credentials are empty.
-    class MissingCredentialsError < RuntimeError; end
-
-    # Raised when a {Service} is constructed and region is not specified.
-    class MissingRegionError < ArgumentError; end
-
-    # Rasied when endpoint discovery failed for operations
-    # that requires endpoints from endpoint discovery
-    class EndpointDiscoveryError < RuntimeError
+    class MissingCredentialsError < RuntimeError
       def initialize(*args)
-        msg = 'Endpoint discovery failed for the operation or discovered endpoint is not working, '\
-          'request will keep failing until endpoint discovery succeeds or :endpoint option is provided.'
+        msg = 'unable to sign request without credentials set'
         super(msg)
       end
     end
 
-    # raised when hostLabel member is not provided
-    # at operation input when endpoint trait is available
-    # with 'hostPrefix' requirement
-    class MissingEndpointHostLabelValue < RuntimeError
-
-      def initialize(name)
-        msg = "Missing required parameter #{name} to construct"\
-          " endpoint host prefix. You can disable host prefix by"\
-          " setting :disable_host_prefix_injection to `true`."
+    # Raised when a client is constructed and region is not specified.
+    class MissingRegionError < ArgumentError
+      def initialize(*args)
+        msg = "missing region; use :region option or "
+        msg << "export region name to ENV['AWS_REGION']"
         super(msg)
       end
-
     end
 
     # Raised when attempting to connect to an endpoint and a `SocketError`

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

@@ -1,4 +1,5 @@
 module Aws
+  # @api private
   class IniParser
     class << self
 

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

@@ -11,15 +11,6 @@ module Aws
     # @api private
     class Non200Response < RuntimeError; end
 
-    # @api private
-    class TokenRetrivalError < RuntimeError; end
-
-    # @api private
-    class TokenExpiredError < RuntimeError; end
-
-    # @api private
-    class TokenRetrivalUnavailableError < RuntimeError; end
-
     # These are the errors we trap when attempting to talk to the
     # instance metadata service.  Any of these imply the service
     # is not present, no responding or some other non-recoverable
@@ -35,14 +26,6 @@ module Aws
       Non200Response,
     ]
 
-    # Path base for GET request for profile and credentials
-    # @api private
-    METADATA_PATH_BASE = '/latest/meta-data/iam/security-credentials/'
-
-    # Path for PUT request for token
-    # @api private
-    METADATA_TOKEN_PATH = '/latest/api/token'
-
     # @param [Hash] options
     # @option options [Integer] :retries (5) Number of times to retry
     #   when retrieving credentials.
@@ -57,8 +40,6 @@ module Aws
     # @option options [IO] :http_debug_output (nil) HTTP wire
     #   traces are sent to this object.  You can specify something
     #   like $stdout.
-    # @option options [Integer] :token_ttl (21600) Time-to-Live in seconds for
-    #   EC2 Metadata Token used for fetching Metadata Profile Credentials.
     def initialize options = {}
       @retries = options[:retries] || 5
       @ip_address = options[:ip_address] || '169.254.169.254'
@@ -67,13 +48,11 @@ module Aws
       @http_read_timeout = options[:http_read_timeout] || 5
       @http_debug_output = options[:http_debug_output]
       @backoff = backoff(options[:backoff])
-      @token_ttl = options[:token_ttl] || 21600
       super
     end
 
-    # @return [Integer] Number of times to retry when retrieving credentials
-    #   from the instance metadata service. Defaults to 0 when resolving from
-    #   the default credential chain ({Aws::CredentialProviderChain}).
+    # @return [Integer] The number of times to retry failed atttempts to
+    #   fetch credentials from the instance metadata service. Defaults to 0.
     attr_reader :retries
 
     private
@@ -90,70 +69,33 @@ module Aws
       # Retry loading credentials up to 3 times is the instance metadata
       # service is responding but is returning invalid JSON documents
       # in response to the GET profile credentials call.
-      begin
-        retry_errors([JSON::ParserError, StandardError], max_retries: 3) do
-          c = JSON.parse(get_credentials.to_s)
-          @credentials = Credentials.new(
-            c['AccessKeyId'],
-            c['SecretAccessKey'],
-            c['Token']
-          )
-          @expiration = c['Expiration'] ? Time.iso8601(c['Expiration']) : nil
-        end
-      rescue JSON::ParserError
-        raise Aws::Errors::MetadataParserError.new
+      retry_errors([JSON::ParserError, StandardError], max_retries: 3) do
+        c = JSON.parse(get_credentials.to_s)
+        @credentials = Credentials.new(
+          c['AccessKeyId'],
+          c['SecretAccessKey'],
+          c['Token']
+        )
+        @expiration = c['Expiration'] ? Time.parse(c['Expiration']) : nil
       end
     end
 
     def get_credentials
       # Retry loading credentials a configurable number of times if
       # the instance metadata service is not responding.
-      if _metadata_disabled?
-        '{}'
-      else
-        begin
-          retry_errors(NETWORK_ERRORS, max_retries: @retries) do
-            open_connection do |conn|
-              _token_attempt(conn)
-              token_value = @token.value if token_set?
-              profile_name = http_get(conn, METADATA_PATH_BASE, token_value)
-                .lines.first.strip
-              http_get(conn, METADATA_PATH_BASE + profile_name, token_value)
-            end
-          end
-        rescue
-          '{}'
-        end
-      end
-    end
-
-    def token_set?
-      @token && !@token.expired?
-    end
-
-    # attempt to fetch token with retries baked in
-    # would be skipped if token already set
-    def _token_attempt(conn)
       begin
         retry_errors(NETWORK_ERRORS, max_retries: @retries) do
-          unless token_set?
-            token_value, ttl = http_put(conn, METADATA_TOKEN_PATH, @token_ttl)
-            @token = Token.new(token_value, ttl) if token_value && ttl
+          open_connection do |conn|
+            path = '/latest/meta-data/iam/security-credentials/'
+            profile_name = http_get(conn, path).lines.first.strip
+            http_get(conn, path + profile_name)
           end
         end
-      rescue *NETWORK_ERRORS, TokenRetrivalUnavailableError
-        # token attempt failed with allowable errors (those indicating
-        # token retrieval not available on the instance), reset token to
-        # allow safe failover to non-token mode
-        @token = nil
+      rescue
+        '{}'
       end
     end
 
-    def _metadata_disabled?
-      flag = ENV["AWS_EC2_METADATA_DISABLED"]
-      !flag.nil? && flag.downcase == "true"
-    end
-
     def open_connection
       http = Net::HTTP.new(@ip_address, @port, nil)
       http.open_timeout = @http_open_timeout
@@ -163,40 +105,10 @@ module Aws
       yield(http).tap { http.finish }
     end
 
-    # GET request fetch profile and credentials
-    def http_get(connection, path, token=nil)
-      headers = {"User-Agent" => "aws-sdk-ruby2/#{VERSION}"}
-      headers["x-aws-ec2-metadata-token"] = token if token
-      response = connection.request(Net::HTTP::Get.new(path, headers))
-      case response.code.to_i
-      when 200
+    def http_get(connection, path)
+      response = connection.request(Net::HTTP::Get.new(path))
+      if response.code.to_i == 200
         response.body
-      when 401
-        raise TokenExpiredError
-      else
-        raise Non200Response
-      end
-    end
-
-    # PUT request fetch token with ttl
-    def http_put(connection, path, ttl)
-      headers = {
-        "User-Agent" => "aws-sdk-ruby2/#{VERSION}",
-        "x-aws-ec2-metadata-token-ttl-seconds" => ttl.to_s
-      }
-      response = connection.request(Net::HTTP::Put.new(path, headers))
-      case response.code.to_i
-      when 200
-        [
-          response.body,
-          response.header["x-aws-ec2-metadata-token-ttl-seconds"].to_i
-        ]
-      when 400
-        raise TokenRetrivalError
-      when 403
-      when 404
-      when 405
-        raise TokenRetrivalUnavailableError
       else
         raise Non200Response
       end
@@ -218,24 +130,5 @@ module Aws
       end
     end
 
-    # @api private
-    # Token used to fetch IMDS profile and credentials
-    class Token
-
-      def initialize(value, ttl)
-        @ttl = ttl
-        @value = value
-        @created_time = Time.now
-      end
-
-      # [String] token value
-      attr_reader :value
-
-      def expired?
-        Time.now - @created_time > @ttl
-      end
-
-    end
-
   end
 end