aws-sdk 1.32.0 → 1.50.0

data/lib/aws/ec2/volume_collection.rb

@@ -76,6 +76,10 @@ module AWS
       #
       # @option options [String] :volume_type
       #
+      # @option options [Boolean] :encrypted (false)
+      #   When true, the volume will be encrypted.
+      #   For more information, refer to [Amazon EBS Encryption](http://http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html)
+      #
       # @return [Volume]
       #
       def create options = {}

data/lib/aws/ec2/vpc.rb

@@ -48,6 +48,14 @@ module AWS
         resp.vpc_set.find{|v| v.vpc_id == vpc_id }
       end
 
+      # @return [Boolean] Returns `true` if the resource exists.
+      def exists?
+        get_resource
+        true
+      rescue Errors::InvalidVpcID::NotFound
+        false
+      end
+
       # Deletes the current VPC.  The VPC must be empty before it can
       # be deleted.
       # @return [nil]

data/lib/aws/ec2/vpc_collection.rb

@@ -30,7 +30,7 @@ module AWS
       #
       # @param [Hash] options
       #
-      # @option options [Boolean] :instance_tenancy (:default)
+      # @option options [Symbol] :instance_tenancy (:default)
       #   The allowed tenancy of instances launched into the VPC. A value of
       #   `:default` means instances can be launched with any tenancy; a value
       #   of `:dedicated` means all instances launched into the VPC will be launched with

data/lib/aws/elasticache/client.rb

@@ -17,7 +17,7 @@ module AWS
     # Client class for Amazon ElastiCache.
     class Client < Core::QueryClient
 
-      API_VERSION = '2013-06-15'
+      API_VERSION = '2014-07-15'
 
       signature_version :Version4, 'elasticache'
 
@@ -27,9 +27,15 @@ module AWS
     end
 
     class Client::V20130615 < Client
-
       define_client_methods('2013-06-15')
+    end
+
+    class Client::V20140324 < Client
+      define_client_methods('2014-03-24')
+    end
 
+    class Client::V20140715 < Client
+      define_client_methods('2014-07-15')
     end
   end
 end

data/lib/aws/emr/job_flow_collection.rb

@@ -132,11 +132,10 @@ module AWS
       #     # enumerate jobs that are more than an hour old
       #     emr.job_flows.created_before(Time.now - 3600).each{|job| ... }
       #
-      # @param [Time,DateTime,Date] time
+      # @param [Time,DateTime,Date,Integer] time
       # @return [JobFlowCollection]
       def created_before time
-        time = time.iso8601 if time.respond_to?(:iso8601)
-        filter(:created_before, time)
+        filter(:created_before, time.to_i)
       end
 
       # Returns a new collection that will only enumerate job flows that
@@ -145,11 +144,10 @@ module AWS
       #     # enumerate jobs that are at most 1 hour old
       #     emr.job_flows.created_after(Time.now - 3600).each{|job| ... }
       #
-      # @param [Time,DateTime,Date] time
+      # @param [Time,DateTime,Date,Integer] time
       # @return [JobFlowCollection]
       def created_after time
-        time = time.iso8601 if time.respond_to?(:iso8601)
-        filter(:created_after, time)
+        filter(:created_after, time.to_i)
       end
 
       # @param [String,Symbol] name

data/lib/aws/glacier.rb

@@ -21,10 +21,10 @@ module AWS
   # To use Amazon Glacier you must first
   # [sign up here](http://aws.amazon.com/glacier/).
   #
-  # For more information about AWS Data Pipeline:
+  # For more information about Amazon Glacier:
   #
-  # * [AWS Data Pipeline](http://aws.amazon.com/glacier/)
-  # * [AWS Data Pipeline Documentation](http://aws.amazon.com/documentation/glacier/)
+  # * [Amazon Glacier](http://aws.amazon.com/glacier/)
+  # * [Amazon Glacier Documentation](http://aws.amazon.com/documentation/glacier/)
   #
   # # Credentials
   #
@@ -61,7 +61,7 @@ module AWS
     endpoint_prefix 'glacier'
 
     # @option options[String] :account_id ('-')
-    def intialize options = {}
+    def initialize options = {}
       @account_id = options[:account_id] || '-'
       super
     end

data/lib/aws/glacier/vault.rb

@@ -69,7 +69,7 @@ module AWS
 
       # @return [ArchiveCollection]
       def archives
-        ArchiveCollection.new(self)
+        ArchiveCollection.new(self, :account_id => account_id)
       end
 
       # @param [String,SNS::Topic] topic The SNS topic ARN string or an

data/lib/aws/iam/server_certificate.rb

@@ -20,6 +20,30 @@ module AWS
     #
     # You can use this class to get information about a certificate
     # and to delete it.
+    #
+    # @attr [String] name The name that identifies the server certificate.
+    #
+    # @attr_reader [String] id The stable and unique string identifying
+    #   the server certificate.
+    #
+    # @attr_reader [Time] updload_date The date when the server certificate was
+    #   uploaded.
+    #
+    # @attr_reader [String] arn The Amazon Resource Name (ARN)
+    #   specifying the server certificate. For more information
+    #   about ARNs and how to use them in policies, see
+    #   {http://docs.amazonwebservices.com/IAM/latest/UserGuide/index.html?Using_Identifiers.html
+    #   Identifiers for IAM Entities} in <i>Using AWS Identity and
+    #   Access Management</i>.
+    #
+    # @attr [String] path Path to the server certificate.
+    #
+    # @attr_reader [String] certificate_body The contents of the public key
+    #   certificate.
+    #
+    # @attr_reader [String] certificate_chain The contents of the public key
+    #   certificate chain.
+    #
     class ServerCertificate < Resource
 
       prefix_update_attributes
@@ -30,27 +54,14 @@ module AWS
         super(opts)
       end
 
-      # @attr [String] The name that identifies the server
-      #   certificate.
       mutable_attribute :name, :static => true, :from => :server_certificate_name
 
-      # @attr_reader [String] The stable and unique string identifying
-      #   the server certificate.
       attribute :id, :static => true, :from => :server_certificate_id
 
-      # @attr_reader [Time] The date when the server certificate was
-      #   uploaded.
       attribute :upload_date, :static => true
 
-      # @attr_reader [String] The Amazon Resource Name (ARN)
-      #   specifying the server certificate. For more information
-      #   about ARNs and how to use them in policies, see
-      #   {http://docs.amazonwebservices.com/IAM/latest/UserGuide/index.html?Using_Identifiers.html
-      #   Identifiers for IAM Entities} in <i>Using AWS Identity and
-      #   Access Management</i>.
       attribute :arn
 
-      # @attr [String] Path to the server certificate.
       mutable_attribute :path do
         translates_input do |path|
           path = "/#{path}" unless path[0] == ?/
@@ -59,12 +70,8 @@ module AWS
         end
       end
 
-      # @attr_reader [String] The contents of the public key
-      #   certificate.
       attribute :certificate_body
 
-      # @attr_reader [String] The contents of the public key
-      #   certificate chain.
       attribute :certificate_chain
 
       provider(:get_server_certificate) do |provider|

data/lib/aws/iam/signing_certificate.rb

@@ -142,6 +142,18 @@ module AWS
         nil
       end
 
+      # @return [Boolean] Returns `true` if the resource exists.
+      def exists?
+        exists = false
+        SigningCertificateCollection.new(:config => config).each do |cert|
+          if cert.id == self.id
+            exists = true
+            break
+          end
+        end
+        exists
+      end
+
       # @api private
       protected
       def resource_identifiers
@@ -157,7 +169,7 @@ module AWS
       # have is fewer than one page of results.
       # @api private
       protected
-      def get_resource attribute
+      def get_resource attribute = nil
         options = user ? { :user_name => user.name } : {}
         client.list_signing_certificates(options)
       end

data/lib/aws/rails.rb

@@ -134,7 +134,7 @@ module AWS
     # If you need to supply configuration values for SES that are different than
     # those in {AWS.config} then you can pass those options:
     #
-    #     AWS.add_action_mailer_delivery_method(:ses, custom_options)
+    #     AWS::Rails.add_action_mailer_delivery_method(:ses, custom_options)
     #
     # @param [Symbol] name (:amazon_ses) The name of the delivery
     #   method.  The name used here should be the same as you set in

data/lib/aws/rds/db_instance.rb

@@ -193,12 +193,11 @@ module AWS
 
       # @return [Boolean] Returns `true` if the db instance exists.
       def exists?
-        begin
-          get_resource
-          true
-        rescue AWS::RDS::Errors::DBInstanceNotFound
-          false
-        end
+        fail AWS::RDS::Errors::DBInstanceNotFound if id.to_s.empty?
+        get_resource
+        true
+      rescue AWS::RDS::Errors::DBInstanceNotFound
+        false
       end
 
       protected

data/lib/aws/record/abstract_base.rb

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'uuidtools'
 require 'set'
 
 module AWS

data/lib/aws/record/hash_model.rb

@@ -140,7 +140,7 @@ module AWS
       def populate_id
         hash_key = self.class.hash_key_attribute
         if hash_key.options[:default_hash_key_attribute]
-          self[hash_key.name] = UUIDTools::UUID.random_create.to_s.downcase
+          self[hash_key.name] = SecureRandom.uuid
         end
       end
 

data/lib/aws/record/model.rb

@@ -397,7 +397,7 @@ module AWS
 
       # @api private
       def populate_id
-        @_id = UUIDTools::UUID.random_create.to_s.downcase
+        @_id = SecureRandom.uuid
       end
 
       # @api private

data/lib/aws/route_53/client.rb

@@ -17,7 +17,7 @@ module AWS
     # Client class for Route53.
     class Client < Core::RESTXMLClient
 
-      API_VERSION = '2012-12-12'
+      API_VERSION = '2013-04-01'
 
       signature_version :Version3Https
 
@@ -27,9 +27,12 @@ module AWS
     end
 
     class Client::V20121212 < Client
-
       define_client_methods('2012-12-12')
+    end
 
+    class Client::V20130401 < Client
+      define_client_methods('2013-04-01')
     end
+
   end
 end

data/lib/aws/route_53/hosted_zone.rb

@@ -21,8 +21,6 @@ module AWS
     #
     # @attr_reader [String] name The hosted zone name.
     #
-    # @attr_reader [String] caller_reference
-    #
     # @attr_reader [Integer] resource_record_set_count
     #   The resource record set count.
     #
@@ -30,6 +28,18 @@ module AWS
     #
     class HostedZone < Core::Resource
 
+      S3_HOSTED_ZONE_IDS = {
+          'us-east-1' => 'Z3AQBSTGFYJSTF',
+          'us-west-2' => 'Z3BJ6K6RIION7M',
+          'us-west-1' => 'Z2F56UZL2M1ACD',
+          'eu-west-1' => 'Z1BKCTXD74EZPE',
+          'ap-southeast-1' => 'Z3O0J2DXBE1FTB',
+          'ap-southeast-2' => 'Z1WCIGYICN2BYD',
+          'ap-northeast-1' => 'Z2M4EHUR26P7ZW',
+          'sa-east-1' => 'Z7KQH4QJS55SO',
+          'us-gov-west-1' => 'Z31GFT0UA1I2HV'
+      }
+
       # @api private
       def initialize id, options = {}
         @id = id.sub(%r!^/hostedzone/!, '')
@@ -50,26 +60,36 @@ module AWS
         "/hostedzone/#{id}"
       end
 
-      attribute :name, :static => true
+      define_attribute_type :list
 
-      attribute :caller_reference, :static => true
+      define_attribute_type :get
 
-      attribute :configuration, :from => :config, :static => true
+      list_attribute :name, :static => true
 
-      attribute :resource_record_set_count
+      list_attribute :configuration, :from => :config, :static => true
 
-      attribute :delegation_set, :static => true
+      list_attribute :resource_record_set_count
 
-      populates_from :create_hosted_zone do |resp|
-        resp[:hosted_zone] if resp[:hosted_zone][:id] == path
-      end
+      get_attribute :delegation_set, :static => true
 
-      populates_from :get_hosted_zone do |resp|
-        resp[:hosted_zone] if resp[:hosted_zone][:id] == path
+      provider(:list_hosted_zones) do |provider|
+        provider.find do |resp|
+          resp.data[:hosted_zones].find do |detail|
+            detail[:hosted_zone][:id] == path
+          end
+        end
+        provider.provides *list_attributes.keys
       end
 
