From 0062dab87e2389ae55c72f9fba94369c586198ff Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 1 Sep 2010 11:13:26 -0700 Subject: [PATCH] [aws][elb] fix indexed_param invocation for non-postfix index --- lib/fog/aws/requests/elb/create_load_balancer.rb | 6 +++--- .../requests/elb/deregister_instances_from_load_balancer.rb | 2 +- lib/fog/aws/requests/elb/describe_instance_health.rb | 2 +- .../requests/elb/register_instances_with_load_balancer.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb index a3715dfa5..eb16fa91e 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer.rb @@ -33,9 +33,9 @@ module Fog listener_instance_port.push(listener['InstancePort']) end - params.merge!(AWS.indexed_param('Listeners.member.%.Protocol', listener_protocol, 1)) - params.merge!(AWS.indexed_param('Listeners.member.%.LoadBalancerPort', listener_lb_port, 1)) - params.merge!(AWS.indexed_param('Listeners.member.%.InstancePort', listener_instance_port, 1)) + params.merge!(AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol, 1)) + params.merge!(AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port, 1)) + params.merge!(AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port, 1)) request({ 'Action' => 'CreateLoadBalancer', diff --git a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb index 5cceacbff..7cd323792 100644 --- a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb +++ b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb @@ -20,7 +20,7 @@ module Fog # * 'Instances'<~Array> - array of hashes describing instances currently enabled # * 'InstanceId'<~String> def deregister_instances_from_load_balancer(instance_ids, lb_name) - params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) + params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids], 1) request({ 'Action' => 'DeregisterInstancesFromLoadBalancer', 'LoadBalancerName' => lb_name, diff --git a/lib/fog/aws/requests/elb/describe_instance_health.rb b/lib/fog/aws/requests/elb/describe_instance_health.rb index 39abb3071..b8e0a3de9 100644 --- a/lib/fog/aws/requests/elb/describe_instance_health.rb +++ b/lib/fog/aws/requests/elb/describe_instance_health.rb @@ -23,7 +23,7 @@ module Fog # * 'InstanceId'<~String> # * 'ReasonCode'<~String> def describe_instance_health(lb_name, instance_ids = []) - params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) + params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids], 1) request({ 'Action' => 'DescribeInstanceHealth', 'LoadBalancerName' => lb_name, diff --git a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb index 46c2a9227..aead83813 100644 --- a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb +++ b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb @@ -20,7 +20,7 @@ module Fog # * 'Instances'<~Array> - array of hashes describing instances currently enabled # * 'InstanceId'<~String> def register_instances_with_load_balancer(instance_ids, lb_name) - params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) + params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids], 1) request({ 'Action' => 'RegisterInstancesWithLoadBalancer', 'LoadBalancerName' => lb_name,