fog 1.0.0 → 1.1.0

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

@@ -33,13 +33,13 @@ module Fog
       end
 
       class Mock
-        
+
         #
         # Usage
         #
         # AWS[:compute].create_snapshot("vol-f7c23423", "latest snapshot")
         #
-        
+
         def create_snapshot(volume_id, description = nil)
           response = Excon::Response.new
           if volume = self.data[:volumes][volume_id]
@@ -59,7 +59,6 @@ module Fog
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
             }.merge!(data)
-            self.data[:snapshots][snapshot_id]['tagSet'] = {}
           else
             response.status = 400
             raise(Excon::Errors.status_error({:expects => 200}, response))

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

@@ -53,7 +53,7 @@ module Fog
             when /^vol\-[a-z0-9]{8}$/i
               'volume'
             end
-            if type && self.data[:"#{type}s"][resource_id]
+            if type && ((type == 'image' && visible_images[resource_id]) || self.data[:"#{type}s"][resource_id])
               { 'resourceId' => resource_id, 'resourceType' => type }
             else
               raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist"))
@@ -64,8 +64,10 @@ module Fog
             self.data[:tags][key] ||= {}
             self.data[:tags][key][value] ||= []
             self.data[:tags][key][value] |= tagged
-            
-            tagged.each {|resource| self.data[:"#{resource['resourceType']}s"][resource['resourceId']]['tagSet'][key] = value}
+
+            tagged.each do |resource|
+              self.data[:tag_sets][resource['resourceId']][key] = value
+            end
           end
 
           response = Excon::Response.new

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

@@ -60,7 +60,6 @@ module Fog
               'size'              => size,
               'snapshotId'        => snapshot_id,
               'status'            => 'creating',
-              'tagSet'            => {},
               'volumeId'          => volume_id
             }
             self.data[:volumes][volume_id] = data

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

@@ -30,8 +30,33 @@ module Fog
 
       class Mock
         def delete_security_group(name)
+          if name == 'default'
+            raise Fog::Compute::AWS::Error.new("InvalidGroup.Reserved => The security group 'default' is reserved")
+          end
+
           response = Excon::Response.new
           if self.data[:security_groups][name]
+
+            used_by_groups = []
+            self.region_data.each do |access_key, key_data|
+              key_data[:security_groups].each do |group_name, group|
+                next if group == self.data[:security_groups][name]
+
+                group['ipPermissions'].each do |group_ip_permission|
+                  group_ip_permission['groups'].each do |group_group_permission|
+                    if group_group_permission['groupName'] == name &&
+                        group_group_permission['userId'] == self.data[:owner_id]
+                      used_by_groups << "#{key_data[:owner_id]}:#{group_name}"
+                    end
+                  end
+                end
+              end
+            end
+
+            unless used_by_groups.empty?
+              raise Fog::Compute::AWS::Error.new("InvalidGroup.InUse => Group #{self.data[:owner_id]}:#{name} is used by groups: #{used_by_groups.uniq.join(" ")}")
+            end
+
             self.data[:security_groups].delete(name)
             response.status = 200
             response.body = {

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

@@ -28,7 +28,7 @@ module Fog
             index += 1 # should start at 1 instead of 0
             params.merge!("Tag.#{index}.Key" => key)
             unless tags[key].nil?
-              params.merge("Tag.#{index}.Value" => tags[key])
+              params.merge!("Tag.#{index}.Value" => tags[key])
             end
           end
 
@@ -53,7 +53,7 @@ module Fog
             when /^vol\-[a-z0-9]{8}$/i
               'volume'
             end
-            if type && self.data[:"#{type}s"][resource_id]
+            if type && ((type == 'image' && visible_images[resource_id]) || self.data[:"#{type}s"][resource_id])
               { 'resourceId' => resource_id, 'resourceType' => type }
             else
               raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist"))
@@ -65,9 +65,8 @@ module Fog
           end
 
           tagged.each do |resource|
-            object = self.data[:"#{resource['resourceType']}s"][resource['resourceId']]
             tags.each do |key, value|
-              tagset = object['tagSet']
+              tagset = self.data[:tag_sets][resource['resourceId']]
               tagset.delete(key) if tagset.has_key?(key) && (value.nil? || tagset[key] == value)
             end
           end

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

@@ -21,7 +21,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAddresses.html]
         def describe_addresses(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -38,7 +38,7 @@ module Fog
 
         def describe_addresses(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
 

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

@@ -22,7 +22,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAvailabilityZones.html]
         def describe_availability_zones(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -39,7 +39,7 @@ module Fog
 
         def describe_availability_zones(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
 
@@ -55,6 +55,9 @@ module Fog
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1c", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "us-west-2", "zoneName" => "us-west-2a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-west-2", "zoneName" => "us-west-2b", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1c", "zoneState" => "available"},

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

@@ -60,7 +60,7 @@ module Fog
 
         def describe_images(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_images with #{filters.class} param is deprecated, use describe_images('image-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_images with #{filters.class} param is deprecated, use describe_images('image-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'image-id' => [*filters]}
           end
 
@@ -98,15 +98,12 @@ module Fog
             'virtualization-type' => 'virtualizationType'
           }
 
-          image_set = self.data[:images].values
+          image_set = visible_images.values
+          image_set = apply_tag_filters(image_set, filters, 'imageId')
 
           for filter_key, filter_value in filters
-            if tag_key = filter_key.split('tag:')[1]
-              image_set = image_set.reject{|image| ![*filter_value].include?(image['tagSet'][tag_key])}
-            else
-              aliased_key = aliases[filter_key]
-              image_set = image_set.reject{|image| ![*filter_value].include?(image[aliased_key])}
-            end
+            aliased_key = aliases[filter_key]
+            image_set = image_set.reject{|image| ![*filter_value].include?(image[aliased_key])}
           end
 
           image_set = image_set.map do |image|
@@ -116,7 +113,7 @@ module Fog
                 image['imageState'] = 'available'
               end
             end
-            image.reject { |key, value| ['registered'].include?(key) }
+            image.reject { |key, value| ['registered'].include?(key) }.merge('tagSet' => self.data[:tag_sets][image['imageId']])
           end
 
           response.status = 200

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

@@ -55,7 +55,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html]
         def describe_instances(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'instance-id' => [*filters]}
           end
           params = {}
@@ -81,14 +81,14 @@ module Fog
 
         def describe_instances(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'instance-id' => [*filters]}
           end
 
           response = Excon::Response.new
 
           instance_set = self.data[:instances].values
-          instance_set = apply_tag_filters(instance_set, filters)
+          instance_set = apply_tag_filters(instance_set, filters, 'instanceId')
 
           aliases = {
             'architecture'      => 'architecture',
@@ -154,16 +154,25 @@ module Fog
             end
           end
 
+          brand_new_instances = instance_set.find_all do |instance|
+            instance['instanceState']['name'] == 'pending' &&
+              Time.now - instance['launchTime'] < Fog::Mock.delay * 2
+          end
+
+          # Error if filtering for a brand new instance directly
+          if (filters['instance-id'] || filters['instanceId']) && !brand_new_instances.empty?
+            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{brand_new_instances.first['instanceId']}' does not exist")
+          end
+
+          # Otherwise don't include it in the list
+          instance_set = instance_set.reject {|instance| brand_new_instances.include?(instance) }
+
           response.status = 200
           reservation_set = {}
 
           instance_set.each do |instance|
             case instance['instanceState']['name']
             when 'pending'
-              if Time.now - instance['launchTime'] < Fog::Mock.delay * 2
-                raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance['instanceId']}' does not exist")
-              end
-
               if Time.now - instance['launchTime'] >= Fog::Mock.delay * 2
                 instance['ipAddress']         = Fog::AWS::Mock.ip_address
                 instance['originalIpAddress'] = instance['ipAddress']
@@ -196,7 +205,7 @@ module Fog
                 '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', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType', 'stateReason', 'tagSet'].include?(key)}
+              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType', 'stateReason'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
             end
           end
 

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

@@ -21,7 +21,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html]
         def describe_key_pairs(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("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 = Fog::AWS.indexed_filters(filters)
@@ -38,7 +38,7 @@ module Fog
 
         def describe_key_pairs(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("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
 

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

@@ -21,7 +21,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html]
         def describe_regions(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'region-name' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -38,7 +38,7 @@ module Fog
 
         def describe_regions(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'region-name' => [*filters]}
           end
 

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

@@ -29,7 +29,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html]
         def describe_reserved_instances(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_reserved_instances with #{filters.class} param is deprecated, use describe_reserved_instances('reserved-instances-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("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 = Fog::AWS.indexed_filters(filters)

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

@@ -31,7 +31,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html]
         def describe_security_groups(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("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 = Fog::AWS.indexed_filters(filters)
@@ -48,7 +48,7 @@ module Fog
 
         def describe_security_groups(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("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
 

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

@@ -27,11 +27,11 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSnapshots.html]
         def describe_snapshots(filters = {}, options = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("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?
-            Fog::Logger.warning("describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("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']
@@ -54,11 +54,11 @@ module Fog
 
         def describe_snapshots(filters = {}, options = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("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?
-            Fog::Logger.warning("describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead [light_black](#{caller.first})[/]")
           end
 
           response = Excon::Response.new
@@ -72,7 +72,7 @@ module Fog
             Fog::Logger.warning("describe_snapshots with RestorableBy other than 'self' (wanted #{restorable_by.inspect}) is not mocked [light_black](#{caller.first})[/]")
           end
 
-          snapshot_set = apply_tag_filters(snapshot_set, filters)
+          snapshot_set = apply_tag_filters(snapshot_set, filters, 'snapshotId')
 
           aliases = {
             'description' => 'description',
@@ -106,6 +106,8 @@ module Fog
             end
           end
 
+          snapshot_set = snapshot_set.map {|snapshot| snapshot.merge('tagSet' => self.data[:tag_sets][snapshot['snapshotId']]) }
+
           response.status = 200
           response.body = {
             'requestId' => Fog::AWS::Mock.request_id,

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

@@ -31,7 +31,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumes.html]
         def describe_volumes(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'volume-id' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -48,15 +48,15 @@ module Fog
 
         def describe_volumes(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'volume-id' => [*filters]}
           end
 
           response = Excon::Response.new
 
           volume_set = self.data[:volumes].values
-          volume_set = apply_tag_filters(volume_set, filters)
-          
+          volume_set = apply_tag_filters(volume_set, filters, 'volumeId')
+
           aliases = {
             'availability-zone' => 'availabilityZone',
             'create-time' => 'createTime',
@@ -102,6 +102,7 @@ module Fog
             end
           end
           volume_set = volume_set.reject {|volume| !self.data[:volumes][volume['volumeId']]}
+          volume_set = volume_set.map {|volume| volume.merge('tagSet' => self.data[:tag_sets][volume['volumeId']]) }
 
           response.status = 200
           response.body = {

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

@@ -37,6 +37,38 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def modify_image_attribute(image_id, attributes)
+          raise ArgumentError.new("image_id is required") unless image_id
+
+          unless self.data[:images][image_id]
+            raise Fog::Compute::AWS::NotFound.new("The AMI ID '#{image_id}' does not exist")
+          end
+
+          (attributes['Add.UserId'] || []).each do |user_id|
+            if image_launch_permissions = self.data[:image_launch_permissions][image_id]
+              image_launch_permissions[:users].push(user_id)
+            end
+          end
+
+          (attributes['Remove.UserId'] || []).each do |user_id|
+            if image_launch_permissions = self.data[:image_launch_permissions][image_id]
+              image_launch_permissions[:users].delete(user_id)
+            end
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'return'        => true,
+            'requestId'     => Fog::AWS::Mock.request_id
+          }
+          response
+        end
+
+      end
     end
   end
 end