aws-sdk 1.7.1 → 1.8.0

data/lib/aws/glacier/vault_collection.rb

@@ -0,0 +1,75 @@
+# Copyright 2011-2012 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
+  class Glacier
+
+    class VaultCollection
+
+      include Core::Collection::WithLimitAndNextToken
+
+      # @param [Hash] options
+      # @option options [String] :account_id
+      def initialize options = {}
+        @account_id = options[:account_id] || '-'
+        super
+      end
+
+      # @return [String]
+      attr_reader :account_id
+
+      # @param [String] name
+      def create name
+
+        options = {}
+        options[:vault_name] = name
+        options[:account_id] = account_id
+        client.create_vault(options)
+
+        self[name]
+
+      end
+
+      # @param [String] name The name of the vault.
+      # @return [Vault] Returns a vault with the given name.
+      def [] name
+        Vault.new(name, :config => config, :account_id => account_id)
+      end
+
+      protected
+
+      def _each_item next_token, limit, options, &block
+
+        options[:limit] = limit if limit
+        options[:marker] = next_token if next_token
+        options[:account_id] = account_id
+
+        resp = client.list_vaults(options)
+        resp[:vault_list].each do |v|
+
+          vault = Vault.new_from(:list_vaults, v,
+            v[:vault_name],
+            :config => config, 
+            :account_id => account_id)
+
+          yield(vault)
+
+        end
+
+        resp[:marker]
+
+      end
+
+    end
+  end
+end

data/lib/aws/glacier/vault_notification_configuration.rb

@@ -0,0 +1,27 @@
+# Copyright 2011-2012 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
+  class Glacier
+    class VaultNotificationConfiguration
+
+      # @return [SNS::Topic] The SNS topic Glacier will publish events to.
+      attr_accessor :sns_topic
+
+      # @return [Array<String>] events An array of one or more events for
+      #   which Amazon Glacier will send notifications.
+      attr_accessor :events
+
+    end
+  end
+end

data/lib/aws/import_export.rb

@@ -0,0 +1,71 @@
+# Copyright 2011-2012 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.
+
+require 'aws/core'
+require 'aws/import_export/config'
+
+module AWS
+
+  # This class is the starting point for working with AWS Import/Export.
+  #
+  # To use AWS Import/Export you must first
+  # {sign up here}[http://aws.amazon.com/importexport/].
+  #
+  # For more information about AWS Import/Export:
+  #
+  # * {AWS Import/Export}[http://aws.amazon.com/importexport/]
+  # * {AWS Import/Export Documentation}[http://aws.amazon.com/documentation/importexport/]
+  #
+  # = Credentials
+  #
+  # You can setup default credentials for all AWS services via
+  # AWS.config:
+  #
+  #   AWS.config(
+  #     :access_key_id => 'YOUR_ACCESS_KEY_ID',
+  #     :secret_access_key => 'YOUR_SECRET_ACCESS_KEY')
+  #
+  # Or you can set them directly on the AWS::ImportExport interface:
+  #
+  #   ie = AWS::ImportExport.new(
+  #     :access_key_id => 'YOUR_ACCESS_KEY_ID',
+  #     :secret_access_key => 'YOUR_SECRET_ACCESS_KEY')
+  #
+  # = Using the Client
+  #
+  # AWS::ImportExport does not provide higher level abstractions for Import/Export at
+  # this time.  You can still access all of the API methods using
+  # {AWS::ImportExport::Client}.  Here is how you access the client and make
+  # a simple request:
+  #
+  #   ie = AWS::ImportExport.new
+  #
+  #   resp = ie.client.list_hosted_zones
+  #   resp[:hosted_zones].each do |zone|
+  #     # ...
+  #   end
+  #
+  # See {Client} for documentation on all of the supported operations.
+  #
+  class ImportExport
+
+    AWS.register_autoloads(self, 'aws/import_export') do
+      autoload :Client,  'client'
+      autoload :Errors,  'errors'
+      autoload :Request, 'request'
+    end
+
+    include Core::ServiceInterface
+
+  end
+end

data/lib/aws/import_export/client.rb

