fog 1.3.1 → 1.4.0

data/lib/fog/aws/models/compute/internet_gateways.rb

@@ -0,0 +1,91 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/internet_gateway'
+
+module Fog
+  module Compute
+    class AWS
+
+      class InternetGateways < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::InternetGateway
+
+        # Creates a new internet gateway
+        #
+        # AWS.internet_gateways.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new InternetGateway
+        #
+        #>> AWS.internet_gateways.new
+        #=>   <Fog::Compute::AWS::InternetGateway
+        #id=nil,
+        #attachment_set=nil,
+        #tag_set=nil
+        #>
+        #
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all InternetGateways that have been created
+        #
+        # AWS.internet_gateways.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all InternetGateways
+        #
+        #>> AWS.internet_gateways.all
+        #<Fog::Compute::AWS::InternetGateways
+        #filters={}
+        #[
+        #<Fog::Compute::AWS::InternetGateway
+        #id="igw-some-id",
+        #attachment_set={"vpcId"=>"vpc-some-id", "state"=>"available"},
+        #tag_set={}
+        #>
+        #]
+        #>
+        #
+
+        def all(filters = filters)
+          unless filters.is_a?(Hash)
+            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('internet-gateway-id' => []) instead [light_black](#{caller.first})[/]")
+            filters = {'internet-gateway-id' => [*filters]}
+          end
+          self.filters = filters
+          data = connection.describe_internet_gateways(filters).body
+          load(data['internetGatewaySet'])
+        end
+
+        # Used to retrieve an InternetGateway
+        #
+        # You can run the following command to get the details:
+        # AWS.internet_gateways.get("igw-12345678")
+        #
+        # ==== Returns
+        #
+        #>> AWS.internet_gateways.get("igw-12345678")
+        #=>   <Fog::Compute::AWS::InternetGateway
+        #id="igw-12345678",
+        #attachment_set={"vpcId"=>"vpc-12345678", "state"=>"available"},
+        #tag_set={}
+        #>
+        #
+
+        def get(internet_gateway_id)
+          if internet_gateway_id
+            self.class.new(:connection => connection).all('internet-gateway-id' => internet_gateway_id).first
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/compute/network_interface.rb

@@ -0,0 +1,70 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class NetworkInterface < Fog::Model
+
+        identity  :network_interface_id,        :aliases => 'networkInterfaceId'
+        attribute :state     
+        attribute :request_id,                  :aliases => 'requestId'
+        attribute :network_interface_id,        :aliases => 'networkInterfaceId'
+        attribute :subnet_id,                   :aliases => 'subnetId'
+        attribute :vpc_id,                      :aliases => 'vpcId'
+        attribute :availability_zone,           :aliases => 'availabilityZone'
+        attribute :description,                 :aliases => 'description'
+        attribute :owner_id,                    :aliases => 'ownerId'
+        attribute :requester_id,                :aliases => 'requesterId'
+        attribute :requester_managed,           :aliases => 'requesterManaged'
+        attribute :status,                      :aliases => 'status'
+        attribute :mac_address,                 :aliases => 'macAddress'
+        attribute :private_ip_address,          :aliases => 'privateIpAddress'
+        attribute :private_dns_name,            :aliases => 'privateDnsName'
+        attribute :source_dest_check,           :aliases => 'sourceDestCheck'
+        attribute :group_set,                   :aliases => 'groupSet'
+        attribute :attachment,                  :aliases => 'attachment'
+        attribute :association,                 :aliases => 'association'
+        attribute :tag_set,                     :aliases => 'tagSet'
+
+
+        # Removes an existing network interface
+        #
+        # network_interface.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+
+        def destroy
+          requires :network_interface_id
+
+          connection.delete_network_interface(network_interface_id)
+          true
+        end
+
+        # Create a network_interface
+        #
+        #  >> g = AWS.network_interfaces.new(:subnet_id => "subnet-someId", options)
+        #  >> g.save
+        #
+        # options is an optional hash which may contain 'PrivateIpAddress', 'Description', 'groupSet'
+        #
+        # == Returns:
+        #
+        # requestId and a networkInterface object
+        #
+
+        def save
+          requires :subnet_id
+          data = connection.create_network_interface(subnet_id).body['networkInterface']
+          new_attributes = data.reject {|key,value| key == 'requestId'}
+          merge_attributes(new_attributes)
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/network_interfaces.rb

@@ -0,0 +1,136 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/network_interface'
+
+module Fog
+  module Compute
+    class AWS
+
+      class NetworkInterfaces < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::NetworkInterface
+
+        # Creates a new network interface
+        #
+        # AWS.network_interfaces.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new network interface
+        #
+        #>> AWS.network_interfaces.new
+        #  <Fog::AWS::Compute::NetworkInterface
+        #    network_interface_id=nil
+        #    state=nil
+        #    request_id=nil
+        #    network_interface_id=nil
+        #    subnet_id=nil
+        #    vpc_id=nil
+        #    availability_zone=nil
+        #    description=nil
+        #    owner_id=nil
+        #    requester_id=nil
+        #    requester_managed=nil
+        #    status=nil
+        #    mac_address=nil
+        #    private_ip_address=nil
+        #    private_dns_name=nil
+        #    source_dest_check=nil
+        #    group_set=nil
+        #    attachment=nil
+        #    association=nil
+        #    tag_set=nil
+        #  >
+        #
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all network interfaces that have been created
+        #
+        # AWS.network_interfaces.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all network interfaces
+        #
+        #>> AWS.network_interfaves.all
+        #  <Fog::AWS::Compute::NetworkInterfaces
+        #    filters={}
+        #    [
+        #      <Fog::Compute::AWS::NetworkInterface
+        #        network_interface_id="eni-da5dc7ca",
+        #        state=nil,
+        #        request_id=nil,
+        #        subnet_id="a9db1bcd-d215-a56f-b0ab-2398d7f37217",
+        #        vpc_id="mock-vpc-id",
+        #        availability_zone="mock-zone",
+        #        description=nil,
+        #        owner_id="",
+        #        requester_id=nil,
+        #        requester_managed="false",
+        #        status="available",
+        #        mac_address="00:11:22:33:44:55",
+        #        private_ip_address="10.0.0.2",
+        #        private_dns_name=nil,
+        #        source_dest_check=true,
+        #        group_set={},
+        #        attachment={},
+        #        association={},
+        #        tag_set={}
+        #      >
+        #    ]
+        #  >
+        #
+
+        def all(filters = filters)
+          self.filters = filters
+          data = connection.describe_network_interfaces(filters).body
+          load(data['networkInterfaceSet'])
+        end
+
+        # Used to retrieve a network interface
+        # network interface id is required to get any information
+        #
+        # You can run the following command to get the details:
+        # AWS.network_interfaces.get("eni-11223344")
+        #
+        # ==== Returns
+        #
+        #>> AWS.NetworkInterface.get("eni-11223344")
+        #  <Fog::AWS::Compute::NetworkInterface
+        #    network_interface_id="eni-da5dc7ca",
+        #    state=nil,
+        #    request_id=nil,
+        #    subnet_id="a9db1bcd-d215-a56f-b0ab-2398d7f37217",
+        #    vpc_id="mock-vpc-id",
+        #    availability_zone="mock-zone",
+        #    description=nil,
+        #    owner_id="",
+        #    requester_id=nil,
+        #    requester_managed="false",
+        #    status="available",
+        #    mac_address="00:11:22:33:44:55",
+        #    private_ip_address="10.0.0.2",
+        #    private_dns_name=nil,
+        #    source_dest_check=true,
+        #    group_set={},
+        #    attachment={},
+        #    association={},
+        #    tag_set={}
+        #  >
+        #
+
+        def get(nic_id)
+          if nic_id
+            self.class.new(:connection => connection).all('network-interface-id' => nic_id).first
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/compute/security_group.rb

@@ -40,12 +40,15 @@ module Fog
         #
 
         def authorize_group_and_owner(group, owner = nil)
-          requires :name
+          Fog::Logger.deprecation("authorize_group_and_ownder is deprecated, use authorize_port_range with :group option instead")
+
+          requires_one :name, :group_id
 
           connection.authorize_security_group_ingress(
             name,
-            'SourceSecurityGroupName'     => group,
-            'SourceSecurityGroupOwnerId'  => owner
+            'GroupId'                    => group_id,
+            'SourceSecurityGroupName'    => group,
+            'SourceSecurityGroupOwnerId' => owner
           )
         end
 
@@ -61,6 +64,7 @@ module Fog
         # options::
         #   A hash that can contain any of the following keys:
         #    :cidr_ip (defaults to "0.0.0.0/0")
+        #    :group - ("account:group_name" or "account:group_id"), cannot be used with :cidr_ip
         #    :ip_protocol (defaults to "tcp")
         #
         # == Returns:
@@ -78,14 +82,28 @@ module Fog
         #
 
         def authorize_port_range(range, options = {})
-          requires :name
+          requires_one :name, :group_id
+
+          ip_permission = {
+            'FromPort'   => range.min,
+            'ToPort'     => range.max,
+            'IpProtocol' => options[:ip_protocol] || 'tcp'
+          }
+
+          if options[:group].nil?
+            ip_permission['IpRanges'] = [
+              { 'CidrIp' => options[:cidr_ip] || '0.0.0.0/0' }
+            ]
+          else
+            ip_permission['Groups'] = [
+              group_info(options[:group])
+            ]
+          end
 
           connection.authorize_security_group_ingress(
             name,
-            'CidrIp'      => options[:cidr_ip] || '0.0.0.0/0',
-            'FromPort'    => range.min,
-            'ToPort'      => range.max,
-            'IpProtocol'  => options[:ip_protocol] || 'tcp'
+            'GroupId'       => group_id,
+            'IpPermissions' => [ ip_permission ]
           )
         end
 
@@ -99,7 +117,7 @@ module Fog
         #
 
         def destroy
-          requires :name
+          requires_one :name, :group_id
 
           if group_id.nil?
             connection.delete_security_group(name)
@@ -136,12 +154,15 @@ module Fog
         #
 
         def revoke_group_and_owner(group, owner = nil)
-          requires :name
+          Fog::Logger.deprecation("revoke_group_and_owner is deprecated, use revoke_port_range with :group option instead")
+
+          requires_one :name, :group_id
 
           connection.revoke_security_group_ingress(
             name,
-            'SourceSecurityGroupName'     => group,
-            'SourceSecurityGroupOwnerId'  => owner
+            'GroupId'                    => group_id,
+            'SourceSecurityGroupName'    => group,
+            'SourceSecurityGroupOwnerId' => owner
           )
         end
 
@@ -157,6 +178,7 @@ module Fog
         # options::
         #   A hash that can contain any of the following keys:
         #    :cidr_ip (defaults to "0.0.0.0/0")
+        #    :group - ("account:group_name" or "account:group_id"), cannot be used with :cidr_ip
         #    :ip_protocol (defaults to "tcp")
         #
         # == Returns:
@@ -174,14 +196,28 @@ module Fog
         #
 
         def revoke_port_range(range, options = {})
-          requires :name
+          requires_one :name, :group_id
+
+          ip_permission = {
+            'FromPort'   => range.min,
+            'ToPort'     => range.max,
+            'IpProtocol' => options[:ip_protocol] || 'tcp'
+          }
+
+          if options[:group].nil?
+            ip_permission['IpRanges'] = [
+              { 'CidrIp' => options[:cidr_ip] || '0.0.0.0/0' }
+            ]
+          else
+            ip_permission['Groups'] = [
+              group_info(options[:group])
+            ]
+          end
 
           connection.revoke_security_group_ingress(
             name,
-            'CidrIp'      => options[:cidr_ip] || '0.0.0.0/0',
-            'FromPort'    => range.min,
-            'ToPort'      => range.max,
-            'IpProtocol'  => options[:ip_protocol] || 'tcp'
+            'GroupId'       => group_id,
+            'IpPermissions' => [ ip_permission ]
           )
         end
 
@@ -204,6 +240,28 @@ module Fog
           true
         end
 
+        private
+
+        def group_info(group_str)
+          account, group = group_str.split(":")
+
+          if account.empty? || group.nil? || group.empty?
+            raise ArgumentError, "group must be specified in form of \"<account id>:<group name or id>\", #{group_str} given"
+          end
+
+          info = { 'UserId' => account }
+
+          if group.start_with?("sg-")
+            # we're dealing with a security group id
+            info['GroupId'] = group
+          else
+            # this has to be a security group name
+            info['GroupName'] = group
+          end
+
+          info
+        end
+
       end
 
     end