-      populates_from :list_hosted_zones do |resp|
-        resp.data[:hosted_zones].find { |detail| detail[:hosted_zone][:id] == path }
+      provider(:create_hosted_zone, :get_hosted_zone) do |provider|
+        provider.find do |resp|
+          if resp[:hosted_zone][:id] == path
+            resp[:hosted_zone][:delegation_set] = resp[:delegation_set]
+            resp[:hosted_zone]
+          end
+        end
+        provider.provides *list_attributes.keys
+        provider.provides *get_attributes.keys
       end
 
       # Deletes the hosted zone.
@@ -86,7 +106,10 @@ module AWS
 
       # @return [Boolean] Returns `true` if this hosted zone exists.
       def exists?
-        get_resource.data[:hosted_zone][:id] == path
+        get_resource
+        true
+      rescue Errors::NoSuchHostedZone
+        false
       end
 
       # Returns resource record sets.
@@ -99,7 +122,7 @@ module AWS
       protected
 
       def resource_identifiers
-        [[:id, id], [:name, name], [:caller_reference, caller_reference]]
+        [[:id, id], [:name, name]]
       end
 
       def get_resource attr_name = nil

data/lib/aws/route_53/hosted_zone_collection.rb

@@ -24,7 +24,8 @@ module AWS
     # # Find existing hosted zone
     #
     #     r53 = AWS::Route53.new
-    #     hosted_zone = r53.hosted_zones['example.com.']
+    #     # to lookup a route53 hosted zone, you need to use the zone id (i.e hosted_zone.id)
+    #     hosted_zone = r53.hosted_zones['Zabcdefghijklm']
     #
     class HostedZoneCollection
 

data/lib/aws/s3/bucket_lifecycle_configuration.rb

@@ -12,7 +12,6 @@
 # language governing permissions and limitations under the License.
 
 require 'nokogiri'
-require 'uuidtools'
 
 module AWS
   class S3
@@ -165,11 +164,13 @@ module AWS
           options[:expiration_time] = expiration_time
         end
 
-        id = options[:id] || UUIDTools::UUID.random_create.to_s
+        id = options[:id] || SecureRandom.uuid
         opts = {
           :status => options[:disabled] == true ? 'Disabled' : 'Enabled',
           :expiration_time => options[:expiration_time],
-          :glacier_transition_time => options[:glacier_transition_time]
+          :glacier_transition_time => options[:glacier_transition_time],
+          :noncurrent_version_transition_days => options[:noncurrent_version_transition_days],
+          :noncurrent_version_expiration_days => options[:noncurrent_version_expiration_days]
         }
         rule = Rule.new(self, id, prefix, opts)
         self.rules << rule
@@ -241,10 +242,10 @@ module AWS
       #
       # @return [nil]
       #
-      def update &block
+      def update arg = {}, &block
         begin
           @batching = true
-          instance_eval(&block) if block_given?
+          instance_exec(arg, &block) if block_given?
           persist(true)
         ensure
           @batching = false
@@ -305,6 +306,13 @@ module AWS
                     xml.Date "#{date}T00:00:00Z"
                   end
                 end if rule.glacier_transition_time
+                xml.NoncurrentVersionTransition do
+                  xml.StorageClass 'GLACIER'
+                  xml.NoncurrentDays rule.noncurrent_version_transition_days
+                end if rule.noncurrent_version_transition_days
+                xml.NoncurrentVersionExpiration do
+                  xml.NoncurrentDays rule.noncurrent_version_expiration_days
+                end if rule.noncurrent_version_expiration_days
               end
             end
           end
@@ -385,6 +393,12 @@ module AWS
           @glacier_transition_time = convert_time_value(value)
         end
 
+        # @return [Integer]
+        attr_accessor :noncurrent_version_transition_days
+
+        # @return [Integer]
+        attr_accessor :noncurrent_version_expiration_days
+
         # @return [String] Returns the rule status, 'Enabled' or 'Disabled'
         attr_accessor :status
 
@@ -412,7 +426,9 @@ module AWS
           other.prefix == prefix and
           other.expiration_time == expiration_time and
           other.glacier_transition_time == glacier_transition_time and
-          other.status == status
+          other.status == status and
+          other.noncurrent_version_transition_days == noncurrent_version_transition_days and
+          other.noncurrent_version_expiration_days == noncurrent_version_expiration_days
         end
         alias_method :==, :eql?