aws 2.10.0 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63a65490209cc977d00bd5a333e68cca85f0f42f
-  data.tar.gz: 2d3ebf015650c457255f462e915a11b075978b29
+  metadata.gz: bff10a7cac38b08d6fe22df978795da02d3986d8
+  data.tar.gz: 16cc29bd2736fa5bcdacabeb1cfce739645a34b2
 SHA512:
-  metadata.gz: 8cf175cc6880a04a0ccd28dbb3155bf1860b7e518a5da70556adf272bc9e7215438c99c4ff9807dfa388cb69573afb01429bf0be026ea41afbb77b6df505274c
-  data.tar.gz: d27ce54b64df2fa43544863cea493833889346dacb663d462ca2a656db355cbaa959b23c89a0d96a35d4a50afa127da0c801ec81b076bea8ffe39acab3ad0943
+  metadata.gz: 654cec5b0dde5782803b0f5c5f59d8e41b444c6ccc8599f953a7e8c8891b6b71bf3808476de48e891eab55f62b8c750c20c5894a0e6928a306e0e3c4f87ec4fa
+  data.tar.gz: 867f637b84da19d74f9d439b684dfd1a1d7efbeec677e7fd217bcb040f8bd0c6932189f52a4871b27037ded5446f6dd073223a2fc06fbc2f33592d721f8fc1b2

data/lib/awsbase/awsbase.rb

@@ -145,6 +145,7 @@ module Aws
         @params[:port] = URI.parse(@params[:endpoint_url]).port
         @params[:service] = URI.parse(@params[:endpoint_url]).path
         @params[:protocol] = URI.parse(@params[:endpoint_url]).scheme
+        @params[:api_version] ||= service_info[:api_version]
         @params[:region] = nil
       else
         @params[:server] ||= service_info[:default_host]

data/lib/ec2/ec2.rb

@@ -554,6 +554,7 @@ module Aws
                      'AddressingType' => options[:addressing_type] || DEFAULT_ADDRESSING_TYPE,
                      'InstanceType'   => options[:instance_type] || DEFAULT_INSTANCE_TYPE})
       # optional params
+      params.merge!(hash_params('SecurityGroupId',options[:SecurityGroupId].to_a)) unless Aws::Utils.blank?(options[:SecurityGroupId])
       params['KeyName'] = options[:key_name] unless Aws::Utils.blank?(options[:key_name])
       params['KernelId'] = options[:kernel_id] unless Aws::Utils.blank?(options[:kernel_id])
       params['RamdiskId'] = options[:ramdisk_id] unless Aws::Utils.blank?(options[:ramdisk_id])

data/lib/elb/elb_interface.rb

@@ -8,7 +8,7 @@ module Aws
 
 
     #Amazon ELB API version being used
-    API_VERSION      = "2009-05-15"
+    API_VERSION      = "2012-06-01"
     DEFAULT_HOST     = "elasticloadbalancing.amazonaws.com"
     DEFAULT_PATH     = '/'
     DEFAULT_PROTOCOL = 'https'
@@ -108,6 +108,52 @@ module Aws
       on_exception
     end
 
+    #
+    # name: name of load balancer
+    # listeners: array of hashes containing :load_balancer_port, :instance_port, :protocol
+    #       eg: {:load_balancer_port=>80, :instance_port=>8080, :protocol=>"HTTP"}
+    #
+    def create_load_balancer_listeners(name, listeners)
+      params = {}
+      params['LoadBalancerName'] = name
+      i = 1
+      listeners.each do |l|
+        params["Listeners.member.#{i}.Protocol"]         = "#{l[:protocol]}"
+        params["Listeners.member.#{i}.LoadBalancerPort"] = "#{l[:load_balancer_port]}"
+        params["Listeners.member.#{i}.InstancePort"]     = "#{l[:instance_port]}"
+        i                                                += 1
+      end
+
+      @logger.info("Creating Listeners for LoadBalancer #{name}")
+
+      link = generate_request("CreateLoadBalancerListeners", params)
+      resp = request_info(link, QElbEmptyResponseParser.new(:logger => @logger))
+
+    rescue Exception
+      on_exception
+    end
+
+    #
+    # name: name of load balancer
+    # ports: array of client port number(s) of the load balancer listener(s) to be removed.
+    #
+    def delete_load_balancer_listeners(name, ports)
+      params = {}
+      params['LoadBalancerName'] = name
+      i = 1
+      ports.each do |l|
+        params["LoadBalancerPorts.member.#{i}"] = "#{l}"
+        i                                       += 1
+      end
+
+      @logger.info("Deleting Listeners for LoadBalancer #{name}")
+
+      link = generate_request("DeleteLoadBalancerListeners", params)
+      resp = request_info(link, QElbEmptyResponseParser.new(:logger => @logger))
+
+    rescue Exception
+      on_exception
+    end
 
     # name: name of load balancer
     # instance_ids: array of instance_id's to add to load balancer
