amazon-ec2 0.7.3 → 0.7.4

data/lib/AWS/EC2/keypairs.rb

@@ -1,6 +1,5 @@
 module AWS
   module EC2
-
     class Base < AWS::Base
 
 
@@ -10,15 +9,10 @@ module AWS
       # @option options [String] :key_name ("")
       #
       def create_keypair( options = {} )
-
         options = { :key_name => "" }.merge(options)
-
         raise ArgumentError, "No :key_name provided" if options[:key_name].nil? || options[:key_name].empty?
-
         params = { "KeyName" => options[:key_name] }
-
         return response_generator(:action => "CreateKeyPair", :params => params)
-
       end
 
 
@@ -29,13 +23,9 @@ module AWS
       # @option options [Array] :key_name ([])
       #
       def describe_keypairs( options = {} )
-
         options = { :key_name => [] }.merge(options)
-
         params = pathlist("KeyName", options[:key_name] )
-
         return response_generator(:action => "DescribeKeyPairs", :params => params)
-
       end
 
 
@@ -44,18 +34,14 @@ module AWS
       # @option options [String] :key_name ("")
       #
       def delete_keypair( options = {} )
-
         options = { :key_name => "" }.merge(options)
-
         raise ArgumentError, "No :key_name provided" if options[:key_name].nil? || options[:key_name].empty?
-
         params = { "KeyName" => options[:key_name] }
-
         return response_generator(:action => "DeleteKeyPair", :params => params)
-
       end
 
-    end
 
+    end
   end
-end
+end
+

data/lib/AWS/EC2/security_groups.rb

@@ -2,6 +2,7 @@ module AWS
   module EC2
     class Base < AWS::Base
 
+
       # The CreateSecurityGroup operation creates a new security group. Every instance is launched
       # in a security group. If none is specified as part of the launch request then instances
       # are launched in the default security group. Instances within the same security group have
@@ -13,21 +14,16 @@ module AWS
       # @option options [String] :group_description ("")
       #
       def create_security_group( options = {} )
-
         options = {:group_name => "",
                    :group_description => ""
                    }.merge(options)
-
         raise ArgumentError, "No :group_name provided" if options[:group_name].nil? || options[:group_name].empty?
         raise ArgumentError, "No :group_description provided" if options[:group_description].nil? || options[:group_description].empty?
-
         params = {
           "GroupName" => options[:group_name],
           "GroupDescription" => options[:group_description]
         }
-
         return response_generator(:action => "CreateSecurityGroup", :params => params)
-
       end
 
 
@@ -41,13 +37,9 @@ module AWS
       # @option options [optional, Array] :group_name ([])
       #
       def describe_security_groups( options = {} )
-
         options = { :group_name => [] }.merge(options)
-
         params = pathlist("GroupName", options[:group_name] )
-
         return response_generator(:action => "DescribeSecurityGroups", :params => params)
-
       end
 
 
@@ -59,15 +51,10 @@ module AWS
       # @option options [String] :group_name ("")
       #
       def delete_security_group( options = {} )
-
         options = { :group_name => "" }.merge(options)
-
         raise ArgumentError, "No :group_name provided" if options[:group_name].nil? || options[:group_name].empty?
-
         params = { "GroupName" => options[:group_name] }
-
         return response_generator(:action => "DeleteSecurityGroup", :params => params)
-
       end
 
 
@@ -96,8 +83,6 @@ module AWS
       # @option options [optional, String] :source_security_group_owner_id (nil) Required when authorizing user group pair permissions
       #
       def authorize_security_group_ingress( options = {} )
-
-        # defaults
         options = { :group_name => nil,
                     :ip_protocol => nil,
                     :from_port => nil,
@@ -118,9 +103,7 @@ module AWS
                    "SourceSecurityGroupName" => options[:source_security_group_name],
                    "SourceSecurityGroupOwnerId" => options[:source_security_group_owner_id]
                    }
-
         return response_generator(:action => "AuthorizeSecurityGroupIngress", :params => params)
-
       end
 
 
@@ -151,8 +134,6 @@ module AWS
       # @option options [optional, String] :source_security_group_owner_id (nil) Required when revoking user group pair permissions
       #
       def revoke_security_group_ingress( options = {} )
