aws-sdk-core 2.11.383 → 3.68.1

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

@@ -0,0 +1,10 @@
+require_relative 'rest/handler'
+require_relative 'rest/request/body'
+require_relative 'rest/request/builder'
+require_relative 'rest/request/endpoint'
+require_relative 'rest/request/headers'
+require_relative 'rest/request/querystring_builder'
+require_relative 'rest/response/body'
+require_relative 'rest/response/headers'
+require_relative 'rest/response/parser'
+require_relative 'rest/response/status_code'

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

@@ -1,4 +1,5 @@
 module Aws
+  # @api private
   module Rest
     class Handler < Seahorse::Client::Handler
 

data/lib/aws-sdk-core/rest/request/builder.rb

@@ -31,7 +31,7 @@ module Aws
         def populate_body(context)
           Body.new(
             serializer_class(context),
-            context.operation.input,
+            context.operation.input
           ).apply(context.http_request, context.params)
         end
 
@@ -40,6 +40,7 @@ module Aws
           case protocol
           when 'rest-xml' then Xml::Builder
           when 'rest-json' then Json::Builder
+          when 'api-gateway' then Json::Builder
           else raise "unsupported protocol #{protocol}"
           end
         end

data/lib/aws-sdk-core/rest/request/endpoint.rb

@@ -49,11 +49,11 @@ module Aws
 
         def apply_querystring_params(uri, params)
           # collect params that are supposed to be part of the query string
-          parts = @rules.shape.members.inject([]) do |parts, (member_name, member_ref)|
+          parts = @rules.shape.members.inject([]) do |prts, (member_name, member_ref)|
             if member_ref.location == 'querystring' && !params[member_name].nil?
-              parts << [member_ref, params[member_name]]
+              prts << [member_ref, params[member_name]]
             end
-            parts
+            prts
           end
           querystring = QuerystringBuilder.new.build(parts)
           querystring = [@query_prefix, querystring == '' ? nil : querystring].compact.join('&')

data/lib/aws-sdk-core/rest/request/headers.rb

@@ -32,11 +32,21 @@ module Aws
           value = apply_json_trait(value) if ref['jsonvalue']
           headers[ref.location_name] =
             case ref.shape
-            when TimestampShape then value.utc.httpdate
+            when TimestampShape then timestamp(ref, value)
             else value.to_s
             end
         end
 
+        def timestamp(ref, value)
+          case ref['timestampFormat'] || ref.shape['timestampFormat']
+          when 'unixTimestamp' then value.to_i
+          when 'iso8601' then value.utc.iso8601
+          else
+            # header default to rfc822
+            value.utc.httpdate
+          end
+        end
+
         def apply_header_map(headers, ref, values)
           prefix = ref.location_name || ''
           values.each_pair do |name, value|

data/lib/aws-sdk-core/rest/request/querystring_builder.rb

@@ -34,6 +34,9 @@ module Aws
           when StringShape, BooleanShape, FloatShape, IntegerShape, StringShape
             param_name = shape_ref.location_name
             "#{param_name}=#{escape(param_value.to_s)}"
+          when TimestampShape
+            param_name = shape_ref.location_name
+            "#{param_name}=#{escape(timestamp(shape_ref, param_value))}"
           when MapShape
             if StringShape === shape_ref.shape.value.shape
               query_map_of_string(param_value)
@@ -56,6 +59,16 @@ module Aws
           end
         end
 
+        def timestamp(ref, value)
+          case ref['timestampFormat'] || ref.shape['timestampFormat']
+          when 'unixTimestamp' then value.to_i
+          when 'rfc822' then value.utc.httpdate
+          else
+            # querystring defaults to iso8601
+            value.utc.iso8601
+          end
+        end
+
         def query_map_of_string(hash)
           list = []
           hash.each_pair do |key, value|

data/lib/aws-sdk-core/rest/response/body.rb

@@ -15,7 +15,9 @@ module Aws
         # @param [IO] body
         # @param [Hash, Struct] data
         def apply(body, data)
-          if streaming?
+          if event_stream?
+            data[@rules[:payload]] = parse_eventstream(body)
+          elsif streaming?
             data[@rules[:payload]] = body
           elsif @rules[:payload]
             data[@rules[:payload]] = parse(body.read, @rules[:payload_member])
@@ -26,6 +28,10 @@ module Aws
 
         private
 
+        def event_stream?
+          @rules[:payload] && @rules[:payload_member].eventstream
+        end
+
         def streaming?
           @rules[:payload] && (
             BlobShape === @rules[:payload_member].shape ||
@@ -37,6 +43,13 @@ module Aws
           @parser_class.new(rules).parse(body, target) if body.size > 0
         end
 
+        def parse_eventstream(body)
+          # body contains an array of parsed event when they arrive
+          @rules[:payload_member].shape.struct_class.new do |payload|
+            body.each { |event| payload << event }
+          end
+        end
+
       end
     end
   end

data/lib/aws-sdk-core/rest/response/headers.rb

@@ -42,6 +42,8 @@ module Aws
           when TimestampShape
             if value =~ /\d+(\.\d*)/
               Time.at(value.to_f)
+            elsif value =~ /^\d+$/
+              Time.at(value.to_i)
             else
               begin
                 Time.parse(value)

data/lib/aws-sdk-core/rest/response/parser.rb

@@ -5,31 +5,34 @@ module Aws
 
         def apply(response)
           # TODO : remove this unless check once response stubbing is fixed
-          unless response.data
-            response.data = response.context.operation.output[:struct_class].new
+          if rules = response.context.operation.output
+            response.data = rules.shape.struct_class.new
+            extract_status_code(rules, response)
+            extract_headers(rules, response)
+            extract_body(rules, response)
+          else
+            response.data = EmptyStructure.new
           end
-          extract_status_code(response)
-          extract_headers(response)
-          extract_body(response)
         end
 
         private
 
-        def extract_status_code(response)
-          status_code = StatusCode.new(response.context.operation.output)
+        def extract_status_code(rules, response)
+          status_code = StatusCode.new(rules)
           status_code.apply(response.context.http_response, response.data)
         end
 
-        def extract_headers(response)
-          headers = Headers.new(response.context.operation.output)
+        def extract_headers(rules, response)
+          headers = Headers.new(rules)
           headers.apply(response.context.http_response, response.data)
         end
 
-        def extract_body(response)
-          Body.new(
-            parser_class(response),
-            response.context.operation.output,
-          ).apply(response.context.http_response.body, response.data)
+        def extract_body(rules, response)
+          Body.new(parser_class(response), rules).
+            apply(
+              response.context.http_response.body,
+              response.data
+            )
         end
 
         def parser_class(response)
@@ -37,6 +40,7 @@ module Aws
           case protocol
           when 'rest-xml' then Xml::Parser
           when 'rest-json' then Json::Parser
+          when 'api-gateway' then Json::Parser
           else raise "unsupported protocol #{protocol}"
           end
         end

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

@@ -20,7 +20,11 @@ module Aws
     # `~/.aws/credentials`) and the shared config file (the default path for
     # which is `~/.aws/config`) are loaded. However, if you set the
     # `ENV['AWS_SDK_CONFIG_OPT_OUT']` environment variable, only the shared
-    # credential file will be loaded.
+    # credential file will be loaded. You can specify the shared credential
+    # file path with the `ENV['AWS_SHARED_CREDENTIALS_FILE']` environment
+    # variable or with the `:credentials_path` option. Similarly, you can
+    # specify the shared config file path with the `ENV['AWS_CONFIG_FILE']`
+    # environment variable or with the `:config_path` option.
     #
     # The default profile name is 'default'. You can specify the profile name
     # with the `ENV['AWS_PROFILE']` environment variable or with the
@@ -28,9 +32,11 @@ module Aws
     #
     # @param [Hash] options
     # @option options [String] :credentials_path Path to the shared credentials
-    #   file. Defaults to "#{Dir.home}/.aws/credentials".
+    #   file. If not specified, will check `ENV['AWS_SHARED_CREDENTIALS_FILE']`
+    #   before using the default value of "#{Dir.home}/.aws/credentials".
     # @option options [String] :config_path Path to the shared config file.
-    #   Defaults to "#{Dir.home}/.aws/config".
+    #   If not specified, will check `ENV['AWS_CONFIG_FILE']` before using the
+    #   default value of "#{Dir.home}/.aws/config".
     # @option options [String] :profile_name The credential/config profile name
     #   to use. If not specified, will check `ENV['AWS_PROFILE']` before using
     #   the fixed default value of 'default'.
@@ -38,6 +44,7 @@ module Aws
     #   file and enables new config values outside of the old shared credential
     #   spec.
     def initialize(options = {})
+      @parsed_config = nil
       @profile_name = determine_profile(options)
       @config_enabled = options[:config_enabled]
       @credentials_path = options[:credentials_path] ||
@@ -84,7 +91,7 @@ module Aws
 
     # Sources static credentials from shared credential/config files.
     #
-    # @param [Hash] options
+    # @param [Hash] opts
     # @option options [String] :profile the name of the configuration file from
     #   which credentials are being sourced.
     # @return [Aws::Credentials] credentials sourced from configuration values,
@@ -92,12 +99,10 @@ module Aws
     def credentials(opts = {})
       p = opts[:profile] || @profile_name
       validate_profile_exists(p) if credentials_present?
-      if credentials = credentials_from_shared(p, opts)
+      if (credentials = credentials_from_shared(p, opts))
         credentials
-      elsif credentials = credentials_from_config(p, opts)
+      elsif (credentials = credentials_from_config(p, opts))
         credentials
-      else
-        nil
       end
     end
 
@@ -106,13 +111,33 @@ module Aws
     # file, if present.
     def assume_role_credentials_from_config(opts = {})
       p = opts.delete(:profile) || @profile_name
-      credentials = assume_role_from_profile(@parsed_credentials, p, opts)
+      chain_config = opts.delete(:chain_config)
+      credentials = assume_role_from_profile(@parsed_credentials, p, opts, chain_config)
       if @parsed_config
-        credentials ||= assume_role_from_profile(@parsed_config, p, opts)
+        credentials ||= assume_role_from_profile(@parsed_config, p, opts, chain_config)
       end
       credentials
     end
 
+    def assume_role_web_identity_credentials_from_config(profile)
+      p = profile || @profile_name
+      if @config_enabled && @parsed_config
+        entry = @parsed_config.fetch(p, {})
+        if entry['web_identity_token_file'] &&
+          entry['role_arn']
+          AssumeRoleWebIdentityCredentials.new(
+            role_arn: entry['role_arn'],
+            web_identity_token_file: entry['web_identity_token_file'],
+            role_session_name: entry['role_session_name']
+          )
+        else
+          nil
+        end
+      else
+        nil
+      end
+    end
+
     def region(opts = {})
       p = opts[:profile] || @profile_name
       if @config_enabled
@@ -128,42 +153,103 @@ module Aws
       end
     end
 
-    def sts_regional_endpoints(opts = {})
+    def endpoint_discovery(opts = {})
+      p = opts[:profile] || @profile_name
+      if @config_enabled && @parsed_config
+        @parsed_config.fetch(p, {})["endpoint_discovery_enabled"]
+      end
+    end
+
+    def credentials_process(profile)
+      validate_profile_exists(profile)
+      @parsed_config[profile]['credential_process']
+    end
+
+    def csm_enabled(opts = {})
+      p = opts[:profile] || @profile_name
+      if @config_enabled
+        if @parsed_credentials
+          value = @parsed_credentials.fetch(p, {})["csm_enabled"]
+        end
+        if @parsed_config
+          value ||= @parsed_config.fetch(p, {})["csm_enabled"]
+        end
+        value
+      else
+        nil
+      end
+    end
+
+    def csm_client_id(opts = {})
       p = opts[:profile] || @profile_name
       if @config_enabled
         if @parsed_credentials
-          mode = @parsed_credentials.fetch(p, {})["sts_regional_endpoints"]
+          value = @parsed_credentials.fetch(p, {})["csm_client_id"]
         end
         if @parsed_config
-          mode ||= @parsed_config.fetch(p, {})["sts_regional_endpoints"]
+          value ||= @parsed_config.fetch(p, {})["csm_client_id"]
         end
-        mode
+        value
       else
         nil
       end
     end
 
-    def endpoint_discovery(opts = {})
+    def csm_port(opts = {})
       p = opts[:profile] || @profile_name
-      if @config_enabled && @parsed_config
-        @parsed_config.fetch(p, {})["endpoint_discovery_enabled"]
+      if @config_enabled
+        if @parsed_credentials
+          value = @parsed_credentials.fetch(p, {})["csm_port"]
+        end
+        if @parsed_config
+          value ||= @parsed_config.fetch(p, {})["csm_port"]
+        end
+        value
+      else
+        nil
+      end
+    end
+
+    def csm_host(opts = {})
+      p = opts[:profile] || @profile_name
+      if @config_enabled
+        if @parsed_credentials
+          value = @parsed_credentials.fetch(p, {})["csm_host"]
+        end
+        if @parsed_config
+          value ||= @parsed_config.fetch(p, {})["csm_host"]
+        end
+        value
+      else
+        nil
       end
     end
 
     private
+
     def credentials_present?
       (@parsed_credentials && !@parsed_credentials.empty?) ||
         (@parsed_config && !@parsed_config.empty?)
     end
-    def assume_role_from_profile(cfg, profile, opts)
+
+    def assume_role_from_profile(cfg, profile, opts, chain_config)
       if cfg && prof_cfg = cfg[profile]
         opts[:source_profile] ||= prof_cfg["source_profile"]
-        if opts[:source_profile]
-          opts[:credentials] = credentials(profile: opts[:source_profile])
+        credential_source = opts.delete(:credential_source)
+        credential_source ||= prof_cfg["credential_source"]
+        if opts[:source_profile] && credential_source
+          raise Errors::CredentialSourceConflictError.new(
+            "Profile #{profile} has a source_profile, and "\
+              "a credential_source. For assume role credentials, must "\
+              "provide only source_profile or credential_source, not both."
+          )
+        elsif opts[:source_profile]
+          opts[:credentials] = resolve_source_profile(opts[:source_profile])
           if opts[:credentials]
             opts[:role_session_name] ||= prof_cfg["role_session_name"]
             opts[:role_session_name] ||= "default_session"
             opts[:role_arn] ||= prof_cfg["role_arn"]
+            opts[:duration_seconds] ||= prof_cfg["duration_seconds"]
             opts[:external_id] ||= prof_cfg["external_id"]
             opts[:serial_number] ||= prof_cfg["mfa_serial"]
             opts[:profile] = opts.delete(:source_profile)
@@ -174,6 +260,26 @@ module Aws
                 " source_profile does not have credentials."
             )
           end
+        elsif credential_source
+          opts[:credentials] = credentials_from_source(
+            credential_source,
+            chain_config
+          )
+          if opts[:credentials]
+            opts[:role_session_name] ||= prof_cfg["role_session_name"]
+            opts[:role_session_name] ||= "default_session"
+            opts[:role_arn] ||= prof_cfg["role_arn"]
+            opts[:duration_seconds] ||= prof_cfg["duration_seconds"]
+            opts[:external_id] ||= prof_cfg["external_id"]
+            opts[:serial_number] ||= prof_cfg["mfa_serial"]
+            opts.delete(:source_profile) # Cleanup
+            AssumeRoleCredentials.new(opts)
+          else
+            raise Errors::NoSourceCredentials.new(
+              "Profile #{profile} could not get source credentials from"\
+                " provider #{credential_source}"
+            )
+          end
         elsif prof_cfg["role_arn"]
           raise Errors::NoSourceProfileError.new(
             "Profile #{profile} has a role_arn, but no source_profile."
@@ -186,6 +292,42 @@ module Aws
       end
     end
 
+    def resolve_source_profile(profile)
+      if (creds = credentials(profile: profile))
+        creds # static credentials
+      elsif (provider = assume_role_web_identity_credentials_from_config(profile))
+        if provider.credentials.set?
+          provider.credentials
+        end
+      elsif (provider = assume_role_process_credentials_from_config(profile))
+        if provider.credentials.set?
+          provider.credentials
+        end
+      end
+    end
+
+    def credentials_from_source(credential_source, config)
+      case credential_source
+      when "Ec2InstanceMetadata"
+        InstanceProfileCredentials.new(
+          retries: config ? config.instance_profile_credentials_retries : 0,
+          http_open_timeout: config ? config.instance_profile_credentials_timeout : 1,
+          http_read_timeout: config ? config.instance_profile_credentials_timeout : 1
+        )
+      when "EcsContainer"
+        ECSCredentials.new
+      else
+        raise Errors::InvalidCredentialSourceError.new(
+          "Unsupported credential_source: #{credential_source}"
+        )
+      end
+    end
+
+    def assume_role_process_credentials_from_config(profile)
+      credential_process = credentials_process(profile)
+      ProcessCredentials.new(credential_process) if credential_process
+    end
+
     def credentials_from_shared(profile, opts)
       if @parsed_credentials && prof_config = @parsed_credentials[profile]
         credentials_from_profile(prof_config)
@@ -230,11 +372,11 @@ module Aws
     end
 
     def determine_credentials_path
-      default = default_shared_config_path('credentials')
+      ENV['AWS_SHARED_CREDENTIALS_FILE'] || default_shared_config_path('credentials')
     end
 
     def determine_config_path
-      default = default_shared_config_path('config')
+      ENV['AWS_CONFIG_FILE'] || default_shared_config_path('config')
     end
 
     def default_shared_config_path(file)