fog 1.20.0 → 1.21.0

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

@@ -8,7 +8,7 @@ module Fog
         # deregister an image
         #
         # ==== Parameters
-        # * image_id<~String> - Id of image to deregister 
+        # * image_id<~String> - Id of image to deregister
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -31,7 +31,7 @@ module Fog
 
         def deregister_image(image_id)
           response = Excon::Response.new
-          if image_id 
+          if image_id
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,

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

@@ -58,7 +58,7 @@ module Fog
 
             {"messageSet" => [], "regionName" => "us-west-2", "zoneName" => "us-west-2a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-west-2", "zoneName" => "us-west-2b", "zoneState" => "available"},
-            
+
             {"messageSet" => [], "regionName" => "sa-east-1", "zoneName" => "sa-east-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "sa-east-1", "zoneName" => "sa-east-1b", "zoneState" => "available"},
 

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

@@ -38,7 +38,7 @@ module Fog
           }.merge!(params))
         end
       end
-      
+
       class Mock
         def describe_dhcp_options(filters = {})
           Excon::Response.new.tap do |response|

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

@@ -92,37 +92,37 @@ module Fog
           instance_set = apply_tag_filters(instance_set, filters, 'instanceId')
 
           aliases = {
-            'architecture'      => 'architecture',
-            'availability-zone' => 'availabilityZone',
-            'client-token'      => 'clientToken',
-            'dns-name'         => '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',
+            'architecture'             => 'architecture',
+            'availability-zone'        => 'availabilityZone',
+            'client-token'             => 'clientToken',
+            'dns-name'                 => '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'
+            'subnet-id'                => 'subnetId',
+            'virtualization-type'      => 'virtualizationType',
+            'vpc-id'                   => 'vpcId'
           }
           block_device_mapping_aliases = {
             'attach-time'           => 'attachTime',
@@ -151,6 +151,10 @@ module Fog
               instance_set = instance_set.reject{|instance| ![*filter_value].include?(instance['stateReason'][aliased_key])}
             elsif filter_key == "group-name"
               instance_set = instance_set.reject {|instance| !instance['groupSet'].include?(filter_value)}
+            elsif filter_key == "group-id"
+              group_ids = [*filter_value]
+              security_group_names = self.data[:security_groups].values.select { |sg| group_ids.include?(sg['groupId']) }.map { |sg| sg['groupName'] }
+              instance_set = instance_set.reject {|instance| (security_group_names & instance['groupSet']).empty?}
             else
               aliased_key = aliases[filter_key]
               instance_set = instance_set.reject {|instance| ![*filter_value].include?(instance[aliased_key])}
@@ -205,6 +209,19 @@ module Fog
 
             if self.data[:instances][instance['instanceId']]
 
+              instance['networkInterfaces'] = self.data[:network_interfaces].select{|ni,ni_conf|
+                  ni_conf['attachment']['instanceId'] == instance['instanceId']
+                }.map{|ni,ni_conf|
+                  {
+                    'ownerId' => ni_conf['ownerId'],
+                    'subnetId' => ni_conf['subnetId'],
+                    'vpcId' => ni_conf['vpcId'],
+                    'networkInterfaceId' => ni_conf['networkInterfaceId'],
+                    'groupSet' => ni_conf['groupSet'],
+                    'attachmentId' => ni_conf['attachment']['attachmentId']
+                  }
+                }
+
               reservation_set[instance['reservationId']] ||= {
                 'groupSet'      => instance['groupSet'],
                 'groupIds'      => instance['groupIds'],

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

@@ -15,7 +15,7 @@ module Fog
         # * body<~Hash>:
         # * 'requestId'<~String> - Id of request
         # * 'InternetGatewaySet'<~Array>:
-        #   * 'internetGatewayId'<~String> - The ID of the Internet gateway. 
+        #   * 'internetGatewayId'<~String> - The ID of the Internet gateway.
         #   * '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

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

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

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

@@ -22,9 +22,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
@@ -62,7 +62,7 @@ module Fog
           }.merge!(params))
         end
       end
-      
+
 
       class Mock
 

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

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class AWS
       class Real
-        
+
         require 'fog/aws/parsers/compute/describe_reserved_instances_offerings'
 
         # Describe all or specified reserved instances offerings
@@ -16,7 +16,7 @@ module Fog
         #     * 'OfferingType'<~String> - type of offering, in ['Heavy Utilization', 'Medium Utilization', 'Light Utilization']
         #     * 'ProductDescription'<~String> - description of offering, in ['Linux/UNIX', 'Linux/UNIX (Amazon VPC)', 'Windows', 'Windows (Amazon VPC)']
         #     * 'MaxDuration'<~Integer> - maximum duration (in seconds) of offering
-        #     * 'MinDuration'<~Integer> - minimum duration (in seconds) of offering 
+        #     * 'MinDuration'<~Integer> - minimum duration (in seconds) of offering
         #
         # ==== Returns
         # * response<~Excon::Response>:

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

@@ -69,14 +69,15 @@ module Fog
             'protocol'  => 'ipProtocol',
             'to-port'   => 'toPort'
           }
+          security_group_groups = lambda { |security_group| (security_group['ipPermissions'] || []).map { |permission| permission["groups"] }.flatten.compact.uniq }
           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'])}}
+                security_group_info = security_group_info.reject{|security_group| !security_group_groups.call(security_group).detect {|group| [*filter_value].include?(group['groupName'])}}
               elsif permission_key == 'group-id'
-                security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions']['groups'].detect {|group| [*filter_value].include?(group['groupId'])}}
+                security_group_info = security_group_info.reject{|security_group| !security_group_groups.call(security_group).detect {|group| [*filter_value].include?(group['groupId'])}}
               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'])}}
+                security_group_info = security_group_info.reject{|security_group| !security_group_groups.call(security_group).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])}}

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

@@ -19,7 +19,7 @@ module Fog
         # * 'state'<~String> - The current state of the Subnet. ['pending', 'available']
         # * 'vpcId'<~String> - The ID of the VPC the subnet is in
         # * 'cidrBlock'<~String> - The CIDR block the Subnet covers.
-        # * 'availableIpAddressCount'<~Integer> - The number of unused IP addresses in the subnet (the IP addresses for any 
+        # * 'availableIpAddressCount'<~Integer> - The number of unused IP addresses in the subnet (the IP addresses for any
         #   stopped instances are considered unavailable)
         # * 'availabilityZone'<~String> - The Availability Zone the subnet is in.
         # * 'tagSet'<~Array>: Tags assigned to the resource.

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

@@ -30,14 +30,14 @@ module Fog
           }.merge!(params))
         end
       end
-      
+
       class Mock
 
         def describe_tags(filters = {})
           response = Excon::Response.new
 
           tag_set = deep_clone(self.data[:tags])
-          
+
           aliases = {
             'key'               => 'key',
             'resource-id'       => 'resourceId',
@@ -58,7 +58,7 @@ module Fog
               filter_resources(tag_set, 'resourceType', filter_value)
             end
           end
-          
+
           tagged_resources = []
           tag_set.each do |key, values|
             values.each do |value, resources|
@@ -78,9 +78,9 @@ module Fog
           }
           response
         end
-        
+
         private
-          
+
           def filter_resources(tag_set, filter, value)
             value_hash_list = tag_set.values
             value_hash_list.each do |value_hash|
@@ -89,7 +89,7 @@ module Fog
               end
             end
           end
-          
+
           def deep_clone(obj)
             case obj
             when Hash
@@ -101,7 +101,7 @@ module Fog
             end
           end
       end
-      
+
     end
   end
 end

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

@@ -26,7 +26,7 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def detach_network_interface(attachment_id, force = false)
           response = Excon::Response.new

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

@@ -9,7 +9,7 @@ module Fog
         #
         # ==== Parameters
         # * AssociationId<~String> - The association ID representing the current association between the route table and subnet.
-        # 
+        #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
@@ -31,7 +31,7 @@ module Fog
 
         def disassociate_route_table(association_id)
           assoc_array = nil
-          routetable = self.data[:route_tables].find { |routetable| 
+          routetable = self.data[:route_tables].find { |routetable|
             assoc_array = routetable["associationSet"].find { |association|
               association['routeTableAssociationId'].eql? association_id
             }

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

@@ -20,7 +20,7 @@ module Fog
         #   'GroupId'<~Array> - One or more groups to add instance to (VPC only)
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyInstanceAttribute.html]
-        #        
+        #
         def modify_instance_attribute(instance_id, attributes)
           params = {}
           params.merge!(Fog::AWS.indexed_param('GroupId', attributes.delete('GroupId') || []))

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

@@ -42,13 +42,13 @@ module Fog
           }.merge!(params))
         end
       end
-      
+
       class Mock
         def modify_network_interface_attribute(network_interface_id, attribute, value)
           response = Excon::Response.new
           if self.data[:network_interfaces][network_interface_id]
             nic = self.data[:network_interfaces][network_interface_id]
-            
+
             case attribute
             when 'description'
               nic['description'] = value.clone

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

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class AWS
       class Real
-        
+
         require 'fog/aws/parsers/compute/basic'
 
         # Modify snapshot attributes

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

@@ -12,8 +12,8 @@ module Fog
         # * options<~Hash>:
         #   * enableDnsSupport<~Boolean> - Indicates whether DNS resolution is supported for the VPC. If this attribute is true, the Amazon DNS
         #     server resolves DNS hostnames for your instances to their corresponding IP addresses; otherwise, it does not.
-        #   * enableDnsHostnames<~Boolean> - Indicates whether the instances launched in the VPC get DNS hostnames. If this attribute is true, 
-        #     instances in the VPC get DNS hostnames; otherwise, they do not. You can only set enableDnsHostnames to true if you also set the 
+        #   * enableDnsHostnames<~Boolean> - Indicates whether the instances launched in the VPC get DNS hostnames. If this attribute is true,
+        #     instances in the VPC get DNS hostnames; otherwise, they do not. You can only set enableDnsHostnames to true if you also set the
         #     EnableDnsSupport attribute to true.
         #
         # ==== Returns

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

@@ -4,7 +4,7 @@ module Fog
       class Real
         require 'fog/aws/parsers/compute/replace_network_acl_association'
 
-        # Replace the network ACL for a subnet with a 
+        # Replace the network ACL for a subnet with a
         #
         # ==== Parameters
         # * association_id<~String> - The ID of the current association between the original network ACL and the subnet

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

@@ -4,7 +4,7 @@ module Fog
       class Real
 
         require 'fog/aws/parsers/compute/basic'
-        
+
         # Resets a network interface attribute value
         #
         # ==== Parameters
@@ -30,7 +30,7 @@ module Fog
           )
         end
       end
-      
+
       class Mock
         def reset_network_interface_attribute(network_interface_id, attribute)
           response = Excon::Response.new

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

@@ -30,6 +30,18 @@ module Fog
         #     * 'Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
         #     * 'Ebs.VolumeType'<~String> - Type of EBS volue. Valid options in ['standard', 'io1'] default is 'standard'.
         #     * 'Ebs.Iops'<~String> - The number of I/O operations per second (IOPS) that the volume supports. Required when VolumeType is 'io1'
+        #   * 'NetworkInterfaces'<~Array>: array of hashes
+        #     * 'NetworkInterfaceId'<~String> - An existing interface to attach to a single instance
+        #     * 'DeviceIndex'<~String> - The device index. Applies both to attaching an existing network interface and creating a network interface
+        #     * 'SubnetId'<~String> - The subnet ID. Applies only when creating a network interface
+        #     * 'Description'<~String> - A description. Applies only when creating a network interface
+        #     * 'PrivateIpAddress'<~String> - The primary private IP address. Applies only when creating a network interface
+        #     * 'SecurityGroupId'<~String> - The ID of the security group. Applies only when creating a network interface.
+        #     * 'DeleteOnTermination'<~String> - Indicates whether to delete the network interface on instance termination.
+        #     * 'PrivateIpAddresses.PrivateIpAddress'<~String> - The private IP address. This parameter can be used multiple times to specify explicit private IP addresses for a network interface, but only one private IP address can be designated as primary.
+        #     * 'PrivateIpAddresses.Primary'<~Bool> - Indicates whether the private IP address is the primary private IP address.
+        #     * 'SecondaryPrivateIpAddressCount'<~Bool> - The number of private IP addresses to assign to the network interface.
+        #     * 'AssociatePublicIpAddress'<~String> - Indicates whether to assign a public IP address to an instance in a VPC. The public IP address is assigned to a specific network interface
         #   * 'ClientToken'<~String> - unique case-sensitive token for ensuring idempotency
         #   * 'DisableApiTermination'<~Boolean> - specifies whether or not to allow termination of the instance from the api
         #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances (not supported for VPC)
@@ -108,6 +120,13 @@ module Fog
           if options['UserData']
             options['UserData'] = Base64.encode64(options['UserData'])
           end
+          if network_interfaces = options.delete('NetworkInterfaces')
+            network_interfaces.each_with_index do |mapping, index|
+              for key, value in mapping
+                options.merge!({ format("NetworkInterface.%d.#{key}", index) => value })
+              end
+            end
+          end
 
           idempotent = !(options['ClientToken'].nil? || options['ClientToken'].empty?)
 
@@ -159,11 +178,36 @@ module Fog
               }
             end
 
+            network_interfaces = (options['NetworkInterfaces'] || []).inject([]) do |mapping, device|
+              device_index          = device.fetch("DeviceIndex", 0)
+              subnet_id             = device.fetch("SubnetId", options[:subnet_id] ||  Fog::AWS::Mock.subnet_id)
+              private_ip_address    = device.fetch("PrivateIpAddress", options[:private_ip_address] || Fog::AWS::Mock.private_ip_address)
+              delete_on_termination = device.fetch("DeleteOnTermination", true)
+              description           = device.fetch("Description", "mock_network_interface")
+              security_group_id     = device.fetch("SecurityGroupId", self.data[:security_groups]['default']['groupId'])
+              interface_options     = {
+                  "PrivateIpAddress"   => private_ip_address,
+                  "GroupSet"           => device.fetch("GroupSet", [security_group_id]),
+                  "Description"        => description
+              }
+
+              interface_id = device.fetch("NetworkInterfaceId", create_network_interface(subnet_id, interface_options))
+
+              mapping << {
+                "networkInterfaceId"  => interface_id,
+                "subnetId"            => subnet_id,
+                "status"              => "attached",
+                "attachTime"          => Time.now,
+                "deleteOnTermination" => delete_on_termination,
+              }
+            end
+
             instance = {
               'amiLaunchIndex'      => i,
               'associatePublicIP'   => options['associatePublicIP'] || false,
               'architecture'        => 'i386',
               'blockDeviceMapping'  => block_device_mapping,
+              'networkInterfaces'   => network_interfaces,
               'clientToken'         => options['clientToken'],
               'dnsName'             => nil,
               'ebsOptimized'        => options['EbsOptimized'] || false,