@@ -0,0 +1,109 @@
+# Copyright 2011-2012 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
+  class ImportExport
+
+    # Client class for AWS Import/Export.
+    class Client < Core::QueryClient
+
+      define_client_methods('2010-06-01')
+
+      # @private
+      CACHEABLE_REQUESTS = Set[]
+
+      ## client methods ##
+
+      # @!method cancel_job(options = {})
+      # Calls the CancelJob API operation.
+      # @param [Hash] options
+      #   * +:job_id+ - *required* - (String)
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:success+ - (Boolean)
+
+      # @!method create_job(options = {})
+      # Calls the CreateJob API operation.
+      # @param [Hash] options
+      #   * +:job_type+ - *required* - (String)
+      #   * +:manifest+ - *required* - (String)
+      #   * +:manifest_addendum+ - (String)
+      #   * +:validate_only+ - *required* - (Boolean)
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:job_id+ - (String)
+      #   * +:job_type+ - (String)
+      #   * +:aws_shipping_address+ - (String)
+      #   * +:signature+ - (String)
+      #   * +:signature_file_contents+ - (String)
+      #   * +:warning_message+ - (String)
+
+      # @!method get_status(options = {})
+      # Calls the GetStatus API operation.
+      # @param [Hash] options
+      #   * +:job_id+ - *required* - (String)
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:job_id+ - (String)
+      #   * +:job_type+ - (String)
+      #   * +:aws_shipping_address+ - (String)
+      #   * +:location_code+ - (String)
+      #   * +:location_message+ - (String)
+      #   * +:progress_code+ - (String)
+      #   * +:progress_message+ - (String)
+      #   * +:carrier+ - (String)
+      #   * +:tracking_number+ - (String)
+      #   * +:log_bucket+ - (String)
+      #   * +:log_key+ - (String)
+      #   * +:error_count+ - (Integer)
+      #   * +:signature+ - (String)
+      #   * +:signature_file_contents+ - (String)
+      #   * +:current_manifest+ - (String)
+      #   * +:creation_date+ - (Time)
+
+      # @!method list_jobs(options = {})
+      # Calls the ListJobs API operation.
+      # @param [Hash] options
+      #   * +:max_jobs+ - (Integer)
+      #   * +:marker+ - (String)
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:jobs+ - (Array<Hash>)
+      #     * +:job_id+ - (String)
+      #     * +:creation_date+ - (Time)
+      #     * +:is_canceled+ - (Boolean)
+      #     * +:job_type+ - (String)
+      #   * +:is_truncated+ - (Boolean)
+
+      # @!method update_job(options = {})
+      # Calls the UpdateJob API operation.
+      # @param [Hash] options
+      #   * +:job_id+ - *required* - (String)
+      #   * +:manifest+ - *required* - (String)
+      #   * +:job_type+ - *required* - (String)
+      #   * +:validate_only+ - *required* - (Boolean)
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:success+ - (Boolean)
+      #   * +:warning_message+ - (String)
+
+      ## end client methods ##
+
+    end
+  end
+end

data/lib/aws/import_export/config.rb

@@ -0,0 +1,19 @@
+
+# Copyright 2011-2012 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.
+
+AWS::Core::Configuration.module_eval do
+
+  add_service 'ImportExport', 'import_export', 'importexport.amazonaws.com'
+
+end

data/lib/aws/import_export/errors.rb

@@ -0,0 +1,22 @@
+# Copyright 2011-2012 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
+  class ImportExport
+    module Errors
+
+      extend Core::LazyErrorClasses
+
+    end
+  end
+end

data/lib/aws/import_export/request.rb

@@ -0,0 +1,23 @@
+# Copyright 2011-2012 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
+  class ImportExport
+
+    # @private
+    class Request < Core::Http::Request
+      include Core::Signature::Version2
+    end
+
+  end
+end

data/lib/aws/route_53/client.rb

@@ -15,7 +15,7 @@ module AWS
   class Route53
 
     # Client class for Route53.
-    class Client < Core::RESTClient
+    class Client < Core::RESTXMLClient
 
       define_client_methods('2012-02-29')
 

data/lib/aws/s3/bucket_lifecycle_configuration.rb

@@ -17,62 +17,74 @@ require 'uuidtools'
 module AWS
   class S3
 
-    # A lifecycle configuration is collections of rules for a single
-    # bucket that instructs that instruct
-    # Amazon S3 to delete certain objects after a period of days.
+    # A lifecycle configuration specify {Rule rules} that manage the way
+    # Amazon S3 stores objects. The rules apply to objects whose keys match
+    # the rule's prefix.
     #
     # == Rules
     #
-    # Each lifecycle configuration has a list of rules.  Each rule has the
-    # following attributes:
+    # A rule is comprised primarily of an id, prefix and set of
+    # configuration options. Configuration options on the rules can specify:
     #
-    # * +#prefix+
-    # * +#expiration_days+
-    # * +#status+
-    # * +#id+
-    #
-    # Objects with keys matching a rule prefix will be deleted after
-    # #expiration_days have passed.
-    #
-    # A rule is comprised primarily of a prefix and number of expiration days.
-    # Objects with keys that start with the given prefix will be automatically
-    # deleted after "expiration days" have passed.  Rules also have an
-    # ID and a status (they can be disabled).
+    # * When to expire an object
+    # * When to transition an object to Glacier
+    # * Whether the rule is enabled or disabled
     #
     # See {Rule} for more information on all of the attributes and methods
     # available for rules.
     #
-    # == Adding Rules
+    # == Expiring Objects
+    #
+    # You can add a rule to a bucket lifecycle configuration using {#add_rule}
+    # inside of an {#update} block that will expire an object after a given
+    # number of days:
+    #
+    #   # delete backups after they are 1 year old
+    #   bucket.lifecycle_configuration.update do
+    #     add_rule('backups/', :expiration_time => 365)
+    #   end
+    #
+    # You can also define the rule to expire objects at a specific date:
+    #
+    #   # delete backups on January 1st of next year
+    #   bucket.lifecycle_configuration.update do
+    #     date = Date.new(Time.now.year + 1, 01, 01)
+    #     add_rule('backups/', :expiration_time => date)
+    #   end
+    #
+    # == Transitioning Objects to Glacier
     #
-    # You can add a rule to a bucket lifecycle configuration using {#add_rule}.
+    # You can add a rule to a bucket lifecycle configuration using {#add_rule}
+    # inside of an {#update} block that will transition objects to Glacier
+    # after a given number of days:
     #
-    #   # add a rule that deletes backups after they are 1 year old
+    #   # move backups to Glacier after 3 days
     #   bucket.lifecycle_configuration.update do
-    #     add_rule('backups/', 365)
+    #     add_rule('backups/', :glacier_transition_time => 3)
     #   end
     #
-    # If you perfer to specify a rule's ID or status (defaults to 'Enabled')
-    # you can do this with {#add_rule}.
+    # You can also define the rule to transition objects at a specific date:
     #
-    #   # add a rule that deletes backups after they are 1 year old
+    #   # transition all backups on January 1st of next year
     #   bucket.lifecycle_configuration.update do
-    #     add_rule('backups/', 365, :id => 'backup-rule', :disabled => true
+    #     date = Date.new(Time.now.year + 1, 01, 01)
+    #     add_rule('backups/', :glacier_transition_time => date)
     #   end
     #
     # == Replacing Rules
     #
     # If you prefer to completely replace a lifecycle configuration, call
-    # {#add_rule} inside a #replace block instead of an #update block:
+    # {#add_rule} inside a {#replace} block instead of an +#update+ block:
     #
     #   # replace all existing rules with the following
     #   bucket.lifecycle_configuration.replace do
-    #     add_rule('backups/', 30)
-    #     add_rule('temp/', 10)
+    #     add_rule('backups/', :glacier_transition_time => 10)
+    #     add_rule('temp/', :expiration_time => 30)
     #   end
     #
     # == Removing Rules
     #
-    # You can delete specific rules with #remove_rule.
+    # You can delete specific rules with {#remove_rule}.
     #
     #   # delete all disabled rules
     #   bucket.lifecycle_configuration.update do
