aws-sdk-core 2.11.502 → 3.94.0

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

@@ -1,8 +1,6 @@
 module Aws
-
   # @api private
   class SharedConfig
-
     # @return [String]
     attr_reader :credentials_path
 
@@ -20,7 +18,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 +30,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,10 +42,11 @@ 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] ||
-        determine_credentials_path
+                          determine_credentials_path
       @parsed_credentials = {}
       load_credentials_file if loadable?(@credentials_path)
       if @config_enabled
@@ -60,7 +65,7 @@ module Aws
       @config_enabled = options[:config_enabled] ? true : false
       @profile_name = determine_profile(options)
       @credentials_path = options[:credentials_path] ||
-        determine_credentials_path
+                          determine_credentials_path
       load_credentials_file if loadable?(@credentials_path)
       if @config_enabled
         @config_path = options[:config_path] || determine_config_path
@@ -84,7 +89,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 +97,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,114 +109,163 @@ 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 region(opts = {})
+    def assume_role_web_identity_credentials_from_config(opts = {})
       p = opts[:profile] || @profile_name
-      if @config_enabled
-        if @parsed_credentials
-          region = @parsed_credentials.fetch(p, {})["region"]
-        end
-        if @parsed_config
-          region ||= @parsed_config.fetch(p, {})["region"]
+      if @config_enabled && @parsed_config
+        entry = @parsed_config.fetch(p, {})
+        if entry['web_identity_token_file'] && entry['role_arn']
+          cfg = {
+            role_arn: entry['role_arn'],
+            web_identity_token_file: entry['web_identity_token_file'],
+            role_session_name: entry['role_session_name']
+          }
+          cfg[:region] = opts[:region] if opts[:region]
+          AssumeRoleWebIdentityCredentials.new(cfg)
         end
-        region
-      else
-        nil
       end
     end
 
-    def sts_regional_endpoints(opts = {})
-      p = opts[:profile] || @profile_name
-      if @config_enabled
-        if @parsed_credentials
-          mode = @parsed_credentials.fetch(p, {})["sts_regional_endpoints"]
-        end
-        if @parsed_config
-          mode ||= @parsed_config.fetch(p, {})["sts_regional_endpoints"]
-        end
-        mode
-      else
-        nil
+    # Add an accessor method (similar to attr_reader) to return a configuration value
+    # Uses the get_config_value below to control where
+    # values are loaded from
+    def self.config_reader(*attrs)
+      attrs.each do |attr|
+        define_method(attr) { |opts = {}| get_config_value(attr.to_s, opts) }
       end
     end
 
-    def s3_us_east_1_regional_endpoint(opts = {})
-      p = opts[:profile] || @profile_name
-      if @config_enabled
-        if @parsed_credentials
-          mode = @parsed_credentials.fetch(p, {})["s3_us_east_1_regional_endpoint"]
-        end
-        if @parsed_config
-          mode ||= @parsed_config.fetch(p, {})["s3_us_east_1_regional_endpoint"]
-        end
-        mode
-      else
-        nil
-      end
-    end
+    config_reader(
+      :region,
+      :credential_process,
+      :endpoint_discovery_enabled,
+      :max_attempts,
+      :retry_mode,
+      :adaptive_retry_wait_to_fill,
+      :correct_clock_skew,
+      :csm_client_id,
+      :csm_enabled,
+      :csm_host,
+      :csm_port,
+      :sts_regional_endpoints,
+      :s3_use_arn_region,
+      :s3_us_east_1_regional_endpoint
+    )
 
-    def endpoint_discovery(opts = {})
+    private
+
+    # Get a config value from from shared credential/config files.
+    # Only loads a value when config_enabled is true
+    # Return a value from credentials preferentially over config
+    def get_config_value(key, opts)
       p = opts[:profile] || @profile_name
-      if @config_enabled && @parsed_config
-        @parsed_config.fetch(p, {})["endpoint_discovery_enabled"]
-      end
+
+      value = @parsed_credentials.fetch(p, {})[key] if @parsed_credentials
+      value ||= @parsed_config.fetch(p, {})[key] if @config_enabled && @parsed_config
+      value
     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])
+        opts[:source_profile] ||= prof_cfg['source_profile']
+        credential_source = opts.delete(:credential_source)
+        credential_source ||= prof_cfg['credential_source']
+        if opts[:source_profile] && credential_source
+          raise Errors::CredentialSourceConflictError,
+                "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], opts)
           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[:external_id] ||= prof_cfg["external_id"]
-            opts[:serial_number] ||= prof_cfg["mfa_serial"]
+            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)
             AssumeRoleCredentials.new(opts)
           else
-            raise Errors::NoSourceProfileError.new(
-              "Profile #{profile} has a role_arn, and source_profile, but the"\
-                " source_profile does not have credentials."
-            )
+            raise Errors::NoSourceProfileError, "Profile #{profile} has a role_arn, and source_profile, but the"\
+                ' source_profile does not have credentials.'
           end
-        elsif prof_cfg["role_arn"]
-          raise Errors::NoSourceProfileError.new(
-            "Profile #{profile} has a role_arn, but no source_profile."
+        elsif credential_source
+          opts[:credentials] = credentials_from_source(
+            credential_source,
+            chain_config
           )
-        else
-          nil
+          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, "Profile #{profile} could not get source credentials from"\
+                " provider #{credential_source}"
+          end
+        elsif prof_cfg['role_arn']
+          raise Errors::NoSourceProfileError, "Profile #{profile} has a role_arn, but no source_profile."
         end
+      end
+    end
+
+    def resolve_source_profile(profile, opts = {})
+      if (creds = credentials(profile: profile))
+        creds # static credentials
+      elsif (provider = assume_role_web_identity_credentials_from_config(opts.merge(profile: profile)))
+        provider.credentials if provider.credentials.set?
+      elsif (provider = assume_role_process_credentials_from_config(profile))
+        provider.credentials if provider.credentials.set?
+      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
-        nil
+        raise Errors::InvalidCredentialSourceError, "Unsupported credential_source: #{credential_source}"
       end
     end
 
-    def credentials_from_shared(profile, opts)
+    def assume_role_process_credentials_from_config(profile)
+      validate_profile_exists(profile)
+      credential_process = @parsed_config[profile]['credential_process']
+      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)
-      else
-        nil
       end
     end
 
-    def credentials_from_config(profile, opts)
+    def credentials_from_config(profile, _opts)
       if @parsed_config && prof_config = @parsed_config[profile]
         credentials_from_profile(prof_config)
-      else
-        nil
       end
     end
 
@@ -223,15 +275,7 @@ module Aws
         prof_config['aws_secret_access_key'],
         prof_config['aws_session_token']
       )
-      if credentials_complete(creds)
-        creds
-      else
-        nil
-      end
-    end
-
-    def credentials_complete(creds)
-      creds.set?
+      creds if creds.set?
     end
 
     def load_credentials_file
@@ -245,11 +289,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)
@@ -261,19 +305,18 @@ module Aws
 
     def validate_profile_exists(profile)
       unless (@parsed_credentials && @parsed_credentials[profile]) ||
-          (@parsed_config && @parsed_config[profile])
+             (@parsed_config && @parsed_config[profile])
         msg = "Profile `#{profile}' not found in #{@credentials_path}"
         msg << " or #{@config_path}" if @config_path
-        raise Errors::NoSuchProfileError.new(msg)
+        raise Errors::NoSuchProfileError, msg
       end
     end
 
     def determine_profile(options)
       ret = options[:profile_name]
-      ret ||= ENV["AWS_PROFILE"]
-      ret ||= "default"
+      ret ||= ENV['AWS_PROFILE']
+      ret ||= 'default'
       ret
     end
-
   end
 end

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

@@ -1,3 +1,5 @@
+require_relative 'ini_parser'
+
 module Aws
   class SharedCredentials
 

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

@@ -1,10 +1,6 @@
 module Aws
   # @api private
-  class Structure < Struct
-
-    if Struct.instance_methods.include?(:to_h)
-      alias orig_to_h to_h
-    end
+  module Structure
 
     def initialize(values = {})
       values.each do |k, v|
@@ -33,8 +29,7 @@ module Aws
     def to_h(obj = self)
       case obj
       when Struct
-        obj.members.each.with_object({}) do |member, hash|
-          value = obj[member]
+        obj.each_pair.with_object({}) do |(member, value), hash|
           hash[member] = to_hash(value) unless value.nil?
         end
       when Hash
@@ -49,21 +44,35 @@ module Aws
     end
     alias to_hash to_h
 
-    undef_method :each
+    # Wraps the default #to_s logic with filtering of sensitive parameters.
+    def to_s(obj = self)
+      Aws::Log::ParamFilter.new.filter(obj).to_s
+    end
 
     class << self
 
       # @api private
       def new(*args)
-        if args == ['AwsEmptyStructure']
-          super
-        elsif args.empty? || args.first == []
-          EmptyStructure
+        if args.empty?
+          Aws::EmptyStructure
         else
-          super(*args)
+          struct = Struct.new(*args)
+          struct.send(:include, Aws::Structure)
+          struct
         end
       end
 
+      # @api private
+      def self.included(base_class)
+        base_class.send(:undef_method, :each)
+      end
+
     end
   end
+
+  # @api private
+  class EmptyStructure < Struct.new('AwsEmptyStructure')
+    include(Aws::Structure)
+  end
+
 end

data/lib/aws-sdk-core/stubbing/data_applicator.rb

@@ -27,7 +27,7 @@ module Aws
       def member_value(ref, value)
         case ref.shape
         when StructureShape
-          apply_data_to_struct(ref, value, ref[:struct_class].new)
+          apply_data_to_struct(ref, value, ref.shape.struct_class.new)
         when ListShape
           value.inject([]) do |list, v|
             list << member_value(ref.shape.member, v)

data/lib/aws-sdk-core/stubbing/empty_stub.rb

@@ -11,7 +11,11 @@ module Aws
 
       # @return [Structure]
       def stub
-        stub_ref(@rules)
+        if @rules
+          stub_ref(@rules)
+        else
+          EmptyStructure.new
+        end
       end
 
       private
@@ -31,8 +35,11 @@ module Aws
       end
 
       def stub_structure(ref, visited)
-        ref.shape.members.inject(ref[:struct_class].new) do |struct, (mname, mref)|
-          struct[mname] = stub_ref(mref, visited)
+        ref.shape.members.inject(ref.shape.struct_class.new) do |struct, (mname, mref)|
+          # For eventstream shape, it returns an Enumerator
+          unless mref.eventstream
+            struct[mname] = stub_ref(mref, visited)
+          end
           struct
         end
       end