fog 1.1.2 → 1.2.0

data/lib/fog/aws/models/compute/vpcs.rb

@@ -0,0 +1,93 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/vpc'
+
+module Fog
+  module Compute
+    class AWS
+
+      class Vpcs < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::VPC
+
+        # Creates a new VPC
+        #
+        # AWS.vpcs.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new VPC
+        #
+        #>> AWS.vpcs.new
+        # <Fog::AWS::VPC::VPC
+        # id=nil,
+        # state=nil,
+        # cidr_block=nil,
+        # dhcp_options_id=nil
+        # tags=nil
+        # tenancy=nil
+        # >
+        #
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all VPCs that have been created
+        #
+        # AWS.vpcs.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all VPCs
+        #
+        #>> AWS.vpcs.all
+        # <Fog::AWS::VPC::VPCs
+        # filters={}
+        # [
+        # <Fog::AWS::VPC::VPC
+        # id="vpc-12345678",
+        # TODO
+        # >
+        # ]
+        # >
+        #
+
+        def all(filters = filters)
+          unless filters.is_a?(Hash)
+            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('vpc-id' => []) instead [light_black](#{caller.first})[/]")
+            filters = {'vpc-id' => [*filters]}
+          end
+          self.filters = filters
+          data = connection.describe_vpcs(filters).body
+          load(data['vpcSet'])
+        end
+
+        # Used to retrieve a VPC
+        # vpc_id is required to get the associated VPC information.
+        #
+        # You can run the following command to get the details:
+        # AWS.vpcs.get("vpc-12345678")
+        #
+        # ==== Returns
+        #
+        #>> AWS.vpcs.get("vpc-12345678")
+        # <Fog::AWS::Compute::VPC
+        # id="vpc-12345678",
+        # TODO
+        # >
+        #
+
+        def get(vpc_id)
+          if vpc_id
+            self.class.new(:connection => connection).all('vpc-id' => vpc_id).first
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/dns/record.rb

@@ -9,14 +9,14 @@ module Fog
         deprecate :ip, :value
         deprecate :ip=, :value=
 
-        identity :id,           :aliases => ['Id']
+        identity :name,           :aliases => ['Name']
 
-        attribute :value,       :aliases => ['ResourceRecords']
-        attribute :name,        :aliases => ['Name']
-        attribute :ttl,         :aliases => ['TTL']
-        attribute :type,        :aliases => ['Type']
-        attribute :status,      :aliases => ['Status']
-        attribute :created_at,  :aliases => ['SubmittedAt']
+        attribute :value,         :aliases => ['ResourceRecords']
+        attribute :ttl,           :aliases => ['TTL']
+        attribute :type,          :aliases => ['Type']
+        attribute :status,        :aliases => ['Status']
+        attribute :created_at,    :aliases => ['SubmittedAt']
+        attribute :alias_target,  :aliases => ['AliasTarget']
 
         def initialize(attributes={})
           self.ttl ||= 3600
@@ -24,14 +24,7 @@ module Fog
         end
 
         def destroy
-          requires :name, :ttl, :type, :value, :zone
-          options = {
-            :action           => 'DELETE',
-            :name             => name,
-            :resource_records => [*value],
-            :ttl              => ttl,
-            :type             => type
-          }
+          options = attributes_to_options('DELETE')
           connection.change_resource_record_sets(zone.id, [options])
           true
         end
@@ -41,25 +34,46 @@ module Fog
         end
 
         def save
-          requires :name, :ttl, :type, :value, :zone
-          options = {
-            :action           => 'CREATE',
-            :name             => name,
-            :resource_records => [*value],
-            :ttl              => ttl,
-            :type             => type
-          }
+          options = attributes_to_options('CREATE')
           data = connection.change_resource_record_sets(zone.id, [options]).body
           merge_attributes(data)
           true
         end
 
+        def modify(new_attributes)
+          options = []
+
+          # Delete the current attributes
+          options << attributes_to_options('DELETE')
+
+          # Create the new attributes
+          merge_attributes(new_attributes)
+          options << attributes_to_options('CREATE')
+
+          data = connection.change_resource_record_sets(zone.id, options).body
+          merge_attributes(data)
+          true
+        end
+
         private
 
         def zone=(new_zone)
           @zone = new_zone
         end
 
+        def attributes_to_options(action)
+          requires :name, :ttl, :type, :zone
+          requires_one :value, :alias_target
+          {
+            :action           => action,
+            :name             => name,
+            :resource_records => [*value],
+            :alias_target     => symbolize_keys(alias_target),
+            :ttl              => ttl,
+            :type             => type
+          }
+        end
+
       end
 
     end

data/lib/fog/aws/models/elasticache/cluster.rb

@@ -53,7 +53,7 @@ module Fog
               :auto_minor_version_upgrade   => auto_upgrade,
               :engine                       => engine,
               :engine_version               => engine_version,
-              :notification_topic_arn       => notification_config['TopicArn'],
+              :notification_topic_arn       => (notification_config['TopicArn']).strip,
               :port                         => port,
               :preferred_availablility_zone => zone,
               :preferred_maintenance_window => maintenance_window,

data/lib/fog/aws/models/elb/listener.rb

@@ -4,20 +4,21 @@ module Fog
     class ELB
       class Listener < Fog::Model
 
-        attribute :policy_names,  :aliases => 'PolicyNames'
-        attribute :instance_port, :aliases => 'InstancePort'
-        attribute :lb_port,       :aliases => 'LoadBalancerPort'
-        attribute :protocol,      :aliases => 'Protocol'
-        attribute :ssl_id,        :aliases => 'SSLCertificateId'
+        attribute :policy_names,      :aliases => 'PolicyNames'
+        attribute :instance_port,     :aliases => 'InstancePort'
+        attribute :instance_protocol, :aliases => 'InstanceProtocol'
+        attribute :lb_port,           :aliases => 'LoadBalancerPort'
+        attribute :protocol,          :aliases => 'Protocol'
+        attribute :ssl_id,            :aliases => 'SSLCertificateId'
 
         def initialize(attributes={})
           # set defaults, which may be overridden in super
-          merge_attributes(:policy_names => [], :instance_port => 80, :lb_port => 80, :protocol => 'HTTP')
+          merge_attributes(:policy_names => [], :instance_port => 80, :instance_protocol => 'HTTP', :lb_port => 80, :protocol => 'HTTP')
           super
         end
 
         def save
-          requires :load_balancer, :instance_port, :lb_port, :protocol
+          requires :load_balancer, :instance_port, :lb_port, :protocol, :instance_protocol
           connection.create_load_balancer_listeners(load_balancer.id, [to_params])
           reload
         end
@@ -44,6 +45,7 @@ module Fog
         def to_params
           {
             'InstancePort'     => instance_port,
+            'InstanceProtocol' => instance_protocol,
             'LoadBalancerPort' => lb_port,
             'Protocol'         => protocol,
             'SSLCertificateId' => ssl_id

data/lib/fog/aws/models/storage/directory.rb

@@ -1,5 +1,6 @@
 require 'fog/core/model'
 require 'fog/aws/models/storage/files'
+require 'fog/aws/models/storage/versions'
 
 module Fog
   module Storage
@@ -58,6 +59,26 @@ module Fog
           @payer = new_payer
         end
 
+        def versioning?
+          requires :key
+          data = connection.get_bucket_versioning(key)
+          data.body['VersioningConfiguration']['Status'] == 'Enabled'
+        end
+
+        def versioning=(new_versioning)
+          requires :key
+          connection.put_bucket_versioning(key, new_versioning ? 'Enabled' : 'Suspended')
+        end
+
+        def versions
+          @versions ||= begin
+            Fog::Storage::AWS::Versions.new(
+                :directory    => self,
+                :connection   => connection
+            )
+          end
+        end
+
         def public=(new_public)
           if new_public
             @acl = 'public-read'
@@ -70,7 +91,7 @@ module Fog
         def public_url
           requires :key
           if connection.get_bucket_acl(key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
-            if key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+            if key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{key}.s3.amazonaws.com"
             else
               "https://s3.amazonaws.com/#{key}"

data/lib/fog/aws/models/storage/file.rb

@@ -1,4 +1,5 @@
 require 'fog/core/model'
+require 'fog/aws/models/storage/versions'
 
 module Fog
   module Storage
@@ -21,6 +22,13 @@ module Fog
         attribute :metadata
         attribute :owner,               :aliases => 'Owner'
         attribute :storage_class,       :aliases => ['x-amz-storage-class', 'StorageClass']
+        attribute :encryption,          :aliases => 'x-amz-server-side-encryption'
+        attribute :version,             :aliases => 'x-amz-version-id'
+
+        # Chunk size to use for multipart uploads
+        # Use small chunk sizes to minimize memory
+        # E.g. 5242880 = 5mb
+        attr_accessor :multipart_chunk_size
 
         def acl=(new_acl)
           valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
@@ -50,12 +58,13 @@ module Fog
           requires :directory, :key
           connection.copy_object(directory.key, key, target_directory_key, target_file_key, options)
           target_directory = connection.directories.new(:key => target_directory_key)
-          target_directory.files.get(target_file_key)
+          target_directory.files.head(target_file_key)
         end
 
-        def destroy
+        def destroy(options = {})
           requires :directory, :key
-          connection.delete_object(directory.key, key)
+          attributes[:body] = nil if options['versionId'] == version
+          connection.delete_object(directory.key, key, options)
           true
         end
 
@@ -91,7 +100,7 @@ module Fog
         def public_url
           requires :directory, :key
           if connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
-            if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+            if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{directory.key}.s3.amazonaws.com/#{Fog::AWS.escape(key)}"
             else
               "https://s3.amazonaws.com/#{directory.key}/#{Fog::AWS.escape(key)}"
@@ -115,10 +124,16 @@ module Fog
           options['Expires'] = expires if expires
           options.merge!(metadata)
           options['x-amz-storage-class'] = storage_class if storage_class
+          options['x-amz-server-side-encryption'] = encryption if encryption
 
-          data = connection.put_object(directory.key, key, body, options)
-          data.headers['ETag'].gsub!('"','')
-          merge_attributes(data.headers)
+          if multipart_chunk_size && body.respond_to?(:read)
+            data = multipart_save(options)
+            merge_attributes(data.body)
+          else
+            data = connection.put_object(directory.key, key, body, options)
+            merge_attributes(data.headers)
+          end
+          self.etag.gsub!('"','')
           self.content_length = Fog::Storage.get_body_size(body)
           true
         end
@@ -128,12 +143,48 @@ module Fog
           collection.get_https_url(key, expires, options)
         end
 
+        def versions
+          @versions ||= begin
+            Fog::Storage::AWS::Versions.new(
+              :file         => self,
+              :connection   => connection
+            )
+          end
+        end
+
         private
 
         def directory=(new_directory)
           @directory = new_directory
         end
 
+        def multipart_save(options)
+          # Initiate the upload
+          res = connection.initiate_multipart_upload(directory.key, key, options)
+          upload_id = res.body["UploadId"]
+
+          # Store ETags of upload parts
+          part_tags = []
+
+          # Upload each part
+          # TODO: optionally upload chunks in parallel using threads
+          # (may cause network performance problems with many small chunks)
+          # TODO: Support large chunk sizes without reading the chunk into memory
+          body.rewind if body.respond_to?(:rewind)
+          while (chunk = body.read(multipart_chunk_size)) do
+            part_upload = connection.upload_part(directory.key, key, upload_id, part_tags.size + 1, chunk )
+            part_tags << part_upload.headers["ETag"]
+          end
+
+        rescue
+          # Abort the upload & reraise
+          connection.abort_multipart_upload(directory.key, key, upload_id) if upload_id
+          raise
+        else
+          # Complete the upload
+          connection.complete_multipart_upload(directory.key, key, upload_id, part_tags)
+        end
+
       end
 
     end

data/lib/fog/aws/models/storage/version.rb

@@ -0,0 +1,36 @@
+require 'fog/core/model'
+
+module Fog
+  module Storage
+    class AWS
+
+      class Version < Fog::Model
+
+        identity  :version,             :aliases => 'VersionId'
+
+        attribute :key,                 :aliases => 'Key'
+        attribute :last_modified,       :aliases => ['Last-Modified', 'LastModified']
+        attribute :latest,              :aliases => 'IsLatest', :type => :boolean
+        attribute :content_length,      :aliases => ['Content-Length', 'Size'], :type => :integer
+        attribute :delete_marker,       :type => :boolean
+
+        def file
+          @file ||= if collection.file
+            collection.file.directory.files.get(key, 'versionId' => version)
+          else
+            collection.directory.files.get(key, 'versionId' => version)
+          end
+        end
+
+        def destroy
+          if collection.file
+            collection.connection.delete_object(collection.file.directory.key, key, 'versionId' => version)
+          else
+            collection.connection.delete_object(collection.directory.key, key, 'versionId' => version)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/storage/versions.rb

@@ -0,0 +1,38 @@
+require 'fog/core/collection'
+require 'fog/aws/models/storage/version'
+
+module Fog
+  module Storage
+    class AWS
+
+      class Versions < Fog::Collection
+
+        attribute :file
+        attribute :directory
+
+        model Fog::Storage::AWS::Version
+
+        def all(options = {})
+          data = if file
+            connection.get_bucket_object_versions(file.directory.key, options.merge('prefix' => file.key)).body['Versions']
+          else
+            connection.get_bucket_object_versions(directory.key, options).body['Versions']
+          end
+
+          load(data)
+        end
+
+        def new(attributes = {})
+          version_type = attributes.keys.first
+
+          model = super(attributes[version_type])
+          model.delete_marker = version_type == 'DeleteMarker'
+
+          model
+        end
+
+      end
+
+    end
+  end
+end