@@ -81,7 +93,7 @@ module AWS
     #     end
     #   end
     #
-    # You can also remove all rules in a single call:
+    # You can also remove all rules in a single call with {#clear}:
     #
     #   # remove all rules from this lifecycle configuration
     #   bucket.lifecycle_configuration.clear
@@ -93,12 +105,12 @@ module AWS
     #   # change the expiration days to 10 for EVERY rule
     #   bucket.lifecycle_configuration.update do
     #     rules.each do |rule|
-    #       rule.expiration_days = 10
+    #       rule.expiration_time = 10
     #     end
     #   end
     #
     # Please be aware, if you add, remove or edit rules outside of an
-    # #update or #replace block, then you must call {#update} yourself
+    # {#update} or {#replace} block, then you must call +#update+ yourself
     # or the changes will not be persisted.
     #
     class BucketLifecycleConfiguration
@@ -127,26 +139,39 @@ module AWS
         end
       end
 
-      # @param [String] prefix
-      #
-      # @param [Integer] expiration_days Indicates the lifetime for objects
-      #   matching the given prefix.
+      # @overload add_rule(prefix, options = {})
+      #   @param [String] prefix objects whose keys begin with this prefix
+      #     will be affected by the rule.
       #
-      # @param [Hash] options
+      #   @option options [String] :id A unique ID for this rule.  If an ID
+      #     is not provided, one will be generated.
       #
-      # @option options [String] :id A unique ID for this rule.  If an ID
-      #   is not provided, one will be generated.
+      #   @option options [Boolean] :disabled (false) By default, all rules
+      #     will have the status of enabled.  You can override this default
+      #     by passing +:disabled+ => true.
       #
-      # @option options [Boolean] :disabled (false) By default, all rules
-      #   will have the status of enabled.  You can override this default
-      #   by passing +:disabled+ => true.
+      #   @option options [Date, Integer] :expiration_time (nil) Indicates
+      #     the lifetime for objects matching the given prefix.
       #
-      # @return [Rule] Returns the rule that was added, as a {Rule} object.
+      #   @option options [Date, Integer] :glacier_transition_time (nil)
+      #     Indicates the time before objects matching the given prefix will
+      #     be transitioned into the Amazon Glacier storage tier.
       #
-      def add_rule prefix, expiration_days, options = {}
+      #   @return [Rule] Returns the rule that was added, as a {Rule} object.
+      def add_rule prefix, expiration_time = nil, options = {}
+        if Hash === expiration_time
+          options = expiration_time
+        else
+          options[:expiration_time] = expiration_time
+        end
+
         id = options[:id] || UUIDTools::UUID.random_create.to_s
-        status = options[:disabled] == true ? 'Disabled' : 'Enabled'
-        rule = Rule.new(self, id, prefix, expiration_days, status)
+        opts = {
+          :status => options[:disabled] == true ? 'Disabled' : 'Enabled',
+          :expiration_time => options[:expiration_time],
+          :glacier_transition_time => options[:glacier_transition_time]
+        }
+        rule = Rule.new(self, id, prefix, opts)
         self.rules << rule
         rule
       end
@@ -188,7 +213,7 @@ module AWS
       #   # set the number of days before expiration for all rules to 10
       #   config = bucket.lifecycle_configuration
       #   config.rules.each do |rule|
-      #     rule.expiration_days = 10
+      #     rule.expiration_time = 10
       #   end
       #   config.update
       #
@@ -197,7 +222,7 @@ module AWS
       #
       #   # shorter version of the example above
       #   bucket.lifecycle_configuration.update do
-      #     rules.each {|rule| rule.expiration_days = 10 }
+      #     rules.each {|rule| rule.expiration_time = 10 }
       #   end
       #
       # A block method for updating a BucketLifecycleConfiguration.
@@ -265,8 +290,22 @@ module AWS
                 xml.Prefix rule.prefix
                 xml.Status rule.status
                 xml.Expiration do
-                  xml.Days rule.expiration_days
-                end
+                  if Integer === rule.expiration_time
+                    xml.Days rule.expiration_time
+                  else
+                    date = rule.expiration_time.to_s
+                    xml.Date "#{date}T00:00:00Z"
+                  end
+                end if rule.expiration_time
+                xml.Transition do
+                  xml.StorageClass 'GLACIER'
+                  if Integer === rule.glacier_transition_time
+                    xml.Days rule.glacier_transition_time
+                  else
+                    date = rule.glacier_transition_time.to_s
+                    xml.Date "#{date}T00:00:00Z"
+                  end
+                end if rule.glacier_transition_time
               end
             end
           end
@@ -284,13 +323,6 @@ module AWS
         end
       end
 
-      protected
-      def parse_xml xml
-        Client::XML::GetBucketLifecycleConfiguration.parse(xml).rules.map do |r|
-          Rule.new(self, r.id, r.prefix, r.expiration.days, r.status)
-        end
-      end
-
       # Represents a single rule from an Amazon S3 bucket lifecycle
       # configuration.
       #
@@ -303,12 +335,21 @@ module AWS
       #
       class Rule
 
-        def initialize configuration, id, prefix, expiration_days, status
+        # @private
+        def initialize configuration, id, prefix, expiration_time = nil, status = nil
           @configuration = configuration
           @id = id
           @prefix = prefix
-          @expiration_days = expiration_days
-          @status = status
+
+          if Hash === expiration_time
+            options = expiration_time
+            options.each do |key, value|
+              send("#{key}=", value) if respond_to?("#{key}=")
+            end
+          else
+            self.expiration_time = expiration_time
+            self.status = status
+          end
         end
 
         # @return [BucketLifecycleConfiguration]
@@ -320,8 +361,30 @@ module AWS
         # @return [String]
         attr_accessor :prefix
 
-        # @return [Integer]
-        attr_accessor :expiration_days
+        # @return [Date] the date the objects will expire
+        # @return [Integer] if the value is an integer, returns the number
+        #   of days before the object will expire.
+        attr_reader :expiration_time
+
+        # Converts any time values to Date objects
+        def expiration_time=(value)
+          @expiration_time = convert_time_value(value)
+        end
+
+        alias expiration_days expiration_time
+        alias expiration_days= expiration_time=
+
+        # @return [Date] the date the objects will be
+        #   transitioned into the Amazon Glacier storage tier.
+        # @return [Integer] if the value is an integer, returns the number
+        #   of days before the object is transitioned into the Amazon Glacier
+        #   storage tier.
+        attr_reader :glacier_transition_time
+
+        # Converts any time values to Date objects
+        def glacier_transition_time=(value)
+          @glacier_transition_time = convert_time_value(value)
+        end
 
         # @return [String] Returns the rule status, 'Enabled' or 'Disabled'
         attr_accessor :status
@@ -348,11 +411,45 @@ module AWS
           other.configuration.bucket == configuration.bucket and
           other.id == id and
           other.prefix == prefix and
-          other.expiration_days == expiration_days and
+          other.expiration_time == expiration_time and
+          other.glacier_transition_time == glacier_transition_time and
           other.status == status
         end
         alias_method :==, :eql?
 
+        private
+
+        # If an integer, returns the integer as days, otherwise
+        # converts any time-like values into Date objects
+        # @return [Integer] if the value is an integer
+        # @return [Date] if the value is a time-like object
+        # @return [nil] if the value is nil
+        def convert_time_value(value)
+          return nil if value.nil?
+          return value if value.is_a?(Integer)
+          Date.parse(value.to_s)
+        end
+
+      end
+
+      protected
+
+      def parse_xml xml
+        Client::XML::GetBucketLifecycleConfiguration.parse(xml).rules.map do |r|
+          opts = { :status => r[:status] }
+
+          if r[:expiration]
+            opts[:expiration_time] =
+              r[:expiration][:days] || r[:expiration][:date]
+          end
+
+          if r[:transition]
+            opts[:glacier_transition_time] =
+              r[:transition][:days] || r[:transition][:date]
+          end
+
+          Rule.new(self, r[:id], r[:prefix], opts)
+        end
       end
 
     end