aws-sdk 1.31.0 → 1.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae7bb3d331e550e7ff9f8908be0c7c45016dd48
-  data.tar.gz: 626caf07a67cd5992430ce126c0696e859e4cd05
+  metadata.gz: ea67344cc4a28f4425f78a8be89ce2394de29849
+  data.tar.gz: 0a21c93c8e6bfda039dd43382134f74d6ba8b7d1
 SHA512:
-  metadata.gz: 83793899c266bf432015d268b2a812c2fd4ee174676d02f495d5e4db2214233029373c6f61dfbaf87fa7171d8454e6c08bc69e0b804928bb30299537ddfb5ef3
-  data.tar.gz: 0d890e1035c3d7d9a664dc3342e9f5e0e9f0867da10718b2f0c8f5e590a1ee4cad109477956f2dcd00a7d978aafc4170b5502c7d860e297851194573df08cad0
+  metadata.gz: 78621398a200b8ef1f163d2b4226b19b72ef063569785a4270ecb6d31d7459ad7da361de193fcd049d2d6e6f4b06fac49c2b754f7f417bf5800bdacfe8b4cafc
+  data.tar.gz: 83bc634bfc0e8ecdb2f73cbe718593d874db185fb2268719e911de60198a19ea3e381a9fe3fdd5a7dfed1e4eac1859b9c6256772e8dadeb37af68dde094990f1

data/lib/aws/auto_scaling/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'AutoScaling', 'auto_scaling', 'autoscaling.%s.amazonaws.com'
+  add_service 'AutoScaling', 'auto_scaling', 'autoscaling'
 
 end

data/lib/aws/cloud_formation/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'CloudFormation', 'cloud_formation', 'cloudformation.%s.amazonaws.com'
+  add_service 'CloudFormation', 'cloud_formation', 'cloudformation'
 
 end

data/lib/aws/cloud_front/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'CloudFront', 'cloud_front', 'cloudfront.amazonaws.com'
+  add_service 'CloudFront', 'cloud_front', 'cloudfront'
 
 end

data/lib/aws/cloud_search/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'CloudSearch', 'cloud_search', 'cloudsearch.%s.amazonaws.com'
+  add_service 'CloudSearch', 'cloud_search', 'cloudsearch'
 
 end

data/lib/aws/cloud_trail/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'CloudTrail', 'cloud_trail', 'cloudtrail.%s.amazonaws.com'
+  add_service 'CloudTrail', 'cloud_trail', 'cloudtrail'
 
 end

data/lib/aws/cloud_watch/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'CloudWatch', 'cloud_watch', 'monitoring.%s.amazonaws.com'
+  add_service 'CloudWatch', 'cloud_watch', 'monitoring'
 
 end

data/lib/aws/core.rb

@@ -164,6 +164,7 @@ module AWS
     autoload :CredentialProviders, "#{SRC}/core/credential_providers"
     autoload :Data, "#{SRC}/core/data"
     autoload :Deprecations, "#{SRC}/core/deprecations"
+    autoload :Endpoints, "#{SRC}/core/endpoints"
     autoload :IndifferentHash, "#{SRC}/core/indifferent_hash"
     autoload :Inflection, "#{SRC}/core/inflection"
     autoload :JSONParser, "#{SRC}/core/json_parser"

data/lib/aws/core/configuration.rb

@@ -392,7 +392,7 @@ module AWS
 
         end
 
-        def add_service name, ruby_name, endpoint_pattern = nil, &endpoint_builder
+        def add_service name, ruby_name, endpoint_prefix
 
           svc = SERVICES[name]
           svc_opt = svc.method_name
@@ -401,15 +401,12 @@ module AWS
           add_option(svc_opt, {})
 
           add_option :"#{ruby_name}_endpoint" do |config,value|
-            if value
-              value
-            elsif endpoint = config.send(svc_opt)[:endpoint]
-              endpoint
-            elsif endpoint_pattern
-              endpoint_pattern % config.endpoint_region(svc)
-            else
-              endpoint_builder.call(config.endpoint_region(svc))
-            end
+            region = config.endpoint_region(svc)
+            endpoint = value
+            endpoint ||= config.send(svc_opt)[:endpoint]
+            endpoint ||= Endpoints.hostname(region, endpoint_prefix)
+            endpoint ||= "#{endpoint_prefix}.#{region}.amazonaws.com"
+            endpoint
           end
 
           add_option(:"#{ruby_name}_port") do |config,value|

data/lib/aws/core/endpoints.rb

@@ -0,0 +1,35 @@
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  module Core
+    # Provides a read-only interface to the bundled endpoints.json file.
+    module Endpoints
+
+      def hostname(region, endpoint_prefix)
+        region = endpoints["regions"][region] || {}
+        endpoint = region[endpoint_prefix] || {}
+        endpoint["hostname"]
+      end
+      module_function :hostname
+
+      def endpoints
+        @endpoints ||= begin
+          JSON.parse(File.read(File.join(AWS::ROOT, 'endpoints.json')))
+        end
+      end
+      module_function :endpoints
+
+    end
+  end
+end

data/lib/aws/core/region_collection.rb

@@ -68,40 +68,11 @@ module AWS
       # @return [Array<String>] Returns an array of non-gov-cloud region names.
       def public_regions
         return ['us-east-1'] if @service and @service.global_endpoint?
-        data = self.class.data
+        data = Endpoints.endpoints
         regions = @service ?
           data['services'][@service.endpoint_prefix] :
           data['regions'].keys
-        regions.reject{|r| r =~ /us-gov/ }
-      end
-
-      class << self
-
-        # @return [nil]
-        # @api private
-        def clear!
-          @data = nil
-        end
-
-        # @return [Hash] Returns a hash of region metadata.
-        # @api private
-        def data
-          @data ||= load_data
-        end
-
-        private
-
-        # @return [Hash]
-        def load_data
-          #return JSON.parse(File.read(File.join(AWS::ROOT, 'endpoints.json')))
-          host = 'aws-sdk-configurations.amazonwebservices.com'
-          path = '/endpoints.json'
-          http = Net::HTTP
-          proxy = AWS.config.proxy_uri
-          http = Net::HTTP::Proxy(proxy.host, proxy.port) unless proxy.nil?
-          JSON.parse(http.get(host, path))
-        end
-
+        regions.reject{ |r| r =~ /us-gov/ }.reject{ |r| r =~ /^cn-/ }
       end
 
     end

data/lib/aws/data_pipeline/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'DataPipeline', 'data_pipeline', 'datapipeline.%s.amazonaws.com'
+  add_service 'DataPipeline', 'data_pipeline', 'datapipeline'
 
 end

data/lib/aws/direct_connect/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'DirectConnect', 'direct_connect', 'directconnect.%s.amazonaws.com'
+  add_service 'DirectConnect', 'direct_connect', 'directconnect'
 
 end

data/lib/aws/dynamo_db/config.rb

@@ -13,7 +13,7 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'DynamoDB', 'dynamo_db', 'dynamodb.%s.amazonaws.com'
+  add_service 'DynamoDB', 'dynamo_db', 'dynamodb'
 
   add_option :dynamo_db_retry_throughput_errors, true, :boolean => true
 

data/lib/aws/ec2/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'EC2', 'ec2', 'ec2.%s.amazonaws.com'
+  add_service 'EC2', 'ec2', 'ec2'
 
 end

data/lib/aws/elastic_beanstalk/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'ElasticBeanstalk', 'elastic_beanstalk', 'elasticbeanstalk.%s.amazonaws.com'
+  add_service 'ElasticBeanstalk', 'elastic_beanstalk', 'elasticbeanstalk'
 
 end

data/lib/aws/elastic_transcoder/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'ElasticTranscoder', 'elastic_transcoder', 'elastictranscoder.%s.amazonaws.com'
+  add_service 'ElasticTranscoder', 'elastic_transcoder', 'elastictranscoder'
 
 end

data/lib/aws/elasticache/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'ElastiCache', 'elasticache', 'elasticache.%s.amazonaws.com'
+  add_service 'ElastiCache', 'elasticache', 'elasticache'
 
 end

data/lib/aws/elb/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'ELB', 'elb', 'elasticloadbalancing.%s.amazonaws.com'
+  add_service 'ELB', 'elb', 'elasticloadbalancing'
 
 end

data/lib/aws/emr/client.rb

@@ -19,7 +19,7 @@ module AWS
 
       API_VERSION = '2009-03-31'
 
-      signature_version :Version4, 'emr'
+      signature_version :Version4, 'elasticmapreduce'
 
       # @api private
       CACHEABLE_REQUESTS = Set[]

data/lib/aws/emr/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'EMR', 'emr', 'elasticmapreduce.%s.amazonaws.com'
+  add_service 'EMR', 'emr', 'elasticmapreduce'
 
 end

data/lib/aws/glacier/config.rb

@@ -14,6 +14,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'Glacier', 'glacier', 'glacier.%s.amazonaws.com'
+  add_service 'Glacier', 'glacier', 'glacier'
 
 end

data/lib/aws/iam/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'IAM', 'iam', 'iam.amazonaws.com'
+  add_service 'IAM', 'iam', 'iam'
 
 end

data/lib/aws/import_export/config.rb

@@ -14,6 +14,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'ImportExport', 'import_export', 'importexport.amazonaws.com'
+  add_service 'ImportExport', 'import_export', 'importexport'
 
 end

data/lib/aws/kinesis/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'Kinesis', 'kinesis', 'kinesis.%s.amazonaws.com'
+  add_service 'Kinesis', 'kinesis', 'kinesis'
 
 end

data/lib/aws/ops_works/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'OpsWorks', 'ops_works', 'opsworks.%s.amazonaws.com'
+  add_service 'OpsWorks', 'ops_works', 'opsworks'
 
 end

data/lib/aws/rds/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'RDS', 'rds', 'rds.%s.amazonaws.com'
+  add_service 'RDS', 'rds', 'rds'
 
 end

data/lib/aws/redshift/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'Redshift', 'redshift', 'redshift.%s.amazonaws.com'
+  add_service 'Redshift', 'redshift', 'redshift'
 
 end

data/lib/aws/route_53/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'Route53', 'route_53', 'route53.amazonaws.com'
+  add_service 'Route53', 'route_53', 'route53'
 
 end

data/lib/aws/s3/config.rb

@@ -13,13 +13,7 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'S3', 's3' do |region|
-    if region == 'us-east-1'
-      's3.amazonaws.com'
-    else
-      's3-%s.amazonaws.com' % region
-    end
-  end
+  add_service 'S3', 's3', 's3'
 
   add_option :s3_force_path_style, false, :boolean => true
 

data/lib/aws/s3/presign_v4.rb

@@ -84,7 +84,7 @@ module AWS
         params = options.merge(
           :bucket_name => object.bucket.name,
           :key => object.key,
-          :data => '',
+          :data => ''
         )
         req = client.send(:build_request, operation_name(method), params)
         req.force_path_style = options.fetch(:force_path_style, path_style)

data/lib/aws/simple_db/config.rb

@@ -13,13 +13,7 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'SimpleDB', 'simple_db' do |region|
-    if region == 'us-east-1'
-      'sdb.amazonaws.com'
-    else
-      'sdb.%s.amazonaws.com' % region
-    end
-  end
+  add_service 'SimpleDB', 'simple_db', 'sdb'
 
   add_option :simple_db_consistent_reads, false, :boolean => true
 

data/lib/aws/simple_email_service/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'SimpleEmailService', 'simple_email_service', 'email.%s.amazonaws.com'
+  add_service 'SimpleEmailService', 'simple_email_service', 'email'
 
 end

data/lib/aws/simple_workflow/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'SimpleWorkflow', 'simple_workflow', 'swf.%s.amazonaws.com'
+  add_service 'SimpleWorkflow', 'simple_workflow', 'swf'
 
 end

data/lib/aws/sns/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'SNS', 'sns', 'sns.%s.amazonaws.com'
+  add_service 'SNS', 'sns', 'sns'
 
 end

data/lib/aws/sqs/config.rb

@@ -13,7 +13,7 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'SQS', 'sqs', 'sqs.%s.amazonaws.com'
+  add_service 'SQS', 'sqs', 'sqs'
 
   add_option :sqs_verify_checksums, true, :boolean => true
 

data/lib/aws/storage_gateway/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'StorageGateway', 'storage_gateway', 'storagegateway.%s.amazonaws.com'
+  add_service 'StorageGateway', 'storage_gateway', 'storagegateway'
 
 end

data/lib/aws/sts/config.rb

@@ -13,12 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'STS', 'sts' do |region|
-    if region =~ /gov/
-      'sts.%s.amazonaws.com' % region
-    else
-      'sts.amazonaws.com'
-    end
-  end
-  
+  add_service 'STS', 'sts', 'sts'
+
 end

data/lib/aws/support/config.rb

@@ -13,6 +13,6 @@
 
 AWS::Core::Configuration.module_eval do
 
-  add_service 'Support', 'support', 'support.%s.amazonaws.com'
+  add_service 'Support', 'support', 'support'
 
 end

data/lib/aws/version.rb

@@ -13,5 +13,5 @@
 
 module AWS
   # Current version of the AWS SDK for Ruby
-  VERSION = '1.31.0'
+  VERSION = '1.31.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.31.1
 platform: ruby
 authors:
 - Amazon Web Services
@@ -135,6 +135,7 @@ files:
 - lib/aws/core/credential_providers.rb
 - lib/aws/core/data.rb
 - lib/aws/core/deprecations.rb
+- lib/aws/core/endpoints.rb
 - lib/aws/core/http/connection_pool.rb
 - lib/aws/core/http/curb_handler.rb
 - lib/aws/core/http/handler.rb