-
-        # defaults
         options = { :group_name => nil,
                     :ip_protocol => nil,
                     :from_port => nil,
@@ -173,11 +154,11 @@ module AWS
                    "SourceSecurityGroupName" => options[:source_security_group_name],
                    "SourceSecurityGroupOwnerId" => options[:source_security_group_owner_id]
                    }
-
         return response_generator(:action => "RevokeSecurityGroupIngress", :params => params)
-
       end
 
+
     end
   end
-end
+end
+

data/lib/AWS/EC2/snapshots.rb

@@ -3,36 +3,29 @@ module AWS
 
     class Base < AWS::Base
 
+
       # The DescribeSnapshots operation describes the status of Amazon EBS snapshots.
       #
       # @option options [Array] :snapshot_id ([])
       #
       def describe_snapshots( options = {} )
-
         options = { :snapshot_id => [] }.merge(options)
-
         params = pathlist("SnapshotId", options[:snapshot_id] )
-
         return response_generator(:action => "DescribeSnapshots", :params => params)
-
       end
 
+
       # The CreateSnapshot operation creates a snapshot of an Amazon EBS volume and stores it in Amazon S3. You can use snapshots for backups, to launch instances from identical snapshots, and to save data before shutting down an instance.
       #
       # @option options [String] :volume_id ('')
       #
       def create_snapshot( options = {} )
-
         options = { :volume_id => '' }.merge(options)
-
         raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
-
         params = {
           "VolumeId" => options[:volume_id]
         }
-
         return response_generator(:action => "CreateSnapshot", :params => params)
-
       end
 
 
@@ -41,19 +34,43 @@ module AWS
       # @option options [String] :snapshot_id ('')
       #
       def delete_snapshot( options = {} )
-
         options = { :snapshot_id => '' }.merge(options)
-
         raise ArgumentError, "No :snapshot_id provided" if options[:snapshot_id].nil? || options[:snapshot_id].empty?
-
         params = {
           "SnapshotId" => options[:snapshot_id]
         }
-
         return response_generator(:action => "DeleteSnapshot", :params => params)
+      end
 
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def describe_snapshot_attribute( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def modify_snapshot_attribute( options = {} )
+        raise "Not yet implemented"
       end
 
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def reset_snapshot_attribute( options = {} )
+        raise "Not yet implemented"
+      end
+
+
     end
   end
-end
+end
+

data/lib/AWS/EC2/volumes.rb

@@ -2,6 +2,7 @@ module AWS
   module EC2
     class Base < AWS::Base
 
+
       # The DescribeVolumes operation lists one or more Amazon EBS volumes that you own, If you do not specify any volumes, Amazon EBS returns all volumes that you own.
       #
       # @option options [optional, String] :volume_id ([])
@@ -12,6 +13,7 @@ module AWS
         return response_generator(:action => "DescribeVolumes", :params => params)
       end
 
+
       # The CreateVolume operation creates a new Amazon EBS volume that you can mount from any Amazon EC2 instance.
       #
       # @option options [String] :availability_zone ('')
@@ -19,43 +21,33 @@ module AWS
       # @option options [optional, String] :snapshot_id ('')
       #
       def create_volume( options = {} )
-
-        # defaults
         options = { :availability_zone => '' }.merge(options)
-
         raise ArgumentError, "No :availability_zone provided" if options[:availability_zone].nil? || options[:availability_zone].empty?
-
         options = { :size => '' }.merge(options)
         options = { :snapshot_id => '' }.merge(options)
-
         params = {
           "AvailabilityZone" => options[:availability_zone],
           "Size" => options[:size],
           "SnapshotId" => options[:snapshot_id]
         }
-
         return response_generator(:action => "CreateVolume", :params => params)
-
       end
 
+
       # The DeleteVolume operation deletes an Amazon EBS volume.
       #
       # @option options [String] :volume_id ('')
       #
       def delete_volume( options = {} )
-
         options = { :volume_id => '' }.merge(options)
-
         raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
-
         params = {
           "VolumeId" => options[:volume_id]
         }
-
         return response_generator(:action => "DeleteVolume", :params => params)
-
       end
 
+
       # The AttachVolume operation attaches an Amazon EBS volume to an instance.
       #
       # @option options [String] :volume_id ('')
@@ -63,11 +55,9 @@ module AWS
       # @option options [String] :device ('')
       #
       def attach_volume( options = {} )
-
         options = { :volume_id => '' }.merge(options)
         options = { :instance_id => '' }.merge(options)
         options = { :device => '' }.merge(options)
-
         raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
         raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
         raise ArgumentError, "No :device provided" if options[:device].nil? || options[:device].empty?
@@ -77,11 +67,10 @@ module AWS
           "InstanceId" => options[:instance_id],
           "Device" => options[:device]
         }
-
         return response_generator(:action => "AttachVolume", :params => params)
-
       end
 
+
       # The DetachVolume operation detaches an Amazon EBS volume from an instance.
       #
       # @option options [String] :volume_id ('')
@@ -90,25 +79,21 @@ module AWS
       # @option options [optional, Boolean] :force ('')
       #
       def detach_volume( options = {} )
-
         options = { :volume_id => '' }.merge(options)
-
         raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
-
         options = { :instance_id => '' }.merge(options)
         options = { :device => '' }.merge(options)
         options = { :force => '' }.merge(options)
-
         params = {
           "VolumeId" => options[:volume_id],
           "InstanceId" => options[:instance_id],
           "Device" => options[:device],
           "Force" => options[:force]
         }
-
         return response_generator(:action => "DetachVolume", :params => params)
       end
 
+
     end
   end
 end

data/lib/AWS/exceptions.rb

@@ -1,8 +1,8 @@
 #--
-# AWS EC2 CLIENT ERROR CODES
-# AWS EC2 can throw error exceptions that contain a '.' in them.
+# AWS ERROR CODES
+# AWS can throw error exceptions that contain a '.' in them.
 # since we can't name an exception class with that '.' I compressed
-# each class name into the non-dot version.  This allows us to retain
+# each class name into the non-dot version which allows us to retain
 # the granularity of the exception.
 #++
 
@@ -14,17 +14,26 @@ module AWS
   # CLIENT : A client side argument error
   class ArgumentError < Error; end
 
+  # Elastic Compute Cloud
+  ############################
+
+  # EC2 : User has the maximum number of allowed IP addresses.
+  class AddressLimitExceeded < Error; end
+
+  # EC2 : The limit on the number of Amazon EBS volumes attached to one instance has been exceeded.
+  class AttachmentLimitExceeded < Error; end
+
   # EC2 : User not authorized.
   class AuthFailure < Error; end
 
-  # EC2 : Invalid AWS Account
-  class InvalidClientTokenId < Error; end
+  # EC2 : Volume is in incorrect state
+  class IncorrectState < Error; end
 
-  # EC2 : Invalid Parameters for Value
-  class InvalidParameterValue < Error; end
+  # EC2 : User has max allowed concurrent running instances.
+  class InstanceLimitExceeded < Error; end
 
-  # EC2 : Specified AMI has an unparsable manifest.
-  class InvalidManifest < Error; end
+  # EC2 : The value of an item added to, or removed from, an image attribute is invalid.
+  class InvalidAMIAttributeItemValue < Error; end
 
   # EC2 : Specified AMI ID is not valid.
   class InvalidAMIIDMalformed < Error; end
@@ -35,6 +44,12 @@ module AWS
   # EC2 : Specified AMI ID has been deregistered and is no longer available.
   class InvalidAMIIDUnavailable < Error; end
 
+  # EC2 : The instance cannot detach from a volume to which it is not attached.
+  class InvalidAttachmentNotFound < Error; end
+
+  # EC2 : The device to which you are trying to attach (i.e. /dev/sdh) is already in use on the instance.
+  class InvalidDeviceInUse < Error; end
+
   # EC2 : Specified instance ID is not valid.
   class InvalidInstanceIDMalformed < Error; end
 
@@ -59,6 +74,15 @@ module AWS
   # EC2 : Specified group name is a reserved name.
   class InvalidGroupReserved < Error; end
 
+  # EC2 : Specified AMI has an unparsable manifest.
+  class InvalidManifest < Error; end
+
+  # EC2 : RunInstances was called with minCount and maxCount set to 0 or minCount > maxCount.
+  class InvalidParameterCombination < Error; end
+
+  # EC2 : The value supplied for a parameter was invalid.
+  class InvalidParameterValue < Error; end
+
   # EC2 : Attempt to authorize a permission that has already been authorized.
   class InvalidPermissionDuplicate < Error; end
 
