aws-sdk 1.8.5 → 1.9.0

data/lib/aws/ec2/network_acl_collection.rb

@@ -32,7 +32,7 @@ module AWS
 
         client_opts = {}
         client_opts[:vpc_id] = vpc_id_option(options)
-        
+
         resp = client.create_network_acl(client_opts)
 
         NetworkACL.new_from(:create_network_acl, resp.network_acl,
@@ -51,7 +51,7 @@ module AWS
         response = filtered_request(:describe_network_acls, options, &block)
         response.network_acl_set.each do |a|
 
-          network_acl = NetworkACL.new_from(:describe_network_acls, a, 
+          network_acl = NetworkACL.new_from(:describe_network_acls, a,
             a.network_acl_id, :config => config)
 
           yield(network_acl)

data/lib/aws/ec2/network_interface.rb

@@ -30,6 +30,11 @@ module AWS
     #
     # @attr_reader [String] private_ip_address
     #
+    # @attr_reader [Array<Hash>] private_ip_addresses Returns an array
+    #   of private ip addresses with the following keys:
+    #   * `:private_ip_address` (String)
+    #   * `:primary` (boolean)
+    #
     # @attr_reader [String] private_dns_name
     #
     # @attr_reader [String] availability_zone_name
@@ -59,7 +64,7 @@ module AWS
       alias_method :id, :network_interface_id
 
       attribute :vpc_id, :static => true
-    
+
       attribute :subnet_id, :static => true
 
       mutable_attribute :description
@@ -70,12 +75,16 @@ module AWS
 
       attribute :private_ip_address, :static => true
 
+      attribute :private_ip_addresses,
+        :from => :private_ip_addresses_set,
+        :static => true
+
       attribute :private_dns_name, :static => true
 
       attribute :mac_address, :static => true
 
       attribute :availability_zone_name,
-        :from => :availability_zone, 
+        :from => :availability_zone,
         :static => true
 
       mutable_attribute :source_dest_check
@@ -86,7 +95,7 @@ module AWS
 
       alias_method :requester_managed?, :requester_managed
 
-      attribute :association do 
+      attribute :association do
         translates_output {|assoc| assoc.to_hash }
       end
 
@@ -172,7 +181,7 @@ module AWS
       #
       # @param [Hash] options
       #
-      # @option options [Integer] :device_index (1) The index of the device 
+      # @option options [Integer] :device_index (1) The index of the device
       #  for the network interface attachment on the instance.  Defaults to 1.
       #
       # @return [nil]

data/lib/aws/ec2/network_interface/attachment.rb

@@ -17,7 +17,7 @@ module AWS
   class EC2
     class NetworkInterface < Resource
       class Attachment
-        
+
         def initialize network_interface, details
           @network_interface = network_interface
           @attachment_id = details[:attachment_id]
@@ -47,7 +47,7 @@ module AWS
         # @return [String] Returns the instance owner id.
         attr_reader :instance_owner_id
 
-        # @return [Integer] The index of the device for the network 
+        # @return [Integer] The index of the device for the network
         #   interface attachment on the instance.
         attr_reader :device_index
 
@@ -64,7 +64,7 @@ module AWS
 
         # Allows you to toggle the delete on termination state.
         #
-        #   network_interface.attachment.delete_on_termination = false
+        #     network_interface.attachment.delete_on_termination = false
         #
         # @param [Boolean] state
         #

data/lib/aws/ec2/network_interface_collection.rb

@@ -32,7 +32,7 @@ module AWS
       #   network interface.
       #
       # @option options [Array<SecurityGroup>,Array<String>] :security_groups
-      #   A list of security groups (or security group id strings) that 
+      #   A list of security groups (or security group id strings) that
       #   should be used by this network interface.
       #
       # @return [NetworkInterface]
@@ -51,12 +51,12 @@ module AWS
 
         groups = groups_options(options)
         client_opts[:groups] = groups if groups
-        
+
         resp = client.create_network_interface(client_opts)
 
         NetworkInterface.new_from(:create_network_interface,
-          resp.network_interface, 
-          resp.network_interface.network_interface_id, 
+          resp.network_interface,
+          resp.network_interface.network_interface_id,
           :config => config)
 
       end
@@ -90,7 +90,7 @@ module AWS
         resp.network_interface_set.each do |n|
 
           network_interface = NetworkInterface.new_from(
-            :describe_network_interfaces, n, 
+            :describe_network_interfaces, n,
             n.network_interface_id, :config => config)
 
           yield(network_interface)

data/lib/aws/ec2/permission_collection.rb

@@ -75,7 +75,7 @@ module AWS
       #   otherwise the resource is made private.
       # @return [nil]
       def public= value
-        params = value ? 
+        params = value ?
           { :add => [{ :group => "all" }] } :
           { :remove => [{ :group => "all" }] }
         client.send(modify_call, modify_params(params))

data/lib/aws/ec2/region.rb

@@ -17,16 +17,16 @@ module AWS
     # Represents an EC2 region.  You can use this to find the
     # endpoint for a given region:
     #
-    #  ec2.regions["us-west-1"].endpoint
+    #     ec2.regions["us-west-1"].endpoint
     #
     # Region also responds to all of the methods of {EC2} except
     # {EC2#regions}; for example, to list instance IDs by region,
     # you can do:
     #
-    #  ec2.regions.inject({}) do |h,region|
-    #    h[region.name] = region.instances.map(&:id)
-    #    h
-    #  end
+    #     ec2.regions.inject({}) do |h,region|
+    #       h[region.name] = region.instances.map(&:id)
+    #       h
+    #     end
     #
     # @attr_reader [String] endpoint The endpoint to use for this region
     #   (e.g. "ec2.eu-west-1.amazonaws.com").
@@ -40,7 +40,7 @@ module AWS
         @config = @client.config
       end
 
-      # @return [String] The name of the region (e.g. "us-east-1").
+      # @return [String] The name of the region (e.g. "us-west-2").
       attr_reader :name
 
       # @return [String]

data/lib/aws/ec2/region_collection.rb

@@ -34,7 +34,7 @@ module AWS
       end
 
       # @return [Region] The region identified by the given name
-      #   (e.g. "us-east-1").
+      #   (e.g. "us-west-2").
       def [](name)
         super
       end

data/lib/aws/ec2/reserved_instances_collection.rb

@@ -14,7 +14,7 @@
 module AWS
   class EC2
     class ReservedInstancesCollection < Collection
-      
+
       include TaggedCollection
 
       def member_class
@@ -27,7 +27,7 @@ module AWS
         response.reserved_instances_set.each do |item|
 
           reserved_instance = ReservedInstances.new_from(
-            :describe_reserved_instances, item, 
+            :describe_reserved_instances, item,
             item.reserved_instances_id, :config => config)
 
           yield(reserved_instance)

data/lib/aws/ec2/reserved_instances_offering_collection.rb

@@ -14,7 +14,7 @@
 module AWS
   class EC2
     class ReservedInstancesOfferingCollection < Collection
-      
+
       include TaggedCollection
 
       def member_class
@@ -26,7 +26,7 @@ module AWS
         response.reserved_instances_offerings_set.each do |item|
 
           reserved_instance_offering = ReservedInstancesOffering.new_from(
-            :describe_reserved_instances_offerings, item, 
+            :describe_reserved_instances_offerings, item,
             item.reserved_instances_offering_id, :config => config)
 
           yield(reserved_instance_offering)

data/lib/aws/ec2/resource_tag_collection.rb

@@ -17,11 +17,11 @@ module AWS
     # Represents the EC2 tags associated with a single resource.
     #
     # @example Manipulating the tags of an EC2 instance
-    #  i = ec2.instances["i-123"]
-    #  i.tags.to_h                  # => { "foo" => "bar", ... }
-    #  i.tags.clear
-    #  i.tags.stage = "production"
-    #  i.tags.stage                 # => "production"
+    #   i = ec2.instances["i-123"]
+    #   i.tags.to_h                  # => { "foo" => "bar", ... }
+    #   i.tags.clear
+    #   i.tags.stage = "production"
+    #   i.tags.stage                 # => "production"
     class ResourceTagCollection
 
       include Core::Model

data/lib/aws/ec2/route_table.rb

@@ -49,7 +49,7 @@ module AWS
         resp.route_table_set.find{|t| t.route_table_id == route_table_id }
       end
 
-      # @return [Boolean] Returns true if this is the main (default) 
+      # @return [Boolean] Returns true if this is the main (default)
       #   route table.
       def main?
         @main = !!associations.find{|a| a.main? } if @main.nil?
@@ -61,7 +61,7 @@ module AWS
         VPC.new(vpc_id, :config => config)
       end
 
-      # @return [Array<Subnet>] Returns an array of subnets ({Subnet}) 
+      # @return [Array<Subnet>] Returns an array of subnets ({Subnet})
       #   that currently associated to this route table.
       def subnets
 
@@ -69,7 +69,7 @@ module AWS
 
         # The default route table has a single association where #subnet
         # returns nil (the main association).  If this is not the main
-        # route table we can safely return the subnets.  
+        # route table we can safely return the subnets.
         return subnets unless subnets.include?(nil)
 
         subnets.compact!
@@ -82,13 +82,13 @@ module AWS
           all_subnets = vpc.subnets.to_a
 
           # subnets assigned directly to a route table
-          associated_subnets = vpc.route_tables.  
+          associated_subnets = vpc.route_tables.
             map(&:associations).flatten.
             map(&:subnet).flatten.
             compact
 
           # subnets NOT assigned to a route table, these default as
-          # belonging to the default route table through the "main" 
+          # belonging to the default route table through the "main"
           # association
           unassociated_subnets = all_subnets.inject([]) do |list,subnet|
             unless associated_subnets.include?(subnet)
@@ -103,17 +103,17 @@ module AWS
 
       end
 
-      # @return [Array<RouteTable::Association>] Returns an array of 
+      # @return [Array<RouteTable::Association>] Returns an array of
       #   {RouteTable::Association} objects (association to subnets).
       def associations
-        association_set.collect do |details| 
-          Association.new(self, 
-            details[:route_table_association_id], 
+        association_set.collect do |details|
+          Association.new(self,
+            details[:route_table_association_id],
             details[:subnet_id])
         end
       end
 
-      # @return [Array<Route>] Returns an array of routes ({Route} objects) 
+      # @return [Array<Route>] Returns an array of routes ({Route} objects)
       #   belonging to this route table.
       def routes
         route_set.map do |route_details|
@@ -124,8 +124,8 @@ module AWS
       # Creates a new route in this route route.  The route must be attached
       # to a gateway, instance or network interface.
       #
-      # @param [String] destination_cidr_block The CIDR address block 
-      #   used for the destination match. For example: 0.0.0.0/0. 
+      # @param [String] destination_cidr_block The CIDR address block
+      #   used for the destination match. For example: 0.0.0.0/0.
       #   Routing decisions are based on the most specific match.
       #
       # @param [Hash] options
@@ -165,7 +165,7 @@ module AWS
         nil
       end
 
-      # Deletes this route table.  The route table must not be 
+      # Deletes this route table.  The route table must not be
       # associated with a subnet. You can't delete the main route table.
       # @return [nil]
       def delete
@@ -174,7 +174,7 @@ module AWS
       end
 
       protected
-      
+
       def route_options destination_cidr_block, options = {}
 
         client_opts = {}

data/lib/aws/ec2/route_table/association.rb

@@ -22,52 +22,52 @@ module AWS
       # * enumerating associations from a route table
       # * Asking a subnet for its route table association
       #
-      # == Enumerating Associations
+      # ## Enumerating Associations
       #
       # Given a route table:
       #
-      #   route_table.associations.each do |assoc|
-      #     if assoc.main? # main association does not have a subnet
-      #       puts "#{assoc.id} : main association"
-      #     else
-      #       puts "#{assoc.id} : #{assoc.subnet.id}"
+      #     route_table.associations.each do |assoc|
+      #       if assoc.main? # main association does not have a subnet
+      #         puts "#{assoc.id} : main association"
+      #       else
+      #         puts "#{assoc.id} : #{assoc.subnet.id}"
+      #       end
       #     end
-      #   end
       #
-      # == Getting a Subnet Route Table Association
+      # ## Getting a Subnet Route Table Association
       #
       # All subnets are associated with a route table.  If the association
       # was never explicitly created, then they are associated by default
       # with the main route table.
       #
-      #   subnet.route_table_association #=> AWS::EC2::RouteTable::Association
+      #     subnet.route_table_association #=> AWS::EC2::RouteTable::Association
       #
-      #   subnet.route_table_association.main? #=> true/false
+      #     subnet.route_table_association.main? #=> true/false
       #
-      # == Creating and Replacing a Route Table Association
+      # ## Creating and Replacing a Route Table Association
       #
       # To replace a route table association start at the subnet end:
       #
-      #   subnet.route_table = some_other_route_table
+      #     subnet.route_table = some_other_route_table
       #
       # If this route table is associated (by default) to the main route
       # table via the main (default) association a new association is created.
       # If it was previously associated directly to a different route table
       # then that association will be repalced.
       #
-      # == Deleting an Association
+      # ## Deleting an Association
       #
       # You can delete all but the main route table association.  When you
       # delete an association, the subnet becomes associated with the
       # main route table.
       #
-      #   # delete all explicit route table associations -- as a result 
-      #   # all subnets will default to the main route table
-      #   vpc.subnets.each do |subnet|
-      #     assoc = subnet.route_table_association
-      #     assoc.delete unless assoc.main?
-      #   end
-      #   
+      #     # delete all explicit route table associations -- as a result
+      #     # all subnets will default to the main route table
+      #     vpc.subnets.each do |subnet|
+      #       assoc = subnet.route_table_association
+      #       assoc.delete unless assoc.main?
+      #     end
+      #
       class Association
 
         # @private
@@ -83,7 +83,7 @@ module AWS
           end
         end
 
-        # @return [String] An identifier representing the association 
+        # @return [String] An identifier representing the association
         #   between the network ACL and subnet.
         attr_reader :association_id
 
@@ -93,7 +93,7 @@ module AWS
         attr_reader :route_table
 
         # @return [Subnet,nil] Returns the subnet this association belongs.
-        #   If this is the main (default) association, then this method 
+        #   If this is the main (default) association, then this method
         #   returns nil.
         attr_reader :subnet
 

data/lib/aws/ec2/route_table/route.rb

@@ -16,13 +16,13 @@ module AWS
 
     # Represents a single route in a {RouteTable}.
     #
-    #   # enumerating routes within a route table
-    #   ec2 = AWS::EC2.new
-    #   route_table = ec2.route_tables.first
-    #   route_table.routes.each do |route|
-    #     # ...  
-    #   end
-    # 
+    #     # enumerating routes within a route table
+    #     ec2 = AWS::EC2.new
+    #     route_table = ec2.route_tables.first
+    #     route_table.routes.each do |route|
+    #       # ...
+    #     end
+    #
     class RouteTable < Resource
       class Route
 
@@ -47,7 +47,7 @@ module AWS
 
           if details[:network_interface_id]
             @network_interface = NetworkInterface.new(
-              details[:network_interface_id], 
+              details[:network_interface_id],
               :vpc_id => route_table.vpc_id,
               :config => route_table.config)
           end