aws-sdk 1.11.3 → 1.12.0

data/lib/aws/auto_scaling/group.rb

@@ -94,6 +94,8 @@ module AWS
 
       attribute :placement_group
 
+      attribute :termination_policies
+
       attribute :suspended_processes do
         translates_output do |processes|
           processes.inject({}) do |hash,process|

data/lib/aws/auto_scaling/group_options.rb

@@ -61,6 +61,14 @@ module AWS
       #   Amazon EC2. For more information about cluster placement group, see
       #   [Using Cluster Instances](http://docs.amazonwebservices.com/AWSEC2/latest/UserGuide/using_cluster_computing.html).
       #
+      # @option options [Array<String>] :termination_policies
+      #   A standalone termination policy or a list of termination policies used
+      #   to select the instance to terminate. The policies are executed in the
+      #   order they are listed. For more information on creating a termination
+      #   policy for your Auto Scaling group, go to
+      #   [Instance Termination Policy for Your Auto Scaling Group](http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/us-termination-policy.html)
+      #   in the Auto Scaling Developer Guide.
+      #
       # @option options [Array<Hash>] :tags A list of tags to apply launched
       #   instances.  Each tag hash may have the following keys:
       #
@@ -102,6 +110,7 @@ module AWS
           :desired_capacity,
           :health_check_grace_period,
           :placement_group,
+          :termination_policies,
         ].each do |opt|
           group_opts[opt] = options[opt] if options.key?(opt)
         end

data/lib/aws/cloud_watch/metric_collection.rb

@@ -97,9 +97,7 @@ module AWS
       #   should be a Hash with a `:name` and `:value`.
       # @return [MetricCollection]
       def with_dimensions *dimensions
-        dimensions = @filters[:dimensions] || []
-        dimensions += dimensions.flatten
-        filter(:dimensions, dimensions)
+        filter(:dimensions, (@filters[:dimensions] || []) + dimensions.flatten )
       end
 
       protected

data/lib/aws/core.rb

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 
 require 'aws/version'
+require 'set'
 
 # AWS is the root module for all of the Amazon Web Services.  It is also
 # where you can configure you access to AWS.
@@ -32,98 +33,112 @@ require 'aws/version'
 module AWS
 
   # @api private
-  SERVICES = {
-    "CloudFront" => {
+  class SvcDetails
+    def initialize class_name, options
+      @class_name = class_name
+      @full_name = options[:full_name]
+      @method_name = options[:method_name]
+      @method_alias = options[:method_alias]
+      @old_name = @method_alias || @method_name
+    end
+    attr_reader :class_name, :full_name, :method_name, :method_alias, :old_name
+  end
+
+  # @api private
+  SERVICES = [
+    SvcDetails.new("CloudFront",
       :full_name => "Amazon CloudFront",
-      :ruby_name => :cloud_front },
-    "CloudSearch" => {
+      :method_name => :cloud_front),
+    SvcDetails.new("CloudSearch",
       :full_name => "Amazon CloudSearch",
-      :ruby_name => :cloud_search },
-    "CloudWatch" => {
+      :method_name => :cloud_search),
+    SvcDetails.new("CloudWatch",
       :full_name => "Amazon CloudWatch",
-      :ruby_name => :cloud_watch },
-    "DynamoDB" => {
+      :method_name => :cloud_watch),
+    SvcDetails.new("DynamoDB",
       :full_name => "Amazon DynamoDB",
-      :ruby_name => :dynamo_db },
-    "EC2" => {
+      :method_name => :dynamo_db),
+    SvcDetails.new("EC2",
       :full_name => "Amazon Elastic Compute Cloud",
-      :ruby_name => :ec2 },
-    "EMR" => {
+      :method_name => :ec2),
+    SvcDetails.new("EMR",
       :full_name => "Amazon Elastic MapReduce",
-      :ruby_name => :emr },
-    "ElastiCache" => {
+      :method_name => :emr),
+    SvcDetails.new("ElastiCache",
       :full_name => "Amazon ElastiCache",
-      :ruby_name => :elasticache },
-    "Glacier" => {
+      :method_name => :elasticache),
+    SvcDetails.new("Glacier",
       :full_name => "Amazon Glacier",
-      :ruby_name => :glacier },
-    "RDS" => {
+      :method_name => :glacier),
+    SvcDetails.new("RDS",
       :full_name => "Amazon Relational Database Service (Beta)",
-      :ruby_name => :rds },
-    "Route53" => {
+      :method_name => :rds),
+    SvcDetails.new("Route53",
       :full_name => "Amazon Route 53",
-      :ruby_name => :route_53 },
-    "SimpleEmailService" => {
+      :method_name => :route_53),
+    SvcDetails.new("SimpleEmailService",
       :full_name => "Amazon Simple E-mail Service",
-      :ruby_name => :simple_email_service },
-    "SNS" => {
+      :method_name => :ses,
+      :method_alias => :simple_email_service),
+    SvcDetails.new("SNS",
       :full_name => "Amazon Simple Notifications Service",
-      :ruby_name => :sns },
-    "SQS" => {
+      :method_name => :sns),
+    SvcDetails.new("SQS",
       :full_name => "Amazon Simple Queue Service",
-      :ruby_name => :sqs },
-    "SimpleWorkflow" => {
+      :method_name => :sqs),
+    SvcDetails.new("SimpleWorkflow",
       :full_name => "Amazon Simple Workflow Service",
-      :ruby_name => :simple_workflow },
-    "SimpleDB" => {
+      :method_name => :swf,
+      :method_alias => :simple_workflow),
+    SvcDetails.new("SimpleDB",
       :full_name => "Amazon SimpleDB",
-      :ruby_name => :simple_db },
-    "AutoScaling" => {
+      :method_name => :simple_db),
+    SvcDetails.new("AutoScaling",
       :full_name => "Auto Scaling",
-      :ruby_name => :auto_scaling },
-    "CloudFormation" => {
+      :method_name => :auto_scaling),
+    SvcDetails.new("CloudFormation",
       :full_name => "AWS CloudFormation",
-      :ruby_name => :cloud_formation },
-    "DataPipeline" => {
+      :method_name => :cloud_formation),
+    SvcDetails.new("DataPipeline",
       :full_name => "AWS Data Pipeline",
-      :ruby_name => :data_pipeline },
-    "DirectConnect" => {
+      :method_name => :data_pipeline),
+    SvcDetails.new("DirectConnect",
       :full_name => "AWS Direct Connect",
-      :ruby_name => :direct_connect },
-    "ElasticBeanstalk" => {
+      :method_name => :direct_connect),
+    SvcDetails.new("ElasticBeanstalk",
       :full_name => "AWS Elastic Beanstalk",
-      :ruby_name => :elastic_beanstalk },
-    "IAM" => {
+      :method_name => :elastic_beanstalk),
+    SvcDetails.new("IAM",
       :full_name => "AWS Identity and Access Management",
-      :ruby_name => :iam },
-    "ImportExport" => {
+      :method_name => :iam),
+    SvcDetails.new("ImportExport",
       :full_name => "AWS Import/Export",
-      :ruby_name => :import_export },
-    "OpsWorks" => {
+      :method_name => :import_export),
+    SvcDetails.new("OpsWorks",
       :full_name => "AWS OpsWorks",
-      :ruby_name => :ops_works },
-    "STS" => {
+      :method_name => :ops_works),
+    SvcDetails.new("STS",
       :full_name => "AWS Security Token Service",
-      :ruby_name => :sts },
-    "StorageGateway" => {
+      :method_name => :sts),
+    SvcDetails.new("StorageGateway",
       :full_name => "AWS Storage Gateway",
-      :ruby_name => :storage_gateway },
-    "Support" => {
+      :method_name => :storage_gateway),
+    SvcDetails.new("Support",
       :full_name => "AWS Support",
-      :ruby_name => :support },
-    "ELB" => {
+      :method_name => :support),
+    SvcDetails.new("ELB",
       :full_name => "Elastic Load Balancing",
-      :ruby_name => :elb },
-    "ElasticTranscoder" => {
+      :method_name => :elb),
+    SvcDetails.new("ElasticTranscoder",
       :full_name => "Amazon Elastic Transcoder",
-      :ruby_name => :elastic_transcoder },
-    "Redshift" => {
+      :method_name => :elastic_transcoder),
+    SvcDetails.new("Redshift",
       :full_name => "Amazon Redshift",
-      :ruby_name => :redshift },
-    "S3" => {
+      :method_name => :redshift),
+    SvcDetails.new("S3",
       :full_name => "Amazon Simple Storage Service",
-      :ruby_name => :s3 }
-  }
+      :method_name => :s3)
+  ].inject({}) { |h,svc| h[svc.class_name] = svc; h }
 
   # @api private
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
@@ -222,100 +237,11 @@ module AWS
 
   class << self
 
-    # @!method cloud_front
-    # @return [CloudFront]
-
-    # @!method cloud_search
-    # @return [CloudSearch]
-
-    # @!method cloud_watch
-    # @return [CloudWatch]
-
-    # @!method dynamo_db
-    # @return [DynamoDB]
-
-    # @!method ec2
-    # @return [EC2]
-
-    # @!method emr
-    # @return [EMR]
-
-    # @!method elasticache
-    # @return [ElastiCache]
-
-    # @!method glacier
-    # @return [Glacier]
-
-    # @!method rds
-    # @return [RDS]
-
-    # @!method route_53
-    # @return [Route53]
-
-    # @!method simple_email_service
-    # @return [SimpleEmailService]
-
-    # @!method sns
-    # @return [SNS]
-
-    # @!method sqs
-    # @return [SQS]
-
-    # @!method simple_workflow
-    # @return [SimpleWorkflow]
-
-    # @!method simple_db
-    # @return [SimpleDB]
-
-    # @!method auto_scaling
-    # @return [AutoScaling]
-
-    # @!method cloud_formation
-    # @return [CloudFormation]
-
-    # @!method data_pipeline
-    # @return [DataPipeline]
-
-    # @!method direct_connect
-    # @return [DirectConnect]
-
-    # @!method elastic_beanstalk
-    # @return [ElasticBeanstalk]
-
-    # @!method iam
-    # @return [IAM]
-
-    # @!method import_export
-    # @return [ImportExport]
-
-    # @!method ops_works
-    # @return [OpsWorks]
-
-    # @!method sts
-    # @return [STS]
-
-    # @!method storage_gateway
-    # @return [StorageGateway]
-
-    # @!method support
-    # @return [Support]
-
-    # @!method elb
-    # @return [ELB]
-
-    # @!method elastic_transcoder
-    # @return [ElasticTranscoder]
-
-    # @!method redshift
-    # @return [Redshift]
-
-    # @!method s3
-    # @return [S3]
-
-    SERVICES.each_pair do |klass,svc|
-      define_method(svc[:ruby_name]) do |*args|
-        AWS.const_get(klass).new(args.first || {})
+    SERVICES.values.each do |svc|
+      define_method(svc.method_name) do |*args|
+        AWS.const_get(svc.class_name).new(args.first || {})
       end
+      alias_method(svc.method_alias, svc.method_name) if svc.method_alias
     end
 
     # @api private
@@ -568,6 +494,18 @@ module AWS
       Core::RegionCollection.new
     end
 
+    # @note Memoization is currently only supported for the EC2 APIs;
+    #   other APIs are unaffected by the status of memoization.  To
+    #   protect your code from future changes in memoization support,
+    #   you should not enable memoization while calling non-EC2 APIs.
+    #
+    # Resets memoizing service requests made in the current thread.
+    # See {memoize} for a full discussion of the memoization feature.
+    # This has no effect if memoization is already enabled.
+    def reset_memoization
+      Thread.current[:aws_memoization] = {}
+    end
+
     # @note Memoization is currently only supported for the EC2 APIs;
     #   other APIs are unaffected by the status of memoization.  To
     #   protect your code from future changes in memoization support,
@@ -690,13 +628,16 @@ module AWS
     end
 
     # Eagerly loads all AWS classes/modules registered with autoload.
-    # @return [nil]
-    def eager_autoload! klass_or_module = AWS
+    # @return [void]
+    def eager_autoload! klass_or_module = AWS, visited = Set.new
       klass_or_module.constants.each do |const_name|
-        if path = klass_or_module.autoload?(const_name)
-          require(path)
-          if const = klass_or_module.const_get(const_name) and const.is_a?(Module)
-            eager_autoload!(const)
+        path = klass_or_module.autoload?(const_name)
+        require(path) if path
+        const = klass_or_module.const_get(const_name)
+        if const.is_a?(Module)
+          unless visited.include?(const)
+            visited << const
+            eager_autoload!(const, visited)
           end
         end
       end
@@ -719,13 +660,13 @@ module AWS
         pattern = File.join(File.dirname(__FILE__), 'api_config', '*.yml')
         Dir.glob(pattern).each do |path|
           matches = path.match(/(\w+)-(\d{4}-\d{2}-\d{2})/)
-          svc = SERVICES[$1][:full_name]
+          svc = SERVICES[$1].full_name
           versions[svc] ||= []
           versions[svc] << $2
         end
 
         # s3 does not have an API configuration, so we have to add it manually
-        versions[SERVICES['S3'][:full_name]] = ['2006-03-01']
+        versions[SERVICES['S3'].full_name] = ['2006-03-01']
 
         # sort the services alphabetically
         versions.keys.sort_by(&:downcase).inject({}) do |hash,svc|
@@ -736,9 +677,9 @@ module AWS
     end
   end
 
-  SERVICES.each_pair do |klass,service|
-    autoload(klass, "aws/#{service[:ruby_name]}")
-    require "aws/#{service[:ruby_name]}/config"
+  SERVICES.values.each do |svc|
+    autoload(svc.class_name, "aws/#{svc.old_name}")
+    require "aws/#{svc.old_name}/config"
   end
 
 end

data/lib/aws/core/configuration.rb

@@ -45,7 +45,7 @@ module AWS
     # configuration values, call {#with}, passing in the updates
     # and a new configuration object will be returned.
     #
-    #     config = Configuration.new(:max_retires => 3)
+    #     config = Configuration.new(:max_retries => 3)
     #     new_config = config.with(:max_retries => 2)
     #
     #     config.max_retries #=> 3
@@ -377,9 +377,17 @@ module AWS
 
         def add_service name, ruby_name, endpoint_pattern = nil, &endpoint_builder
 
+          svc = SERVICES[name]
+          svc_opt = svc.method_name
+          ruby_name = svc.old_name
+
+          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.region
             else
@@ -388,13 +396,23 @@ module AWS
           end
 
           add_option(:"#{ruby_name}_port") do |config,value|
-            value || (config.use_ssl? ? 443 : 80)
+            if value
+              value
+            elsif port = config.send(svc_opt)[:port]
+              port
+            else
+              config.use_ssl? ? 443 : 80
+            end
           end
 
           # users only need to specify service regions when they use
           # a test endpoint with a sigv4 service
           add_option(:"#{ruby_name}_region") do |config,value|
-            value || begin
+            if value
+              value
+            elsif region = config.send(svc_opt)[:region]
+              region
+            else
               endpoint = config.send("#{ruby_name}_endpoint")
               if endpoint =~ /us-gov/
                 if matches = endpoint.match(/(us-gov-west-\d+)/)
@@ -467,7 +485,7 @@ module AWS
 
       add_option :http_continue_threshold, false
 
-      add_option :http_idle_timeout, 60
+      add_option :http_idle_timeout, 5
 
       add_option :http_wire_trace, false, :boolean => true