fog 0.3.7 → 0.3.8

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

@@ -8,8 +8,8 @@ module Fog
         # Describe all or specified snapshots
         #
         # ==== Parameters
-        # * snapshot_id<~Array> - List of snapshots to describe, defaults to all
-        # * options<~Array>:
+        # * filters<~Hash> - List of filters to limit results with
+        # * options<~Hash>:
         #   * 'Owner'<~String> - Owner of snapshot in ['self', 'amazon', account_id]
         #   * 'RestorableBy'<~String> - Account id of user who can create volumes from this snapshot
         #
@@ -23,55 +23,92 @@ module Fog
         #       * 'startTime'<~Time>: Timestamp of when snapshot was initiated
         #       * 'status'<~String>: Snapshot state, in ['pending', 'completed']
         #       * 'volumeId'<~String>: Id of volume that snapshot contains
-        def describe_snapshots(snapshot_id = [], options = {})
-          options['Owner'] ||= 'self'
-          options.merge!(AWS.indexed_param('SnapshotId', snapshot_id))
+        def describe_snapshots(filters = {}, options = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'snapshot-id' => [*filters]}
+          end
+          unless options.empty?
+            Formatador.display_line("[yellow][WARN] describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead[/] [light_black](#{caller.first})[/]")
+          end
+
+          for key in ['ExecutableBy', 'ImageId', 'Owner', 'RestorableBy']
+            if filters.has_key?(key)
+              options[key] = filters.delete(key)
+            end
+          end
+          options['RestorableBy'] ||= 'self'
+          params = AWS.indexed_filters(filters).merge!(options)
           request({
             'Action'    => 'DescribeSnapshots',
             :idempotent => true,
             :parser     => Fog::Parsers::AWS::Compute::DescribeSnapshots.new
-          }.merge!(options))
+          }.merge!(params))
         end
 
       end
 
       class Mock
 
-        def describe_snapshots(snapshot_id = [])
+        def describe_snapshots(filters = {}, options = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'snapshot-id' => [*filters]}
+          end
+          unless options.empty?
+            Formatador.display_line("[yellow][WARN] describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead[/] [light_black](#{caller.first})[/]")
+          end
+
+          if filters.keys.any? {|key| key =~ /^tag/}
+            Formatador.display_line("[yellow][WARN] describe_snapshots tag filters are not yet mocked[/] [light_black](#{caller.first})[/]")
+            Fog::Mock.not_implemented
+          end
+
           response = Excon::Response.new
-          snapshot_id = [*snapshot_id]
-          if snapshot_id != []
-            snapshot_set = @data[:snapshots].reject {|key,value| !snapshot_id.include?(key)}.values
-          else
-            snapshot_set = @data[:snapshots].values
+
+          snapshot_set = @data[:snapshots].values
+
+          if filters.delete('owner-alias')
+            Formatador.display_line("[yellow][WARN] describe_snapshots with owner-alias is not mocked[/] [light_black](#{caller.first})[/]")
           end
 
-          if snapshot_id.length == 0 || snapshot_id.length == snapshot_set.length
-            snapshot_set.each do |snapshot|
-              case snapshot['status']
-              when 'in progress', 'pending'
-                if Time.now - snapshot['startTime'] > Fog::Mock.delay * 2
-                  snapshot['progress']  = '100%'
-                  snapshot['status']    = 'completed'
-                elsif Time.now - snapshot['startTime'] > Fog::Mock.delay
-                  snapshot['progress']  = '50%'
-                  snapshot['status']    = 'in progress'
-                else
-                  snapshot['progress']  = '0%'
-                  snapshot['status']    = 'in progress'
-                end
+          aliases = {
+            'description' => 'description',
+            'owner-id'    => 'ownerId',
+            'progress'    => 'progress',
+            'snapshot-id' => 'snapshotId',
+            'start-time'  => 'startTime',
+            'status'      => 'status',
+            'volume-id'   => 'volumeId',
+            'volume-size' => 'volumeSize'
+          }
+          for filter_key, filter_value in filters
+            aliased_key = aliases[filter_key]
+            snapshot_set = snapshot_set.reject{|snapshot| ![*filter_value].include?(snapshot[aliased_key])}
+          end
+
+          snapshot_set.each do |snapshot|
+            case snapshot['status']
+            when 'in progress', 'pending'
+              if Time.now - snapshot['startTime'] > Fog::Mock.delay * 2
+                snapshot['progress']  = '100%'
+                snapshot['status']    = 'completed'
+              elsif Time.now - snapshot['startTime'] > Fog::Mock.delay
+                snapshot['progress']  = '50%'
+                snapshot['status']    = 'in progress'
+              else
+                snapshot['progress']  = '0%'
+                snapshot['status']    = 'in progress'
               end
             end
