amazon-ec2 0.9.10 → 0.9.11

data/ChangeLog

@@ -1,3 +1,8 @@
+=== 0.9.11 2010-04-23
+ * RDS#create_db_instance : renamed misspelled :backend_retention_period option to :backup_retention_period.
+ * Better handling of FixNum options in a few methods.
+ * A few bug fixes.
+
 === 0.9.10 2010-03-26
  * Enhancements to EC2 register_image to handle registration based on EBS snapshots (jamespharaoh)
 

data/README.rdoc

@@ -348,6 +348,20 @@ The original code for this library was provided by Amazon Web Services, LLC as s
 
 Comments, patches, Git pull requests and bug reports are welcome. Send an email to mailto:glenn@rempe.us or join the Google Groups forum.
 
+== Patches & Pull Requests
+
+Please follow these steps if you want to send a patch or a GitHub pull request:
+
+* Fork grempe/amazon-ec2
+* Create a topic branch: `git checkout -b my_fix`
+* Make sure you add tests for your changes and that they all pass with 'rake test'
+* Don't change files that you don't own like the gemspec or VERSION
+* Commit your changes, one change/fix per commit
+* Push your fixes branch: `git push origin my_fix`
+* Open an Issue referencing your branch.
+* Please do not push to `master` on your fork. This will make everyone’s life easier.
+
+
 Enjoy!
 
 Glenn Rempe

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.9.11

data/amazon-ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2010-03-26}
+  s.date = %q{2010-04-25}
   s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling APIs.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]

data/lib/AWS/EC2/instances.rb

@@ -10,7 +10,7 @@ module AWS
       # @option options [Integer] :min_count (1) Minimum number of instances to launch. If the value is more than Amazon EC2 can launch, no instances are launched at all.
       # @option options [Integer] :max_count (1) Maximum number of instances to launch. If the value is more than Amazon EC2 can launch, the largest possible number above minCount will be launched instead.
       # @option options [optional, String] :key_name (nil) The name of the key pair.
-      # @option options [optional, Array of Strings or String] :security_group (nil) Name of the security group(s).
+      # @option options [optional, Array] :security_group (nil) Name of the security group(s). Array of Strings or String.
       # @option options [optional, String] :additional_info (nil) Specifies additional information to make available to the instance(s).
       # @option options [optional, String] :user_data (nil) MIME, Base64-encoded user data.
       # @option options [optional, String] :instance_type (nil) Specifies the instance type.

data/lib/AWS/EC2/spot_instance_requests.rb

@@ -27,6 +27,7 @@ module AWS
       # @option options [optional,String] :availability_zone (nil) Specifies the placement constraints (Availability Zones) for launching the instances.
       # @option options [optional, Array] :block_device_mapping ([]) An array of Hashes representing the elements of the block device mapping.  e.g. [{:device_name => '/dev/sdh', :virtual_name => '', :ebs_snapshot_id => '', :ebs_volume_size => '', :ebs_delete_on_termination => ''},{},...]
       # @option options [optional, Boolean] :monitoring_enabled (false) Enables monitoring for the instance.
