aws-sdk 1.6.4 → 1.6.5

data/lib/aws/ec2/key_pair_collection.rb

@@ -90,7 +90,7 @@ module AWS
           options[:private_key] = response.data[:key_material]
         end
 
-        KeyPair.new(response.key_name, options)
+        KeyPair.new(response.key_name, options.merge(:config => config))
 
       end
 

data/lib/aws/ec2/security_group.rb

@@ -16,14 +16,14 @@ module AWS
 
     # Represents a security group in EC2.
     #
-    # @attr_reader [String] description The short informal description 
+    # @attr_reader [String] description The short informal description
     #   given when the group was created.
     #
     # @attr_reader [String] name The name of the security group.
     #
     # @attr_reader [String] owner_id The security group owner's id.
     #
-    # @attr_reader [String,nil] vpc_id If this is a VPC security group, 
+    # @attr_reader [String,nil] vpc_id If this is a VPC security group,
     #   vpc_id is the ID of the VPC this group was created in.
     #   Returns false otherwise.
     #
@@ -73,10 +73,10 @@ module AWS
         ]).security_group_index.key?(id)
       end
 
-      # Returns true if this security group is a VPC security group and 
+      # Returns true if this security group is a VPC security group and
       # not an EC2 security group.  VPC security groups belong to a VPC
       # subnet and can have egress rules.
-      # @return [Boolean] Returns true if this is a VPC security group and 
+      # @return [Boolean] Returns true if this is a VPC security group and
       #   false if this is an EC2 security group.
       def vpc?
         vpc_id ? true : false
@@ -92,7 +92,7 @@ module AWS
 
       # @return [SecurityGroup::IngressIpPermissionCollection] Returns a
       #   collection of {IpPermission} objects that represents all of
-      #   the (ingress) permissions this security group has 
+      #   the (ingress) permissions this security group has
       #   authorizations for.
       def ingress_ip_permissions
         IngressIpPermissionCollection.new(self, :config => config)
@@ -106,7 +106,7 @@ module AWS
         EgressIpPermissionCollection.new(self, :config => config)
       end
 
-      # Adds ingress rules for ICMP pings.  Defaults to 0.0.0.0/0 for 
+      # Adds ingress rules for ICMP pings.  Defaults to 0.0.0.0/0 for
       # the list of allowed IP ranges the ping can come from.
       #
       #   security_group.allow_ping # anyone can ping servers in this group
@@ -124,13 +124,13 @@ module AWS
         authorize_ingress('icmp', -1, *sources)
       end
 
-      # Removes ingress rules for ICMP pings.  Defaults to 0.0.0.0/0 for 
+      # Removes ingress rules for ICMP pings.  Defaults to 0.0.0.0/0 for
       # the list of IP ranges to revoke.
       #
       # @param [String] sources One or more IP ranges to disallow ping from.
       #   Defaults to 0.0.0.0/0
       #
-      # @return [nil] 
+      # @return [nil]
       #
       def disallow_ping *sources
         sources << '0.0.0.0/0' if sources.empty?
@@ -141,7 +141,7 @@ module AWS
       # Ingress rules permit inbound traffic over a given protocol for
       # a given port range from one or more souce ip addresses.
       #
-      # This example grants the whole internet (0.0.0.0/0) access to port 80 
+      # This example grants the whole internet (0.0.0.0/0) access to port 80
       # over TCP (HTTP web traffic).
       #
       #   security_group.authorize_ingress(:tcp, 80)
@@ -152,19 +152,19 @@ module AWS
       #   security_group.authorize_ingress(:tcp, 20..21)
       #
       # == Sources
-      # 
+      #
       # Security groups accept ingress trafic from:
       #
       # * CIDR IP addresses
       # * security groups
       # * load balancers
-      # 
+      #
       # === Ip Addresses
       #
-      # In the following example allow incoming SSH from a list of 
+      # In the following example allow incoming SSH from a list of
       # IP address ranges.
       #
-      #   security_group.authorize_ingress(:tcp, 22, 
+      #   security_group.authorize_ingress(:tcp, 22,
       #     '111.111.111.111/0', '222.222.222.222/0')
       #
       # === Security Groups
@@ -194,13 +194,13 @@ module AWS
       # You can do the same with a hash as well (with either +:group_id+
       # or +:group_name+):
       #
-      #   sg.authorize_ingress(:tcp, 21..22, { :group_id => 'sg-id', :user_id => 'abcxyz123' }) 
+      #   sg.authorize_ingress(:tcp, 21..22, { :group_id => 'sg-id', :user_id => 'abcxyz123' })
       #
       # === Load Balancers
       #
       # If you use ELB to manage load balancers, then you need to add
       # ingress permissions to the security groups they route traffic into.
-      # You can do this by passing the {ELB::LoadBalancer} into 
+      # You can do this by passing the {ELB::LoadBalancer} into
       # authorize_ingress:
       #
       #   load_balancer = AWS::ELB.new.load_balancers['web-load-balancer']
@@ -218,14 +218,14 @@ module AWS
       #   or the string equivalent.
       #
       # @param [Integer, Range] ports The port (or port range) to allow
-      #   traffic through.  You can pass a single integer (like 80) 
+      #   traffic through.  You can pass a single integer (like 80)
       #   or a range (like 20..21).
       #
       # @param [Mixed] sources One or more CIDR IP addresses,
       #   security groups, or load balancers.  Security groups
       #   can be specified as hashes.
       #
-      #   A security group hash must provide either +:group_id+ or 
+      #   A security group hash must provide either +:group_id+ or
       #   +:group_name+ for the security group.  If the security group
       #   does not belong to you aws account then you must also
       #   provide +:user_id+ (which can be an AWS account ID or alias).
@@ -240,7 +240,7 @@ module AWS
         nil
       end
 
-      # Revokes an ingress (inbound) ip permission.  This is the inverse 
+      # Revokes an ingress (inbound) ip permission.  This is the inverse
       # operation to {#authorize_ingress}.  See {#authorize_ingress}
       # for param and option documentation.
       #
@@ -257,14 +257,14 @@ module AWS
       end
 
       # Authorize egress (outbound) traffic for a VPC security group.
-      # 
+      #
       #   # allow traffic for all protocols/ports from the given sources
       #   security_group.authorize_egress('10.0.0.0/16', '10.0.0.1/16')
       #
       #   # allow tcp traffic outband via port 80
       #   security_group.authorize_egress('10.0.0.0/16',
       #     :protocol => :tcp, :ports => 80..80)
-      # 
+      #
       # @note Calling this method on a non-VPC security group raises an error.
       #
       # @overload authorize_egress(*sources, options = {})
@@ -281,7 +281,7 @@ module AWS
       #
       #   @option options [Range<Integer>,Integer] :ports (nil) An optional
       #     port or range of ports.  This option is required depending on
-      #     the protocol.  
+      #     the protocol.
       #
       # @return [nil]
       #
@@ -292,7 +292,7 @@ module AWS
         nil
       end
 
-      # Revokes an egress (outound) ip permission.  This is the inverse 
+      # Revokes an egress (outound) ip permission.  This is the inverse
       # operation to {#authorize_egress}.  See {#authorize_egress}
       # for param and option documentation.
       #
@@ -307,13 +307,13 @@ module AWS
         nil
       end
 
-      # Deletes this security group. 
+      # Deletes this security group.
       #
-      # If you attempt to delete a security group that contains 
+      # If you attempt to delete a security group that contains
       # instances, or attempt to delete a security group that is referenced
-      # by another security group, an error is raised. For example, if 
-      # security group B has a rule that allows access from security 
-      # group A, security group A cannot be deleted until the rule is 
+      # by another security group, an error is raised. For example, if
+      # security group B has a rule that allows access from security
+      # group A, security group A cannot be deleted until the rule is
       # removed.
       # @return [nil]
       def delete
@@ -321,6 +321,11 @@ module AWS
         nil
       end
 
+      # @private
+      def <=> other
+        self.id <=> other.id
+      end
+
       # @private
       def resource_type
         'security-group'
@@ -361,7 +366,7 @@ module AWS
         ensure_vpc do
 
           last = args.last
-          
+
           if last.is_a?(Hash) and (last.key?(:protocol) or last.key?(:ports))
             # hashes at the end of egress methods could be a hash intedned
             # to be a source, like:
@@ -409,11 +414,11 @@ module AWS
           when SecurityGroup
             groups << { :group_id => source.id, :user_id => source.owner_id }
 
-          when ELB::LoadBalancer 
+          when ELB::LoadBalancer
             groups << source.source_security_group
 
           when Hash
-            
+
             # group name or id required
             unless source.has_key?(:group_id) or source.has_key?(:group_name)
               raise ArgumentError, 'invalid ip permission hash, ' +
@@ -437,7 +442,7 @@ module AWS
         ips << { :cidr_ip => '0.0.0.0/0' } if ips.empty? and groups.empty?
 
         [ips, groups]
-        
+
       end
 
       # @private

data/lib/aws/ec2/security_group/ip_permission.rb

@@ -31,7 +31,7 @@ module AWS
         #   grant permission to.
         #
         # @option options [Boolean] :egress (false) When true this IpPermission
-        #   is assumed to be an egree permission.
+        #   is assumed to be an egress permission.
         #
         def initialize security_group, protocol, ports, options = {}
 
@@ -55,7 +55,7 @@ module AWS
 
         end
 
-        # @return [SecurityGroup] The security group this permission is 
+        # @return [SecurityGroup] The security group this permission is
         #   authorized for.
         attr_reader :security_group
 
@@ -68,8 +68,8 @@ module AWS
         # @return [Array] An array of string CIDR ip addresses.
         attr_reader :ip_ranges
 
-        # @return [Array] An array of security groups that have been 
-        # granted access with this permission.
+        # @return [Array] An array of security groups that have been
+        #   granted access with this permission.
         attr_reader :groups
 
         # @return [Boolean] True if this is an egress permission
@@ -99,9 +99,9 @@ module AWS
           other.security_group == security_group and
           other.protocol == protocol and
           other.port_range == port_range and
-          other.ip_ranges == ip_ranges and
-          other.groups == groups and
-          other.egress == egress?
+          other.ip_ranges.sort == ip_ranges.sort and
+          other.groups.sort == groups.sort and
+          other.egress? == egress?
         end
         alias_method :==, :eql?
 

data/lib/aws/elb/backend_server_policy_collection.rb

@@ -18,9 +18,9 @@ module AWS
     #
     # == Creating a Backend Server Policy
     #
-    # Creating a backend server policy can be a bit tricky.  A 
-    # BackendServerAuthenticationPolicyType policy only has one 
-    # attribute, a list of public key policies.  
+    # Creating a backend server policy can be a bit tricky.  A
+    # BackendServerAuthenticationPolicyType policy only has one
+    # attribute, a list of public key policies.
     #
     # Before you can assign a policy to a backend server instance port you
     # must create on of the appropriate type:
@@ -36,7 +36,7 @@ module AWS
     #   KEY
     #
     #   public_key_policy = load_balancer.policies.create("pkp",
-    #     'PublicKeyPolicyType', 'PublicKey' => public_key.strip)  
+    #     'PublicKeyPolicyType', 'PublicKey' => public_key.strip)
     #
     #   # step 2, create the backend server policy, passing the public key policy
     #
@@ -54,16 +54,16 @@ module AWS
     # can assign it to a backend instance port:
     #
     #   load_balancer.backend_server_policies[80] = backend_policy
-    # 
+    #
     # If you want to remove the policy you can pass nil instead.
     #
     #   # removes the policy from instance port 80
-    #   load_balancer.backend_server_policies[80] = nil 
+    #   load_balancer.backend_server_policies[80] = nil
     #
     # You can also get the current policy:
     #
     #   load_balancer.backend_server_policies[80] # returns a policy or nil
-    # 
+    #
     class BackendServerPolicyCollection
 
       include Core::Collection::Simple
@@ -78,7 +78,7 @@ module AWS
 
       # Returns the policy currently assigned to the given instance port.
       #
-      # @param [Integer] instance_port The backend server port to 
+      # @param [Integer] instance_port The backend server port to
       #   get the currently policy of.
       #
       # @return [LoadBalancerPolicy,nil] Returns the load balancer policy
@@ -125,10 +125,9 @@ module AWS
         instance_port = options[:instance_port]
 
         load_balancer.backend_server_descriptions.each do |desc|
-          if instance_port.nil? or desc.instance_port == instance_port
-            desc.policy_names.collect do |policy_name|
-              policy = load_balancer.policies[policy_name]
-              yield(policy)
+          if instance_port.nil? or desc[:instance_port] == instance_port
+            desc[:policy_names].each do |policy_name|
+              yield(load_balancer.policies[policy_name])
             end
           end
         end

data/lib/aws/elb/client.rb

@@ -17,8 +17,6 @@ module AWS
     # Client class for Elastic Load Balancing (ELB).
     class Client < Core::QueryClient
 
-      define_client_methods('2012-06-01')
-
       # @private
       CACHEABLE_REQUESTS = Set[]
 
@@ -495,6 +493,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2012-06-01')
+
     end
   end
 end

data/lib/aws/elb/instance_collection.rb

@@ -15,7 +15,7 @@ module AWS
   class ELB
 
     class InstanceCollection
-      
+
       include Core::Collection::Simple
 
       def initialize load_balancer, options = {}
@@ -57,7 +57,7 @@ module AWS
         end
 
         instance
-        
+
       end
 
       # Returns an array of instance health descriptions.  Each description
@@ -69,9 +69,9 @@ module AWS
       #
       #   * +:state+ - Specifies the current state of the instance.
       #
