fog 1.5.0 → 1.6.0

data/lib/fog/aws/models/glacier/jobs.rb

@@ -0,0 +1,45 @@
+require 'fog/core/collection'
+require 'fog/aws/models/glacier/job'
+
+module Fog
+  module AWS
+    class Glacier
+
+      class Jobs < Fog::Collection
+
+        model Fog::AWS::Glacier::Job
+        attribute :vault
+        attribute :filters
+        
+        def initialize(attributes)
+          self.filters = {}
+          super
+        end
+
+        # acceptable filters are:
+        # statuscode InProgress/Failed/Succeeded
+        # completed (true/false)
+        def all(filters = self.filters)
+          self.filters = filters
+          data = connection.list_jobs(vault.id, self.filters).body['JobList']
+          load(data)
+        end
+
+        def get(key)
+          data = connection.describe_job(vault.id, key).body
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def new(attributes = {})
+          requires :vault
+          super({ :vault => vault }.merge!(attributes))
+        end
+
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/glacier/vault.rb

@@ -0,0 +1,53 @@
+require 'fog/core/model'
+require 'fog/aws/models/glacier/archives'
+require 'fog/aws/models/glacier/jobs'
+
+module Fog
+  module AWS
+    class Glacier
+
+      class Vault < Fog::Model
+
+        identity  :id,                    :aliases => 'VaultName'
+        attribute :created_at,            :aliases => 'CreationDate', :type => :time
+        attribute :last_inventory_at,     :aliases => 'LastInventoryDate', :type => :time
+        attribute :number_of_archives,    :aliases => 'NumberOfArchives', :type => :integer
+        attribute :size_in_bytes,         :aliases => 'SizeInBytes', :type => :integer
+        attribute :arn,                   :aliases => 'VaultARN'
+
+        def ready?
+          # Glacier requests are synchronous
+          true
+        end
+
+        def archives
+          @archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :connection => connection)
+        end
+
+        def jobs(filters={})
+          Fog::AWS::Glacier::Jobs.new(:vault => self, :connection => connection, :filters => filters)
+        end
+
+        def set_notification_configuration(topic, events)
+          connection.set_vault_notification_configuration(id, topic, events)
+        end
+
+        def delete_notification_configuration
+          connection.delete_vault_notification_configuration
+        end
+        
+        def save
+          requires :id
+          connection.create_vault(id)
+          reload
+        end
+
+        def destroy
+          requires :id
+          connection.delete_vault(id)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/glacier/vaults.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/aws/models/glacier/vault'
+
+module Fog
+  module AWS
+    class Glacier
+
+      class Vaults < Fog::Collection
+
+        model Fog::AWS::Glacier::Vault
+
+        def all
+          data = connection.list_vaults.body['VaultList']
+          load(data)
+        end
+
+        def get(key)
+          data = connection.describe_vault(key).body
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/rds/server.rb

@@ -29,6 +29,7 @@ module Fog
         attribute :db_parameter_groups, :aliases => 'DBParameterGroups'
         attribute :backup_retention_period, :aliases => 'BackupRetentionPeriod', :type => :integer
         attribute :license_model, :aliases => 'LicenseModel'
+        attribute :db_subnet_group_name, :aliases => 'DBSubnetGroupName'
 
         attr_accessor :password, :parameter_group_name, :security_group_names, :port
 
@@ -100,7 +101,8 @@ module Fog
             'PreferredMaintenanceWindow'    => preferred_maintenance_window,
             'PreferredBackupWindow'         => preferred_backup_window,
             'MultiAZ'                       => multi_az,
-            'LicenseModel'                  => license_model
+            'LicenseModel'                  => license_model,
+            'DBSubnetGroupName'             => db_subnet_group_name
           }
 
           options.delete_if {|key, value| value.nil?}

data/lib/fog/aws/models/rds/snapshot.rb

@@ -17,6 +17,7 @@ module Fog
         attribute  :port, :aliases => 'Port', :type => :integer
         attribute  :allocated_storage, :aliases => 'AllocatedStorage', :type => :integer
         attribute  :availability_zone, :aliases => 'AvailabilityZone'
+        attribute  :type, :aliases => 'SnapshotType'
 
         def ready?
           state == 'available'

data/lib/fog/aws/models/rds/snapshots.rb

@@ -15,6 +15,9 @@ module Fog
           if attributes[:server]
             filters[:identifier] = attributes[:server].id
           end
+          if attributes[:type]
+            filters[:type] = attributes[:type]
+          end
           super
         end
 

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

@@ -101,9 +101,9 @@ module Fog
           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]$/
-              "https://#{directory.key}.s3.amazonaws.com/#{Fog::AWS.escape(key)}"
+              "https://#{directory.key}.s3.amazonaws.com/#{Fog::AWS.escape(key)}".gsub('%2F','/')
             else
-              "https://s3.amazonaws.com/#{directory.key}/#{Fog::AWS.escape(key)}"
+              "https://s3.amazonaws.com/#{directory.key}/#{Fog::AWS.escape(key)}".gsub('%2F','/')
             end
           else
             nil
@@ -173,7 +173,8 @@ module Fog
           # 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 )
+            md5 = Base64.encode64(Digest::MD5.digest(chunk)).strip
+            part_upload = connection.upload_part(directory.key, key, upload_id, part_tags.size + 1, chunk, 'Content-MD5' => md5 )
             part_tags << part_upload.headers["ETag"]
           end
 

data/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb

@@ -15,7 +15,8 @@ module Fog
           end
 
           def reset_auto_scaling_group
-            @auto_scaling_group = { 'AvailabilityZones' => [], 'EnabledMetrics' => [], 'Instances' => [], 'LoadBalancerNames' => [], 'SuspendedProcesses' => [] }
+            @auto_scaling_group = { 'AvailabilityZones' => [], 'EnabledMetrics' => [], 'Instances' => [], 
+                                  'LoadBalancerNames' => [], 'SuspendedProcesses' => [], 'TerminationPolicies' => [] }
           end
 
           def reset_enabled_metric
@@ -43,6 +44,8 @@ module Fog
               @in_load_balancer_names = true
             when 'SuspendedProcesses'
               @in_suspended_processes = true
+            when 'TerminationPolicies'
+              @in_termination_policies = true
             end
           end
 
@@ -62,6 +65,8 @@ module Fog
               elsif @in_suspended_processes
                 @auto_scaling_group['SuspendedProcesses'] << @suspended_process
                 reset_suspended_process
+              elsif @in_termination_policies
+                @auto_scaling_group['TerminationPolicies'] << value
               elsif !@in_instances && !@in_policies
                 @results['AutoScalingGroups'] << @auto_scaling_group
                 reset_auto_scaling_group
@@ -81,6 +86,8 @@ module Fog
               else
                 @auto_scaling_group[name] = value
               end
+            when 'TerminationPolicies'
+              @in_termination_policies = false
 
             when 'AvailabilityZone', 'HealthStatus', 'InstanceId', 'LifecycleState'
               @instance[name] = value

data/lib/fog/aws/parsers/compute/create_volume.rb

@@ -7,11 +7,11 @@ module Fog
 
           def end_element(name)
             case name
-            when 'availabilityZone', 'requestId', 'snapshotId', 'status', 'volumeId'
+            when 'availabilityZone', 'requestId', 'snapshotId', 'status', 'volumeId', 'volumeType'
               @response[name] = value
             when 'createTime'
               @response[name] = Time.parse(value)
-            when 'size'
+            when 'size', 'iops'
               @response[name] = value.to_i
             end
           end

data/lib/fog/aws/parsers/compute/describe_instance_status.rb

@@ -56,7 +56,14 @@ module Fog
                 @response['instanceStatusSet'] << @instance
               end
               @item = nil
-            when 'code', 'description', 'notBefore', 'notAfter', 'name', 'status'
+            when 'code'
+              case @inside
+              when :eventsSet
+                @item[name] = value
+              when :instanceState
+                @instance[@inside.to_s][name] = value.to_i
+              end
+            when 'description', 'notBefore', 'notAfter', 'name', 'status'
               @item.nil? ? (@instance[@inside.to_s][name] = value) : (@item[name] = value)
             end
           end

data/lib/fog/aws/parsers/compute/describe_instances.rb

@@ -97,6 +97,8 @@ module Fog
               @instance['productCodes'] << value
             when 'state'
               @instance['monitoring'][name] = (value == 'enabled')
+            when 'ebsOptimized'
+              @instance['ebsOptimized'] = (value == 'true')
             end
           end
 

data/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb

@@ -19,7 +19,7 @@ module Fog
             when 'fixedPrice', 'usagePrice'
               @reserved_instances_offering[name] = value.to_f
             when 'item'
-              @response['reservedInstancesOfferingsSet'] << @reserved_instances_offering
+              @response['reservedInstancesOfferingsSet'] << @reserved_instances_offering unless @reserved_instances_offering.empty?
               @reserved_instances_offering = {}
             when 'requestId'
               @response[name] = value

data/lib/fog/aws/parsers/compute/describe_volumes.rb

@@ -48,7 +48,7 @@ module Fog
               end
             else
               case name
-              when 'availabilityZone', 'snapshotId', 'status', 'volumeId'
+              when 'availabilityZone', 'snapshotId', 'status', 'volumeId', 'volumeType'
                 @volume[name] = value
               when 'createTime'
                 @volume[name] = Time.parse(value)
@@ -57,7 +57,7 @@ module Fog
                 @volume = { 'attachmentSet' => [], 'tagSet' => {} }
               when 'requestId'
                 @response[name] = value
-              when 'size'
+              when 'size', 'iops'
                 @volume[name] = value.to_i
               end
             end

data/lib/fog/aws/parsers/compute/run_instances.rb

@@ -71,6 +71,8 @@ module Fog
               @instance['monitoring'][name] = (value == 'true')
             when 'subnetId'
               @response[name] = value
+            when 'ebsOptimized'
+              @instance['ebsOptimized'] = (value == 'true')
             end
           end
 

data/lib/fog/aws/parsers/compute/spot_instance_requests.rb

@@ -48,7 +48,7 @@ module Fog
                 @response['spotInstanceRequestSet'] << @spot_instance_request
                 @spot_instance_request = { 'launchSpecification' => { 'blockDeviceMapping' => [], 'groupSet' => [] } }
               end
-            when 'imageId', 'instanceType', 'keyname'
+            when 'imageId', 'instanceType', 'keyname', 'subnetId'
               @spot_instance_request['launchSpecification'][name] = value
             when 'enabled'
               @spot_instance_request['launchSpecification']['monitoring'] = (value == 'true')

data/lib/fog/aws/parsers/dns/list_resource_record_sets.rb

@@ -18,8 +18,10 @@ module Fog
           def end_element(name)
             if @section == :resource_record_set
               case name
-              when 'Name', 'Type', 'TTL', 'SetIdentifier', 'Weight', 'Region'
+              when 'Type', 'TTL', 'SetIdentifier', 'Weight', 'Region'
                 @resource_record_set[name] = value
+              when 'Name'
+                @resource_record_set[name] = value.gsub('\\052', '*')
               when 'Value'
                 @resource_record_set['ResourceRecords'] << value
               when 'AliasTarget'

data/lib/fog/aws/parsers/rds/db_parser.rb

@@ -38,6 +38,7 @@ module Fog
           end
 
           def end_element(name)
+
             case name
               
             when 'LatestRestorableTime', 'InstanceCreateTime'
@@ -45,7 +46,8 @@ module Fog
             when 'Engine', 
               'DBInstanceStatus', 'DBInstanceIdentifier', 'EngineVersion', 
               'PreferredBackupWindow', 'PreferredMaintenanceWindow', 
-              'AvailabilityZone', 'MasterUsername', 'DBName', 'LicenseModel'
+              'AvailabilityZone', 'MasterUsername', 'DBName', 'LicenseModel',
+              'DBSubnetGroupName'
               @db_instance[name] = value
             when 'MultiAZ', 'AutoMinorVersionUpgrade'
               if value == 'false'

data/lib/fog/aws/parsers/rds/snapshot_parser.rb

@@ -30,6 +30,7 @@ module Fog
             when 'MasterUsername' then @db_snapshot['MasterUsername'] = value
             when 'Port' then @db_snapshot['Port'] = value.to_i
             when 'SnapshotCreateTime' then @db_snapshot['SnapshotCreateTime'] = Time.parse value
+            when 'SnapshotType' then @db_snapshot['SnapshotType'] = value
             when 'Status' then @db_snapshot['Status'] = value
             end
           end

data/lib/fog/aws/rds.rb

@@ -80,30 +80,30 @@ module Fog
             end
           end
         end
-        
+
         def self.reset
           @data = nil
         end
-        
+
         def initialize(options={})
-                
+
           @use_iam_profile = options[:use_iam_profile]
           @region = options[:region] || 'us-east-1'
-        
+
           unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
-        
+
         end
-        
+
         def data
           self.class.data[@region][@aws_access_key_id]
         end
-        
+
         def reset_data
           self.class.data[@region].delete(@aws_access_key_id)
         end
-        
+
         def setup_credentials(options)
           @aws_access_key_id = options[:aws_access_key_id]
         end
@@ -174,7 +174,7 @@ module Fog
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2011-04-01' #'2010-07-28'
+              :version            => '2012-01-15' #'2011-04-01'
             }
           )
 

data/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb

@@ -98,6 +98,7 @@ module Fog
             'MinSize'                 => min_size,
             'PlacementGroup'          => nil,
             'SuspendedProcesses'      => [],
+            'TerminationPolicies'     => [],
             'VPCZoneIdentifier'       => nil
           }.merge!(options)
 

data/lib/fog/aws/requests/auto_scaling/delete_auto_scaling_group.rb

@@ -36,7 +36,7 @@ module Fog
 
         def delete_auto_scaling_group(auto_scaling_group_name)
           unless self.data[:auto_scaling_groups].delete(auto_scaling_group_name)
-            raise Fog::AWS::Autoscaling::NotFound, "The auto scaling group '#{auto_scaling_group_name}' does not exist."
+            raise Fog::AWS::AutoScaling::ValidationError, "The auto scaling group '#{auto_scaling_group_name}' does not exist."
           end
 
           response = Excon::Response.new

data/lib/fog/aws/requests/compute/create_volume.rb

@@ -10,7 +10,10 @@ module Fog
         # ==== Parameters
         # * availability_zone<~String> - availability zone to create volume in
         # * size<~Integer> - Size in GiBs for volume.  Must be between 1 and 1024.
-        # * snapshot_id<~String> - Optional, snapshot to create volume from
+        # * options<~Hash>
+        #   * 'SnapshotId'<~String> - Optional, snapshot to create volume from
+        #   * 'VolumeType'<~String> - Optional, volume type. standard or io1, default is standard.
+        #   * 'Iops'<~Integer> - Number of IOPS the volume supports. Required if VolumeType is io1, must be between 1 and 1000.
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -21,51 +24,87 @@ module Fog
         #     * 'snapshotId'<~String> - Snapshot volume was created from, if any
         #     * 'status's<~String> - State of volume
         #     * 'volumeId'<~String> - Reference to volume
+        #     * 'volumeType'<~String> - Type of volume
+        #     * 'iops'<~Integer> - Number of IOPS the volume supports
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVolume.html]
-        def create_volume(availability_zone, size, snapshot_id = nil)
-          request(
+        def create_volume(availability_zone, size, options = {})
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("create_volume with a bare snapshot_id is deprecated, use create_volume(availability_zone, size, 'SnapshotId' => snapshot_id) instead [light_black](#{caller.first})[/]")
+            options = { 'SnapshotId' => options }
+          end
+
+          request({
             'Action'            => 'CreateVolume',
             'AvailabilityZone'  => availability_zone,
             'Size'              => size,
-            'SnapshotId'        => snapshot_id,
             :parser             => Fog::Parsers::Compute::AWS::CreateVolume.new
-          )
+          }.merge(options))
         end
 
       end
 
       class Mock
 
-        def create_volume(availability_zone, size, snapshot_id = nil)
+        def create_volume(availability_zone, size, options = {})
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("create_volume with a bare snapshot_id is deprecated, use create_volume(availability_zone, size, 'SnapshotId' => snapshot_id) instead [light_black](#{caller.first})[/]")
+            options = { 'SnapshotId' => options }
+          end
+
           response = Excon::Response.new
-          if availability_zone && (size || snapshot_id)
-            snapshot = self.data[:snapshots][snapshot_id]
-            if snapshot_id && !snapshot
-              raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
+          if availability_zone && (size || options['SnapshotId'])
+            snapshot = self.data[:snapshots][options['SnapshotId']]
+            if options['SnapshotId'] && !snapshot
+              raise Fog::Compute::AWS::NotFound.new("The snapshot '#{options['SnapshotId']}' does not exist.")
             end
 
             if snapshot && size && size < snapshot['volumeSize']
-              raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' has size #{snapshot['volumeSize']} which is greater than #{size}.")
+              raise Fog::Compute::AWS::NotFound.new("The snapshot '#{options['SnapshotId']}' has size #{snapshot['volumeSize']} which is greater than #{size}.")
             elsif snapshot && !size
               size = snapshot['volumeSize']
             end
 
+            if options['VolumeType'] == 'io1'
+              iops = options['Iops']
+              if !iops
+                raise Fog::Compute::AWS::Error.new("InvalidParameterCombination => The parameter iops must be specified for io1 volumes.")
+              end
+
+              if size < 10
+                raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume of #{size}GiB is too small; minimum is 10GiB.")
+              end
+
+              if (iops_to_size_ratio = iops.to_f / size.to_f) > 10.0
+                raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Iops to volume size ratio of #{"%.1f" % iops_to_size_ratio} is too high; maximum is 10.0")
+              end
+
+              if iops < 100
+                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too low; minimum is 100.")
+              end
+
+              if iops > 1000
+                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too high; maximum is 1000.")
+              end
+            end
+
             response.status = 200
             volume_id = Fog::AWS::Mock.volume_id
             data = {
               'availabilityZone'  => availability_zone,
               'attachmentSet'     => [],
               'createTime'        => Time.now,
+              'iops'              => options['Iops'],
               'size'              => size,
-              'snapshotId'        => snapshot_id,
+              'snapshotId'        => options['SnapshotId'],
               'status'            => 'creating',
-              'volumeId'          => volume_id
+              'volumeId'          => volume_id,
+              'volumeType'        => options['VolumeType'] || 'standard'
             }
             self.data[:volumes][volume_id] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
-            }.merge!(data.reject {|key,value| !['availabilityZone','createTime','size','snapshotId','status','volumeId'].include?(key) })
+            }.merge!(data.reject {|key,value| !['availabilityZone','createTime','size','snapshotId','status','volumeId','volumeType'].include?(key) })
           else
             response.status = 400
             response.body = {