+      # @option options [optional, Boolean] :base64_encoded (false)
       #
       def request_spot_instances( options = {} )
         options = { :instance_count => 1,
@@ -35,6 +36,7 @@ module AWS
 
         raise ArgumentError, ":addressing_type has been deprecated." if options[:addressing_type]
         raise ArgumentError, ":spot_price must be provided" if options[:spot_price].nil? || options[:spot_price].empty?
+        raise ArgumentError, ":base64_encoded must be 'true' or 'false'" unless [true, false].include?(options[:base64_encoded])
 
         user_data = extract_user_data(options)
 
@@ -64,7 +66,7 @@ module AWS
         params["LaunchSpecification.SubnetId"]                          = options[:subnet_id] unless options[:subnet_id].nil?
         params["LaunchSpecification.Placement.AvailabilityZone"]        = options[:availability_zone] unless options[:availability_zone].nil?
         params["LaunchSpecification.Monitoring.Enabled"]                = options[:monitoring_enabled].to_s unless options[:monitoring_enabled].nil?
-        
+
         return response_generator(:action => "RequestSpotInstances", :params => params)
       end
 

data/lib/AWS/ELB/load_balancers.rb

@@ -115,7 +115,7 @@ module AWS
         raise ArgumentError, "No :instances provided" if options[:instances].nil? || options[:instances].empty?
         raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
         params = {}
-        params.merge!(pathlist('Instances.member', [options[:instances]].flatten))
+        params.merge!(pathhashlist('Instances.member', options[:instances].flatten.collect{|e| {:instance_id => e}}, {:instance_id => 'InstanceId'}))
         params['LoadBalancerName'] = options[:load_balancer_name]
         return response_generator(:action => "DeregisterInstancesFromLoadBalancer", :params => params)
       end
@@ -125,26 +125,21 @@ module AWS
       #
       # Note: Completion of this API does not guarantee that operation has completed. Rather, it means that the request has been registered and the changes will happen shortly.
       #
-      # @option options [Hash] :health_check A Hash with the keys (:timeout, :interval, :unhealthy_threshold, :healthy_threshold)
       # @option options [String] :load_balancer_name The name of the load balancer.
+      # @option options [Hash] :health_check A Hash with the key values provided as String or FixNum values (:timeout, :interval, :unhealthy_threshold, :healthy_threshold)
       #
       def configure_health_check( options = {} )
-        raise ArgumentError, "No :health_check provided" if options[:health_check].nil? || options[:health_check].empty?
-        raise ArgumentError, "No :health_check => :target provided" if options[:health_check][:target].nil? || options[:health_check][:target].empty?
-        raise ArgumentError, "No :health_check => :timeout provided" if options[:health_check][:timeout].nil? || options[:health_check][:timeout].empty?
-        raise ArgumentError, "No :health_check => :interval provided" if options[:health_check][:interval].nil? || options[:health_check][:interval].empty?
-        raise ArgumentError, "No :health_check => :unhealthy_threshold provided" if options[:health_check][:unhealthy_threshold].nil? || options[:health_check][:unhealthy_threshold].empty?
-        raise ArgumentError, "No :health_check => :healthy_threshold provided" if options[:health_check][:healthy_threshold].nil? || options[:health_check][:healthy_threshold].empty?
         raise ArgumentError, "No :load_balancer_name provided" if options[:load_balancer_name].nil? || options[:load_balancer_name].empty?
+        raise ArgumentError, "No :health_check Hash provided" if options[:health_check].nil? || options[:health_check].empty?
 
         params = {}
 
-        params['LoadBalancerName'] = options[:load_balancer_name]
-        params['HealthCheck.Target'] = options[:health_check][:target]
-        params['HealthCheck.Timeout'] = options[:health_check][:timeout]
-        params['HealthCheck.Interval'] = options[:health_check][:interval]
-        params['HealthCheck.UnhealthyThreshold'] = options[:health_check][:unhealthy_threshold]
-        params['HealthCheck.HealthyThreshold'] = options[:health_check][:healthy_threshold]
+        params['LoadBalancerName']                = options[:load_balancer_name]
+        params['HealthCheck.Target']              = options[:health_check][:target] unless options[:health_check][:target].nil?
+        params['HealthCheck.Timeout']             = options[:health_check][:timeout].to_s unless options[:health_check][:timeout].nil?
+        params['HealthCheck.Interval']            = options[:health_check][:interval].to_s unless options[:health_check][:interval].nil?
+        params['HealthCheck.UnhealthyThreshold']  = options[:health_check][:unhealthy_threshold].to_s unless options[:health_check][:unhealthy_threshold].nil?
+        params['HealthCheck.HealthyThreshold']    = options[:health_check][:healthy_threshold].to_s unless options[:health_check][:healthy_threshold].nil?
 
         return response_generator(:action => "ConfigureHealthCheck", :params => params)
       end

data/lib/AWS/RDS/rds.rb

@@ -17,7 +17,7 @@ module AWS
       # @option options [String] :db_security_groups are the list of db security groups to associate with the instance (nil)
       # @option options [String] :availability_zone is the availability_zone to create the instance in (nil)
       # @option options [String] :preferred_maintenance_window in format: ddd:hh24:mi-ddd:hh24:mi (nil)
-      # @option options [String] :backend_retention_period is the number of days which automated backups are retained (1)
+      # @option options [String] :backup_retention_period is the number of days which automated backups are retained (1)
       # @option options [String] :preferred_backup_window is the daily time range for which automated backups are created
       #
       def create_db_instance( options = {})
@@ -29,6 +29,9 @@ module AWS
         raise ArgumentError, "No :master_user_password provided" if options.does_not_have?(:master_user_password)
         raise ArgumentError, "No :db_instance_class provided" if options.does_not_have?(:db_instance_class)
 
+        # handle a former argument that was misspelled
+        raise ArgumentError, "Perhaps you meant :backup_retention_period" if options.has?(:backend_retention_period)
+
         params = {}
         params['DBInstanceIdentifier'] = options[:db_instance_identifier]
         params["AllocatedStorage"] = options[:allocated_storage].to_s
@@ -42,8 +45,8 @@ module AWS
         params["DBParameterGroup"] = options[:db_parameter_group] if options.has?(:db_parameter_group)
         params["DBSecurityGroups"] = options[:db_security_groups] if options.has?(:db_security_groups)
         params["AvailabilityZone"] = options[:availability_zone] if options.has?(:availability_zone)
-        params["PreferredMaintenanceWindow"] = options[:preferred_backup_window] if options.has?(:preferred_backup_window)
-        params["BackupRetentionPeriod"] = options[:backend_retention_period] if options.has?(:backend_retention_period)
+        params["PreferredMaintenanceWindow"] = options[:preferred_maintenance_window] if options.has?(:preferred_maintenance_window)
+        params["BackupRetentionPeriod"] = options[:backup_retention_period].to_s if options.has?(:backup_retention_period)
         params["PreferredBackupWindow"] = options[:preferred_backup_window] if options.has?(:preferred_backup_window)
 
         return response_generator(:action => "CreateDBInstance", :params => params)
@@ -363,7 +366,7 @@ module AWS
         params["DBParameterGroupName"] = options[:db_parameter_group_name] if options.has?(:db_parameter_group_name)
         params["DBSecurityGroups"] = options[:db_security_groups] if options.has?(:db_security_groups)
         params["AvailabilityZone"] = options[:availability_zone] if options.has?(:availability_zone)
-        params["PreferredMaintenanceWindow"] = options[:preferred_backup_window] if options.has?(:preferred_backup_window)
+        params["PreferredMaintenanceWindow"] = options[:preferred_maintenance_window] if options.has?(:preferred_maintenance_window)
         params["BackupRetentionPeriod"] = options[:backend_retention_period] if options.has?(:backend_retention_period)
         params["PreferredBackupWindow"] = options[:preferred_backup_window] if options.has?(:preferred_backup_window)
 

data/test/test_ELB_load_balancers.rb

@@ -184,10 +184,10 @@ context "elb load balancers " do
     lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params.merge(:instances=>[])) }.should.raise(AWS::ArgumentError)
   end
 