-
-            response.status = 200
-            response.body = {
-              'requestId' => Fog::AWS::Mock.request_id,
-              'snapshotSet' => snapshot_set
-            }
-            response
-          else
-            raise Fog::AWS::Compute::NotFound.new("The snapshot #{snapshot_id.inspect} does not exist.")
           end
+
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'snapshotSet' => snapshot_set
+          }
+          response
         end
 
       end

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

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class Compute
+      class Real
+
+        require 'fog/aws/parsers/compute/describe_tags'
+
+        # Describe all or specified tags
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'tagSet'<~Array>:
+        #       * 'resourceId'<~String> - id of resource tag belongs to
+        #       * 'resourceType'<~String> - type of resource tag belongs to
+        #       * 'key'<~String> - Tag's key
+        #       * 'value'<~String> - Tag's value
+        def describe_tags(filters = {})
+          params = AWS.indexed_filters(filters)
+          request({
+            'Action'    => 'DescribeTags',
+            :idempotent => true,
+            :parser     => Fog::Parsers::AWS::Compute::DescribeTags.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+
+        def describe_tags(filters = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Fog
         # Describe all or specified volumes.
         #
         # ==== Parameters
-        # * volume_id<~Array> - List of volumes to describe, defaults to all
+        # * filters<~Hash> - List of filters to limit results with
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -26,8 +26,12 @@ module Fog
         #         * 'instanceId'<~String> - Reference to attached instance
         #         * 'status'<~String> - Attachment state
         #         * 'volumeId'<~String> - Reference to volume
-        def describe_volumes(volume_id = [])
-          params = AWS.indexed_param('VolumeId', volume_id)
+        def describe_volumes(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'volume-id' => [*filters]}
+          end
+          params = AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeVolumes',
             :idempotent => true,
@@ -39,45 +43,72 @@ module Fog
 
       class Mock
 
-        def describe_volumes(volume_id = [])
+        def describe_volumes(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'volume-id' => [*filters]}
+          end
+
+          if filters.keys.any? {|key| key =~ /^tag/}
+            Formatador.display_line("[yellow][WARN] describe_volumes tag filters are not yet mocked[/] [light_black](#{caller.first})[/]")
+            Fog::Mock.not_implemented
+          end
+
           response = Excon::Response.new
-          volume_id = [*volume_id]
-          if volume_id != []
-            volume_set = @data[:volumes].reject {|key,value| !volume_id.include?(key)}.values
-          else
-            volume_set = @data[:volumes].values
+
+          volume_set = @data[:volumes].values
+
+          aliases = {
+            'availability-zone' => 'availabilityZone',
+            'create-time' => 'createTime',
+            'size' => 'size',
+            'snapshot-id' => 'snapshotId',
+            'status' => 'status',
+            'volume-id' => 'volumeId'
+          }
+          attachment_aliases = {
+            'attach-time' => 'attachTime',
+            'delete-on-termination' => 'deleteOnTermination',
+            'device'      => 'device',
+            'instance-id' => 'instanceId',
+            'status'      => 'status'
+          }
+          for filter_key, filter_value in filters
+            if attachment_key = filter_key.split('attachment.')[1]
+              aliased_key = permission_aliases[filter_key]
+              volume_set = volume_set.reject{|volume| !volume['attachmentSet'].detect {|attachment| [*filter_value].include?(attachment[aliased_key])}}
+            else
+              aliased_key = aliases[filter_key]
+              volume_set = volume_set.reject{|volume| ![*filter_value].include?(volume[aliased_key])}
+            end
           end
 
-          if volume_id.length == 0 || volume_id.length == volume_set.length
-            volume_set.each do |volume|
-              case volume['status']
-              when 'attaching'
-                if Time.now - volume['attachmentSet'].first['attachTime'] > Fog::Mock.delay
-                  volume['attachmentSet'].first['status'] = 'in-use'
-                  volume['status'] = 'in-use'
-                end
-              when 'creating'
-                if Time.now - volume['createTime'] > Fog::Mock.delay
-                  volume['status'] = 'available'
-                end
-              when 'deleting'
-                if Time.now - @data[:deleted_at][volume['volumeId']] > Fog::Mock.delay
-                  @data[:deleted_at].delete(volume['volumeId'])
-                  @data[:volumes].delete(volume['volumeId'])
-                end
+          volume_set.each do |volume|
+            case volume['status']
+            when 'attaching'
+              if Time.now - volume['attachmentSet'].first['attachTime'] > Fog::Mock.delay
+                volume['attachmentSet'].first['status'] = 'in-use'
+                volume['status'] = 'in-use'
+              end
+            when 'creating'
+              if Time.now - volume['createTime'] > Fog::Mock.delay
+                volume['status'] = 'available'
+              end
+            when 'deleting'
+              if Time.now - @data[:deleted_at][volume['volumeId']] > Fog::Mock.delay
+                @data[:deleted_at].delete(volume['volumeId'])
+                @data[:volumes].delete(volume['volumeId'])
               end
             end
-
-            volume_set = volume_set.reject {|volume| !@data[:volumes][volume['volumeId']]}
-            response.status = 200
-            response.body = {
-              'requestId' => Fog::AWS::Mock.request_id,
-              'volumeSet' => volume_set
-            }
-            response
-          else
-            raise Fog::AWS::Compute::NotFound.new("The volume #{volume_id.inspect} does not exist.")
           end
+          volume_set = volume_set.reject {|volume| !@data[:volumes][volume['volumeId']]}
+
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'volumeSet' => volume_set
+          }
+          response
         end
 
       end

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

@@ -34,7 +34,7 @@ module Fog
         #     default is 'm1.small'
         #   * 'KernelId'<~String> - Id of kernel with which to launch
         #   * 'KeyName'<~String> - Name of a keypair to add to booting instances
-        #   * 'Monitoring.Enabled'<~Boolean> - Enables monitoring, defaults to 
+        #   * 'Monitoring.Enabled'<~Boolean> - Enables monitoring, defaults to
         #     disabled
         #   * 'RamdiskId'<~String> - Id of ramdisk with which to launch
         #   * 'UserData'<~String> -  Additional data to provide to booting instances
@@ -87,17 +87,21 @@ module Fog
               end
             end
           end
-          if security_groups = [*options.delete('SecurityGroup')]
-            options.merge!(AWS.indexed_param('SecurityGroup', security_groups))
+          if security_groups = options.delete('SecurityGroup')
+            options.merge!(AWS.indexed_param('SecurityGroup', [*security_groups]))
           end
           if options['UserData']
             options['UserData'] = Base64.encode64(options['UserData'])
           end
+
+          idempotent = !(options['ClientToken'].nil? || options['ClientToken'].empty?)
+
           request({
             'Action'    => 'RunInstances',
             'ImageId'   => image_id,
             'MinCount'  => min_count,
             'MaxCount'  => max_count,
+            :idempotent => idempotent,
             :parser     => Fog::Parsers::AWS::Compute::RunInstances.new
           }.merge!(options))
         end
@@ -119,6 +123,7 @@ module Fog
             instance = {
               'amiLaunchIndex'      => i,
               'blockDeviceMapping'  => [],
+              'clientToken'         => options['clientToken'],
               'dnsName'             => nil,
               'imageId'             => image_id,
               'instanceId'          => instance_id,
@@ -142,6 +147,8 @@ module Fog
               'ownerId'             => @owner_id,
               'privateIpAddress'    => nil,
               'reservationId'       => reservation_id,
+              'stateReason'         => {},
+              'tagSet'              => {}
             })
           end
           response.body = {

data/lib/fog/aws/simpledb.rb

@@ -63,9 +63,10 @@ module Fog
           @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @host       = options[:host]      || 'sdb.amazonaws.com'
           @nil_string = options[:nil_string]|| 'nil'
+          @path       = options[:path]      || '/'
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
         end
 
         private
@@ -137,6 +138,7 @@ module Fog
               :aws_access_key_id  => @aws_access_key_id,
               :hmac               => @hmac,
               :host               => @host,
+              :path               => @path,
               :version            => '2009-04-15'
             }
           )

data/lib/fog/aws/storage.rb

@@ -75,8 +75,8 @@ module Fog
 
         def self.data
           @data ||= Hash.new do |hash, region|
-            hash[region] = Hash.new do |hash, key|
-              hash[key] = {
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
                 :buckets => {}
               }
             end
@@ -138,8 +138,15 @@ module Fog
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
           @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)
-          options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
+          if @endpoint = options[:endpoint]
+            endpoint = URI.parse(@endpoint)
+            @host = endpoint.host
+            @path = endpoint.path
+            @port = endpoint.port
+            @scheme = endpoint.scheme
+          else
+            options[:region] ||= 'us-east-1'
+            @host = options[:host] || case options[:region]
             when 'eu-west-1'
               's3-eu-west-1.amazonaws.com'
             when 'us-east-1'
@@ -151,9 +158,11 @@ module Fog
             else
               raise ArgumentError, "Unknown region: #{options[:region].inspect}"
             end
-          @port   = options[:port]      || 443
-          @scheme = options[:scheme]    || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent] || true)
+            @path   = options[:path]      || '/'
+            @port   = options[:port]      || 443
+            @scheme = options[:scheme]    || 'https'
+          end
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
         end
 
         def reload
@@ -213,7 +222,7 @@ DATA
             subdomain = nil
           end
 
-          canonical_resource  = "/"
+          canonical_resource  = @path.dup
           unless subdomain.nil? || subdomain == @host
             canonical_resource << "#{CGI.escape(subdomain).downcase}/"
           end

data/lib/fog/bluebox/models/compute/flavor.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Bluebox

data/lib/fog/bluebox/models/compute/flavors.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/bluebox/models/compute/flavor'
 
 module Fog

data/lib/fog/bluebox/models/compute/image.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Bluebox