aws-sdk 1.6.4 → 1.6.5

data/lib/aws/elb/listener_collection.rb

@@ -30,18 +30,18 @@ module AWS
       # @param [Hash] options
       #
       # @option options [Integer] :port Specifies the external
-      #   load balancer port number. This property cannot be modified for 
+      #   load balancer port number. This property cannot be modified for
       #   the life of the LoadBalancer.
       #
       # @option options [String,Symbol] :protocol Specifies the load balancer
       #   transport protocol to use for routing.  Valid values include:
       #
-      # @option options [Integer] :instance_port Specifies the TCP port on 
-      #   which the instance server is listening. This property cannot be 
+      # @option options [Integer] :instance_port Specifies the TCP port on
+      #   which the instance server is listening. This property cannot be
       #   modified for the life of the load balancer.
       #
-      # @option options [String,Symbol] :instance_protocol Specifies the 
-      #   protocol to use for routing traffic to back-end instances.  Valid 
+      # @option options [String,Symbol] :instance_protocol Specifies the
+      #   protocol to use for routing traffic to back-end instances.  Valid
       #   values include:
       #
       #   * :http, 'HTTP'
@@ -53,14 +53,14 @@ module AWS
       #
       #   NOTE: If the front-end protocol is HTTP or HTTPS, +:instance_protocol+
       #   has to be at the same protocol layer, i.e., HTTP or HTTPS. Likewise,
-      #   if the front-end protocol is TCP or SSL, +:instance_protocol+ has 
+      #   if the front-end protocol is TCP or SSL, +:instance_protocol+ has
       #   to be TCP or SSL.
       #
       #   NOTE: If there is another listener with the same +:instance_port+
-      #   whose +:instance_protocol+ is secure, i.e., HTTPS or SSL, the 
-      #   listener's +:instance_protocol+ has to be secure, i.e., HTTPS 
+      #   whose +:instance_protocol+ is secure, i.e., HTTPS or SSL, the
+      #   listener's +:instance_protocol+ has to be secure, i.e., HTTPS
       #   or SSL. If there is another listener with the same +:instance_port+
-      #   whose +:instance_protocol+ is HTTP or TCP, the listener's 
+      #   whose +:instance_protocol+ is HTTP or TCP, the listener's
       #   +:instance_protocol+ must be either HTTP or TCP.
       #
       #   * :tcp, 'TCP'
@@ -69,20 +69,20 @@ module AWS
       #   This property cannot be modified for the life of the load balancer.
       #
       # @option options [String,IAM::ServerCertificate] :server_certificate The
-      #   ARN string of an IAM::ServerCertifcate or an IAM::ServerCertificate 
+      #   ARN string of an IAM::ServerCertifcate or an IAM::ServerCertificate
       #   object.  Reqruied for HTTPs listeners.
       #
       # @return [Listener]
       def create options = {}
-        
+
         format_listener_opts(options)
 
         client.create_load_balancer_listeners(
           :load_balancer_name => load_balancer.name,
           :listeners => [options])
 
-        Listener.new(load_balancer, 
-          options[:load_balancer_port], 
+        Listener.new(load_balancer,
+          options[:load_balancer_port],
           options.merge(:config => config))
 
       end
@@ -94,25 +94,19 @@ module AWS
 
       protected
       def _each_item options = {}
-        load_balancer.listener_descriptions.each do |desc|
-
-          desc = desc.listener
+        load_balancer.listener_descriptions.each do |description|
 
-          opts = {}
-          opts[:config] = config
-          opts[:protocol] = desc.protocol
-          opts[:instance_port] =  desc.instance_port
-          opts[:instance_protocol] = desc.instance_protocol
-          opts[:ssl_certificate_id] = desc.ssl_certificate_id if
-            desc.respond_to?(:ssl_certificate_id)
+          port = description[:listener][:load_balancer_port]
 
-          listener = Listener.new(load_balancer, desc.load_balancer_port, opts)
+          options = {}
+          options[:config] = config
+          options.merge!(description[:listener])
 
-          yield(listener)
+          yield(Listener.new(load_balancer, port, options))
 
         end
       end
-      
+
     end
 
   end

data/lib/aws/elb/load_balancer.rb

@@ -19,17 +19,45 @@ module AWS
     # @attr_reader [Array<String>] availability_zone_names Return the names of
     #   the availability zones this load balancer routes traffic to.
     #
-    # @attr_reader [String] canonical_hosted_zone_name Provides the name of 
+    # @attr_reader [String] canonical_hosted_zone_name Provides the name of
     #   the Amazon Route 53 hosted zone that is associated with the load
     #   balancer.  For more information: {http://docs.amazonwebservices.com/ElasticLoadBalancing/latest/DeveloperGuide/index.html?using-domain-names-with-elb.html}.
     #
-    # @attr_reader [String] canonical_hosted_zone_name_id Provides the ID of 
-    #   the Amazon Route 53 hosted zone name that is associated with the 
+    # @attr_reader [String] canonical_hosted_zone_name_id Provides the ID of
+    #   the Amazon Route 53 hosted zone name that is associated with the
     #   load balancer.  For more information: {http://docs.amazonwebservices.com/ElasticLoadBalancing/latest/DeveloperGuide/index.html?using-domain-names-with-elb.html}.
     #
-    # @attr_reader [String] dns_name Specifies the external DNS name 
+    # @attr_reader [String] dns_name Specifies the external DNS name
     #   associated with this load balancer.
     #
+    # @attr_reader [Hash] policy_descriptions Returns a hash of
+    #   +:app_cookie_stickiness_policies+, +:lb_cookie_stickiness_policies+
+    #   and +:other_policies+.  See also {#policies}.
+    #
+    # @attr_reader [String,nil] scheme Specifies the type of LoadBalancer.
+    #   This attribute it set only for LoadBalancers attached to an Amazon VPC.
+    #   If the Scheme is 'internet-facing', the LoadBalancer has a publicly
+    #   resolvable DNS name that resolves to public IP addresses.
+    #   If the Scheme is 'internal', the LoadBalancer has a publicly 
+    #   resolvable DNS name that resolves to private IP addresses.
+    #
+    # @attr_reader [Array<String>] subnet_ids Provides a list of VPC subnet IDs
+    #   for the LoadBalancer.
+    #
+    # @attr_reader [Hash] health_check
+    #   Returns a hash of the various health probes conducted on the
+    #   load balancer instances.  The following entries are returned:
+    #   * +:healthy_threshold+
+    #   * +:unhealthy_threshold+
+    #   * +:interval+
+    #   * +:target+
+    #   * +:timeout+
+    #   See {#configure_health_check} for more details on what each of the
+    #   configuration values mean.
+    #
+    # @return [Hash]
+    #
+    #
     class LoadBalancer < Core::Resource
 
       def initialize name, options = {}
@@ -38,10 +66,10 @@ module AWS
 
       attribute :name, :from => :load_balancer_name, :static => true
 
-      #availability_zones
+      # see #availability_zones
       attribute :availability_zone_names, :from => :availability_zones
 
-      #backend_server_policies
+      # see #backend_server_policies
       attribute :backend_server_descriptions
 
       attribute :canonical_hosted_zone_name, :static => true
@@ -52,27 +80,37 @@ module AWS
 
       attribute :dns_name, :static => true
 
-      #health_check_configuration
-      attribute :health_check_description, :from => :health_check
+      attribute :health_check, :alias => :health_check_configuration
 
-      #instances
+      # see #instances
       attribute :instance_descriptions, :from => :instances
 
-      #listeners
+      # see #listeners
       attribute :listener_descriptions
 
-      #source_security_group
-      attribute :security_group_description, 
-        :from => :source_security_group, 
+      attribute :policy_descriptions, :from => :policies
+
+      attribute :scheme, :static => true
+
+      attribute :subnet_ids, :from => :subnets, :static => true
+
+      attribute :security_group_ids, :from => :security_groups, :static => true
+
+      attribute :source_security_group_owner_alias,
+        :from => [:source_security_group, :owner_alias],
+        :static => true
+
+      attribute :source_security_group_name,
+        :from => [:source_security_group, :group_name],
         :static => true
 
       populates_from(:describe_load_balancers) do |resp|
-        resp.load_balancer_descriptions.find do |lb|
-          lb.load_balancer_name == name
+        resp.data[:load_balancer_descriptions].find do |lb|
+          lb[:load_balancer_name] == name
         end
       end
 
-      # A collection that help maanage the availability zones for 
+      # A collection that help maanage the availability zones for
       # this load balancer.
       #
       # @example enable an availability zone
@@ -89,7 +127,7 @@ module AWS
       #     puts zone.name
       #   end
       #
-      # @return [AvailabilityZoneCollection] Returns a collection that 
+      # @return [AvailabilityZoneCollection] Returns a collection that
       #   represents this load balancer's availability zones.  You can
       #   use this collection to enable and disable availability zones.
       def availability_zones
@@ -118,55 +156,55 @@ module AWS
 
       # Updates the configuration that drives the instance health checks.
       #
-      # You only need to pass the options you want to change.  You can 
-      # call {#health_check_configuration} if you want to see what the
+      # You only need to pass the options you want to change.  You can
+      # call {#health_check} if you want to see what the
       # current configuration values are.
       #
       # @param [Hash] options
       #
       # @option options [Integer] :healthy_threshold Specifies the number of
-      #   consecutive health probe successes required before moving the 
+      #   consecutive health probe successes required before moving the
       #   instance to the Healthy state.
       #
-      # @option options [Integer] :unhealthy_threshold Specifies the number 
-      #   of consecutive health probe failures required before moving the 
+      # @option options [Integer] :unhealthy_threshold Specifies the number
+      #   of consecutive health probe failures required before moving the
       #   instance to the Unhealthy state.
       #
-      # @option options [Integer] :interval Specifies the approximate 
-      #   interval, in seconds, between health checks of an individual 
+      # @option options [Integer] :interval Specifies the approximate
+      #   interval, in seconds, between health checks of an individual
       #   instance.
       #
-      # @option options [Integer] :timeout Specifies the amount of time, in 
-      #   seconds, during which no response means a failed health probe.  
+      # @option options [Integer] :timeout Specifies the amount of time, in
+      #   seconds, during which no response means a failed health probe.
       #   This value must be less than the +:interval+ value.
       #
-      # @option options [String] :target Specifies the instance being checked. 
+      # @option options [String] :target Specifies the instance being checked.
       #
       #   This option should be formatted like: "TCP:80"
       #
-      #   * The protocol is either TCP, HTTP, HTTPS, or SSL. 
+      #   * The protocol is either TCP, HTTP, HTTPS, or SSL.
       #   * The range of valid ports is one (1) through 65535.
       #
-      #   TCP is the default, specified as a TCP: port pair, for example 
-      #   "TCP:5000". In this case a healthcheck simply attempts to open a 
-      #   TCP connection to the instance on the specified port. Failure to 
+      #   TCP is the default, specified as a TCP: port pair, for example
+      #   "TCP:5000". In this case a healthcheck simply attempts to open a
+      #   TCP connection to the instance on the specified port. Failure to
       #   connect within the configured timeout is considered unhealthy.
       #
       #   SSL is also specified as SSL: port pair, for example, SSL:5000.
-      #   For HTTP or HTTPS protocol, the situation is different. You have 
-      #   to include a ping path in the string. HTTP is specified as a 
-      #   HTTP:port;/;PathToPing; grouping, for example 
-      #   "HTTP:80/weather/us/wa/seattle". In this case, a HTTP GET request 
-      #   is issued to the instance on the given port and path. Any answer 
-      #   other than "200 OK" within the timeout period is considered 
+      #   For HTTP or HTTPS protocol, the situation is different. You have
+      #   to include a ping path in the string. HTTP is specified as a
+      #   HTTP:port;/;PathToPing; grouping, for example
+      #   "HTTP:80/weather/us/wa/seattle". In this case, a HTTP GET request
+      #   is issued to the instance on the given port and path. Any answer
+      #   other than "200 OK" within the timeout period is considered
       #   unhealthy.
       #
-      #   The total length of the HTTP ping target needs to be 1024 16-bit 
+      #   The total length of the HTTP ping target needs to be 1024 16-bit
       #   Unicode characters or less.
       #
       def configure_health_check options = {}
 
-        new_config = health_check_configuration.merge(options)
+        new_config = health_check.merge(options)
 
         response = client.configure_health_check(
           :load_balancer_name => name,
@@ -176,29 +214,20 @@ module AWS
 
       end
 
-      # Returns a hash of the various health probes conducted on the 
-      # load balancer instances.  The following entries are returned:
-      #
-      #   * +:healthy_threshold+
-      #   * +:unhealthy_threshold+
-      #   * +:interval+
-      #   * +:target+
-      #   * +:timeout+
-      #
-      # See {#configure_health_check} for more details on what each of the
-      # configuration values mean.
-      #
-      # @return [Hash]
-      #
-      def health_check_configuration
-        cfg = health_check_description
-        {
-          :healthy_threshold => cfg.healthy_threshold,
-          :unhealthy_threshold => cfg.unhealthy_threshold,
-          :interval => cfg.interval,
-          :target => cfg.target,
-          :timeout => cfg.timeout,
-        }
+      # @note VPC only
+      # @return [Array<EC2::Subnet>] Returns an array of VPC subnets
+      #   for this load balancer.
+      def subnets
+        subnet_ids.map{|id| EC2::Subnet.new(id, :config => config) }
+      end
+
+      # @note VPC only
+      # Returns the VPC security groups assigned to this load balancer.
+      # @return [Array<EC2::SecurityGroup>]
+      def security_groups
+        security_group_ids.collect do |id|
+          EC2::SecurityGroup.new(id, :config => config)
+        end
       end
 
       # Generally you don't need to call this method, rather you can
@@ -216,9 +245,9 @@ module AWS
       #   * {EC2::SecurityGroup#authorize_egress}
       #
       def source_security_group
-        { 
-          :group_name => security_group_description.group_name,
-          :user_id => security_group_description.owner_alias,
+        {
+          :group_name => source_security_group_name,
+          :user_id => source_security_group_owner_alias,
         }
       end
 
@@ -238,14 +267,13 @@ module AWS
       end
 
       protected
+
       def resource_identifiers
-        [[:load_balancer_name,name]]
+        [[:load_balancer_name, name]]
       end
 
-      protected
       def get_resource attr_name
-        # describing all, makes memoization more efficient
-        client.describe_load_balancers
+        client.describe_load_balancers(:load_balancer_names => [name])
       end
 
     end

data/lib/aws/elb/load_balancer_collection.rb

@@ -46,14 +46,13 @@ module AWS
       #   one or more availability zones.  Values may be availability zone
       #   name strings, or {AWS::EC2::AvailabilityZone} objects.
       #
-      # @option options [required,Array] :listeners An array of load balancer
-      #   listener options.  Each value must be an array with the following
-      #   keys:
-      #
-      #   +:port+
-      #   +:protocol+
-      #   +:instance_port+
-      #   +:instance_protocol+
+      # @option options [required,Array<Hash>] :listeners An array of load 
+      #   balancer listener options.  Each value must be an array with the
+      #   following keys:
+      #   * +:port+
+      #   * +:protocol+
+      #   * +:instance_port+
+      #   * +:instance_protocol+
       #
       #   Port values should be integers, and protocols should be symbols or
       #   strings (e.g. :http, or 'HTTP').  See {ListenerCollection#create}
@@ -63,34 +62,48 @@ module AWS
       #   The ARN string of an IAM::ServerCertifcate or an
       #   IAM::ServerCertificate object.  Reqruied for HTTPs listeners.
       #
+      # @option options [Array] :subnets An list of VPC subets to attach the
+      #   load balancer to.  This can be an array of subnet ids (strings) or
+      #   {EC2::Subnet} objects. VPC only.
+      #
+      # @option options [Array] :security_groups The security groups assigned to
+      #   your load balancer within your VPC.  This can be an array of
+      #   security group ids or {EC2::SecurityGroup} objects. VPC only.
+      #
+      # @option options [String] :scheme ('internal' The type of a load 
+      #   balancer.  Accepts 'internet-facing' or 'internal'. VPC only.
+      #
       def create name, options = {}
 
-        unless options[:availability_zones]
-          raise ArgumentError, "missing required :availability_zones option"
+        if listeners = options[:listeners]
+          options[:listeners] = [listeners].flatten.map do |listener|
+            format_listener_opts(listener)
+          end
         end
 
-        unless options[:listeners]
-          raise ArgumentError, "missing required :listeners option"
+        if zones = options[:availability_zones]
+          options[:availability_zones] = [zones].flatten.map do |zone|
+            zone.is_a?(EC2::AvailabilityZone) ? zone.name : zone
+          end
         end
 
-        zones = [options[:availability_zones]].flatten.collect do |zone|
-          zone.is_a?(EC2::AvailabilityZone) ? zone.name : zone
+        if groups = options[:security_groups]
+          options[:security_groups] = [groups].flatten.map do |group|
+            group.is_a?(EC2::SecurityGroup) ? group.id : group
+          end
         end
 
-        listeners = [options[:listeners]].flatten.collect do |listener_opts|
-          format_listener_opts(listener_opts)
+        if subnets = options[:subnets]
+          options[:subnets] = [subnets].flatten.map do |subnet|
+            subnet.is_a?(EC2::Subnet) ? subnet.id : subnet
+          end
         end
 
-        response = client.create_load_balancer(
-          :load_balancer_name => name.to_s,
-          :availability_zones => zones,
-          :listeners => listeners)
+        options[:load_balancer_name] = name.to_s
 
-        opts = {}
-        opts[:config] = config
-        opts[:dns_name] = response.dns_name
+        resp = client.create_load_balancer(options)
 
-        LoadBalancer.new(name, opts)
+        LoadBalancer.new(name, :dns_name => resp[:dns_name], :config => config)
 
       end