fog 0.3.7 → 0.3.8

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

@@ -8,7 +8,7 @@ module Fog
         # Describe all or specified instances
         #
         # ==== Parameters
-        # * instance_id<~Array> - List of instance ids to describe, defaults to all
+        # * filters<~Hash> - List of filters to limit results with
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -50,8 +50,13 @@ module Fog
         #           * 'rootDeviceType'<~String> - root device type used by AMI in [ebs, instance-store]
         #           * 'ramdiskId'<~String> - Id of ramdisk used to launch instance
         #           * 'reason'<~String> - reason for most recent state transition, or blank
-        def describe_instances(instance_id = [])
-          params = AWS.indexed_param('InstanceId', instance_id)
+        def describe_instances(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'instance-id' => [*filters]}
+          end
+          params = AWS.indexed_filters(filters)
+
           request({
             'Action'    => 'DescribeInstances',
             :idempotent => true,
@@ -63,64 +68,131 @@ module Fog
 
       class Mock
 
-        def describe_instances(instance_id = [])
+        def describe_instances(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'instance-id' => [*filters]}
+          end
+
+          if filters.keys.any? {|key| key =~ /^tag/}
+            Formatador.display_line("[yellow][WARN] describe_instances tag filters are not yet mocked[/] [light_black](#{caller.first})[/]")
+            Fog::Mock.not_implemented
+          end
+
           response = Excon::Response.new
-          instance_id = [*instance_id]
-          if instance_id != []
-            instance_set = @data[:instances].reject {|key,value| !instance_id.include?(key)}.values
-          else
-            instance_set = @data[:instances].values
+
+          instance_set = @data[:instances].values
+
+          aliases = {
+            'architecture'      => 'architecture',
+            'availability-zone' => 'availabilityZone',
+            'client-token'      => 'clientToken',
+            'dns-token'         => 'dnsName',
+            'group-id'          => 'groupId',
+            'image-id'          => 'imageId',
+            'instance-id'       => 'instanceId',
+            'instance-lifecycle'  => 'instanceLifecycle',
+            'instance-type'     => 'instanceType',
+            'ip-address'        => 'ipAddress',
+            'kernel-id'         => 'kernelId',
+            'key-name'          => 'key-name',
+            'launch-index'      => 'launchIndex',
+            'launch-time'       => 'launchTime',
+            'monitoring-state'  => 'monitoringState',
+            'owner-id'          => 'ownerId',
+            'placement-group-name' => 'placementGroupName',
+            'platform'          => 'platform',
+            'private-dns-name'  => 'privateDnsName',
+            'private-ip-address'  => 'privateIpAddress',
+            'product-code'      => 'productCode',
+            'ramdisk-id'        => 'ramdiskId',
+            'reason'            => 'reason',
+            'requester-id'      => 'requesterId',
+            'reservation-id'    => 'reservationId',
+            'root-device-name'  => 'rootDeviceName',
+            'root-device-type'  => 'rootDeviceType',
+            'spot-instance-request-id' => 'spotInstanceRequestId',
+            'subnet-id'         => 'subnetId',
+            'virtualization-type' => 'virtualizationType',
+            'vpc-id'            => 'vpcId'
+          }
+          block_device_mapping_aliases = {
+            'attach-time'           => 'attachTime',
+            'delete-on-termination' => 'deleteOnTermination',
+            'device-name'           => 'deviceName',
+            'status'                => 'status',
+            'volume-id'             => 'volumeId',
+          }
+          instance_state_aliases = {
+            'code' => 'code',
+            'name' => 'name'
+          }
+          state_reason_aliases = {
+            'code'    => 'code',
+            'message' => 'message'
+          }
+          for filter_key, filter_value in filters
+            if block_device_mapping_key = filter_key.split('block-device-mapping.')[1]
+              aliased_key = block_device_mapping_aliases[block_device_mapping_key]
+              instance_set = instance_set.reject{|instance| !instance['blockDeviceMapping'].detect {|block_device_mapping| [*filter_value].include?(block_device_mapping[aliased_key])}}
+            elsif instance_state_key = filter_key.split('instance-state-')[1]
+              aliased_key = instance_state_aliases[instance_state_key]
+              instance_set = instance_set.reject{|instance| ![*filter_value].include?(instance['instanceState'][aliased_key])}
+            elsif state_reason_key = filter_key.split('state-reason-')[1]
+              aliased_key = state_reason_aliases[state_reason_key]
+              instance_set = instance_set.reject{|instance| ![*filter_value].include?(instance['stateReason'][aliased_key])}
+            else
+              aliased_key = aliases[filter_key]
+              instance_set = instance_set.reject {|instance| ![*filter_value].include?(instance[aliased_key])}
+            end
           end
 
-          if instance_id.length == 0 || instance_id.length == instance_set.length
-            response.status = 200
-            reservation_set = {}
-
-            instance_set.each do |instance|
-              case instance['instanceState']['name']
-              when 'pending'
-                if Time.now - instance['launchTime'] > Fog::Mock.delay
-                  instance['ipAddress']         = Fog::AWS::Mock.ip_address
-                  instance['dnsName']           = Fog::AWS::Mock.dns_name_for(instance['ipAddress'])
-                  instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
-                  instance['privateDnsName']    = Fog::AWS::Mock.private_dns_name_for(instance['privateIpAddress'])
-                  instance['instanceState']     = { 'code' => 16, 'name' => 'running' }
-                end
-              when 'rebooting'
-                instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
-              when 'shutting-down'
-                if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay * 2
-                  @data[:deleted_at].delete(instance['instanceId'])
-                  @data[:instances].delete(instance['instanceId'])
-                elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
-                  instance['instanceState'] = { 'code' => 48, 'name' => 'terminating' }
-                end
-              when 'terminating'
-                if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
-                  @data[:deleted_at].delete(instance['instanceId'])
-                  @data[:instances].delete(instance['instanceId'])
-                end
-              end
+          response.status = 200
+          reservation_set = {}
 
-              if @data[:instances][instance['instanceId']]
-                reservation_set[instance['reservationId']] ||= {
-                  'groupSet'      => instance['groupSet'],
-                  'instancesSet'  => [],
-                  'ownerId'       => instance['ownerId'],
-                  'reservationId' => instance['reservationId']
-                }
-                reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
+          instance_set.each do |instance|
+            case instance['instanceState']['name']
+            when 'pending'
+              if Time.now - instance['launchTime'] > Fog::Mock.delay
+                instance['ipAddress']         = Fog::AWS::Mock.ip_address
+                instance['dnsName']           = Fog::AWS::Mock.dns_name_for(instance['ipAddress'])
+                instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
+                instance['privateDnsName']    = Fog::AWS::Mock.private_dns_name_for(instance['privateIpAddress'])
+                instance['instanceState']     = { 'code' => 16, 'name' => 'running' }
+              end
+            when 'rebooting'
+              instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
+            when 'shutting-down'
+              if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay * 2
+                @data[:deleted_at].delete(instance['instanceId'])
+                @data[:instances].delete(instance['instanceId'])
+              elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
+                instance['instanceState'] = { 'code' => 48, 'name' => 'terminating' }
+              end
+            when 'terminating'
+              if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
+                @data[:deleted_at].delete(instance['instanceId'])
+                @data[:instances].delete(instance['instanceId'])
               end
             end
 
-            response.body = {
-              'requestId'       => Fog::AWS::Mock.request_id,
-              'reservationSet' => reservation_set.values
-            }
-            response
-          else
-            raise Fog::AWS::Compute::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
+            if @data[:instances][instance['instanceId']]
+
+              reservation_set[instance['reservationId']] ||= {
+                'groupSet'      => instance['groupSet'],
+                'instancesSet'  => [],
+                'ownerId'       => instance['ownerId'],
+                'reservationId' => instance['reservationId']
+              }
+              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType', 'stateReason', 'tagSet'].include?(key)}
+            end
           end
+
+          response.body = {
+            'requestId'       => Fog::AWS::Mock.request_id,
+            'reservationSet' => reservation_set.values
+          }
+          response
         end
 
       end

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

@@ -8,7 +8,7 @@ module Fog
         # Describe all or specified key pairs
         #
         # ==== Parameters
-        # * key_name<~Array>:: List of key names to describe, defaults to all
+        # * filters<~Hash> - List of filters to limit results with
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -17,8 +17,12 @@ module Fog
         #     * 'keySet'<~Array>:
         #       * 'keyName'<~String> - Name of key
         #       * 'keyFingerprint'<~String> - Fingerprint of key
-        def describe_key_pairs(key_name = [])
-          params = AWS.indexed_param('KeyName', key_name)
+        def describe_key_pairs(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'key-name' => [*filters]}
+          end
+          params = AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeKeyPairs',
             :idempotent => true,
@@ -30,26 +34,30 @@ module Fog
 
       class Mock
 
-        def describe_key_pairs(key_name = [])
-          response = Excon::Response.new
-          key_name = [*key_name]
-          if key_name != []
-            key_set = @data[:key_pairs].reject {|key, value| !key_name.include?(key)}.values
-          else
-            key_set = @data[:key_pairs].values
+        def describe_key_pairs(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'key-name' => [*filters]}
           end
-          if key_name.length == 0 || key_name.length == key_set.length
-            response.status = 200
-            response.body = {
-              'requestId' => Fog::AWS::Mock.request_id,
-              'keySet'    => key_set.map do |key|
-                key.reject {|key,value| !['keyFingerprint', 'keyName'].include?(key)}
-              end
-            }
-            response
-          else
-            raise Fog::AWS::Compute::NotFound.new("The key pair #{key_name.inspect} does not exist")
+
+          response = Excon::Response.new
+
+          key_set = @data[:key_pairs].values
+
+          aliases = {'fingerprint' => 'keyFingerprint', 'key-name' => 'keyName'}
+          for filter_key, filter_value in filters
+            aliased_key = aliases[filter_key]
+            key_set = key_set.reject{|key_pair| ![*filter_value].include?(key_pair[aliased_key])}
           end
+
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'keySet'    => key_set.map do |key_pair|
+              key_pair.reject {|key,value| !['keyFingerprint', 'keyName'].include?(key)}
+            end
+          }
+          response
         end
 
       end

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

@@ -8,7 +8,7 @@ module Fog
         # Describe all or specified regions
         #
         # ==== Params
-        # * region_name<~String> - List of regions to describe, defaults to all
+        # * filters<~Hash> - List of filters to limit results with
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -17,8 +17,12 @@ module Fog
         #     * 'regionInfo'<~Array>:
         #       * 'regionName'<~String> - Name of region
         #       * 'regionEndpoint'<~String> - Service endpoint for region
-        def describe_regions(region_name = [])
-          params = AWS.indexed_param('RegionName', region_name)
+        def describe_regions(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'region-name' => [*filters]}
+          end
+          params = AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeRegions',
             :idempotent => true,
@@ -30,29 +34,30 @@ module Fog
 
       class Mock
 
-        def describe_regions(region_name = [])
-          response = Excon::Response.new
-          region_name = [*region_name]
-          regions = {
-            'eu-west-1' => {"regionName"=>"eu-west-1", "regionEndpoint"=>"eu-west-1.ec2.amazonaws.com"},
-            'us-east-1' => {"regionName"=>"us-east-1", "regionEndpoint"=>"us-east-1.ec2.amazonaws.com"}
-          }
-          if region_name != []
-            region_info = regions.reject {|key, value| !region_name.include?(key)}.values
-          else
-            region_info = regions.values
+        def describe_regions(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'region-name' => [*filters]}
           end
 
-          if region_name.length == 0 || region_name.length == region_info.length
-            response.status = 200
-            response.body = {
-              'requestId'   => Fog::AWS::Mock.request_id,
-              'regionInfo'  => region_info
-            }
-            response
-          else
-            raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Invalid region: #{region_name.inspect}")
+          response = Excon::Response.new
+          region_info = [
+            {"regionName"=>"eu-west-1", "regionEndpoint"=>"eu-west-1.ec2.amazonaws.com"},
+            {"regionName"=>"us-east-1", "regionEndpoint"=>"us-east-1.ec2.amazonaws.com"}
+          ]
+
+          aliases = {'region-name' => 'regionName', 'endpoint' => 'regionEndpoint'}
+          for filter_key, filter_value in filters
+            aliased_key = aliases[filter_key]
+            region_info = region_info.reject{|region| ![*filter_value].include?(region[aliased_key])}
           end
+
+          response.status = 200
+          response.body = {
+            'requestId'   => Fog::AWS::Mock.request_id,
+            'regionInfo'  => region_info
+          }
+          response
         end
 
       end

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

@@ -8,7 +8,7 @@ module Fog
         # Describe all or specified reserved instances
         #
         # ==== Parameters
-        # * reserved_instances_id<~Array> - List of reserved instance ids to describe, defaults to all
+        # * filters<~Hash> - List of filters to limit results with
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -25,8 +25,12 @@ module Fog
         #       * 'start'<~Time> - start time for reservation
         #       * 'state'<~String> - state of reserved instance purchase, in .[pending-payment, active, payment-failed, retired]
         #       * 'usagePrice"<~Float> - usage price of reserved instances, per hour
-        def describe_reserved_instances(reserved_instances_id = [])
-          params = AWS.indexed_param('ReservedInstancesId', reserved_instances_id)
+        def describe_reserved_instances(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_reserved_instances with #{filters.class} param is deprecated, use describe_reserved_instances('reserved-instances-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'reserved-instances-id' => [*filters]}
+          end
+          params = AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeReservedInstances',
             :idempotent => true,
@@ -38,7 +42,7 @@ module Fog
 
       class Mock
 
-        def describe_reserved_instances(reserved_instances_id = {})
+        def describe_reserved_instances(filters = {})
           Fog::Mock.not_implemented
         end
 

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

@@ -8,7 +8,7 @@ module Fog
         # Describe all or specified security groups
         #
         # ==== Parameters
-        # * group_name<~Array> - List of groups to describe, defaults to all
+        # * filters<~Hash> - List of filters to limit results with
         #
         # === Returns
         # * response<~Excon::Response>:
@@ -27,8 +27,12 @@ module Fog
         #           * 'cidrIp'<~String> - CIDR range
         #         * 'toPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #       * 'ownerId'<~String> - AWS Access Key Id of the owner of the security group
-        def describe_security_groups(group_name = [])
-          params = AWS.indexed_param('GroupName', group_name)
+        def describe_security_groups(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'group-name' => [*filters]}
+          end
+          params = AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeSecurityGroups',
             :idempotent => true,
@@ -40,24 +44,49 @@ module Fog
 
       class Mock
 
-        def describe_security_groups(group_name = [])
-          response = Excon::Response.new
-          group_name = [*group_name]
-          if group_name != []
-            security_group_info = @data[:security_groups].reject {|key, value| !group_name.include?(key)}.values
-          else
-            security_group_info = @data[:security_groups].values
+        def describe_security_groups(filters = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'group-name' => [*filters]}
           end
-          if group_name.length == 0 || group_name.length == security_group_info.length
-            response.status = 200
-            response.body = {
-              'requestId'         => Fog::AWS::Mock.request_id,
-              'securityGroupInfo' => security_group_info
-            }
-            response
-          else
-            raise Fog::AWS::Compute::NotFound.new("The security group #{group_name.inspect} does not exist")
+
+          response = Excon::Response.new
+
+          security_group_info = @data[:security_groups].values
+
+          aliases = {
+            'description' => 'groupDescription',
+            'group-name'  => 'groupName',
+            'owner-id'    => 'ownerId'
+          }
+          permission_aliases = {
+            'cidr'      => 'cidrIp',
+            'from-port' => 'fromPort',
+            'protocol'  => 'ipProtocol',
+            'to-port'   => 'toPort'
+          }
+          for filter_key, filter_value in filters
+            if permission_key = filter_key.split('ip-permission.')[1]
+              if permission_key == 'group-name'
+                security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions']['groups'].detect {|group| [*filter_value].include?(group['groupName'])}}
+              elsif permission_key == 'user-id'
+                security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions']['groups'].detect {|group| [*filter_value].include?(group['userId'])}}
+              else
+                aliased_key = permission_aliases[filter_key]
+                security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions'].detect {|permission| [*filter_value].include?(permission[aliased_key])}}
+              end
+            else
+              aliased_key = aliases[filter_key]
+              security_group_info = security_group_info.reject{|security_group| ![*filter_value].include?(security_group[aliased_key])}
+            end
           end
+
+          response.status = 200
+          response.body = {
+            'requestId'         => Fog::AWS::Mock.request_id,
+            'securityGroupInfo' => security_group_info
+          }
+          response
         end
 
       end