@@ -149,6 +195,30 @@ module Aws
       on_exception
     end
 
+    # name: name of load balancer
+    # healthy_threshold: number of successful probes required to enter Healthy state.
+    # unhealthy_threshold: number of unsuccessful probes required to enter Unhealthy state.
+    # interval: interval between probes (seconds)
+    # target: probe target (protocol:port[/path])
+    # timeout: probe response timeout
+    def configure_health_check(name, healthy_threshold, unhealthy_threshold, interval, target, timeout )
+      params                                   = {}
+      params['LoadBalancerName']               = name
+      params['HealthCheck.HealthyThreshold']   = "#{healthy_threshold}"
+      params['HealthCheck.UnhealthyThreshold'] = "#{unhealthy_threshold}"
+      params['HealthCheck.Interval']           = "#{interval}"
+      params['HealthCheck.Target']             = target
+      params['HealthCheck.Timeout']            = "#{timeout}"
+
+      @logger.info("Configuring health check for Load Balancer '#{name}'")
+
+      link = generate_request("ConfigureHealthCheck", params)
+      resp = request_info(link, QElbConfigureHealthCheckParser.new(:logger => @logger))
+
+    rescue Exception
+      on_exception
+    end
+
 
     def describe_load_balancers(lparams={})
       @logger.info("Describing Load Balancers")
@@ -196,7 +266,7 @@ module Aws
 
       link                       = generate_request("DeleteLoadBalancer", params)
 
-      resp                       = request_info(link, QElbDeleteParser.new(:logger => @logger))
+      resp                       = request_info(link, QElbEmptyResponseParser.new(:logger => @logger))
 
     rescue Exception
       on_exception
@@ -231,7 +301,7 @@ module Aws
 
       def tagstart(name, attributes)
 #                puts 'tagstart ' + name + ' -- ' + @xmlpath
-        if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Listeners')
+        if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/ListenerDescriptions')
           @listener = {}
         end
         if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/AvailabilityZones')
@@ -280,7 +350,7 @@ module Aws
             @member[:health_check][:unhealthy_threshold] = @text.to_i
           # AvailabilityZones
           when 'member' then
-            if @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Listeners'
+            if @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/ListenerDescriptions'
               @member[:listeners] << @listener
             elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/AvailabilityZones'
               @availability_zone = @text
@@ -323,6 +393,35 @@ module Aws
 #
     end
 
+    class QElbConfigureHealthCheckParser < AwsParser
+
+      def reset
+        @result = {}
+      end
+
+      def tagstart(name, attributes)
+        if name == 'HealthCheck'
+          @result[:health_check] = {}
+        end
+      end
+
+      def tagend(name)
+        case name
+          when 'HealthyThreshold' then
+            @result[:health_check][:healthy_threshold] = @text.to_i
+          when 'UnhealthyThreshold' then
+            @result[:health_check][:unhealthy_threshold] = @text.to_i
+          when 'Interval' then
+            @result[:health_check][:interval] = @text.to_i
+          when 'Target' then
+            @result[:health_check][:target] = @text
+          when 'Timeout' then
+            @result[:health_check][:timeout] = @text.to_i
+        end
+      end
+#
+    end
+
     class QElbDescribeInstancesHealthParser < AwsParser
 
       def reset
@@ -353,7 +452,7 @@ module Aws
 #
     end
 
-    class QElbDeleteParser < AwsParser
+    class QElbEmptyResponseParser < AwsParser
       def reset
         @result = true
       end
@@ -363,4 +462,5 @@ module Aws
   end
 
 
-end
+end
+

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = "2.10.0"
+  VERSION = "2.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.2
 platform: ruby
 authors:
 - Travis Reeder
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools