From 0e90decc4ece033026306cd294e6a62917f84d53 Mon Sep 17 00:00:00 2001 From: geemus Date: Sun, 2 May 2010 13:25:14 -0700 Subject: [PATCH] [elb] cleanup --- lib/fog/aws/elb.rb | 4 ++-- lib/fog/aws/requests/elb/describe_load_balancers.rb | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/fog/aws/elb.rb b/lib/fog/aws/elb.rb index 2e037e7ea..d1801db95 100644 --- a/lib/fog/aws/elb.rb +++ b/lib/fog/aws/elb.rb @@ -44,14 +44,14 @@ module Fog @aws_secret_access_key = options[:aws_secret_access_key] @hmac = HMAC::SHA256.new(@aws_secret_access_key) @host = options[:host] || case options[:region] + when 'ap-southeast-1' + 'elasticloadbalancing.ap-southeast-1.amazonaws.com' when 'eu-west-1' 'elasticloadbalancing.eu-west-1.amazonaws.com' when 'us-east-1' 'elasticloadbalancing.us-east-1.amazonaws.com' when 'us-west-1' 'elasticloadbalancing.us-west-1.amazonaws.com' - when 'ap-southeast-1' - 'elasticloadbalancing.ap-southeast-1.amazonaws.com' else 'elasticloadbalancing.amazonaws.com' end diff --git a/lib/fog/aws/requests/elb/describe_load_balancers.rb b/lib/fog/aws/requests/elb/describe_load_balancers.rb index 0e4475ba9..32c0d6833 100644 --- a/lib/fog/aws/requests/elb/describe_load_balancers.rb +++ b/lib/fog/aws/requests/elb/describe_load_balancers.rb @@ -36,9 +36,7 @@ module Fog # * 'AvailabilityZones'<~Array> - list of availability zones covered by this load balancer # * 'Instances'<~Array> - list of instances that the load balancer balances between def describe_load_balancers(lb_name = []) - lb_name = [lb_name] if lb_name.instance_of?(String) - lb_name.unshift(nil) - params = AWS.indexed_param('LoadBalancerNames.member', lb_name) + params = AWS.indexed_param('LoadBalancerNames.member', [*lb_name]) request({ 'Action' => 'DescribeLoadBalancers', :parser => Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new @@ -46,6 +44,14 @@ module Fog end end + + class Mock + + def describe_load_balancers(lb_name = []) + raise MockNotImplemented.new("Contributions welcome!") + end + + end end end end