@@ -71,22 +95,79 @@ module AWS
   # EC2 : Specified reservation ID does not exist.
   class InvalidReservationIDNotFound < Error; end
 
-  # EC2 : User has reached max allowed concurrent running instances.
-  class InstanceLimitExceeded < Error; end
+  # EC2 : The snapshot ID that was passed as an argument was malformed.
+  class InvalidSnapshotIDMalformed < Error; end
 
-  # EC2 : An invalid set of parameters were passed as arguments
-  class InvalidParameterCombination < Error; end
-
-  # EC2 : An unknown parameter was passed as an argument
-  class UnknownParameter < Error; end
+  # EC2 : The specified snapshot does not exist.
+  class InvalidSnapshotIDNotFound < Error; end
 
   # EC2 : The user ID is neither in the form of an AWS account ID or one
   # of the special values accepted by the owner or executableBy flags
   # in the DescribeImages call.
   class InvalidUserIDMalformed < Error; end
 
-  # EC2 : The value of an item added to, or removed from, an image attribute is invalid.
-  class InvalidAMIAttributeItemValue < Error; end
+  # EC2 : Reserved Instances ID not found.
+  class InvalidReservedInstancesId < Error; end
+
+  # EC2 : Reserved Instances Offering ID not found.
+  class InvalidReservedInstancesOfferingId < Error; end
+
+  # EC2 : The volume ID that was passed as an argument was malformed.
+  class InvalidVolumeIDMalformed < Error; end
+
+  # EC2 : The volume specified does not exist.
+  class InvalidVolumeIDNotFound < Error; end
+
+  # EC2 : The volume already exists in the system.
+  class InvalidVolumeIDDuplicate < Error; end
+
+  # EC2 : The specified volume ID and instance ID are in different Availability Zones.
+  class InvalidVolumeIDZoneMismatch < Error; end
+
+  # EC2 : The zone specified does not exist.
+  class InvalidZoneNotFound < Error; end
+
+  # EC2 : Insufficient Reserved Instances capacity.
+  class InsufficientReservedInstancesCapacity < Error; end
+
+  # EC2 : The instance specified does not support EBS.
+  class NonEBSInstance < Error; end
+
+  # EC2 : The limit on the number of Amazon EBS snapshots in the pending state has been exceeded.
+  class PendingSnapshotLimitExceeded < Error; end
+
+  # EC2 : Your current quota does not allow you to purchase the required number of reserved instances.
+  class ReservedInstancesLimitExceeded < Error; end
+
+  # EC2 : The limit on the number of Amazon EBS snapshots has been exceeded.
+  class SnapshotLimitExceeded < Error; end
+
+  # EC2 : An unknown parameter was passed as an argument
+  class UnknownParameter < Error; end
+
+  # EC2 : The limit on the number of Amazon EBS volumes has been exceeded.
+  class VolumeLimitExceeded < Error; end
+
+  # Server Error Codes
+  ###
+
+  # Server : Internal Error.
+  class InternalError < Error; end
+
+  # Server : Not enough available addresses to satisfy your minimum request.
+  class InsufficientAddressCapacity < Error; end
+
+  # Server : There are not enough available instances to satisfy your minimum request.
+  class InsufficientInstanceCapacity < Error; end
+
+  # Server : There are not enough available reserved instances to satisfy your minimum request.
+  class InsufficientReservedInstanceCapacity < Error; end
+
+  # Server : The server is overloaded and cannot handle the request.
+  class Unavailable < Error; end
+
+  # Elastic Load Balancer
+  ############################
 
   # ELB : The Load balancer specified was not found.
   class LoadBalancerNotFound < Error; end
@@ -106,14 +187,11 @@ module AWS
   # ELB :
   class InvalidConfigurationRequest < Error; end
 
-  # Server : Internal AWS EC2 Error.
-  class InternalError < Error; end
-
-  # Server : There are not enough available instances to satisfy your minimum request.
-  class InsufficientInstanceCapacity < Error; end
+  # API Errors
+  ############################
 
-  # Server : The server is overloaded and cannot handle the request.
-  class Unavailable < Error; end
+  # Server : Invalid AWS Account
+  class InvalidClientTokenId < Error; end
 
   # Server : The provided signature does not match.
   class SignatureDoesNotMatch < Error; end