-  specify "should be able to degresiter instances from load balancers with degregister_instances_from_load_balancer" do
+  specify "should be able to deregister instances from load balancers with deregister_instances_from_load_balancer" do
     @elb.stubs(:make_request).with('DeregisterInstancesFromLoadBalancer', {
       'LoadBalancerName' => 'Test Name',
-      'Instances.member.1' => 'i-6055fa09'
+      'Instances.member.1.InstanceId' => 'i-6055fa09'
      }).returns stub(:body => @deregister_instances_from_load_balancer_response_body, :is_a? => true)
 
      response = @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params)
@@ -197,7 +197,7 @@ context "elb load balancers " do
   specify "method deregister_instances_from_load_balancer should reject bad arguments" do
     @elb.stubs(:make_request).with('DeregisterInstancesFromLoadBalancer', {
       'LoadBalancerName' => 'Test Name',
-      'Instances.member.1' => 'i-6055fa09'
+      'Instances.member.1.InstanceId' => 'i-6055fa09'
     }).returns stub(:body => @deregister_instances_from_load_balancer_response_body, :is_a? => true)
 
     lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params) }.should.not.raise(AWS::ArgumentError)
@@ -206,7 +206,7 @@ context "elb load balancers " do
     lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params.merge(:instances=>[])) }.should.raise(AWS::ArgumentError)
   end
 
