fog 1.20.0 → 1.21.0

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

@@ -4,10 +4,10 @@ module Fog
       class Real
 
         require 'fog/aws/parsers/compute/basic'
-        # 
+        #
         #
         # ==== Parameters
-        # * dhcp_options_id<~String> - The ID of the DHCP options you want to associate with the VPC, or "default" if you want the VPC 
+        # * dhcp_options_id<~String> - The ID of the DHCP options you want to associate with the VPC, or "default" if you want the VPC
         #   to use no DHCP options.
         # * vpc_id<~String> - The ID of the VPC
         #

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

@@ -56,7 +56,7 @@ module Fog
 
         def add_route_association(routeTableId, subnetId, main=nil)
           response = {
-              "routeTableAssociationId" => "rtbassoc-#{Fog::Mock.random_hex(8)}", 
+              "routeTableAssociationId" => "rtbassoc-#{Fog::Mock.random_hex(8)}",
               "routeTableId" => routeTableId,
               "subnetId" => nil,
               "main" => false
@@ -66,9 +66,9 @@ module Fog
           else
             response['subnetId'] = subnetId
           end
-          response   
+          response
         end
-        
+
       end
     end
   end

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

@@ -29,7 +29,7 @@ module Fog
           )
         end
       end
-      
+
 
       class Mock
 

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

@@ -184,13 +184,29 @@ module Fog
                   'ipProtocol' => permission['IpProtocol'],
                   'fromPort' => Integer(permission['FromPort']),
                   'toPort' => Integer(permission['ToPort']),
-                  'groups' => (permission['Groups'] || []).map {|g| {'groupName' => g['GroupName'], 'userId' => g['UserId'] || self.data[:owner_id], 'groupId' => self.data[:security_groups][g['GroupName']] && self.data[:security_groups][g['GroupName']]['groupId']} },
+                  'groups' => (permission['Groups'] || []).map do |authorized_group|
+                    security_group = if group_name = authorized_group['GroupName']
+                                       self.data[:security_groups][group_name] || {}
+                                     elsif group_id = authorized_group['GroupId']
+                                       self.data[:security_groups].values.find { |sg| sg['groupId'] == group_id }
+                                     end
+
+                    {'groupName' => authorized_group['GroupName'] || security_group["groupName"], 'userId' => authorized_group['UserId'] || self.data[:owner_id], 'groupId' => authorized_group["GroupId"] || security_group['groupId']}
+                  end,
                   'ipRanges' => (permission['IpRanges'] || []).map {|r| { 'cidrIp' => r['CidrIp'] } }
                 }
               else
                 normalized_permissions << {
                   'ipProtocol' => permission['IpProtocol'],
-                  'groups' => (permission['Groups'] || []).map {|g| {'groupName' => g['GroupName'], 'userId' => g['UserId'] || self.data[:owner_id], 'groupId' => self.data[:security_groups][g['GroupName']]['groupId']} },
+                  'groups' => (permission['Groups'] || []).map do |authorized_group|
+                    security_group = if group_name = authorized_group['GroupName']
+                                       self.data[:security_groups][group_name] || {}
+                                     elsif group_id = authorized_group['GroupId']
+                                       self.data[:security_groups].values.find { |sg| sg['groupId'] == group_id }
+                                     end
+
+                    {'groupName' => authorized_group['GroupName'] || security_group["groupName"], 'userId' => authorized_group['UserId'] || self.data[:owner_id], 'groupId' => authorized_group["GroupId"] || security_group['groupId']}
+                  end,
                   'ipRanges' => (permission['IpRanges'] || []).map {|r| { 'cidrIp' => r['CidrIp'] } }
                 }
               end

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

@@ -24,7 +24,7 @@ module Fog
           params = {}
           block_device_mappings = options[:block_device_mappings] ||  []
 
-          params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.DeviceName', block_device_mappings.map{|mapping| mapping['DeviceName']}) 
+          params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.DeviceName', block_device_mappings.map{|mapping| mapping['DeviceName']})
           params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.NoDevice', block_device_mappings.map{|mapping| mapping['NoDevice']})
           params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.VirtualName', block_device_mappings.map{|mapping| mapping['VirtualName']})
           params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.Ebs.SnapshotId', block_device_mappings.map{|mapping| mapping['Ebs.SnapshotId']})
@@ -45,16 +45,16 @@ module Fog
       end
 
       class Mock
-        
+
         # Usage
-        # 
+        #
         # AWS[:compute].create_image("i-ac65ee8c", "test", "something")
         #
-        
+
         def create_image(instance_id, name, description, no_reboot = false, options = {})
           params = {}
           block_device_mappings = options[:block_device_mappings] || []
-          params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.DeviceName', block_device_mappings.map{|mapping| mapping['DeviceName']}) 
+          params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.DeviceName', block_device_mappings.map{|mapping| mapping['DeviceName']})
           params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.NoDevice', block_device_mappings.map{|mapping| mapping['NoDevice']})
           params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.VirtualName', block_device_mappings.map{|mapping| mapping['VirtualName']})
           params.merge!Fog::AWS.indexed_param('BlockDeviceMapping.%d.Ebs.SnapshotId', block_device_mappings.map{|mapping| mapping['Ebs.SnapshotId']})

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

@@ -16,8 +16,8 @@ module Fog
         # * 'requestId'<~String> - Id of request
         # * 'internetGateway'<~Array>:
         # *   'attachmentSet'<~Array>: 	A list of VPCs attached to the Internet gateway
-        # *     'vpcId'<~String> - The ID of the VPC the Internet gateway is attached to. 
-        # *     'state'<~String> - The current state of the attachment. 
+        # *     'vpcId'<~String> - The ID of the VPC the Internet gateway is attached to.
+        # *     'state'<~String> - The current state of the attachment.
         # *   'tagSet'<~Array>: Tags assigned to the resource.
         # *     'key'<~String> - Tag's key
         # *     'value'<~String> - Tag's value

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

@@ -12,7 +12,7 @@ module Fog
         # * options<~Hash>:
         #   * PrivateIpAddress<~String> - The private IP address of the network interface
         #   * Description<~String>      - The description of the network interface
-        #   * groupSet<~Array>          - The security group IDs for use by the network interface
+        #   * GroupSet<~Array>          - The security group IDs for use by the network interface
         #
         # === Returns
         # * response<~Excon::Response>:
@@ -26,9 +26,9 @@ module Fog
         # *   'description'<~String>        - The description
         # *   'ownerId'<~String>            - The ID of the person who created the interface
         # *   'requesterId'<~String>        - The ID ot teh entity requesting this interface
-        # *   'requesterManaged'<~String>   - 
+        # *   'requesterManaged'<~String>   -
         # *   'status'<~String>             - "available" or "in-use"
-        # *   'macAddress'<~String>         - 
+        # *   'macAddress'<~String>         -
         # *   'privateIpAddress'<~String>   - IP address of the interface within the subnet
         # *   'privateDnsName'<~String>     - The private DNS name
         # *   'sourceDestCheck'<~Boolean>   - Flag indicating whether traffic to or from the instance is validated
@@ -60,7 +60,7 @@ module Fog
 
         end
       end
-      
+
       class Mock
         def create_network_interface(subnetId, options = {})
           response = Excon::Response.new
@@ -70,7 +70,7 @@ module Fog
             groups = {}
             if options['GroupSet']
               options['GroupSet'].each do |group_id|
-                name = self.data[:security_groups].select { |k,v| v['groupId'] == group_id } .first.first
+                name = self.data[:security_groups].select { |k,v| v['groupId'] == group_id }.first
                 if name.nil?
                   raise Fog::Compute::AWS::Error.new("Unknown security group '#{group_id}' specified")
                 end

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

@@ -33,7 +33,7 @@ module Fog
           elsif instance_id
             request_vars['InstanceId'] = instance_id
           elsif network_interface_id
-            request_vars['NetworkInterfaceId'] = network_interface_id         
+            request_vars['NetworkInterfaceId'] = network_interface_id
           end
           request(request_vars)
         end
