From 972c2792ead65f4b94925c9446b072b569867e19 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 22 Sep 2010 17:20:59 -0700 Subject: [PATCH] [aws] 1 index indexed_param and remove extra argument --- lib/fog/aws.rb | 4 ++-- lib/fog/aws/requests/compute/modify_snapshot_attribute.rb | 4 ++-- lib/fog/aws/requests/elb/create_load_balancer.rb | 8 ++++---- .../elb/deregister_instances_from_load_balancer.rb | 2 +- lib/fog/aws/requests/elb/describe_instance_health.rb | 2 +- lib/fog/aws/requests/elb/describe_load_balancers.rb | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb index 59aafe68f..dfebe1248 100644 --- a/lib/fog/aws.rb +++ b/lib/fog/aws.rb @@ -11,13 +11,13 @@ module Fog service 'simpledb' service 'storage' - def self.indexed_param(key, values, offset = 0) + def self.indexed_param(key, values) params = {} unless key.include?('%d') key << '.%d' end [*values].each_with_index do |value, index| - params[format(key, index + offset)] = value + params[format(key, index + 1)] = value end params end diff --git a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb index 7935efbe0..24ac16342 100644 --- a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb @@ -12,8 +12,8 @@ module Fog # def modify_snapshot_attribute(snapshot_id, attribute, operation_type, options = {}) params = {} - params.merge!(AWS.indexed_param('UserId', options['UserId'], 1)) - params.merge!(AWS.indexed_param('UserGroup', options['UserGroup'], 1)) + params.merge!(AWS.indexed_param('UserId', options['UserId'])) + params.merge!(AWS.indexed_param('UserGroup', options['UserGroup'])) request({ 'Action' => 'ModifySnapshotAttribute', 'Attribute' => attribute, diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb index cef282fe1..6b8011322 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer.rb @@ -22,7 +22,7 @@ module Fog # * 'CreateLoadBalancerResult'<~Hash>: # * 'DNSName'<~String> - DNS name for the newly created ELB def create_load_balancer(availability_zones, lb_name, listeners) - params = ELB.indexed_param('AvailabilityZones.member', [*availability_zones], 1) + params = ELB.indexed_param('AvailabilityZones.member', [*availability_zones]) listener_protocol = [] listener_lb_port = [] @@ -33,9 +33,9 @@ module Fog listener_instance_port.push(listener['InstancePort']) end - 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)) + params.merge!(AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol)) + params.merge!(AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port)) + params.merge!(AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port)) 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 44e1e0700..56f08b0f6 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.%d.InstanceId', [*instance_ids], 1) + params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids]) 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 6ea22bf4d..01dbf0b89 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.%d.InstanceId', [*instance_ids], 1) + params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids]) request({ 'Action' => 'DescribeInstanceHealth', 'LoadBalancerName' => lb_name, diff --git a/lib/fog/aws/requests/elb/describe_load_balancers.rb b/lib/fog/aws/requests/elb/describe_load_balancers.rb index a741300a8..1524926ce 100644 --- a/lib/fog/aws/requests/elb/describe_load_balancers.rb +++ b/lib/fog/aws/requests/elb/describe_load_balancers.rb @@ -38,7 +38,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 = []) - params = AWS.indexed_param('LoadBalancerNames.member', [*lb_name], 1) + params = AWS.indexed_param('LoadBalancerNames.member', [*lb_name]) request({ 'Action' => 'DescribeLoadBalancers', :parser => Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new