aws-sdk-core 2.0.3 → 2.0.4

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

@@ -1,5 +1,5 @@
 Aws.add_service(:CloudTrail, {
-  api: File.join(Aws::APIS_DIR, 'CloudTrail.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CloudTrail.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'CloudTrail.paginators.json'),
+  api: File.join(Aws::API_DIR, 'CloudTrail.api.json'),
+  docs: File.join(Aws::API_DIR, 'CloudTrail.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'CloudTrail.paginators.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:CloudWatch, {
-  api: File.join(Aws::APIS_DIR, 'CloudWatch.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CloudWatch.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'CloudWatch.paginators.json'),
+  api: File.join(Aws::API_DIR, 'CloudWatch.api.json'),
+  docs: File.join(Aws::API_DIR, 'CloudWatch.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'CloudWatch.paginators.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:CloudWatchLogs, {
-  api: File.join(Aws::APIS_DIR, 'CloudWatchLogs.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CloudWatchLogs.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'CloudWatchLogs.paginators.json'),
+  api: File.join(Aws::API_DIR, 'CloudWatchLogs.api.json'),
+  docs: File.join(Aws::API_DIR, 'CloudWatchLogs.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'CloudWatchLogs.paginators.json'),
 })

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

@@ -1,4 +1,4 @@
 Aws.add_service(:CognitoIdentity, {
-  api: File.join(Aws::APIS_DIR, 'CognitoIdentity.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CognitoIdentity.docs.json'),
+  api: File.join(Aws::API_DIR, 'CognitoIdentity.api.json'),
+  docs: File.join(Aws::API_DIR, 'CognitoIdentity.docs.json'),
 })

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

@@ -1,4 +1,4 @@
 Aws.add_service(:CognitoSync, {
-  api: File.join(Aws::APIS_DIR, 'CognitoSync.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CognitoSync.docs.json'),
+  api: File.join(Aws::API_DIR, 'CognitoSync.api.json'),
+  docs: File.join(Aws::API_DIR, 'CognitoSync.docs.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:DataPipeline, {
-  api: File.join(Aws::APIS_DIR, 'DataPipeline.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'DataPipeline.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'DataPipeline.paginators.json'),
+  api: File.join(Aws::API_DIR, 'DataPipeline.api.json'),
+  docs: File.join(Aws::API_DIR, 'DataPipeline.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'DataPipeline.paginators.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:DirectConnect, {
-  api: File.join(Aws::APIS_DIR, 'DirectConnect.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'DirectConnect.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'DirectConnect.paginators.json'),
+  api: File.join(Aws::API_DIR, 'DirectConnect.api.json'),
+  docs: File.join(Aws::API_DIR, 'DirectConnect.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'DirectConnect.paginators.json'),
 })

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

@@ -1,8 +1,8 @@
 Aws.add_service(:DynamoDB, {
-  api: File.join(Aws::APIS_DIR, 'DynamoDB.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'DynamoDB.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'DynamoDB.paginators.json'),
-  waiters: File.join(Aws::APIS_DIR, 'DynamoDB.waiters.json'),
+  api: File.join(Aws::API_DIR, 'DynamoDB.api.json'),
+  docs: File.join(Aws::API_DIR, 'DynamoDB.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'DynamoDB.paginators.json'),
+  waiters: File.join(Aws::API_DIR, 'DynamoDB.waiters.json'),
 })
 
 module Aws

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

@@ -1,7 +1,7 @@
 Aws.add_service(:EC2, {
-  api: File.join(Aws::APIS_DIR, 'EC2.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'EC2.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'EC2.paginators.json'),
-  resources: File.join(Aws::APIS_DIR, 'EC2.resources.json'),
-  waiters: File.join(Aws::APIS_DIR, 'EC2.waiters.json'),
+  api: File.join(Aws::API_DIR, 'EC2.api.json'),
+  docs: File.join(Aws::API_DIR, 'EC2.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'EC2.paginators.json'),
+  resources: File.join(Aws::API_DIR, 'EC2.resources.json'),
+  waiters: File.join(Aws::API_DIR, 'EC2.waiters.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:ElastiCache, {
-  api: File.join(Aws::APIS_DIR, 'ElastiCache.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'ElastiCache.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'ElastiCache.paginators.json'),
+  api: File.join(Aws::API_DIR, 'ElastiCache.api.json'),
+  docs: File.join(Aws::API_DIR, 'ElastiCache.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'ElastiCache.paginators.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:ElasticBeanstalk, {
-  api: File.join(Aws::APIS_DIR, 'ElasticBeanstalk.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'ElasticBeanstalk.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'ElasticBeanstalk.paginators.json'),
+  api: File.join(Aws::API_DIR, 'ElasticBeanstalk.api.json'),
+  docs: File.join(Aws::API_DIR, 'ElasticBeanstalk.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'ElasticBeanstalk.paginators.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:ElasticLoadBalancing, {
-  api: File.join(Aws::APIS_DIR, 'ElasticLoadBalancing.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'ElasticLoadBalancing.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'ElasticLoadBalancing.paginators.json'),
+  api: File.join(Aws::API_DIR, 'ElasticLoadBalancing.api.json'),
+  docs: File.join(Aws::API_DIR, 'ElasticLoadBalancing.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'ElasticLoadBalancing.paginators.json'),
 })

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

@@ -1,6 +1,6 @@
 Aws.add_service(:ElasticTranscoder, {
-  api: File.join(Aws::APIS_DIR, 'ElasticTranscoder.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'ElasticTranscoder.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'ElasticTranscoder.paginators.json'),
-  waiters: File.join(Aws::APIS_DIR, 'ElasticTranscoder.waiters.json'),
+  api: File.join(Aws::API_DIR, 'ElasticTranscoder.api.json'),
+  docs: File.join(Aws::API_DIR, 'ElasticTranscoder.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'ElasticTranscoder.paginators.json'),
+  waiters: File.join(Aws::API_DIR, 'ElasticTranscoder.waiters.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:EMR, {
-  api: File.join(Aws::APIS_DIR, 'EMR.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'EMR.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'EMR.paginators.json'),
+  api: File.join(Aws::API_DIR, 'EMR.api.json'),
+  docs: File.join(Aws::API_DIR, 'EMR.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'EMR.paginators.json'),
 })

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

@@ -4,92 +4,30 @@ module Aws
   # @api private
   class EndpointProvider
 
-    # @option options [Array<Hash>] :rules ([]) An array of grouped rules.
-    def initialize(options = {})
-      @rules = options[:rules] || []
-    end
+    # @api private
+    PATH = File.join(File.dirname(__FILE__), '..', '..', 'endpoints.json')
+
+    # @api private
+    RULES = MultiJson.load(File.read(PATH))['endpoints']
 
-    # @option options [required, String] :service
-    # @option options [required, String] :region
-    # @option options [required, String] :scheme
-    # @return [String,nil]
-    def resolve(options)
-      @rules.each do |rule_group|
-        if region_matches?(rule_group, options)
-          rule_group['rules'].each do |rule|
-            if service_matches?(rule, options)
-              return expand_endpoint(rule['config']['endpoint'], options)
-            end
+    class << self
+
+      def resolve(region, service)
+        keys(region, service).each do |key|
+          if match = RULES[key]
+            return expand(match['endpoint'], region.to_s, service.to_s)
           end
         end
       end
-      nil
-    end
 
-    # @option options [required, String] :pattern The endpoint pattern with
-    #   optional placeholders. This is applied when rules match during
-    #   resolution. Valid placeholders include:
-    #
-    #   * `{scheme}`
-    #   * `{region}`
-    #   * `{service}`
-    #
-    #   An example pattern:
-    #
-    #       "#{scheme}://{service}.{region}.amazonaws.com"
-    #
-    # @option options [Integer] :priority (100) A number from 0 to 999.
-    #   Rules with lower number have a higher priority and are evaluated first.
-    #
-    # @option options [String] :region_prefix ("") Causes regions with this
-    #   prefix to match. Leave this empty if you want to match all regions.
-    #
-    # @option options [Array<String>] :services A list of services this rule
-    #   applies to. Omit this option if you want this rule to apply to all
-    #   services.
-    #
-    #   The string must be the service endpoint prefix as a string.
-    #   E.g. "s3", "ec2", "monitoring" (for cloud watch).
-    #
-    def add_rule(options = {})
-      @rules = (@rules + [new_rule(options)]).sort_by { |r| r['priority'] }
-    end
-
-    private
-
-    def new_rule(options)
-      rule = {}
-      rule['services'] = options[:services] if options[:services]
-      rule['config'] = {}
-      rule['config']['endpoint'] = options[:pattern]
-      {
-        'priority' => options[:priority] || 100,
-        'regionPrefix' => options[:region_prefix] || '',
-        'rules' => [rule]
-      }
-    end
-
-    def region_matches?(rule_group, options)
-      options[:region] && options[:region].match(/^#{rule_group['regionPrefix']}/)
-    end
-
-    def service_matches?(rule, options)
-      rule['services'].nil? || rule['services'].include?(options[:service])
-    end
-
-    def expand_endpoint(pattern, options)
-      pattern.gsub(/{\w+}/) { |match| options[match[1..-2].to_sym] }
-    end
-
-    class << self
+      private
 
-      def default_provider
-        @default_provider ||= EndpointProvider.new(rules: default_rules)
+      def keys(region, service)
+        ["#{region}/#{service}", "#{region}/*", "*/#{service}", "*/*"]
       end
 
-      def default_rules
-        path = File.join(File.dirname(__FILE__), '..', '..', 'endpoints.json')
-        MultiJson.load(File.read(path))
+      def expand(pattern, region, service)
+        'https://' + pattern.sub('{region}', region).sub('{service}', service)
       end
 
     end

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

@@ -1,7 +1,7 @@
 Aws.add_service(:Glacier, {
-  api: File.join(Aws::APIS_DIR, 'Glacier.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'Glacier.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'Glacier.paginators.json'),
-  resources: File.join(Aws::APIS_DIR, 'Glacier.resources.json'),
-  waiters: File.join(Aws::APIS_DIR, 'Glacier.waiters.json'),
+  api: File.join(Aws::API_DIR, 'Glacier.api.json'),
+  docs: File.join(Aws::API_DIR, 'Glacier.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'Glacier.paginators.json'),
+  resources: File.join(Aws::API_DIR, 'Glacier.resources.json'),
+  waiters: File.join(Aws::API_DIR, 'Glacier.waiters.json'),
 })

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

@@ -1,6 +1,6 @@
 Aws.add_service(:IAM, {
-  api: File.join(Aws::APIS_DIR, 'IAM.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'IAM.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'IAM.paginators.json'),
-  resources: File.join(Aws::APIS_DIR, 'IAM.resources.json'),
+  api: File.join(Aws::API_DIR, 'IAM.api.json'),
+  docs: File.join(Aws::API_DIR, 'IAM.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'IAM.paginators.json'),
+  resources: File.join(Aws::API_DIR, 'IAM.resources.json'),
 })

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

@@ -1,5 +1,5 @@
 Aws.add_service(:ImportExport, {
-  api: File.join(Aws::APIS_DIR, 'ImportExport.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'ImportExport.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'ImportExport.paginators.json'),
+  api: File.join(Aws::API_DIR, 'ImportExport.api.json'),
+  docs: File.join(Aws::API_DIR, 'ImportExport.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'ImportExport.paginators.json'),
 })

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

@@ -1,10 +1,11 @@
 require 'time'
 require 'net/http'
-require 'thread'
 
 module Aws
   class InstanceProfileCredentials < Credentials
 
+    include RefreshingCredentials
+
     # @api private
     class Non200Response < RuntimeError; end
 
@@ -38,58 +39,25 @@ module Aws
       @http_open_timeout = options[:http_open_timeout] || 1
       @http_read_timeout = options[:http_read_timeout] || 1
       @http_debug_output = options[:http_debug_output]
-      @refresh_mutex = Mutex.new
-      refresh!
+      super
     end
 
     # @return [Integer] The number of times to retry failed atttempts to
     #   fetch credentials from the instance metadata service. Defaults to 0.
     attr_reader :retries
 
-    # @return [String,nil]
-    def access_key_id
-      refresh_if_stale
-      @access_key_id
-    end
-
-    # @return [String,nil]
-    def secret_access_key
-      refresh_if_stale
-      @secret_access_key
-    end
-
-    # @return [String,nil]
-    def session_token
-      refresh_if_stale
-      @session_token
-    end
-
-    # @return [Time,nil]
-    def expiration
-      refresh_if_stale
-      @expiration
-    end
-
-    def refresh!
-      @refresh_mutex.synchronize do
-        credentials = MultiJson.load(get_credentials)
-        @access_key_id = credentials['AccessKeyId']
-        @secret_access_key = credentials['SecretAccessKey']
-        @session_token = credentials['Token']
-        if expires = credentials['Expiration']
-          @expiration = Time.parse(expires)
-        else
-          @expiration = nil
-        end
-      end
-    end
-
     private
 
-    # Refreshes instance metadata credentials if they are within
-    # 5 minutes of expiration.
-    def refresh_if_stale
-      refresh! if @expiration && @expiration.utc <= Time.now.utc + 5 * 60
+    def refresh
+      credentials = MultiJson.load(get_credentials)
+      @access_key_id = credentials['AccessKeyId']
+      @secret_access_key = credentials['SecretAccessKey']
+      @session_token = credentials['Token']
+      if expires = credentials['Expiration']
+        @expiration = Time.parse(expires)
+      else
+        @expiration = nil
+      end
     end
 
     def get_credentials

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

@@ -1,5 +1,5 @@
 Aws.add_service(:Kinesis, {
-  api: File.join(Aws::APIS_DIR, 'Kinesis.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'Kinesis.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'Kinesis.paginators.json'),
+  api: File.join(Aws::API_DIR, 'Kinesis.api.json'),
+  docs: File.join(Aws::API_DIR, 'Kinesis.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'Kinesis.paginators.json'),
 })

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

@@ -1,6 +1,6 @@
 Aws.add_service(:OpsWorks, {
-  api: File.join(Aws::APIS_DIR, 'OpsWorks.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'OpsWorks.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'OpsWorks.paginators.json'),
-  resources: File.join(Aws::APIS_DIR, 'OpsWorks.resources.json'),
+  api: File.join(Aws::API_DIR, 'OpsWorks.api.json'),
+  docs: File.join(Aws::API_DIR, 'OpsWorks.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'OpsWorks.paginators.json'),
+  resources: File.join(Aws::API_DIR, 'OpsWorks.resources.json'),
 })

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

@@ -84,6 +84,24 @@ module Aws
     end
     alias each each_page
 
+    # @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

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

@@ -20,11 +20,7 @@ module Aws
       }
 
       option(:endpoint) do |cfg|
-        EndpointProvider.default_provider.resolve(
-          service: cfg.api.metadata('endpointPrefix'),
-          region: cfg.region,
-          scheme: 'https'
-        )
+        EndpointProvider.resolve(cfg.region, cfg.api.metadata('endpointPrefix'))
       end
 
       def after_initialize(client)

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

@@ -40,14 +40,7 @@ module Aws
       # Intentionally not documented - this should go away when all
       # services support signature version 4 in every region.
       option(:signature_version) do |cfg|
-        if
-          cfg.api.metadata('endpointPrefix') == 's3' &&
-          cfg.api.metadata('v3Regions').include?(cfg.region)
-        then
-          's3'
-        else
-          cfg.api.metadata('signatureVersion')
-        end
+        cfg.api.metadata('signatureVersion')
       end
 
       option(:sigv4_name) do |cfg|
@@ -82,7 +75,8 @@ module Aws
         private
 
         def sign_authenticated_requests(context)
-          if signer = SIGNERS[context.config.signature_version]
+          version = context[:signature_version] || context.config.signature_version
+          if signer = SIGNERS[version]
             require_credentials(context)
             signer.sign(context)
           end