@@ -54,14 +54,14 @@ module Fog
                 raise Fog::Compute::AWS::NotFound.new("The networkInterface ID '#{network_interface_id}' does not exist")
               elsif !route_table['routeSet'].find { |route| route['destinationCidrBlock'].eql? destination_cidr_block }.nil?
                 raise Fog::Compute::AWS::Error, "RouteAlreadyExists => The route identified by #{destination_cidr_block} already exists."
-              else   
-                response = Excon::Response.new           
+              else
+                response = Excon::Response.new
                 route_table['routeSet'].push({
                   "destinationCidrBlock" => destination_cidr_block,
                   "gatewayId" => internet_gateway_id,
-                  "instanceId"=>instance_id, 
-                  "instanceOwnerId"=>instance_owner_id, 
-                  "networkInterfaceId"=>network_interface_id, 
+                  "instanceId"=>instance_id,
+                  "instanceOwnerId"=>instance_owner_id,
+                  "networkInterfaceId"=>network_interface_id,
                   "state" => "pending",
                   "origin" => "CreateRoute"
                 })
@@ -82,7 +82,7 @@ module Fog
           elsif destination_cidr_block.empty?
             raise Fog::Compute::AWS::InvalidParameterValue.new("Value () for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.")
           end
-        end        
+        end
       end
     end
   end

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

@@ -32,7 +32,7 @@ module Fog
           })
         end
       end
-      
+
       class Mock
         def create_route_table(vpc_id)
           response = Excon::Response.new
@@ -45,9 +45,9 @@ module Fog
               'routeSet' => [{
                 "destinationCidrBlock" => vpc["cidrBlock"],
                 "gatewayId" => "local",
-                "instanceId"=>nil, 
-                "instanceOwnerId"=>nil, 
-                "networkInterfaceId"=>nil, 
+                "instanceId"=>nil,
+                "instanceOwnerId"=>nil,
+                "networkInterfaceId"=>nil,
                 "state" => "pending",
                 "origin" => "CreateRouteTable"
               }],
@@ -62,7 +62,7 @@ module Fog
             response
           else
             raise Fog::Compute::AWS::NotFound.new("The vpc ID '#{vpc_id}' does not exist")
-          end 
+          end
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Fog
         # ==== Parameters
         # * cidrBlock<~String> - The CIDR block you want the VPC to cover (e.g., 10.0.0.0/16).
         # * options<~Hash>:
-        #   * InstanceTenancy<~String> - The allowed tenancy of instances launched into the VPC. A value of default 
+        #   * InstanceTenancy<~String> - The allowed tenancy of instances launched into the VPC. A value of default
         #     means instances can be launched with any tenancy; a value of dedicated means instances must be launched with tenancy as dedicated.
         #     please not that the documentation is incorrect instanceTenancy will not work while InstanceTenancy will
         #
@@ -37,26 +37,26 @@ module Fog
 
         end
       end
-      
+
       class Mock
         def create_vpc(cidrBlock)
           Excon::Response.new.tap do |response|
-            if cidrBlock 
+            if cidrBlock
               response.status = 200
               vpc_id = Fog::AWS::Mock.vpc_id
-              self.data[:vpcs].push({
+              vpc = {
                 'vpcId'         => vpc_id,
                 'state'         => 'pending',
                 'cidrBlock'     => cidrBlock,
                 'dhcpOptionsId' => Fog::AWS::Mock.request_id,
                 'tagSet'        => {}
-            
-              })
+              }
+              self.data[:vpcs].push(vpc)
 
               #Creates a default route for the subnet
               default_route = self.route_tables.new(:vpc_id => vpc_id)
               default_route.save
-              
+
               # You are not able to push a main route in the normal AWS, so we are re-implementing some of the
               # associate_route_table here in order to accomplish this.
               route_table = self.data[:route_tables].find { |routetable| routetable["routeTableId"].eql? default_route.id }
@@ -74,7 +74,7 @@ module Fog
 
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,
-                'vpcSet'    => self.data[:vpcs]
+                'vpcSet'    => [vpc]
               }
             else
               response.status = 400

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

@@ -4,8 +4,8 @@ module Fog
       class Real
 
         require 'fog/aws/parsers/compute/basic'
-        #Deletes a set of DHCP options that you specify. Amazon VPC returns an error if the set of options you specify is currently 
-        #associated with a VPC. You can disassociate the set of options by associating either a new set of options or the default 
+        #Deletes a set of DHCP options that you specify. Amazon VPC returns an error if the set of options you specify is currently
+        #associated with a VPC. You can disassociate the set of options by associating either a new set of options or the default
         #options with the VPC.
         #
         # ==== Parameters
@@ -26,14 +26,14 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def delete_dhcp_options(dhcp_options_id)
           Excon::Response.new.tap do |response|
             if dhcp_options_id
               response.status = 200
               self.data[:dhcp_options].reject! { |v| v['dhcpOptionsId'] == dhcp_options_id }
-            
+
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,
                 'return' => true

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

@@ -24,14 +24,14 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def delete_internet_gateway(internet_gateway_id)
           Excon::Response.new.tap do |response|
             if internet_gateway_id
               response.status = 200
               self.data[:internet_gateways].delete(internet_gateway_id)
-            
+
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,
                 'return' => true

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

@@ -24,7 +24,7 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def delete_network_acl(network_acl_id)
           response = Excon::Response.new

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

@@ -28,7 +28,7 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def delete_network_acl_entry(network_acl_id, rule_number, egress)
           response = Excon::Response.new

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

@@ -24,7 +24,7 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def delete_network_interface(network_interface_id)
           response = Excon::Response.new

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

@@ -5,12 +5,12 @@ module Fog
 
         require 'fog/aws/parsers/compute/basic'
 
-        # Deletes the specified route from the specified route table. 
+        # Deletes the specified route from the specified route table.
         #
         # ==== Parameters
         # * RouteTableId<~String> - The ID of the route table.
         # * DestinationCidrBlock<~String> - The CIDR range for the route. The value you specify must match the CIDR for the route exactly.
-        # 
+        #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
@@ -22,7 +22,7 @@ module Fog
           request(
             'Action'                => 'DeleteRoute',
             'RouteTableId'          => route_table_id,
-            'DestinationCidrBlock'  => destination_cidr_block,              
+            'DestinationCidrBlock'  => destination_cidr_block,
             :parser                 => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
@@ -30,7 +30,7 @@ module Fog
       end
 
       class Mock
-        
+
         def delete_route(route_table_id, destination_cidr_block)
           route_table = self.data[:route_tables].find { |routetable| routetable["routeTableId"].eql? route_table_id }
           unless route_table.nil?
@@ -48,7 +48,7 @@ module Fog
               # Cannot delete the default route
               raise Fog::Compute::AWS::Error, "InvalidParameterValue => cannot remove local route #{destination_cidr_block} in route table #{route_table_id}"
             else
-              raise Fog::Compute::AWS::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}") 
+              raise Fog::Compute::AWS::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
             end
           else
             raise Fog::Compute::AWS::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")

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

@@ -71,10 +71,20 @@ module Fog
               end
             end
 
+            active_instances = self.data[:instances].values.select do |instance|
+              if instance['groupSet'].include?(name) && instance['instanceState'] != "terminated"
+                instance
+              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
 
+            if active_instances.any?
+              raise Fog::Compute::AWS::Error.new("InUse => There are active instances using security group '#{name}'")
+            end
+
             self.data[:security_groups].delete(name)
             response.status = 200
             response.body = {

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

@@ -4,7 +4,7 @@ module Fog
       class Real
 
         require 'fog/aws/parsers/compute/basic'
-        # Deletes a subnet from a VPC. You must terminate all running instances in the subnet before deleting it, otherwise Amazon 
+        # Deletes a subnet from a VPC. You must terminate all running instances in the subnet before deleting it, otherwise Amazon
         # VPC returns an error
         #
         # ==== Parameters
@@ -25,14 +25,14 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def delete_subnet(subnet_id)
           Excon::Response.new.tap do |response|
             if subnet_id
               self.data[:subnets].reject! { |v| v['subnetId'] == subnet_id }
               response.status = 200
-            
+
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,
                 'return' => true

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

@@ -28,7 +28,7 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def delete_vpc(vpc_id)
           Excon::Response.new.tap do |response|