-      #   * +:reason_code+ - Provides information about the cause of 
-      #     OutOfService instances. Specifically, it indicates whether the 
-      #     cause is Elastic Load Balancing or the instance behind the 
+      #   * +:reason_code+ - Provides information about the cause of
+      #     OutOfService instances. Specifically, it indicates whether the
+      #     cause is Elastic Load Balancing or the instance behind the
       #     load balancer.
       #
       # You can get the health of all instances for this load balancer
@@ -93,7 +93,7 @@ module AWS
       #
       # == Health for a Single Instance
       #
-      # If you want the health of a single instance you can use the {#[]} 
+      # If you want the health of a single instance you can use the {#[]}
       # instead:
       #
       #   load_balancer.instances['i-123456'].elb_health
@@ -125,7 +125,7 @@ module AWS
 
       end
 
-      # @return [LoadBalancer] Returns the load balancer this collection 
+      # @return [LoadBalancer] Returns the load balancer this collection
       #   belongs to.
       attr_reader :load_balancer
 
@@ -164,8 +164,7 @@ module AWS
       protected
       def _each_item options = {}
         load_balancer.instance_descriptions.each do |instance|
-          instance = self[instance.instance_id]
-          yield(instance)
+          yield(self[instance[:instance_id]])
         end
       end
 

data/lib/aws/elb/listener.rb

@@ -42,31 +42,31 @@ module AWS
       # @return [LoadBalancer]
       attr_reader :load_balancer
 
-      # @return [Integer] 
+      # @return [Integer]
       attr_reader :port
 
       # @return [Symbol] Returns the protocl for this listener.
       def protocol
-        proto = @protocol || _description.listener.protocol
+        proto = @protocol ||= _description[:listener][:protocol]
         proto.to_s.downcase.to_sym
       end
 
       # @return [Integer]
       def instance_port
-        @instance_port || _description.listener.instance_port
+        @instance_port ||= _description[:listener][:instance_port]
       end
 
       # @return [Symbol]
       def instance_protocol
-        proto = @instance_protocol || _description.listener.instance_protocol
+        proto = @instance_protocol ||= _description[:listener][:instance_protocol]
         proto.to_s.downcase.to_sym
       end
 
-      # Sets the certificate that terminates the specified listener's SSL 
-      # connections. The specified certificate replaces any prior 
+      # Sets the certificate that terminates the specified listener's SSL
+      # connections. The specified certificate replaces any prior
       # certificate for this listener.
       #
-      # @param [String,IAM::ServerCertificate] server_certificate The ARN 
+      # @param [String,IAM::ServerCertificate] server_certificate The ARN
       #   of an IAM::ServerCertificate or an IAM::ServerCertificate object.
       #
       # @return [nil]
@@ -89,9 +89,9 @@ module AWS
       #   associated with this listener, or nil if there is none.
       def server_certificate
         desc = _description
-        if desc.listener.respond_to?(:ssl_certificate_id)
+        if desc[:listener][:ssl_certificate_id]
           AWS.memoize do
-            arn = desc.listener.ssl_certificate_id
+            arn = desc[:listener][:ssl_certificate_id]
             iam = IAM.new(:config => config)
             iam.server_certificates.find{|cert| cert.arn == arn }
           end
@@ -101,10 +101,10 @@ module AWS
       end
 
       # @return [LoadBalancerPolicy,nil] Returns the current policy for this
-      #   listener.  Returns nil if no load balancer policy has been 
+      #   listener.  Returns nil if no load balancer policy has been
       #   associated with it.
       def policy
-        policy_name = _description.policy_names.first
+        policy_name = _description[:policy_names].first
         policy_name ? load_balancer.policies[policy_name] : nil
       end
 
@@ -115,7 +115,7 @@ module AWS
 
         policy_name = policy_or_policy_name.is_a?(LoadBalancerPolicy) ?
           policy_or_policy_name.name : policy_or_policy_name.to_s
-      
+
         client.set_load_balancer_policies_of_listener(
           :load_balancer_name => load_balancer.name,
           :load_balancer_port => port,
@@ -171,16 +171,17 @@ module AWS
 
       # @private
       def eql? other
-        other.is_a?(Listener) and 
+        other.is_a?(Listener) and
         other.load_balancer == load_balancer and
         other.port == port
       end
       alias_method :==, :eql?
 
       protected
+
       def _description
-        load_balancer.listener_descriptions.find do |desc| 
-          desc.listener.load_balancer_port == port
+        load_balancer.listener_descriptions.find do |desc|
+          desc[:listener][:load_balancer_port] == port
         end
       end