-  specify "should be able to degresiter instances from load balancers with degregister_instances_from_load_balancer" do
+  specify "should be able to configure_health_check for instances from load balancers" do
     @elb.stubs(:make_request).with('ConfigureHealthCheck', {
       'LoadBalancerName' => 'Test Name',
       'HealthCheck.Interval' => '5',
@@ -218,8 +218,45 @@ context "elb load balancers " do
 
     response = @elb.configure_health_check(@valid_configure_health_check_params)
     response.should.be.an.instance_of Hash
+
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params.merge(:load_balancer_name => nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params.merge(:load_balancer_name => "")) }.should.raise(AWS::ArgumentError)
+
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params.merge(:health_check => nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params.merge(:health_check => "")) }.should.raise(AWS::ArgumentError)
+
   end
 
+  specify "should be able to configure_health_check for instances from load balancers with string health check args" do
+    @elb.stubs(:make_request).with('ConfigureHealthCheck', {
+      'LoadBalancerName' => 'Test Name',
+      'HealthCheck.Interval' => '5',
+      'HealthCheck.Target' => 'HTTP:80/servlets-examples/servlet/',
+      'HealthCheck.HealthyThreshold' => '2',
+      'HealthCheck.Timeout' => '2',
+      'HealthCheck.UnhealthyThreshold' => '2'
+    }).returns stub(:body => @configure_health_check_response_body, :is_a? => true)
+
+    response = @elb.configure_health_check(@valid_configure_health_check_params.merge(:health_check => {:target => 'HTTP:80/servlets-examples/servlet/', :timeout => '2', :interval  => '5', :unhealthy_threshold  => '2', :healthy_threshold  => '2' }))
+    response.should.be.an.instance_of Hash
+  end
+
+  specify "should be able to configure_health_check for instances from load balancers with FixNum health check args" do
+    @elb.stubs(:make_request).with('ConfigureHealthCheck', {
+      'LoadBalancerName' => 'Test Name',
+      'HealthCheck.Interval' => '5',
+      'HealthCheck.Target' => 'HTTP:80/servlets-examples/servlet/',
+      'HealthCheck.HealthyThreshold' => '2',
+      'HealthCheck.Timeout' => '2',
+      'HealthCheck.UnhealthyThreshold' => '2'
+    }).returns stub(:body => @configure_health_check_response_body, :is_a? => true)
+
+    response = @elb.configure_health_check(@valid_configure_health_check_params.merge(:health_check => {:target => 'HTTP:80/servlets-examples/servlet/', :timeout => 2, :interval  => 5, :unhealthy_threshold  => 2, :healthy_threshold  => 2 }))
+    response.should.be.an.instance_of Hash
+  end
+
+
   specify "method degregister_instances_from_load_balancer should reject bad arguments" do
    @elb.stubs(:make_request).with('ConfigureHealthCheck', {
       'LoadBalancerName' => 'Test Name',

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 10
-  version: 0.9.10
+  - 11
+  version: 0.9.11
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -07:00
+date: 2010-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency