aws-sdk 1.24.0 → 1.25.0

data/lib/aws/auto_scaling/scheduled_action.rb

@@ -16,8 +16,6 @@ require 'time'
 module AWS
   class AutoScaling
 
-    # @attr_reader [String] auto_scaling_group_name
-    #
     # @attr_reader [Integer] desired_capacity
     #
     # @attr_reader [String] recurrence
@@ -35,7 +33,8 @@ module AWS
     class ScheduledAction < Core::Resource
 
       # @api private
-      def initialize name, options = {}
+      def initialize group, name, options = {}
+        @group = group
         @name = name
         super
       end
@@ -43,9 +42,14 @@ module AWS
       # @return [String]
       attr_reader :name
 
-      attribute :arn, :from => :scheduled_action_arn
+      attr_reader :group
 
-      attribute :auto_scaling_group_name, :static => true
+      # @return [String]
+      def auto_scaling_group_name
+        group.name
+      end
+
+      attribute :arn, :from => :scheduled_action_arn
 
       attribute :desired_capacity
 
@@ -65,11 +69,6 @@ module AWS
         end
       end
 
-      # @return [Group]
-      def group
-        Group.new(auto_scaling_group_name, :config => config)
-      end
-
       # Updates the scheduled action.  If you omit an option,
       # the corresponding value remains unchanged in the Auto
       # Scaling group.
@@ -91,22 +90,15 @@ module AWS
       # @return [nil]
       #
       def update options = {}
-
-        client_opts = options.dup
-        client_opts[:scheduled_action_name] = name
-        client_opts[:auto_scaling_group_name] = auto_scaling_group_name
-
-        # convert these options to timestamps
+        options.update(resource_options)
+        # convert times to formatted strings
         [:start_time, :end_time].each do |opt|
-          if client_opts[opt].is_a?(Time)
-            client_opts[opt] = client_opts[opt].iso8601
+          if options[opt].is_a?(Time)
+            options[opt] = options[opt].iso8601
           end
         end
-
-        client.put_scheduled_update_group_action(client_opts)
-
+        client.put_scheduled_update_group_action(options)
         nil
-
       end
       alias_method :put, :update
 
@@ -114,29 +106,33 @@ module AWS
       def exists?
         client_opts = {}
         client_opts[:scheduled_action_names] = [name]
+        client_opts[:auto_scaling_group_name] = auto_scaling_group_name
         resp = client.describe_scheduled_actions(client_opts)
         !resp.scheduled_update_group_actions.empty?
+      rescue Errors::ValidationError
+        false
       end
 
       # Deletes the current scheduled action.
       # @return [nil]
       def delete
-        client_opts = {}
-        client_opts[:scheduled_action_name] = name
-        client_opts[:auto_scaling_group_name] = auto_scaling_group_name
-        client.delete_scheduled_action(client_opts)
+        client.delete_scheduled_action(resource_options)
         nil
       end
 
       protected
 
       def resource_identifiers
-        [[:name, name]]
+        [
+          [:auto_scaling_group_name, auto_scaling_group_name],
+          [:scheduled_action_name, name],
+        ]
       end
 
       def get_resource attr_name = nil
         client_opts = {}
         client_opts[:scheduled_action_names] = [name]
+        client_opts[:auto_scaling_group_name] = auto_scaling_group_name
         client.describe_scheduled_actions(client_opts)
       end
 

data/lib/aws/auto_scaling/scheduled_action_collection.rb

@@ -62,8 +62,10 @@ module AWS
       #
       def create name, options = {}
 
-        scheduled_action = ScheduledAction.new(name,
-          :auto_scaling_group_name => auto_scaling_group_name_opt(options),
+        group = auto_scaling_group(options)
+
+        scheduled_action = ScheduledAction.new(group, name,
+          :auto_scaling_group_name => group.name,
           :config => config)
 
         scheduled_action.update(options)
@@ -75,12 +77,14 @@ module AWS
       # @param [String] name The name of the scheduled action.
       # @return [ScheduledAction]
       def [] name
-        options = {}
-        options[:config] = config
-        if group = @filters[:auto_scaling_group_name]
-          options[:auto_scaling_group_name] = group
+        if group_name = @filters[:auto_scaling_group_name]
+          group = Group.new(group_name, :config => config)
+          ScheduledAction.new(group, name)
+        else
+          msg = 'uou must filter this collection by a group to get a ' +
+            'scheduled action by name'
+          raise msg
         end
-        ScheduledAction.new(name, options)
       end
 
       # Returns a new {ScheduledActionCollection} filtered
@@ -132,11 +136,11 @@ module AWS
 
       protected
 
-      def auto_scaling_group_name_opt options
+      def auto_scaling_group(options)
 
         group = options.delete(:group)
         group ||= @filters[:auto_scaling_group_name]
-        group = group.name if group.is_a?(Group)
+        group = Group.new(group, :config => config) if group.is_a?(String)
 
         unless group
           raise ArgumentError, 'missing required option :group'
@@ -176,9 +180,12 @@ module AWS
         resp = client.describe_scheduled_actions(options.merge(@filters))
         resp.scheduled_update_group_actions.each do |details|
 
+          group = Group.new(details[:auto_scaling_group_name], :config => config)
+
           scheduled_action = ScheduledAction.new_from(
             :describe_scheduled_actions,
             details,
+            group,
             details.scheduled_action_name,
             :config => config)
 

data/lib/aws/core.rb

@@ -368,8 +368,8 @@ module AWS
     #   and instance of {Core::Response} and returns a string.
     #
     # @option options [Integer] :max_retries (3) The maximum number of times
-    #   service errors (500) should be retried.  There is an exponential
-    #   backoff in between service request retries, so the more retries the
+    #   service errors (500) and throttling errors should be retried. There is
+    #   an exponential backoff in between retries, so the more retries the
     #   longer it can take to fail.
     #
     # @option options [String, URI, nil] :proxy_uri (nil) The URI of the proxy

data/lib/aws/core/configuration.rb

@@ -121,8 +121,8 @@ module AWS
     # @attr_reader [LogFormatter] log_formatter The log message formatter.
     #
     # @attr_reader [Integer] max_retries (3) The maximum number of times
-    #   service errors (500) should be retried.  There is an exponential
-    #   backoff in between service request retries, so the more retries the
+    #   service errors (500) and throttling errors should be retried. There is
+    #   an exponential backoff in between retries, so the more retries the
     #   longer it can take to fail.
     #
     # @attr_reader [URI,nil] proxy_uri (nil) The URI of the proxy

data/lib/aws/s3/client.rb

@@ -1404,6 +1404,20 @@ module AWS
 
       end
 
+      # Gets the torrent for a key.
+      # @overload get_object_torrent(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @return [Core::Response]
+      #
+      object_method(:get_object_torrent, :get, 'torrent') do
+        process_response do |resp|
+          extract_object_headers(resp)
+          resp.data[:data] = resp.http_response.body
+        end
+      end
+
       # @overload head_object(options = {})
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name

data/lib/aws/s3/uploaded_part.rb

@@ -73,7 +73,7 @@ module AWS
          part = resp.parts.first and
          part.part_number == part_number and
          part.send(name)) or
-          raise "part 3 of upload abc123 does not exist"
+          raise "part #{part_number} of upload #{upload.id} does not exist"
       end
 
     end

data/lib/aws/storage_gateway/client.rb

@@ -17,7 +17,7 @@ module AWS
     # Client class for AWS Storage Gateway.
     class Client < Core::JSONClient
 
-      API_VERSION = '2012-06-30'
+      API_VERSION = '2013-06-30'
 
       # @api private
       CACHEABLE_REQUESTS = Set[]
@@ -29,5 +29,12 @@ module AWS
       define_client_methods('2012-06-30')
 
     end
+
+    class Client::V20130630 < Client
+
+      define_client_methods('2013-06-30')
+
+    end
+
   end
 end

data/lib/aws/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -619,6 +619,7 @@ files:
 - lib/aws/api_config/SNS-2010-03-31.yml
 - lib/aws/api_config/SQS-2012-11-05.yml
 - lib/aws/api_config/StorageGateway-2012-06-30.yml
+- lib/aws/api_config/StorageGateway-2013-06-30.yml
 - lib/aws/api_config/STS-2011-06-15.yml
 - lib/aws/api_config/Support-2013-04-15.yml
 - bin/aws-rb