fog 0.2.30 → 0.3.0

data/lib/fog/aws/requests/{ec2 → compute}/detach_volume.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/detach_volume'
+        require 'fog/aws/parsers/compute/detach_volume'
 
         # Detach an Amazon EBS volume from a running instance
         #
@@ -28,7 +28,7 @@ module Fog
             'Action'    => 'DetachVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::DetachVolume.new
+            :parser     => Fog::Parsers::AWS::Compute::DetachVolume.new
           }.merge!(options))
         end
 
@@ -48,7 +48,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/disassociate_address.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Disassociate an elastic IP address from its instance (if any)
@@ -18,7 +18,7 @@ module Fog
             'Action'    => 'DisassociateAddress',
             'PublicIp'  => public_ip,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
 
@@ -42,7 +42,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/get_console_output.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/get_console_output'
+        require 'fog/aws/parsers/compute/get_console_output'
 
         # Retrieve console output for specified instance
         #
@@ -22,7 +22,7 @@ module Fog
             'Action'      => 'GetConsoleOutput',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::EC2::GetConsoleOutput.new
+            :parser       => Fog::Parsers::AWS::Compute::GetConsoleOutput.new
           )
         end
 
@@ -42,7 +42,7 @@ module Fog
             }
             response
           else;
-            raise Fog::AWS::EC2::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
 

data/lib/fog/aws/requests/compute/import_key_pair.rb

@@ -0,0 +1,54 @@
+module Fog
+  module AWS
+    class Compute
+      class Real
+
+        require 'fog/aws/parsers/compute/import_key_pair'
+
+        # Import an existing public key to create a new key pair
+        #
+        # ==== Parameters
+        # * key_name<~String> - Unique name for key pair.
+        # * public_key_material<~String> - RSA public key
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'keyFingerprint'<~String> - SHA-1 digest of DER encoded private key
+        #     * 'keyName'<~String> - Name of key
+        #     * 'requestId'<~String> - Id of request
+        def import_key_pair(key_name, public_key_material)
+          request(
+            'Action'  => 'ImportKeyPair',
+            'KeyName' => key_name,
+            'PublicKeyMaterial' => Base64::encode64(public_key_material),
+            :parser   => Fog::Parsers::AWS::Compute::ImportKeyPair.new
+          )
+        end
+
+      end
+
+      class Mock
+
+        def import_key_pair(key_name, public_key_material)
+          response = Excon::Response.new
+          unless @data[:key_pairs][key_name]
+            response.status = 200
+            data = {
+              'keyFingerprint'  => Fog::AWS::Mock.key_fingerprint,
+              'keyName'         => key_name
+            }
+            @data[:key_pairs][key_name] = data
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id
+            }.merge!(data)
+            response
+          else
+            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/{ec2 → compute}/modify_image_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Modify image attributes
@@ -21,7 +21,7 @@ module Fog
             'ImageId'       => image_id,
             'OperationType' => operation_type,
             :idempotent     => true,
-            :parser         => Fog::Parsers::AWS::EC2::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/modify_snapshot_attribute.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Modify snapshot attributes
@@ -20,7 +20,7 @@ module Fog
             'SnapshotId'    => snapshot_id,
             'OperationType' => operation_type,
             :idempotent     => true,
-            :parser         => Fog::Parsers::AWS::EC2::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/reboot_instances.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Reboot specified instances
@@ -18,7 +18,7 @@ module Fog
           request({
             'Action'    => 'RebootInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
 
@@ -40,7 +40,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/register_image.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/register_image'
+        require 'fog/aws/parsers/compute/register_image'
 
         # register an image
         #
@@ -36,7 +36,7 @@ module Fog
             'Action'      => 'RegisterImage',
             'Name'        => name,
             'Description' => description,
-            :parser       => Fog::Parsers::AWS::EC2::RegisterImage.new
+            :parser       => Fog::Parsers::AWS::Compute::RegisterImage.new
           }
 
           # This determines if we are doing a snapshot or a S3 backed AMI.
@@ -79,7 +79,7 @@ module Fog
             if name.empty?
               message << 'The request must contain the parameter name'
             end
-            raise Fog::AWS::EC2::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/release_address.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Release an elastic IP address.
@@ -15,7 +15,7 @@ module Fog
             'Action'    => 'ReleaseAddress',
             'PublicIp'  => public_ip,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
 
@@ -33,7 +33,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/revoke_security_group_ingress.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Remove permissions from a security group
@@ -26,7 +26,7 @@ module Fog
           request({
             'Action'    => 'RevokeSecurityGroupIngress',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
 
@@ -64,7 +64,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The security group '#{options['GroupName']}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The security group '#{options['GroupName']}' does not exist")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/run_instances.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/run_instances'
+        require 'fog/aws/parsers/compute/run_instances'
 
         # Launch specified instances
         #
@@ -26,6 +26,7 @@ module Fog
         #     * 'Ebs.SnapshotId'<~String> - id of snapshot to boot volume from
         #     * 'Ebs.VolumeSize'<~String> - size of volume in GiBs required unless snapshot is specified
         #     * 'Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
+        #   * 'ClientToken'<~String> - unique case-sensitive token for ensuring idempotency
         #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances (you must omit this parameter if using Virtual Private Clouds)
         #   * 'InstanceInitiatedShutdownBehaviour'<~String> - specifies whether volumes are stopped or terminated when instance is shutdown
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
@@ -97,7 +98,7 @@ module Fog
             'ImageId'   => image_id,
             'MinCount'  => min_count,
             'MaxCount'  => max_count,
-            :parser     => Fog::Parsers::AWS::EC2::RunInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::RunInstances.new
           }.merge!(options))
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/start_instances.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/start_stop_instances'
+        require 'fog/aws/parsers/compute/start_stop_instances'
 
         # Start specified instance
         #
@@ -20,7 +20,7 @@ module Fog
           request({
             'Action'    => 'StartInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::StartStopInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::StartStopInstances.new
           }.merge!(params))
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/stop_instances.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/start_stop_instances'
+        require 'fog/aws/parsers/compute/start_stop_instances'
 
         # Stop specified instance
         #
@@ -20,7 +20,7 @@ module Fog
           request({
             'Action'    => 'StopInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::StartStopInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::StartStopInstances.new
           }.merge!(params))
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/terminate_instances.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/terminate_instances'
+        require 'fog/aws/parsers/compute/terminate_instances'
 
         # Terminate specified instances
         #
@@ -27,7 +27,7 @@ module Fog
           request({
             'Action'    => 'TerminateInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::TerminateInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::TerminateInstances.new
           }.merge!(params))
         end
 
@@ -84,7 +84,7 @@ module Fog
 
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
 

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/create_load_balancer'

data/lib/fog/aws/requests/elb/delete_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/delete_load_balancer'

data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/deregister_instances_from_load_balancer'

data/lib/fog/aws/requests/elb/describe_instance_health.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/describe_instance_health'

data/lib/fog/aws/requests/elb/describe_load_balancers.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/describe_load_balancers'

data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/disable_availability_zones_for_load_balancer'

data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/enable_availability_zones_for_load_balancer'

data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/register_instances_with_load_balancer'