aws-sdk 1.5.3 → 1.5.4

data/lib/aws/api_config/EC2-2012-06-01.yml

@@ -34,7 +34,6 @@
   :inputs:
     InstanceId:
     - :string
-    - :required
     PublicIp:
     - :string
     AllocationId:

data/lib/aws/core.rb

@@ -61,7 +61,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'

data/lib/aws/ec2/client.rb

@@ -103,7 +103,7 @@ module AWS
       #
       # === Options:
       #
-      # * +:instance_id+ - *required* - (String) The instance to associate with
+      # * +:instance_id+ - (String) The instance to associate with
       #   the IP address.
       # * +:public_ip+ - (String) IP address that you are assigning to the
       #   instance.

data/lib/aws/ec2/elastic_ip.rb

@@ -21,13 +21,14 @@ module AWS
     #   The ID representing the allocation of the address for use with Amazon 
     #   VPC.
     #
-    # @attr_reader [String] Indicates whether this elastic ip address is for 
-    #   EC2 instances ('standard') or VPC instances ('vpc').
+    # @attr_reader [String] domain Indicates whether this elastic ip address 
+    #   is for EC2 instances ('standard') or VPC instances ('vpc').
     #
-    # @attr_reader [String,nil] The ID of the association between this elastic
-    #   ip address and an EC2 VPC instance (VPC only).
+    # @attr_reader [String,nil] association_id The ID of the association 
+    #   between this elastic ip address and an EC2 VPC instance (VPC only).
     #
-    # @attr_reader [String,nil] The ID of the network interface (VPC only).
+    # @attr_reader [String,nil] network_interface_id The ID of the network 
+    #   interface (VPC only).
     #
     # @attr_reader [String,nil] network_interface_owner_id 
     #   The ID of the AWS account that owns the network interface (VPC only).
@@ -67,10 +68,10 @@ module AWS
         domain == 'vpc'
       end
 
-      # @return [Boolean] Returns true if this IP address is attached to
-      #   an EC2 instance.
+      # @return [Boolean] Returns true if this IP address is associated
+      #   with an EC2 instance or a network interface.
       def associated?
-        !!instance_id
+        !!(instance_id || association_id)
       end
 
       alias_method :attached?, :associated?
@@ -83,6 +84,15 @@ module AWS
         end
       end
 
+      # @return [NetworkInterface,nil] Returns the network interface this
+      #   elastic ip is associated with.  Returns +nil+ if this is not
+      #   associated with an elastic ip address.
+      def network_interface
+        if nid = network_interface_id
+          NetworkInterface.new(nid, :config => config)
+        end
+      end
+
       # Releases the elastic IP address.
       #
       # (For non-VPC elastic ips) Releasing an IP address automatically 
@@ -99,6 +109,47 @@ module AWS
       end
       alias_method :release, :delete
 
+      # Associates this elastic IP address with an instance or a network
+      # interface.  You may provide +:instance+ or +:network_interface+
+      # but not both options.
+      #
+      #   # associate with an instance
+      #   eip.associate :instance => 'i-12345678'
+      #
+      #   # associate with a network interface
+      #   eip.associate :network_interface => 'ni-12345678'
+      #
+      # @param [Hash] options
+      #
+      # @option options [String,Instance] :instance The id of an instance
+      #   or an {Instance} object.  
+      #
+      # @option options [String,NetworkInterface] :network_interface The id
+      #   of a network interface or a {NetworkInterface} object.
+      #
+      # @return [String] Returns the resulting association id.
+      #
+      def associate options
+
+        client_opts = {}
+
+        [:instance,:network_interface].each do |opt|
+          if value = options[opt]
+            client_opts[:"#{opt}_id"] = value.is_a?(Resource) ? value.id : value
+          end
+        end
+
+        if vpc?
+          client_opts[:allocation_id] = allocation_id
+        else
+          client_opts[:public_ip] = public_ip
+        end
+
+        resp = client.associate_address(client_opts)
+        resp.data[:association_id]
+
+      end
+
       # Disassociates this elastic IP address from an EC2 instance.
       # Raises an exception if this elastic IP is not currently
       # associated with an instance.

data/lib/aws/ec2/instance_collection.rb

@@ -24,7 +24,7 @@ module AWS
     #
     # To run an instance:
     #
-    #   ec2.instances.create(:image_id => "ami-8c1fece5")
+    #   ec2.instances.create(:image_id => "ami-1b814f72")
     #
     # To get an instance by ID:
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -490,7 +490,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -352312075848361752
+      hash: -1968762056350445253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: